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

[tor-commits] [torbutton/master] Translations update



commit 1f316a27edf886f450a4ad1a1d684fb1df8ead66
Author: Georg Koppen <gk@xxxxxxxxxxxxxx>
Date:   Thu Aug 16 10:10:56 2018 +0000

    Translations update
---
 src/chrome/locale/ar/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ar/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ar/torbutton.properties          |  4 +-
 src/chrome/locale/bn-BD/aboutTor.dtd               | 42 ++++--------
 .../locale/bn-BD/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/bn-BD/torbutton.dtd              |  4 +-
 src/chrome/locale/bn-BD/torbutton.properties       | 10 +--
 src/chrome/locale/ca/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/ca/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/ca/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/ca/aboutTor.properties           | 19 ++++--
 src/chrome/locale/ca/brand.dtd                     | 15 +++--
 src/chrome/locale/ca/brand.properties              | 15 +++--
 src/chrome/locale/ca/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ca/torbutton.dtd                 | 61 +++++++++++++-----
 src/chrome/locale/ca/torbutton.properties          | 67 +++++++++++++------
 src/chrome/locale/da/aboutTBUpdate.dtd             |  2 +-
 src/chrome/locale/da/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/da/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/da/torbutton.dtd                 |  6 +-
 src/chrome/locale/da/torbutton.properties          | 10 +--
 src/chrome/locale/de/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/de/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/de/torbutton.dtd                 |  4 +-
 src/chrome/locale/de/torbutton.properties          |  8 +--
 src/chrome/locale/es/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/es/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/es/torbutton.properties          |  6 +-
 src/chrome/locale/eu/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/eu/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fa/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/fa/brand.properties              |  2 +-
 src/chrome/locale/fa/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fa/torbutton.dtd                 |  6 +-
 src/chrome/locale/fr/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/fr/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/fr/torbutton.dtd                 |  2 +-
 src/chrome/locale/fr/torbutton.properties          |  6 +-
 src/chrome/locale/ga/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/ga/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/ga/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/ga/aboutTor.properties           | 19 ++++--
 src/chrome/locale/ga/brand.dtd                     | 15 +++--
 src/chrome/locale/ga/brand.properties              | 17 ++---
 src/chrome/locale/ga/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ga/torbutton.dtd                 | 67 +++++++++++++------
 src/chrome/locale/ga/torbutton.properties          | 75 +++++++++++++++-------
 src/chrome/locale/he/aboutDialog.dtd               |  2 +-
 src/chrome/locale/he/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/he/brand.properties              |  4 +-
 src/chrome/locale/he/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/he/torbutton.properties          |  8 +--
 src/chrome/locale/id/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/id/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/id/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/id/aboutTor.properties           | 21 +++---
 src/chrome/locale/id/brand.dtd                     | 15 +++--
 src/chrome/locale/id/brand.properties              | 17 ++---
 src/chrome/locale/id/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/id/torbutton.dtd                 | 43 +++++++++++--
 src/chrome/locale/id/torbutton.properties          | 51 ++++++++++++---
 src/chrome/locale/is/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/is/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/is/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/is/aboutTor.properties           | 19 ++++--
 src/chrome/locale/is/brand.dtd                     | 15 +++--
 src/chrome/locale/is/brand.properties              | 17 ++---
 src/chrome/locale/is/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/is/torbutton.dtd                 | 65 +++++++++++++------
 src/chrome/locale/is/torbutton.properties          | 67 +++++++++++++------
 src/chrome/locale/it/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/it/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/it/torbutton.properties          |  6 +-
 src/chrome/locale/ja/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ja/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ko/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/ko/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nb/aboutDialog.dtd               | 19 ++++++
 src/chrome/locale/nb/aboutTBUpdate.dtd             |  6 ++
 src/chrome/locale/nb/aboutTor.dtd                  | 54 +++++-----------
 src/chrome/locale/nb/aboutTor.properties           | 19 ++++--
 src/chrome/locale/nb/brand.dtd                     | 15 +++--
 src/chrome/locale/nb/brand.properties              | 17 ++---
 src/chrome/locale/nb/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nb/torbutton.dtd                 | 51 +++++++++++----
 src/chrome/locale/nb/torbutton.properties          | 63 +++++++++++++-----
 src/chrome/locale/nl/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/nl/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/nl/torbutton.dtd                 |  4 +-
 src/chrome/locale/nl/torbutton.properties          |  4 +-
 src/chrome/locale/pl/aboutTor.dtd                  | 44 ++++---------
 src/chrome/locale/pl/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/pt-BR/aboutTor.dtd               | 42 ++++--------
 .../locale/pt-BR/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/pt-BR/torbutton.properties       | 14 ++--
 src/chrome/locale/ru/aboutTor.dtd                  | 43 ++++---------
 src/chrome/locale/ru/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/ru/torbutton.properties          |  4 +-
 src/chrome/locale/sv/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/sv/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/tr/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/tr/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/tr/torbutton.dtd                 |  2 +-
 src/chrome/locale/vi/aboutTor.dtd                  | 42 ++++--------
 src/chrome/locale/vi/aboutTor.properties           |  2 +-
 src/chrome/locale/vi/browserOnboarding.properties  | 38 +++++++++++
 src/chrome/locale/vi/torbutton.dtd                 | 26 ++++----
 src/chrome/locale/vi/torbutton.properties          |  8 +--
 src/chrome/locale/zh-CN/aboutTor.dtd               | 42 ++++--------
 .../locale/zh-CN/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/zh-TW/aboutTor.dtd               | 42 ++++--------
 .../locale/zh-TW/browserOnboarding.properties      | 38 +++++++++++
 src/chrome/locale/zh-TW/torbutton.dtd              |  4 +-
 src/chrome/locale/zh-TW/torbutton.properties       |  6 +-
 114 files changed, 2121 insertions(+), 1176 deletions(-)

diff --git a/src/chrome/locale/ar/aboutTor.dtd b/src/chrome/locale/ar/aboutTor.dtd
index 86fe2cd2..6a71cdd9 100644
--- a/src/chrome/locale/ar/aboutTor.dtd
+++ b/src/chrome/locale/ar/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "عÙ? تÙ?ر">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "تحذÙ?ر: Ù?Ø°Ù? Ù?سخة Ù?دÙ?Ù?Ø© Ù?Ù? اÙ?Ù?تصÙ?Ø­.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ø£Ù?ضاÙ?Ø? Ù?Ø°Ù? Ù?سخة Ù?دÙ?Ù?Ø© Ù?Ù? اÙ?Ù?تصÙ?Ø­.">
-<!ENTITY aboutTor.outOfDate2.label "اضغط عÙ?Ù? رÙ?ز اÙ?بصÙ?Ø© Ø«Ù? اختر &quot;تحÙ?Ù? Ù?Ù? تحدÙ?ثات Ù?تصÙ?Ø­ تÙ?ر&quot;">
-
-<!ENTITY aboutTor.check.label "اختبر إعدادات شبÙ?Ø© تÙ?ر.">
-
-<!ENTITY aboutTor.success.label "Ø£Ù?Ù?اÙ? بÙ? Ù?Ù? Ù?تصÙ?Ø­ تÙ?ر">
-<!ENTITY aboutTor.success2.label "Ù?تصÙ? بشبÙ?Ø© تÙ?ر">
-<!ENTITY aboutTor.success3.label "Ù?Ù?Ù?Ù?Ù? اÙ?Ø¢Ù? تصÙ?Ø­ اÙ?اÙ?ترÙ?ت بشÙ?Ù? Ù?Ø­Ù?Ù? Ù?Ù?Ù?تÙ?.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "حدث خطأ Ù?ا!">
 <!ENTITY aboutTor.failure2.label "تÙ?ر Ù?ا Ù?عÙ?Ù? Ù?Ù? Ù?ذا اÙ?Ù?تصÙ?Ø­.">
 
-<!ENTITY aboutTor.search.label "بحث">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ù?عÙ?Ù?Ù?ات إضاÙ?Ù?Ø©:">
-<!ENTITY aboutTor.torInfo2.label "اÙ?دÙ?Ù?Ø© Ù?عÙ?Ù?اÙ? اÙ?Ø¥Ù?ترÙ?ت:">
-<!ENTITY aboutTor.torInfo3.label "Ù?Ù?طة اÙ?خرÙ?ج:">
-<!ENTITY aboutTor.torInfo4.label "Ù?ذا اÙ?Ù?خدÙ? Ù?ا Ù?حتÙ?ظ بأÙ? Ù?عÙ?Ù?Ù?ات عÙ? زÙ?ارÙ?.">
-<!ENTITY aboutTor.whatnextQuestion.label "Ù?اذا بعدØ?">
-<!ENTITY aboutTor.whatnextAnswer.label "Ù?ا Ù?Ù?Ø«Ù? تÙ?ر Ù?Ù? Ù?ا تحتاجÙ? Ù?Ù?تصÙ?Ø­ بشÙ?Ù? Ù?Ø­Ù?Ù? Ù?Ù?Ù?تÙ?! Ù?د تحتاج Ù?تغÙ?Ù?ر بعد عاداتÙ? أثÙ?اء اÙ?تصÙ?Ù?Ø­ Ù?ضÙ?اÙ? سرÙ?Ø© Ù?Ù?Ù?تÙ?.">
-<!ENTITY aboutTor.whatnext.label "Ù?صائح Ù?Ù?Ø­Ù?اظ عÙ?Ù? سرÙ?Ù?Ø© Ù?Ù?Ù?تÙ? »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ø£Ù?Ø© أسئÙ?Ø©Ø?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "س">
-<!ENTITY aboutTor.torbrowser_user_manual.label "دÙ?Ù?Ù? استخداÙ? Ù?تصÙ?Ù?Ø­ تÙ?ر">
-<!ENTITY aboutTor.helpInfo1.label "بإÙ?Ù?اÙ?Ù? اÙ?Ù?ساعدة!">
-<!ENTITY aboutTor.helpInfo2.label "Ù?Ù?Ù?Ù?Ù? Ù?ساعدة شبÙ?Ø© تÙ?ر Ù? جعÙ?Ù?ا Ø£Ù?ثر سرعة Ù? Ù?Ù?Ù?Ø© بإحدÙ? اÙ?طرÙ? اÙ?آتÙ?Ø©:">
-<!ENTITY aboutTor.helpInfo3.label "شغÙ?Ù? Ù?Ù?طة تÙ?ر »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "تبرع بخدÙ?اتÙ? »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "تبرع »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Ù?شرÙ?ع تÙ?ر Ù?Ù? Ù?شرÙ?ع غÙ?ر ربحÙ? (حسب US 501(c)(3)) Ù?Ù?Ù?رس Ù?Ù?بحثØ? Ù?اÙ?تطÙ?Ù?رØ? Ù?اÙ?تÙ?عÙ?Ø© Ø­Ù?Ù? Ù?Ù?ضÙ?ع إخÙ?اء اÙ?Ù?Ù?Ù?Ø© Ù?اÙ?خصÙ?صÙ?Ø©.">
-<!ENTITY aboutTor.learnMore.label "اÙ?رأ اÙ?Ù?زÙ?د عÙ? Ù?شرÙ?ع تÙ?ر »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ar/browserOnboarding.properties b/src/chrome/locale/ar/browserOnboarding.properties
new file mode 100644
index 00000000..6910fd7b
--- /dev/null
+++ b/src/chrome/locale/ar/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ù?رحباÙ?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=اÙ?خصÙ?صÙ?Ø©
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Ø¥Ù?تشاÙ?
+
+onboarding.tour-tor-security=اÙ?Ø£Ù?اÙ?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=خدÙ?ات اÙ?بصÙ?Ø© (Onion)
+onboarding.tour-tor-onion-services.title=خدÙ?ات اÙ?بصÙ?Ø© (Onion)
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ar/torbutton.properties b/src/chrome/locale/ar/torbutton.properties
index 815004f9..5dd4c283 100644
--- a/src/chrome/locale/ar/torbutton.properties
+++ b/src/chrome/locale/ar/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=Ù?ا Ù?Ù?تÙ?Ù? %S اÙ?صÙ?احÙ?ات اÙ?Ù?Ø·Ù?Ù?بة Ù?Ù?
 profileMigrationFailed=Ù?Ø´Ù? Ù?Ù?Ù? Ù?Ù?Ù? إعدادات %S اÙ?Ù?Ù?جÙ?د Ø¥Ù?Ù? اÙ?إصدارة اÙ?جدÙ?دة.\nسÙ?ستخدÙ? Ù?Ù?Ù? إعدادات جدÙ?د.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=اÙ?اتصاÙ? Ù?عÙ?Ù? (خدÙ?Ø© بصÙ?Ø©Ø? %1$SØ? Ù?Ù?اتÙ?Ø­ %2$S بتةØ? %3$S)
+pageInfo_OnionEncryption=اÙ?اتصاÙ? Ù?عÙ?Ù? (خدÙ?Ø© بصÙ?Ø©)
diff --git a/src/chrome/locale/bn-BD/aboutTor.dtd b/src/chrome/locale/bn-BD/aboutTor.dtd
index f9226bf1..dffca8a8 100644
--- a/src/chrome/locale/bn-BD/aboutTor.dtd
+++ b/src/chrome/locale/bn-BD/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tor সম�পর���">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "সতর��তা: �� ব�রা��ার�ি প�রান�।">
-<!ENTITY aboutTor.outOfDateTorOff.label "��াড়া�, �� ব�রা��ার�ি� প�রান�।">
-<!ENTITY aboutTor.outOfDate2.label "Onion �র �পর ��লি� �র�ন �ব� তারপর �র ব�রা��ার �পড�� �ন�য ��� নির�বা�ন �র�ন।">
-
-<!ENTITY aboutTor.check.label "�র ন���য়ার�� স��ি�স ��স��  �র�ন">
-
-<!ENTITY aboutTor.success.label "�র ব�রা��ার� স�বা�তম">
-<!ENTITY aboutTor.success2.label "�র ন���য়ার��� স�য���ত">
-<!ENTITY aboutTor.success3.label "�পনি ��ন নিরাপদ� �ন��ারন�� ব�রা�� �রত� পারব�ন।">
+<!ENTITY aboutTor.ready.label "���সপ�ল�র. ��পন�.">
+<!ENTITY aboutTor.ready2.label "�পনি বিশ�ব�র সব��য়� ব�য��তি�ত ব�রা��ি� �ভি���তার �ন�য প�রস�ত�ত ।">
 <!ENTITY aboutTor.failure.label "�ি�� ভ�ল হয়���!">
 <!ENTITY aboutTor.failure2.label "�র �� ব�রা��ার� �া� �র�� না">
 
-<!ENTITY aboutTor.search.label "����ন">
+<!ENTITY aboutTor.search.label "DuckDuckGo স���� �ন�সন�ধান">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "�তিরি��ত তথ�য:">
-<!ENTITY aboutTor.torInfo2.label "দ�শ �ব� IP ঠি�ানা:">
-<!ENTITY aboutTor.torInfo3.label "প�রস�থান ন�ড:">
-<!ENTITY aboutTor.torInfo4.label "�� সার�ভার দর�শ� সম�পর��� ��ন� তথ�য ল� �র� না।">
-<!ENTITY aboutTor.whatnextQuestion.label "�রপর ��?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor �পনি সমস�ত ব�নাম� ব�রা�� �রত� হব� না! �পনার পরি�য় নিরাপদ থা�� তা নিশ��িত �রত� �পনা�� �পনার ব�রা��ি� �ভ�যাস��লির �ি�� পরিবর�তন �রত� হব�।">
-<!ENTITY aboutTor.whatnext.label "নিরাপদ� থা�ার থা�ার �িপস »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "প�রশ�ন?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "�মাদ�র �র ব�রা��ার�র ম�যান�য়াল পর���ষা �র�ন»">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "�র ব�রা��ার ���ার ম�যান�য়াল">
-<!ENTITY aboutTor.helpInfo1.label "ত�মি সাহায�য �রত� পার!">
-<!ENTITY aboutTor.helpInfo2.label "�র ন���য়ার�� দ�র�ত �ব� শ��তিশাল� �রত� �পনি �ন�� �পায় ���:">
-<!ENTITY aboutTor.helpInfo3.label "���ি �র� রিল� নাড �ালান »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "�পনার পরিষ�বা��লি স�ব����াস�ব� »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "দান �র�ন »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "�মাদ�র �র ব�রা��ার�র ম�যান�য়াল পর���ষা �র�ন»">
 
-<!ENTITY aboutTor.footer.label "�র প�র�ল�প�ি মার��িন য���তরাষ���র�র 501 (সি) (3) �-লাভ�ন� �ব�ষণা, �ন�নয়ন �ব� �নলা�ন ��পন�য়তা �ব� ��পন�য়তার শি��ষা।">
-<!ENTITY aboutTor.learnMore.label "Tor প�র�ল�প সম�পর��� �র� �ান�ন »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "�র প�র�ল�প�ি ���ি মার��িন 501 (c) (3) �লাভ�ন� প�রতিষ�ঠান, মানবাধি�ার �ব� ম���ত �ব� �ন�ম���ত ��স সনদ� �ব� ��পন�য়তা প�রয���তি�� সমর�থন �র�, তাদ�র নিষিদ�ধ সহ�লভ�যতা �ব� ব�যবহার �ব� তাদ�র ব����ানি� � �নপ�রিয় ব��াপড়া ।">
+<!ENTITY aboutTor.getInvolved.label "য���ত হ�ন»">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/bn-BD/browserOnboarding.properties b/src/chrome/locale/bn-BD/browserOnboarding.properties
new file mode 100644
index 00000000..aaf75ba1
--- /dev/null
+++ b/src/chrome/locale/bn-BD/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=��পন�য়তা
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion স�বা
+onboarding.tour-tor-onion-services.title=Onion স�বা
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/bn-BD/torbutton.dtd b/src/chrome/locale/bn-BD/torbutton.dtd
index 98b928cc..201f3111 100644
--- a/src/chrome/locale/bn-BD/torbutton.dtd
+++ b/src/chrome/locale/bn-BD/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "�ি�� ফন�� �ব� �ণিত �িহ�ন ���ষম ���।">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "�ি�� ফন��, ���ন, �ণিত প�রত�� �ব� �বি ���ষম রয়���।">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "�ডি� �ব� ভিডি� (HTML5 মিডিয়া) ��লি�-��-��লা।">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "�র সার��ি�">
+<!ENTITY torbutton.circuit_display.new_circuit "�� সা���র �ন�য নত�ন সার��ি�">
diff --git a/src/chrome/locale/bn-BD/torbutton.properties b/src/chrome/locale/bn-BD/torbutton.properties
index 377fd910..45634d87 100644
--- a/src/chrome/locale/bn-BD/torbutton.properties
+++ b/src/chrome/locale/bn-BD/torbutton.properties
@@ -2,11 +2,11 @@ torbutton.circuit_display.internet = �ন��ারন���র
 torbutton.circuit_display.ip_unknown = ��পি ��ানা
 torbutton.circuit_display.onion_site = �নি�ন সা��
 torbutton.circuit_display.this_browser = �� ব�রা��ার
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = রিল��
 torbutton.circuit_display.tor_bridge = ব�রি�
 torbutton.circuit_display.unknown_country = ��ানা দ�শ
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = �ার�ড
+torbutton.circuit_display.guard_note = �পনার [�ার�ড] ন�ড পরিবর�তন হত� পার� না।
 torbutton.circuit_display.learn_more = �র� �ান�ন
 torbutton.content_sizer.margin_tooltip = �র ব�রা��ার �পনার ��ন�ড� প�রস�থ �ব� ����তা নি���ত �রত� �� মার��িন য�� �র�, �ব� ��ভাব� মান�ষ �পনা�� �নলা�ন ��র�যা� �রার ��ষমতা হ�রাস �র�।
 torbutton.panel.tooltip.disabled = �র স��রিয় �রত� ��লি� �র�ন
@@ -54,5 +54,5 @@ profileAccessDenied=%S প�র�ফা�ল�ি ��যা��স�
 profileMigrationFailed=�পনার বিদ�যমান %S প�র�ফা�ল� স�থানান�তর ব�যর�থ হয়���।\nনত�ন স��ি�স ব�যবহার �রা হব�।
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=স�য�� �ন��রিপ��  (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=স�য�� �ন��রিপ�� (Onion Service)
diff --git a/src/chrome/locale/ca/aboutDialog.dtd b/src/chrome/locale/ca/aboutDialog.dtd
new file mode 100644
index 00000000..4ab33f91
--- /dev/null
+++ b/src/chrome/locale/ca/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; és desenvolupat per">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "El &vendorShortName;">
+<!ENTITY project.end             ", un treball sense ànim de lucre per defensar la privacitat i llibertat virtual.">
+
+<!ENTITY help.start              "Vols ajudar?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Fes una donació">
+<!ENTITY help.or                 "o">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "Forma'n part">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Preguntes?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Ajuda la xarxa Tor a créixer!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Informació de la llicència">
+<!ENTITY tor.TrademarkStatement   "'Tor' i 'Onion Logo' són marques registrades per Tor Project, Inc.">
diff --git a/src/chrome/locale/ca/aboutTBUpdate.dtd b/src/chrome/locale/ca/aboutTBUpdate.dtd
new file mode 100644
index 00000000..515e1e79
--- /dev/null
+++ b/src/chrome/locale/ca/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Actualització del navegador Tor">
+<!ENTITY aboutTBUpdate.updated "El navegador Tor s'ha actualitzat. ">
+<!ENTITY aboutTBUpdate.linkPrefix "Per la informació més actualitzada sobre aquesta versió,">
+<!ENTITY aboutTBUpdate.linkLabel  "visiteu el lloc web">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Registre de canvis:">
diff --git a/src/chrome/locale/ca/aboutTor.dtd b/src/chrome/locale/ca/aboutTor.dtd
index 9f14022b..3adff326 100644
--- a/src/chrome/locale/ca/aboutTor.dtd
+++ b/src/chrome/locale/ca/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Quant a Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Hi ha algun error.">
+<!ENTITY aboutTor.failure2.label "Tor no funciona en aquest navegador.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Preguntes?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ca/aboutTor.properties b/src/chrome/locale/ca/aboutTor.properties
index 02088f01..169ac01c 100644
--- a/src/chrome/locale/ca/aboutTor.properties
+++ b/src/chrome/locale/ca/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Cerca <a href="%1$S">de forma segura</a> amb <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Fes una donació ara!
+
+aboutTor.donationBanner.slogan=Tor: Potenciant la resistència digital
+aboutTor.donationBanner.mozilla=Dona avui i Mozilla us recompensarà!
+
+aboutTor.donationBanner.tagline1=Protegint periodistes, denunciants i activistes des de 2006
+aboutTor.donationBanner.tagline2=Interconectant llibertat global
+aboutTor.donationBanner.tagline3=Llibertat online
+aboutTor.donationBanner.tagline4=Fomentant la lliure expresió global
+aboutTor.donationBanner.tagline5=Protegint la Privacitat de milions de persones cada dia
diff --git a/src/chrome/locale/ca/brand.dtd b/src/chrome/locale/ca/brand.dtd
index 59f665e8..a0ffa28e 100644
--- a/src/chrome/locale/ca/brand.dtd
+++ b/src/chrome/locale/ca/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Navegador Tor">
+<!ENTITY  brandShortName        "Navegador Tor">
+<!ENTITY  brandFullName         "Navegador Tor">
+<!ENTITY  vendorShortName       "Projecte Tor">
+<!ENTITY  trademarkInfo.part1   "El Firefox i els logotips del Firefox són marques registrades de la Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Cliqueu per carregar els complements de sistema instal·lats">
+<!ENTITY plugins.installed.enable "Activa els complements">
+<!ENTITY plugins.installed.disable "Desactiva els complements">
+<!ENTITY plugins.installed.disable.tip "Clicqueu per evitar que es carreguin els complements de sistema">
diff --git a/src/chrome/locale/ca/brand.properties b/src/chrome/locale/ca/brand.properties
index f63def38..8c65dd7e 100644
--- a/src/chrome/locale/ca/brand.properties
+++ b/src/chrome/locale/ca/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Navegador Tor
+brandShortName=Navegador Tor
+brandFullName=Navegador Tor
+vendorShortName=Projecte Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Inici de Firefox, pàgina d'inici amb cerca ràpida
+homePageImport=Importa la pàgina d'inici des de %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Selecció de pàgina d'inici
+homePageMigrationDescription=Trieu la pàgina d'inici que voleu:
 
 syncBrandShortName=Sync
diff --git a/src/chrome/locale/ca/browserOnboarding.properties b/src/chrome/locale/ca/browserOnboarding.properties
new file mode 100644
index 00000000..8f47794f
--- /dev/null
+++ b/src/chrome/locale/ca/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privadesa
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Seguretat
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ca/torbutton.dtd b/src/chrome/locale/ca/torbutton.dtd
index 1ee6378f..8bd89b77 100644
--- a/src/chrome/locale/ca/torbutton.dtd
+++ b/src/chrome/locale/ca/torbutton.dtd
@@ -1,22 +1,51 @@
 <!ENTITY torbutton.context_menu.new_identity "Nova identitat">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "Nou circuit Tor per a aquest lloc">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Paràmetres de seguretat...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Preferències de la Xarxa Tor...7">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Cerca una actualització del navegador Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Protecció de les galetes">
+<!ENTITY torbutton.context_menu.cookieProtections "Proteccions de les Galetes...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
 <!ENTITY torbutton.button.tooltip "Feu clic per a iniciar Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Reestableix predeterminats">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
+<!ENTITY torbutton.prefs.security_settings "Paràmetres de seguretat del navegador Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Torna a les opcions per defecte">
+<!ENTITY torbutton.prefs.custom_warning "El navegador personalitzat ha obtingut uns paràmetres inusuals de seguretat. Per raons de privacitat i de seguretat, recomanem l'elecció d'un nivell de seguretat per defecte.">
+<!ENTITY torbutton.cookiedialog.title "Configura proteccions de les galetes">
+<!ENTITY torbutton.cookiedialog.lockCol "Protegit">
+<!ENTITY torbutton.cookiedialog.domainCol "Allotjador">
 <!ENTITY torbutton.cookiedialog.nameCol "Nom">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.cookiedialog.pathCol "Camí">
+<!ENTITY torbutton.cookiedialog.protectCookie "Protegir les galetes">
+<!ENTITY torbutton.cookiedialog.removeCookie "Suprimir galetes">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Galetes sense protecció">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Suprimir totes amb protecció">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Protegir noves galetes">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "No protegir noves galetes">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Restringir galetes de tercers i dades de seguiment">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Marca la casella de selecció per prevenir característiques d'abús i seguiments al consultar un web. Les característiques modificables son les URL blob, canals de difusió, memòria cau del navegador, galetes, favicons, capçaleres HTTP Auth, enllaços de preconexió, emmagatzemament local, URL mediaSource, sol·licitud OCSP, SharedWorkers i tiquets TLS.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Canviar detalls que distingeixen d'altres usuaris del navegador Tor">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Mantingueu aquesta casella marcada per a ocultar informació sensible sobre vosté a les pàgines web, tal com les capacitats de l'ordinador, la distribució del teclat, la localització dels connectors instal·lats, la llista de connectors, el seu estat de xarxa, la orientació de la pantalla, el seu tamany, el zoom específic per a cada lloc, els tipus de fitxer acceptats, els colors de sistema i les capacitats WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Nivell de seguretat">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "El control lliscant de seguretat permet deshabilitar característiques del navegador que poden permetre vulnerabilitats en atemptats de furoners.">
+<!ENTITY torbutton.prefs.sec_standard_label "Estàndard">
+<!ENTITY torbutton.prefs.sec_standard_description "Totes les característiques del buscador Tor i de la pàgina web estan actives.">
+<!ENTITY torbutton.prefs.sec_safer_label "Més segur.">
+<!ENTITY torbutton.prefs.sec_safer_description "Desactivar les funcions del lloc web que sovint són perilloses, pot fent que alguns llocs perden funcionalitat.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "A la configuració més segura:">
+<!ENTITY torbutton.prefs.sec_safest_label "més segur">
+<!ENTITY torbutton.prefs.sec_safest_description "Només es permeten funcions del lloc web requerides per a llocs estàtics i serveis bàsics. Aquests canvis afecten imatges, mitjans de comunicació i scripts.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "A la configuració més segura:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Apreneu-ne més">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "El JavaScript està desactivat per defecte en tots els llocs no-HTTPS">
+<!ENTITY torbutton.prefs.sec_js_disabled "El JavaScript està desactivat per defecte a tots els llocs.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Algunes fonts i símbols matemàtics estan desactivats. ">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Algunes fonts, icones, símbols matemàtics, i imatges estan desactivats. ">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "L'àudio i el vídeo (mitjans de comunicació HTML5) són click-to-play.">
+<!ENTITY torbutton.circuit_display.title "Circuit de Tor">
+<!ENTITY torbutton.circuit_display.new_circuit " Circuit de Tor per a aquest lloc ">
diff --git a/src/chrome/locale/ca/torbutton.properties b/src/chrome/locale/ca/torbutton.properties
index 232359a2..978d6b91 100644
--- a/src/chrome/locale/ca/torbutton.properties
+++ b/src/chrome/locale/ca/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Feu clic per a activar Tor
-torbutton.panel.tooltip.enabled = Feu clic per a desactivar Tor
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP desconeguda
+torbutton.circuit_display.onion_site = Lloc .onion
+torbutton.circuit_display.this_browser = Aquest navegador
+torbutton.circuit_display.relay = Repetidor
+torbutton.circuit_display.tor_bridge = Pont
+torbutton.circuit_display.unknown_country = País desconegut
+torbutton.circuit_display.guard = Guarda
+torbutton.circuit_display.guard_note = El vostre node de [Guarda] pot no canviar.
+torbutton.circuit_display.learn_more = Apreneu-ne més
+torbutton.content_sizer.margin_tooltip = El navegador Tor afegeix aquest marge per a minorar la diferència de alçada i amplada de la finestra, això fa reduir la capacitat de rastrejar-te.
+torbutton.panel.tooltip.disabled = Feu clic per activar Tor
+torbutton.panel.tooltip.enabled = Feu clic per desactivar Tor
 torbutton.panel.label.disabled = Tor està desactivat
 torbutton.panel.label.enabled = Tor està activat
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Voleu carregar els continguts externs?
-torbutton.popup.external.app = Es necessita una aplicació externa per a manejar:\n\n
-torbutton.popup.external.note = \n\nAvís: les aplicacions externes no estan adaptades a Tor per defecte i podrien revelar la vostra identitat.\n
-torbutton.popup.external.suggest = \nSi aquest arxiu no és de fiar, haurieu o bé desar-lo per inspeccionar-lo desconectat o a una VM (màquina virtual),\n o bé considerar a usar un proxy transparent per Tor tipus Tails LiveCD o torsocks.\n
-torbutton.popup.launch = Inicia l'aplicació
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton permet accedir a la configuració de Tor i esborrar fàcilment i ràpidament les dades privades de navegació per internet.
+torbutton.popup.external.title = Voleu descarregar un tipus de fitxer extern?
+torbutton.popup.external.app = Tor Browser no pot visualitzar aquest fitxer. Cal obrir-lo amb una altra aplicació.\n\n
+torbutton.popup.external.note = Alguns tipus de fitxers poden fer que les aplicacions es connectin a Internet sense passar per Tor.\n\n
+torbutton.popup.external.suggest = Per seguretat, obriu els fitxers descarregats havent desactivat la connexió a Internet, o fer servir un CD de sistema operatiu preconfigurat com Tails.\n
+torbutton.popup.launch = Descarrega el fitxer
 torbutton.popup.cancel = Cancel·la
-torbutton.popup.dontask = Inicia les aplicacions automàticament
-torbutton.popup.prompted_language = Per donar-vos més privacitat, Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que pàgines web que preferiu veure a la vostra llengua nativa siguin mostrades en anglès.\n\nDesitjeu demanar les pàgines web en anglès per una major privacitat?
-torbutton.popup.no_newnym = Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposa d'accés al Tor Control Port.\n\nEsteu usant Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.dontask = A partir d'ara, descarrega els fitxers automàticament
+torbutton.popup.prompted_language = Per donar-vos més privacitat, el Torbutton pot demanar la versió en anglès de les pàgines web. Això pot provocar que les pàgines web que vulgueu veure en una altra llengua siguin mostrades en anglès.\n\nVoleu demanar les pàgines web en anglès per una major privadesa?
+torbutton.popup.no_newnym = El Torbutton no pot adjudicar-vos de forma segura una nova identitat. No disposeu d'accés al Tor Control Port.\n\nEsteu usant el Tor Browser Bundle?
+torbutton.title.prompt_torbrowser = Informació important sobre Torbutton
+torbutton.popup.prompt_torbrowser = Torbutton Funciona de forma diferent ara: ja no el pot tancar.\n\nHem fet aquest canvi per que l'ús de Torbutton en un navegador utilitzat també per navegar fora de l'entorn de Tor ja no es segur. Hi havien moltes incidències i no hem trobat cap altre solució per arreglar-les. \n\nSi desitja continuar utilitzant Firefox de forma habitual, ha de desinstalar Torbutton i descarregar Tor Browser Bundle. La seguretat de Tor Browser es millor que la de Firefox, fins i tot quan es fa servir Torbutton. \n\nPer desinstalar Torbutton, seleccioni Eines->Addons->Extensions and faci click sobre el botó Desinstalar al costat de Torbutton 
+torbutton.popup.short_torbrowser = Informació important sobre Torbutton! \n\nTorbutton ara és troba sempre activat.\n\nFaci click sobre Torbutton per més informació.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+torbutton.popup.confirm_plugins = Alguns Plugins com Flash poden afectar la seva privacitat i el seu anonimat.\n\nTambé poden  curt-circuitar Tor per revelar la ubicació actual i l'adreça IP.\n\nEstà segur de voler activar aquests plugins? \n\n
 torbutton.popup.never_ask_again = No torneu a preguntar
+torbutton.popup.confirm_newnym = El navegador Tor tancarà totes les finestres i pestanyes. Totes les sessions web es perdran. \n\nVol reiniciar el navegador Tor per reiniciar la seva identitat?\n\n
+
+torbutton.slider_notification = El menú de la ceba verda té ara un slider que li permet ajustar el seu nivell de seguretat. Fes-li un cop d'ull!
+torbutton.slider_notification_button = Obrir les preferències de seguretat
+
+torbutton.maximize_warning = Maximitzar Tor Browser por permetre als llocs web determinar les dimensions del teu monitor, que pot utilitzar-se per a rastrejar-li. Li recomanem que deixe la finestra de Tor Browser amb la seva mida per defecte.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Permetre en el futur
+canvas.siteprompt=Aquest lloc web (%S) ha intentat extreure les dades de la imatge del llenç HTML5, que es poden utilitzar per identificar el seu ordinador.\n\nEl Navegador Tor hauria  de permetre que aquest lloc web extregui les dades de la imatge del llenç HTML5?
+canvas.notNow=Ara no
+canvas.notNowAccessKey=N
+canvas.allow=Permet a partir d'ara
 canvas.allowAccessKey=A
-canvas.never=Mai per aquest lloc
+canvas.never=Mai per a aquest lloc (recomanat)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Problema en el perfil %S
+profileReadOnly=No pot executar %S des de un sistema de fitxers de només lectura. Si us plau, copie $S a un altra localització avanç de intentar usar-ho.
+profileReadOnlyMac=No pot executar %S des de un sistema de fitxers de només lectura. Si us plau, copie $S a la seva carpeta Escriptori o Aplicacions avanç de intentar usar-ho.
+profileAccessDenied=%S no té permisos per accedir al perfil. Si us plau, ajuste els permisos del seu sistema de fitxers i intente-ho de nou.
+profileMigrationFailed=La migració del vostre perfil %S ha fallat.\nEs fara servir una nova configuració.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Connexió xifrada (Onion Service, %1$S, claus de %2$S bits, %3$S)
+pageInfo_OnionEncryption=Connexió xifrada (Onion Service)
diff --git a/src/chrome/locale/da/aboutTBUpdate.dtd b/src/chrome/locale/da/aboutTBUpdate.dtd
index d0167c73..450e65ce 100644
--- a/src/chrome/locale/da/aboutTBUpdate.dtd
+++ b/src/chrome/locale/da/aboutTBUpdate.dtd
@@ -1,4 +1,4 @@
-<!ENTITY aboutTBUpdate.title "Tor Browser-opdatering">
+<!ENTITY aboutTBUpdate.title "Opdateringer til Tor Browser">
 <!ENTITY aboutTBUpdate.updated "Tor Browser er blevet opdateret.">
 <!ENTITY aboutTBUpdate.linkPrefix "For den mest aktuelle information om denne udgivelse,">
 <!ENTITY aboutTBUpdate.linkLabel  "Besøg vores webside">
diff --git a/src/chrome/locale/da/aboutTor.dtd b/src/chrome/locale/da/aboutTor.dtd
index 6e2679a1..9bd057c8 100644
--- a/src/chrome/locale/da/aboutTor.dtd
+++ b/src/chrome/locale/da/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Om Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ADVARSEL: denne browser er forældet.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Denne browser er desuden forældet.">
-<!ENTITY aboutTor.outOfDate2.label "Klik på løget og vælg så Søg efter Tor Browser-opdateringer.">
-
-<!ENTITY aboutTor.check.label "Test Tor-netværksindstillinger">
-
-<!ENTITY aboutTor.success.label "Velkommen til Tor Browser">
-<!ENTITY aboutTor.success2.label "Forbundet til Tor-netværket.">
-<!ENTITY aboutTor.success3.label "Du kan nu frit bruge internettet anonymt">
+<!ENTITY aboutTor.ready.label "Udforsk. Privat.">
+<!ENTITY aboutTor.ready2.label "Du er klar til verdenens mest private browseroplevelse.">
 <!ENTITY aboutTor.failure.label "Noget gik galt!">
 <!ENTITY aboutTor.failure2.label "Tor virker ikke i denne browser.">
 
-<!ENTITY aboutTor.search.label "Søg">
+<!ENTITY aboutTor.search.label "Søg med DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Yderligere information:">
-<!ENTITY aboutTor.torInfo2.label "Land og IP-adresse:">
-<!ENTITY aboutTor.torInfo3.label "Udgangsknudepunkt:">
-<!ENTITY aboutTor.torInfo4.label "Denne server logger ikke nogle informationer om besøgende.">
-<!ENTITY aboutTor.whatnextQuestion.label "Hvad er næste skridt?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor er IKKE al den sikkerhed du har brug for for at browse anonymt. Du bliver muligvis også nødt til at ændre nogle af dine browsingvaner for at sikre, at din identitet er sikker.">
-<!ENTITY aboutTor.whatnext.label "Tips til at være anonym »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spørgsmål?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tjek vores Tor Browser-manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-brugermanual">
-<!ENTITY aboutTor.helpInfo1.label "Du kan hjælpe!">
-<!ENTITY aboutTor.helpInfo2.label "Der er mange måder du kan hjælpe med at gøre Tor-netværket hurtigere og stærkere:">
-<!ENTITY aboutTor.helpInfo3.label "Kør et Tor-relæknudepunkt »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Tilbyd din hjælp »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Foretag en donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser-manual">
 
-<!ENTITY aboutTor.footer.label "Tor-projektet er et US 501(c)(3) nonprofit-projekt dedikeret til forskning, udvikling og uddannelse af online anonymitet og privatliv.">
-<!ENTITY aboutTor.learnMore.label "Lær mere om Tor-projektet »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Deltag »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/da/browserOnboarding.properties b/src/chrome/locale/da/browserOnboarding.properties
new file mode 100644
index 00000000..d94aa845
--- /dev/null
+++ b/src/chrome/locale/da/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privatliv
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Sikkerhed
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-tjenester
+onboarding.tour-tor-onion-services.title=Onion-tjenester
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/da/torbutton.dtd b/src/chrome/locale/da/torbutton.dtd
index 7936505c..694792e8 100644
--- a/src/chrome/locale/da/torbutton.dtd
+++ b/src/chrome/locale/da/torbutton.dtd
@@ -6,7 +6,7 @@
 <!ENTITY torbutton.context_menu.preferences.key "S">
 <!ENTITY torbutton.context_menu.networksettings "Tor-netværksindstillinger...">
 <!ENTITY torbutton.context_menu.networksettings.key "N">
-<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter Tor Browser-opdatering...">
+<!ENTITY torbutton.context_menu.downloadUpdate "Søg efter opdateringer til Tor Browser...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "O">
 <!ENTITY torbutton.context_menu.cookieProtections "Cookie-beskyttelser...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
@@ -37,10 +37,10 @@
 <!ENTITY torbutton.prefs.sec_standard_description "Alle Tor Browser- og webstedsfunktionaliteter er aktiveret.">
 <!ENTITY torbutton.prefs.sec_safer_label "Mere sikker">
 <!ENTITY torbutton.prefs.sec_safer_description "Deaktiverer webstedsfunktionaliteter som ofte er farlige, hvilket kan gøre at nogle steder mister deres funktionalitet.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "Ved den mere sikker indstilling:">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Ved mere sikker-indstillingen:">
 <!ENTITY torbutton.prefs.sec_safest_label "Mest sikker">
 <!ENTITY torbutton.prefs.sec_safest_description "Tillader kun webstedsfunktionaliteter som kræves til statiske steder og grundlæggende tjenester. �ndringerne påvirker billeder, medier og scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "Ved den sikreste indstilling:">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Ved mest sikker-indstillingen:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "Lær mere">
 <!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er deaktiveret på ikke-HTTPS steder.">
 <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som standard deaktiveret på alle steder.">
diff --git a/src/chrome/locale/da/torbutton.properties b/src/chrome/locale/da/torbutton.properties
index 12b79807..978691c4 100644
--- a/src/chrome/locale/da/torbutton.properties
+++ b/src/chrome/locale/da/torbutton.properties
@@ -1,7 +1,7 @@
-torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.internet = Internettet
 torbutton.circuit_display.ip_unknown = Ukendt IP-adresse
 torbutton.circuit_display.onion_site = Løg side
-torbutton.circuit_display.this_browser = Denne browser
+torbutton.circuit_display.this_browser = Browseren
 torbutton.circuit_display.relay = Relæ
 torbutton.circuit_display.tor_bridge = Bro
 torbutton.circuit_display.unknown_country = Ukendt land
@@ -32,7 +32,7 @@ torbutton.popup.never_ask_again = Spørg mig aldrig igen
 torbutton.popup.confirm_newnym = Tor Browser vil lukke alle vinduer og faneblade. Alle webside-sessioner vil gå tabt.\nGenstart Tor Browser nu for at nulstille din identitet?\n
 
 torbutton.slider_notification = Nu har det grønne løg menuen en sikkerheds skyder som lader dig tilpasse dit sikkerhedsniveau. Tjek det ud!
-torbutton.slider_notification_button = Ã?ben sikkerhedsindstillinger
+torbutton.slider_notification_button = Ã?bn sikkerhedsindstillinger
 
 torbutton.maximize_warning = Hvis du maksimere Tor Browser kan websteder fastslå din skærmstørrelse, hvilket kan blive brugt til at spore dig. Vi anbefaler at du lader Tor Browser-vinduet være i sin originale standardstørrelse.
 
@@ -54,5 +54,5 @@ profileAccessDenied= %S har ikke rettigheder til at bruge profilen. Skift venlig
 profileMigrationFailed=Overførsel af din eksisterende %S profil fejlede.\nNye indstillinger vil blive brugt.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Forbindelse krypteret (løg-tjeneste, %1$S, %2$S-bit nøgler, %3$S)
+pageInfo_OnionEncryption=Forbindelse krypteret (løg-tjeneste)
diff --git a/src/chrome/locale/de/aboutTor.dtd b/src/chrome/locale/de/aboutTor.dtd
index 8e1d77fc..a653661a 100644
--- a/src/chrome/locale/de/aboutTor.dtd
+++ b/src/chrome/locale/de/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ã?ber Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "WARNUNG: Dieser Browser ist nicht mehr aktuell!">
-<!ENTITY aboutTor.outOfDateTorOff.label "AUSSERDEM, dieser Browser ist nicht aktuell.">
-<!ENTITY aboutTor.outOfDate2.label "Klicken Sie auf die Zwiebel und wählen Sie dann Suche nach Tor-Browser-Aktualisierung.">
-
-<!ENTITY aboutTor.check.label "Tor-Netzwerkeinstellungen testen">
-
-<!ENTITY aboutTor.success.label "Willkommen im Tor Browser">
-<!ENTITY aboutTor.success2.label "Mit dem Tor-Netzwerk verbunden.">
-<!ENTITY aboutTor.success3.label "Sie können jetzt anonym im Internet surfen.">
+<!ENTITY aboutTor.ready.label "Entdecken. Privat.">
+<!ENTITY aboutTor.ready2.label "Sie sind bereit für das privateste Browsing-Erlebnis der Welt.">
 <!ENTITY aboutTor.failure.label "Irgend etwas lief schief!">
 <!ENTITY aboutTor.failure2.label "Tor funktioniert mit diesem Browser nicht.">
 
-<!ENTITY aboutTor.search.label "Suche">
+<!ENTITY aboutTor.search.label "Mit DuckDuckGo suchen">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Zusätzliche Informationen:">
-<!ENTITY aboutTor.torInfo2.label "Land &amp; IP-Adresse:">
-<!ENTITY aboutTor.torInfo3.label "Austrittsknoten:">
-<!ENTITY aboutTor.torInfo4.label "Dieser Server speichert keine Informationen über Besucher.">
-<!ENTITY aboutTor.whatnextQuestion.label "Was nun?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor ist NICHT alles was benötigt wird, um anonym zu surfen! Sie müssen eventuell einige Gewohnheiten ändern, um sicherzustellen, dass Ihre Identität geschützt bleibt.">
-<!ENTITY aboutTor.whatnext.label "Tipps, um anonym zu bleiben »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Fragen?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Schauen Sie unser Tor-Browser-Handbuch an »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Benutzerhandbuch">
-<!ENTITY aboutTor.helpInfo1.label "Sie können helfen!">
-<!ENTITY aboutTor.helpInfo2.label "Es gibt viele Möglichkeiten, um das Tor-Netzwerk schneller und stärker zu machen:">
-<!ENTITY aboutTor.helpInfo3.label "Einen Tor-Relaisknoten betreiben »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Ihre Dienste bereitstellen »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Etwas spenden »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor-Browser-Handbuch">
 
-<!ENTITY aboutTor.footer.label "Die Organisation »The Tor Project« ist nach dem US-Gesetz US 501(c)(3) als gemeinnützig eingestuft und widmet sich der Forschung, der Entwicklung und der Schulung zum Thema Internetanonymität und Datenschutz.">
-<!ENTITY aboutTor.learnMore.label "Mehr über das Tor-Projekt erfahren »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Machen Sie mit »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/de/browserOnboarding.properties b/src/chrome/locale/de/browserOnboarding.properties
new file mode 100644
index 00000000..6b6c63fc
--- /dev/null
+++ b/src/chrome/locale/de/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Willkommen
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privatsphäre
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Entdecken
+
+onboarding.tour-tor-security=Sicherheit
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-Dienste
+onboarding.tour-tor-onion-services.title=Onion-Dienste
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/de/torbutton.dtd b/src/chrome/locale/de/torbutton.dtd
index 7fbb0f1c..0b22921a 100644
--- a/src/chrome/locale/de/torbutton.dtd
+++ b/src/chrome/locale/de/torbutton.dtd
@@ -48,5 +48,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "Einige Schriftarten und mathematische Symbole sind deaktiviert.">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Einige Schriftarten, Symbole, mathematische Symbole und Bilder sind deaktiviert.">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio und Video (HTML5-Medien) müssen zur Wiedergabe angeklickt werden.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Tor Kanal">
+<!ENTITY torbutton.circuit_display.new_circuit "Neuen Kanal für diese Seite">
diff --git a/src/chrome/locale/de/torbutton.properties b/src/chrome/locale/de/torbutton.properties
index 6564c22e..d03bb543 100644
--- a/src/chrome/locale/de/torbutton.properties
+++ b/src/chrome/locale/de/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = Dieser Browser
 torbutton.circuit_display.relay = Verteiler
 torbutton.circuit_display.tor_bridge = Brücke
 torbutton.circuit_display.unknown_country = Unbekanntes Land
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Wächter
+torbutton.circuit_display.guard_note = Dein [Wächter] Knotenpunkt darf sich nicht ändern.
 torbutton.circuit_display.learn_more = Erfahren Sie mehr
 torbutton.content_sizer.margin_tooltip = Tor Browser fügt diese Begrenzung hinzu, um die Breite und Höhe Ihres Fensters weniger einzigartig zu machen. Dadurch wird es anderen erschwert, Sie im Internet zu verfolgen.
 torbutton.panel.tooltip.disabled = Klicken, um Tor zu aktivieren
@@ -54,5 +54,5 @@ profileAccessDenied=%S hat keine Berechtigung um dieses Profil abzurufen. Bitte
 profileMigrationFailed=Ã?bernahme des bestehenden %S Profils ist fehlgeschlagen.\nEs werden neue Einstellungen verwendet.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Verbindung verschlüsselt (Onion-Dienst, %1$S, %2$S bit Schlüssel, %3$S)
+pageInfo_OnionEncryption=Verbindung verschlüsselt (Onion-Dienst)
diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd
index 73ce9ef0..2c7494e7 100644
--- a/src/chrome/locale/es/aboutTor.dtd
+++ b/src/chrome/locale/es/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Acerca de Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ADEM�S, este navegador tampoco está actualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualización del Navegador Tor.">
-
-<!ENTITY aboutTor.check.label "Probar las preferencias de red Tor">
-
-<!ENTITY aboutTor.success.label "Bienvenido al Navegador Tor">
-<!ENTITY aboutTor.success2.label "Conectado a la red Tor.">
-<!ENTITY aboutTor.success3.label "Ahora es libre de navegar por Internet anónimamente.">
+<!ENTITY aboutTor.ready.label "Explora. Privadamente.">
+<!ENTITY aboutTor.ready2.label "Estás listo para experimentar la navegación más privada del mundo.">
 <!ENTITY aboutTor.failure.label "¡Algo fue mal!">
 <!ENTITY aboutTor.failure2.label "Tor no está funcionando en este navegador.">
 
-<!ENTITY aboutTor.search.label "Buscar">
+<!ENTITY aboutTor.search.label "Buscar con DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Información adicional:">
-<!ENTITY aboutTor.torInfo2.label "País y dirección IP:">
-<!ENTITY aboutTor.torInfo3.label "Nodo de salida:">
-<!ENTITY aboutTor.torInfo4.label "Este servidor no registra ninguna información sobre los visitantes.">
-<!ENTITY aboutTor.whatnextQuestion.label "¿Qué sigue?">
-<!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura.">
-<!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "¿Preguntas?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Comprobar nuestro Manual del Navegador Tor">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »">
-<!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!">
-<!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte.">
-<!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Ofrece tus serviciosde forma voluntaria »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Realiza una donación »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Manual del Navegador Tor">
 
-<!ENTITY aboutTor.footer.label "El Projecto Tor es una US 501(c)(3) sin ánimo de lucro dedicada a la investigación, desarrollo y educación sobre anonimidad y privacidad en línea.">
-<!ENTITY aboutTor.learnMore.label "Aprenda más acerca del El Proyecto Tor »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "El proyecto Tor es una organización sin fines de lucro definida legalmente en EUA 501(c)(3), avanzando libertades y derechos humanos mediante la creación y despliegue de tecnologías de anonimato y privacidad sin costo y de fuente abierta, soportando su disponibilidad y uso sin restricciones y ampliando su entendimiento científico y popular.">
+<!ENTITY aboutTor.getInvolved.label "Involúcrese">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/es/browserOnboarding.properties b/src/chrome/locale/es/browserOnboarding.properties
new file mode 100644
index 00000000..6b8764e4
--- /dev/null
+++ b/src/chrome/locale/es/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bienvenido
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacidad
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorar
+
+onboarding.tour-tor-security=Seguridad
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Servicios Onion
+onboarding.tour-tor-onion-services.title=Servicios Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/es/torbutton.properties b/src/chrome/locale/es/torbutton.properties
index 3afb1be3..9335f4df 100644
--- a/src/chrome/locale/es/torbutton.properties
+++ b/src/chrome/locale/es/torbutton.properties
@@ -2,7 +2,7 @@ torbutton.circuit_display.internet = Internet
 torbutton.circuit_display.ip_unknown = IP desconocida
 torbutton.circuit_display.onion_site = Sitio onion
 torbutton.circuit_display.this_browser = Este navegador
-torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.relay = Repetidor
 torbutton.circuit_display.tor_bridge = Repetidor puente (bridge)
 torbutton.circuit_display.unknown_country = País desconocido
 torbutton.circuit_display.guard = Protección
@@ -54,5 +54,5 @@ profileAccessDenied=%S no tiene permiso para acceder al perfil. Ajuste los permi
 profileMigrationFailed=Ha ocurrido un error en la migración de tu perfil %S. \nSe usarán los nuevos ajustes.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión encriptada (Servicio Onion, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Conexión encpritada (Servicio Onion)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Conexión cifrada (Servicio Onion, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Conexión cifrada (Servicio Onion)
diff --git a/src/chrome/locale/eu/aboutTor.dtd b/src/chrome/locale/eu/aboutTor.dtd
index 3b6a11eb..3fb2f888 100644
--- a/src/chrome/locale/eu/aboutTor.dtd
+++ b/src/chrome/locale/eu/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tori buruz">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "KONTUZ: nabigatzaile hau zaharkituta dago.">
-<!ENTITY aboutTor.outOfDateTorOff.label "BAITA, nabigatzaile hau zaharkituta dago.">
-<!ENTITY aboutTor.outOfDate2.label "Tipulan sakatu eta ondoren Tor Browser Bundlea egiaztatu hautatu">
-
-<!ENTITY aboutTor.check.label "Tor sare ezarpenak frogatu">
-
-<!ENTITY aboutTor.success.label "Ongi etorri Tor Browserera">
-<!ENTITY aboutTor.success2.label "Tor sarera konektatuta.">
-<!ENTITY aboutTor.success3.label "Aske zara orain Internet anonimotasunez nabigatzeko.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Zerbait gaizki joan da!">
 <!ENTITY aboutTor.failure2.label "Tor ez da nabigatzaile honetan funtzionatzen ari.">
 
-<!ENTITY aboutTor.search.label "Bilatu">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Informazio gehiago:">
-<!ENTITY aboutTor.torInfo2.label "Herrialde eta IP helbidea:">
-<!ENTITY aboutTor.torInfo3.label "Irteera nodoa:">
-<!ENTITY aboutTor.torInfo4.label "Ostalari honek ez du bisitarien inguruko inolako informaziorik biltzen.">
-<!ENTITY aboutTor.whatnextQuestion.label "Eta orain zer?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor EZ da anonimoki nabigatzeko behar duzun guztia! Baliteke zure nabigatze ohitura batzuk aldatu behar izatea zure nortasuna seguru mantentzen dela ziurtatzeko.">
-<!ENTITY aboutTor.whatnext.label "Anonimo mantentzeko aholkuak »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Galderarik?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual">
-<!ENTITY aboutTor.helpInfo1.label "Lagundu dezakezu!">
-<!ENTITY aboutTor.helpInfo2.label "Tor sarea bizkorragoa eta indartsuagoa egiteko hainbat modutan lagundu dezakezu:">
-<!ENTITY aboutTor.helpInfo3.label "Tor errele nodo bat exekutatu »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Zure zerbitzuak bolondrestu »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Dohaintza egin »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "The Tor Project irabazi asmorik gabeko US 501(c)(3) bat da, ikerketara, garapenera, eta onlineko anonimotasuna eta pribatutasunaren hezkuntzara zuzendutakoa.">
-<!ENTITY aboutTor.learnMore.label "The Tor Projecti buruz gehiago ikasi »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/eu/browserOnboarding.properties b/src/chrome/locale/eu/browserOnboarding.properties
new file mode 100644
index 00000000..9d378850
--- /dev/null
+++ b/src/chrome/locale/eu/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Pribatutasuna
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Segurtasuna
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fa/aboutTor.dtd b/src/chrome/locale/fa/aboutTor.dtd
index 7ed77f81..92674b09 100644
--- a/src/chrome/locale/fa/aboutTor.dtd
+++ b/src/chrome/locale/fa/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "دربارÙ?â??Û? تÙ?ر">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Ù?شدار: اÛ?Ù? Ù?رÙ?رگر بÙ? رÙ?ز Ù?Û?ست.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ù?Ù?Ú?Ù?Û?Ù? Ù« اÛ?Ù? Ù?رÙ?رگر Ù?دÛ?Ù?Û? Ù?Û? باشد .">
-<!ENTITY aboutTor.outOfDate2.label "رÙ?Û? Ù¾Û?از Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? سپس اÙ?تخاب Ú©Ù?Û?د Check را براÛ? بÙ? رÙ?ز رساÙ?Û? Tor Browser">
-
-<!ENTITY aboutTor.check.label "تÙ?ظÛ?Ù?ات شبکÙ?â??Û? تÙ?ر را بررسÛ? Ú©Ù?Û?د">
-
-<!ENTITY aboutTor.success.label "بÙ? Ù?رÙ?رگر تÙ?ر Ø®Ù?Ø´ Ø¢Ù?دÛ?د.">
-<!ENTITY aboutTor.success2.label "اتصاÙ? با شبکÙ?â??Û? تÙ?ر برÙ?رار شد.">
-<!ENTITY aboutTor.success3.label "اکÙ?Ù?Ù? Ø´Ù?ا بÙ? Ø·Ù?ر Ù?اشÙ?اس بÙ? اÛ?Ù?ترÙ?ت دسترسÛ? دارÛ?د.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "خطاÛ?Û? Ù¾Û?Ø´ Ø¢Ù?دÙ? است!">
 <!ENTITY aboutTor.failure2.label "تا با اÛ?Ù? Ù?رÙ?رگر کار Ù?Ù?Û?â??Ú©Ù?د.">
 
-<!ENTITY aboutTor.search.label "جستجÙ?">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "اطÙ?اعات بÙ?شتر">
-<!ENTITY aboutTor.torInfo2.label "Ù?Ø´Ù?ر Ù? آدرس Ø¢Ù? Ù¾Û?:">
-<!ENTITY aboutTor.torInfo3.label "Ù?سÙ?رÙ?اب Ù?خرج">
-<!ENTITY aboutTor.torInfo4.label "اÛ?Ù? سرÙ?ر Ù?Û?Ú? گزارشÛ? از Ù?عاÙ?Û?ت بازدÛ?د Ú©Ù?Ù?دگاÙ? Ø®Ù?د ثبت Ù?Ù?Û? Ú©Ù?د.">
-<!ENTITY aboutTor.whatnextQuestion.label "بعدÛ? Ú?Û?ستØ?">
-<!ENTITY aboutTor.whatnextAnswer.label "تÙ?ر Ù?Ù?Ù?â??Û? Ù?Û?از Ø´Ù?ا براÛ? Ù?اشÙ?اس Ù?اÙ?دÙ? در Ù?ب را برآÙ?ردÙ? Ù?Ù?Û?â??Ú©Ù?د! براÛ? اطÙ?Û?Ù?اÙ? از اÛ?Ù?Ù?Û? Ù?Ù?Û?تتاÙ?Ø? Ù?Û?از دارÛ?د برخÛ? عادات Ù?بگردÛ?تاÙ? را تغÛ?Û?ر دÙ?Û?د.">
-<!ENTITY aboutTor.whatnext.label "راÙ?Ù?Ù?اÛ?Û? براÛ? Ù?اشÙ?اس Ù?اÙ?دÙ?.">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "پرسشØ?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "راÙ?Ù?Ù?اÛ? کاربرÛ? Ù?رÙ?رگر تÙ?ر">
-<!ENTITY aboutTor.helpInfo1.label "Ù?Û?â??تÙ?اÙ?Û?د Ú©Ù?Ú© Ú©Ù?Û?د!">
-<!ENTITY aboutTor.helpInfo2.label "راÙ? Ù?اÛ? زÛ?ادÛ? براÛ? Ú©Ù?Ú© کردÙ? Ø´Ù?ا جÙ?ت سرÛ?عتر کردÙ? Ù? Ù?ستحکÙ? کردÙ? شبکÙ? تÙ?ر Ù?جÙ?د دارد:">
-<!ENTITY aboutTor.helpInfo3.label "Ù?سÙ?رÙ?اب تÙ?رÙ? ادارÙ? Ù?Ù?Ù?د »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "داÙ?Ø·Ù?ب Ø´Ù?Ù?د »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "اÙ?دا Ù?Ù?Ù?د »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "پرÙ?Ú?Ù?Ù? تÙ?ر سازÙ?اÙ? غÛ?ر اÙ?تÙ?اعÛ? Ø¢Ù?رÛ?کاÛ?Û? 501(c)3 Ù?ختص Ù¾Ú?Ù?Ù?Ø´, تÙ?سعÙ? Ù? Ø¢Ù?Ù?زش در زÙ?Û?Ù? Ù?اشÙ?اسÛ? Ù? حرÛ?Ù? شخصÛ? Ø¢Ù?Ù?اÙ?Ù? Ù?ست.">
-<!ENTITY aboutTor.learnMore.label "اطÙ?اعات بÛ?شتر در پرÙ?Ú?Ù?Ù? تÙ?ر Ù?سب Ù?Ù?Ù?د">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/fa/brand.properties b/src/chrome/locale/fa/brand.properties
index e9eb95f4..f5ec5a29 100644
--- a/src/chrome/locale/fa/brand.properties
+++ b/src/chrome/locale/fa/brand.properties
@@ -11,6 +11,6 @@ homePageSingleStartMain=صÙ?Ø­Ù?Ù? Firefox Start, صÙ?Ø­Ù?Ù? خاÙ?Ú¯Û? تÙ?د 
 homePageImport=صÙ?Ø­Ù?â??Ù? خاÙ?Ú¯Û?تاÙ?â??را از %S Ù?ارد Ù?Ù?Ù?د
 
 homePageMigrationPageTitle=اÙ?تخاب صÙ?Ø­Ù?Ù? خاÙ?Ú¯Û?
-homePageMigrationDescription=بÙ?رÙ?اÛ?Û?د صÙ?Ø­Ù?Ù? خاÙ?Ú¯Û? اÙ?تخاب Ú¯Ù?Û?د:
+homePageMigrationDescription=Ù?Ø·Ù?اÙ? صÙ?Ø­Ù? خاÙ?Ú¯Û? Ù?Ù?رد Ù?ظر Ø®Ù?د را اÙ?تخاب Ù?Ù?اÛ?Û?د:
 
 syncBrandShortName=Ù?Ù?گاÙ?â?? سازÛ?
diff --git a/src/chrome/locale/fa/browserOnboarding.properties b/src/chrome/locale/fa/browserOnboarding.properties
new file mode 100644
index 00000000..663555ad
--- /dev/null
+++ b/src/chrome/locale/fa/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ø®Ù?Ø´ Ø¢Ù?دÛ?د
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=حرÛ?Ù? خصÙ?صÛ?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=گشت Ù? گذار
+
+onboarding.tour-tor-security=اÙ?Ù?Û?ت
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=خدÙ?ات Ù¾Û?ازÛ?
+onboarding.tour-tor-onion-services.title=خدÙ?ات Ù¾Û?ازÛ?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fa/torbutton.dtd b/src/chrome/locale/fa/torbutton.dtd
index 61323e64..6bf62d14 100644
--- a/src/chrome/locale/fa/torbutton.dtd
+++ b/src/chrome/locale/fa/torbutton.dtd
@@ -33,12 +33,12 @@
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Keep this box checked to hide things from websites that could be unique about you, including your computer performance, keyboard layout, locale, the location of installed plugins, the list of installed plugins, your network status, screen orientation, screen size, site-specific zoom levels, supported file types, system colors, and WebGL capabilities.">
 <!ENTITY torbutton.prefs.sec_caption "سطح اÙ?Ù?Û?ت">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
-<!ENTITY torbutton.prefs.sec_standard_label "Standard">
+<!ENTITY torbutton.prefs.sec_standard_label "استاÙ?دارد">
 <!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
+<!ENTITY torbutton.prefs.sec_safer_label "اÛ?Ù?Ù? تر ">
 <!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
 <!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
+<!ENTITY torbutton.prefs.sec_safest_label "اÛ?Ù?Ù? ترÛ?Ù? ">
 <!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
 <!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "اطÙ?اعات بÛ?شتر">
diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd
index 6a551d95..66b7f11b 100644
--- a/src/chrome/locale/fr/aboutTor.dtd
+++ b/src/chrome/locale/fr/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ã? propos de Tor ">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "AVERTISSEMENT : ce navigateur nâ??est pas à jour.">
-<!ENTITY aboutTor.outOfDateTorOff.label "DE PLUS, ce navigateur nâ??est pas à jour.">
-<!ENTITY aboutTor.outOfDate2.label "Cliquez sur lâ??oignon, puis choisissez Vérifier les mises à jour du Navigateur Tor.">
-
-<!ENTITY aboutTor.check.label "Tester les paramètres du réseau Tor">
-
-<!ENTITY aboutTor.success.label "Bienvenue dans le Navigateur Tor">
-<!ENTITY aboutTor.success2.label "Connecté au réseau Tor.">
-<!ENTITY aboutTor.success3.label "Vous êtes maintenant libre de naviguer anonymement sur Internet.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Une erreur sâ??est produiteâ??!">
 <!ENTITY aboutTor.failure2.label "Tor ne fonctionne pas dans ce navigateur.">
 
-<!ENTITY aboutTor.search.label "Chercher">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Informations supplémentaires :">
-<!ENTITY aboutTor.torInfo2.label "Pays &amp; adresse IP :">
-<!ENTITY aboutTor.torInfo3.label "NÅ?ud de sortie :">
-<!ENTITY aboutTor.torInfo4.label "Ce serveur ne journalise aucune information sur les visteurs.">
-<!ENTITY aboutTor.whatnextQuestion.label "Que faire ensuiteâ???">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor nâ??est PAS le seul outil dont vous avez besoin pour naviguer anonymementâ??! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garantir la sécurité de votre identité.">
-<!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Des questionsâ???">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "G">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Guide dâ??utilisation du Navigateur Tor">
-<!ENTITY aboutTor.helpInfo1.label "Vous pouvez aiderâ??!">
-<!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :">
-<!ENTITY aboutTor.helpInfo3.label "Exploiter un nÅ?ud-relais Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html";>
-<!ENTITY aboutTor.helpInfo4.label "Devenir bénévole »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html";>
-<!ENTITY aboutTor.helpInfo5.label "Faire un don »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Le Projet Tor est une organisation sans but lucratif US 501(c)(3) dédiée à la recherche, au développement et à lâ??éducation sur lâ??anonymat et à la vie privée en ligne.">
-<!ENTITY aboutTor.learnMore.label "En savoir plus sur le Projet Tor »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html";>
diff --git a/src/chrome/locale/fr/browserOnboarding.properties b/src/chrome/locale/fr/browserOnboarding.properties
new file mode 100644
index 00000000..1dc86527
--- /dev/null
+++ b/src/chrome/locale/fr/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bienvenue
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Confidentialité
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorer
+
+onboarding.tour-tor-security=Sécurité
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Les services oignon
+onboarding.tour-tor-onion-services.title=Les services oignon
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/fr/torbutton.dtd b/src/chrome/locale/fr/torbutton.dtd
index 052b0adf..65b9e7d2 100644
--- a/src/chrome/locale/fr/torbutton.dtd
+++ b/src/chrome/locale/fr/torbutton.dtd
@@ -27,7 +27,7 @@
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ne pas protéger les nouveaux fichiers témoins">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les fichiers témoins tiers et les autres données de suivi à la trace">
 <!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "L">
-<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace lorsque vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Gardez cette case cochée pour empêcher que diverses fonctions du navigateur soient utilisées pour vous suivre à la trace quand vous surfez sur le Web. Les fonctions modifiées incluent les URL de grands objets binaires, les canaux de diffusion, le cache du navigateur, les fichiers fichiers témoins, les favoricônes, les en-têtes Auth HTTP, les préconnexions de liens, localStorage, les URL de sources de médias, les requêtes OCSP, les travailleurs Web SharedWorker, et les billets de session TLS.">
 <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue dâ??autres utilisateurs du Navigateur Tor">
 <!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
 <!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Gardez cette case cochée pour cacher aux sites Web certaines choses qui pourraient être uniques à votre sujet, incluant les performances de votre ordinateur, lâ??agencement du clavier, les paramètres de langue, lâ??emplacement des greffons installés, la liste des greffons installés, lâ??état de votre réseau, lâ??orientation de lâ??écran, la taille de lâ??écran, les niveaux de zoom particuliers aux sites, les types de fichiers pris en charge, les couleurs système et les capacités WebGL.">
diff --git a/src/chrome/locale/fr/torbutton.properties b/src/chrome/locale/fr/torbutton.properties
index 00dd0ac2..919fdc8c 100644
--- a/src/chrome/locale/fr/torbutton.properties
+++ b/src/chrome/locale/fr/torbutton.properties
@@ -17,14 +17,14 @@ extensions.torbutton@xxxxxxxxxxxxxx.description = BoutonTor fournit un bouton po
 torbutton.popup.external.title = Télécharger un type de fichier externeâ???
 torbutton.popup.external.app = Le Navigateur Tor ne peut pas afficher ce fichier. Il est necessaire de lâ??ouvrir avec une autre application.
 torbutton.popup.external.note = Certains types de fichiers peuvent causer des connexions à lâ??Internet sans passer par Tor pour certaines applications 
-torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fichiers téléchargés que lorsque vous êtes hors ligne, ou en utilisant un CD autonome Tor comme Tails.\n
+torbutton.popup.external.suggest = Par sécurité, vous ne devriez ouvrir les fichiers téléchargés quâ??une fois hors ligne ou en utilisant un CD autonome Tor comme Tails.\n
 torbutton.popup.launch = Télécharger le fichier
 torbutton.popup.cancel = Annuler
 torbutton.popup.dontask = Télécharger automatiquement à partir de maintenant
 torbutton.popup.prompted_language = Pour renforcer votre anonymat, BoutonTor peut demander la version anglaise des pages Web. Les pages que vous préférez lire dans votre langue maternelle pourraient alors sâ??afficher en anglais.\n\nVoulez-vous demander des pages Web en anglais pour améliorer votre anonymatâ???
-torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il nâ??a pas accès au port de contrôle de Tor.\n\nUtilisez-vous lâ??offre groupée de navigation Torâ???
+torbutton.popup.no_newnym = BoutonTor ne peut pas vous attribuer une nouvelle identité de façon sûre. Il nâ??a pas accès au port de contrôle de Tor.\n\nUtilisez-vous lâ??offre groupée du Navigateur Torâ???
 torbutton.title.prompt_torbrowser = Informations importantes concernant BoutonTor
-torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il nâ??est pas sécuritaire dâ??utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger lâ??offre groupée de navigation Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même sâ??il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor.
+torbutton.popup.prompt_torbrowser = BoutonTor fonctionne différemment maintenant : vous ne pouvez plus le désactiver.\n\nNous avons effectué ce changement car il nâ??est pas sécuritaire dâ??utiliser BoutonTor dans un navigateur qui est également utiliser pour une navigation sans Tor. Trop de bogues ne pouvaient être réglés autrement.\n\nSi vous voulez continuer à utiliser Firefox normalement, vous devriez désinstaller BoutonTor et télécharger lâ??offre groupée du Navigateur Tor. Les propriétés de confidentialité du Navigateur Tor sont aussi supérieures à celles de Firefox, même sâ??il est utilisé avec BoutonTor.\n\nPour enlever BoutonTor, allez dans Outils->Modules complémentaires->Extensions et cliquer sur Supprimer à coté de BoutonTor.
 torbutton.popup.short_torbrowser = Informations importantes concernant BoutonTorâ??!\n\nBoutonTor est toujours activé dorénavant.\n\nCliquer sur BoutonTor pour plus dâ??informations.
 
 torbutton.popup.confirm_plugins = Les greffons tels que Flash peuvent nuire à vos anonymat et vie privée.\n\nIls peuvent également contourner Tor afin de révéler votre position actuelle ainsi que votre adresse IP.\n\nÃ?tes-vous certain de vouloir activer les greffonsâ???\n\n
diff --git a/src/chrome/locale/ga/aboutDialog.dtd b/src/chrome/locale/ga/aboutDialog.dtd
new file mode 100644
index 00000000..6ad9a5ca
--- /dev/null
+++ b/src/chrome/locale/ga/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "Tá &brandShortName; forbartha ag">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", eagraíocht neamhbhrabhúis a chosnaíonn do phríobháideachas agus do shaoirse ar líne.">
+
+<!ENTITY help.start              "Ar mhaith leat cuidiú linn?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Tabhair síntiús airgid">
+<!ENTITY help.or                 "nó">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "glac páirt">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Ceisteanna?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Cabhraigh linn borradh a chur faoi Líonra Tor!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Ceadúnas">
+<!ENTITY tor.TrademarkStatement   "Is trádmharcanna de chuid Tor Project, Inc. iad 'Tor' agus an 'Onion Logo'">
diff --git a/src/chrome/locale/ga/aboutTBUpdate.dtd b/src/chrome/locale/ga/aboutTBUpdate.dtd
new file mode 100644
index 00000000..1c4063a3
--- /dev/null
+++ b/src/chrome/locale/ga/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Nuashonrú Brabhsálaí Tor">
+<!ENTITY aboutTBUpdate.updated "Nuashonraíodh Brabhsálaí Tor">
+<!ENTITY aboutTBUpdate.linkPrefix "Chun teach ar an eolas is déanaí maidir leis an leagan seo,">
+<!ENTITY aboutTBUpdate.linkLabel  "tabhair cuairt ar ár suíomh Gréasáin">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Logchomhad athruithe:">
diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd
index 9f14022b..fd31fd4a 100644
--- a/src/chrome/locale/ga/aboutTor.dtd
+++ b/src/chrome/locale/ga/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Maidir le Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Chuaigh rud éigin ar strae!">
+<!ENTITY aboutTor.failure2.label "Níl Tor ag obair sa bhrabhsálaí seo.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ceisteanna?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ga/aboutTor.properties b/src/chrome/locale/ga/aboutTor.properties
index 02088f01..7db055e4 100644
--- a/src/chrome/locale/ga/aboutTor.properties
+++ b/src/chrome/locale/ga/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=<a href="%1$S">Cuardach slán</a> le <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Tabhair Síntiús Airgid Anois!
+
+aboutTor.donationBanner.slogan=Tor: Cumhacht na Frithbheartaíochta Digití
+aboutTor.donationBanner.mozilla=Tabhair síntiús airgid inniu agus meaitseálfaidh Mozilla é!
+
+aboutTor.donationBanner.tagline1=Iriseoirí, sceithirí, agus gníomhaígh á gcosaint ó 2006
+aboutTor.donationBanner.tagline2=Saoirse Líonraithe ar fud an domhain
+aboutTor.donationBanner.tagline3=Saoirse Ar Líne
+aboutTor.donationBanner.tagline4=Saoirse Cainte á cothú ar fud an domhain
+aboutTor.donationBanner.tagline5=Príobháideachas na milliún á chosaint chuile lá
diff --git a/src/chrome/locale/ga/brand.dtd b/src/chrome/locale/ga/brand.dtd
index 59f665e8..7a8c4860 100644
--- a/src/chrome/locale/ga/brand.dtd
+++ b/src/chrome/locale/ga/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Brabhsálaí Tor">
+<!ENTITY  brandShortName        "Brabhsálaí Tor">
+<!ENTITY  brandFullName         "Brabhsálaí Tor">
+<!ENTITY  vendorShortName       "Tionscadal Tor">
+<!ENTITY  trademarkInfo.part1   "Is trádmharcanna de chuid Fondúireacht Mozilla 'Firefox' agus lógónna Firefox.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Cliceáil chun forlíontáin an chórais a lódáil">
+<!ENTITY plugins.installed.enable "Cumasaigh breiseáin">
+<!ENTITY plugins.installed.disable "Díchumasaigh breiseáin">
+<!ENTITY plugins.installed.disable.tip "Cliceáil chun cosc a chur ar fhorlíontáin an chórais">
diff --git a/src/chrome/locale/ga/brand.properties b/src/chrome/locale/ga/brand.properties
index f63def38..4f96f506 100644
--- a/src/chrome/locale/ga/brand.properties
+++ b/src/chrome/locale/ga/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Brabhsálaí Tor
+brandShortName=Brabhsálaí Tor
+brandFullName=Brabhsálaí Tor
+vendorShortName=Tionscadal Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, leathanach baile sciobtha, le cuardach ionsuite
+homePageImport=Iompórtáil do leathanach baile ó %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Roghnú Leathanaigh Bhaile
+homePageMigrationDescription=Roghnaigh do leathanach baile:
 
-syncBrandShortName=Sync
+syncBrandShortName=Sioncronú
diff --git a/src/chrome/locale/ga/browserOnboarding.properties b/src/chrome/locale/ga/browserOnboarding.properties
new file mode 100644
index 00000000..1a26ba8e
--- /dev/null
+++ b/src/chrome/locale/ga/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Príobháideachas
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Seirbhísí Onion
+onboarding.tour-tor-onion-services.title=Seirbhísí Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ga/torbutton.dtd b/src/chrome/locale/ga/torbutton.dtd
index d8d88e49..26c3f555 100644
--- a/src/chrome/locale/ga/torbutton.dtd
+++ b/src/chrome/locale/ga/torbutton.dtd
@@ -1,22 +1,51 @@
-<!ENTITY torbutton.context_menu.new_identity "New Identity">
+<!ENTITY torbutton.context_menu.new_identity "Aitheantas Nua">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "Ciorcad Nua Tor don Suíomh seo">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Socruithe Slándála...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Socruithe Líonra Tor...">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Lorg Nuashonrú ar Bhrabhsálaí Tor...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Caomhnú Fianán...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.button.tooltip "Cliceáil chun cnaipe Tor a thúsú">
+<!ENTITY torbutton.prefs.security_settings "Socruithe Slándála Bhrabhsálaí Tor">
+<!ENTITY torbutton.prefs.restore_defaults "Fill ar na Réamhshocruithe">
+<!ENTITY torbutton.prefs.custom_warning "Tá socruithe slándála an bhrabhsálaí as an ngnáth faoi láthair, mar thoradh ar do chuid sainroghanna.  Ar chúiseanna slándála agus príobháideachais, molaimid duit ceann de na leibhéil slándála réamhshocraithe a roghnú.">
+<!ENTITY torbutton.cookiedialog.title "Bainistigh Caomhnú Fianán">
+<!ENTITY torbutton.cookiedialog.lockCol "Cosanta">
+<!ENTITY torbutton.cookiedialog.domainCol "�stríomhaire">
+<!ENTITY torbutton.cookiedialog.nameCol "Ainm">
+<!ENTITY torbutton.cookiedialog.pathCol "Cosán">
+<!ENTITY torbutton.cookiedialog.protectCookie "Caomhnaigh an Fianán">
+<!ENTITY torbutton.cookiedialog.removeCookie "Scrios an Fianán">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Ná caomhnaigh an fianán">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Scrios iad nach bhfuil caomhnaithe">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Caomhnaigh Fianáin Nua">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ná Caomhnaigh Fianáin Nua">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Cuir srian le fianáin tríú páirtí agus le sonraí lorgaireachta eile">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Coinnigh tic sa bhosca seo chun cosc a chur ar ghnéithe éagsúla sa bhrabhsálaí a mbaintear mí-úsáid astu chun do ghníomhaíocht ar an nGréasán a lorg. I measc na ngnéithe seo: blob-URLanna, cainéil chraolta, taisce an bhrabhsálaí, fianáin, deilbhíní suímh, ceanntásca HTTP Auth, réamhcheangal nascanna, stóras áitiúil, URLanna mediaSource, iarratais OCSP, Oibrithe Roinnte, agus ticéid seisiún TLS. ">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Athraigh na mionsonraí a dhéanann idirdhealú ó úsáideoirí Tor eile">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "H">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Coinnigh tic sa bhosca seo chun sonraí a bhaineann leatsa go pearsanta a chur i bhfolach ó shuímh Ghréasáin, mar shampla luas do ríomhaire, leagan amach do mhéarchláir, an logchaighdeán, an áit ina bhfuil forlíontáin suiteáilte, na forlíontáin shuiteáilte féin, stádas do líonra, treoshuíomh an scáileáin, méid an scáileáin, leibhéil zúmála ar shuímh ar leith, cineálacha comhaid a dtacaíonn do bhrabhsálaí leo, dathanna an chórais, agus acmhainní WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Leibhéal Slándála">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Ligeann an Sleamhnán Slándála duit gnéithe áirithe sa bhrabhsálaí a dhíchumasú nuair is féidir le bradaí iad a úsáid chun ionsaí a dhéanamh ort.">
+<!ENTITY torbutton.prefs.sec_standard_label "Gnáthshlándáil">
+<!ENTITY torbutton.prefs.sec_standard_description "Gach gné de bhrabhsálaí Tor agus gach gné de shuímh Ghréasáin ar siúl.">
+<!ENTITY torbutton.prefs.sec_safer_label "Níos Sábháilte">
+<!ENTITY torbutton.prefs.sec_safer_description "Díchumasaítear gnéithe de shuímh atá contúirteach go minic; dá bharr seo, ní fheidhmeoidh gach suíomh mar is ceart.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Leis an rogha níos sábháilte:">
+<!ENTITY torbutton.prefs.sec_safest_label "Is Sábháilte">
+<!ENTITY torbutton.prefs.sec_safest_description "Ní cheadaítear ach na gnéithe atá de dhíth ar shuímh statacha agus ar bhunseirbhísí. Téann na hathruithe seo i bhfeidhm ar íomhánna, ar mheáin, agus ar scripteanna.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Leis an rogha is sábháilte:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Tuilleadh eolais">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "Tá JavaScript díchumasaithe ar shuímh nach mbaineann úsáid as HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "Tá JavaScript díchumasaithe ar gach suíomh de réir réamhshocraithe.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Tá roinnt clófhoirne agus siombailí matamaiticiúla díchumasaithe.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Tá roinnt clófhoirne, deilbhíní, siombailí matamaiticiúla, agus íomhánna díchumasaithe.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Caithfidh tú fuaimeanna agus físeáin (meáin HTML5) a chliceáil lena seinm.">
+<!ENTITY torbutton.circuit_display.title "Ciorcad Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Ciorcad Nua don Suíomh seo">
diff --git a/src/chrome/locale/ga/torbutton.properties b/src/chrome/locale/ga/torbutton.properties
index ee5b1f95..a8e1578a 100644
--- a/src/chrome/locale/ga/torbutton.properties
+++ b/src/chrome/locale/ga/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Launch application
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Always launch applications from now on
-torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
-torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
-torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.circuit_display.internet = An tIdirlíon
+torbutton.circuit_display.ip_unknown = IP anaithnid
+torbutton.circuit_display.onion_site = Suíomh Onion
+torbutton.circuit_display.this_browser = An brabhsálaí seo
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Droichead
+torbutton.circuit_display.unknown_country = Tír anaithnid
+torbutton.circuit_display.guard = Guard
+torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.learn_more = Tuilleadh eolais
+torbutton.content_sizer.margin_tooltip = Cuireann Brabhsálaí Tor an chiumhais seo leis an bhfuinneog ionas nach mbeidh leithead agus airde na fuinneoige chomh suntasach, sa chaoi go mbíonn sé níos deacra do ghníomhaíocht ar líne a lorg.
+torbutton.panel.tooltip.disabled = Cliceáil le Tor a chumasú
+torbutton.panel.tooltip.enabled = Cliceáil le Tor a dhíchumasú
+torbutton.panel.label.disabled = Tá Tor Díchumasaithe
+torbutton.panel.label.enabled = Tá Tor Cumasaithe
+extensions.torbutton@xxxxxxxxxxxxxx.description = Is féidir leat an cnaipe Tor a úsáid chun Tor a chumrú agus do chuid sonraí brabhsála príobháideacha a ghlanadh go tapa agus go héasca.
+torbutton.popup.external.title = �oslódáil cineál comhaid seachtrach?
+torbutton.popup.external.app = Ní féidir le Brabhsálaí Tor an comhad seo a thaispeáint. Ní mór duit é a oscailt le feidhmchlár eile.\n\n
+torbutton.popup.external.note = Déanann feidhmchláir áirithe ceangal díreach leis an Idirlín gan dul trí Tor mar gheall ar chineálacha comhaid áirithe.\n\n
+torbutton.popup.external.suggest = Le bheith slán sábháilte, níor chóir duit comhaid íoslódáilte a oscailt go dtí go mbeidh tú as líne, nó CD Beo Tor ar nós Tails a úsáid.\n
+torbutton.popup.launch = �oslódáil an comhad
+torbutton.popup.cancel = Cealaigh
+torbutton.popup.dontask = �oslódáil comhaid go huathoibríoch as seo amach
+torbutton.popup.prompted_language = Is féidir leis an gcnaipe Tor an leagan Béarla de leathanaigh Ghréasáin a iarraidh, chun tuilleadh príobháideachais a thabhairt duit. Leis seo i bhfeidhm, seans go bhfaighidh tú an leagan Béarla de leathanaigh dhátheangacha ab fhearr leat a léamh i nGaeilge.\n\nAn bhfuil fonn ort leaganacha Béarla a iarraidh mar sin féin?
+torbutton.popup.no_newnym = Níl an cnaipe Tor in ann aitheantas nua a thabhairt duit go sábháilte. Níl sé in ann teacht ar Phort Rialaithe Tor.\n\nAn bhfuil tú ag úsáid Burla Brabhsálaí Tor?
+torbutton.title.prompt_torbrowser = Eolas Tábhachtach faoi Chnaipe Tor
+torbutton.popup.prompt_torbrowser = Feidhmíonn an cnaipe Tor go difriúil anois; ní féidir leat é a mhúchadh a thuilleadh.\n\nD'athraíomar é seo toisc nach bhfuil sé sábháilte an cnaipe Tor a úsáid i mbrabhsálaí a úsáidtear le brabhsáil lasmuigh de Tor. Bhí an iomarca fabhtanna ann nach rabhamar in ann deisiú ar aon bhealach eile.\n\nMás mian leat leanúint ar aghaidh le Firefox mar is gnáth, ba chóir duit an cnaipe Tor a dhíshuiteáil agus Brabhsálaí Tor a íoslódáil. Tá na hairíonna slándála i mBrabhsálaí Tor i bhfad níos fearr ná na cinn i ngnáth-Firefox, fiú nuair a úsáidtear Firefox leis an gcnaipe Tor.\n\nChun an cnaipe Tor a bhaint, oscail Uirlisí->Breiseáin->Eisínteachtaí ansin cliceáil an cnaipe Bain in aice le Cnaipe Tor.
+torbutton.popup.short_torbrowser = Eolas Tábhachtach maidir leis an gCnaipe Tor!\n\nTá an Cnaipe Tor cumasaithe i gcónaí.\n\nCliceáil air chun tuilleadh eolais a fháil.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Is féidir le forlíontáin ar nós Flash dochar a dhéanamh do do phríobháideachas agus d'aitheantas a nochtadh ar líne.\n\nTá siad in ann Tor a sheachaint agus an áit ina bhfuil tú agus do sheoladh IP a nochtadh.\n\nAn bhfuil tú cinnte gur mhaith leat forlíontáin a chumasú?\n\n
+torbutton.popup.never_ask_again = Ná fiafraigh díom arís
+torbutton.popup.confirm_newnym = Dúnfaidh Brabhsálaí Tor gach fuinneog agus gach cluaisín. Caillfidh tú gach seisiún oscailte.\n\nAn bhfuil fonn ort Brabhsálaí Tor a atosú anois agus d'aitheantas a athshocrú?\n\n
+
+torbutton.slider_notification = Anois gheobhaidh tú sleamhnán slándála faoin oinniún glas a ligeann duit an leibhéal slándála a athrú. Bain triail as!
+torbutton.slider_notification_button = Oscail na socruithe slándála
+
+torbutton.maximize_warning = Bíonn suímh Ghréasáin in ann méid do scáileáin a fháil amach nuair a uasmhéadaíonn tú Brabhsálaí Tor, rud a chabhraíonn leo do ghníomhaíocht ar líne a lorg. Molaimid duit fuinneoga an bhrabhsálaí a fhágáil ar a méid réamhshocraithe.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Rinne an suíomh seo (%S) iarracht sonraí íomhá a bhaint ó chanbhás HTML5, sonraí a d'fhéadfaí a úsáid chun do ríomhaire féin a aithint.\n\nAn bhfuil fonn ort cead a thabhairt don suíomh seo sonraí íomhá a bhaint ó chanbhás HTML5?
+canvas.notNow=Níl Anois
+canvas.notNowAccessKey=N
+canvas.allow=Ceadaigh amach anseo
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Ná ceadaigh don suíomh seo riamh (molta)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Fadhb leis an bPróifíl %S
+profileReadOnly=Ní féidir leat %S a rith ó chóras comhad inléite amháin. Cóipeáil %S go dtí suíomh eile agus ansin bain triail eile as.
+profileReadOnlyMac=Ní féidir leat %S a rith ó chóras comhad inléite amháin. Cóipeáil %S go dtí do Dheasc nó an fillteán Applications, ansin bain triail eile as.
+profileAccessDenied=Níl cead rochtana ag %S ar an bpróifíl. Athraigh na ceadanna ar do chóras comhad agus bain triail eile as.
+profileMigrationFailed=Níorbh fhéidir an phróifíl %S atá agat a aistriú.\n�sáidfear socruithe nua.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ceangal Criptithe (Seirbhís Onion, %1$S, eochracha %2$S giotán, %3$S)
+pageInfo_OnionEncryption=Ceangal Criptithe (Seirbhís Onion)
diff --git a/src/chrome/locale/he/aboutDialog.dtd b/src/chrome/locale/he/aboutDialog.dtd
index ce1bcbaa..d334bfd0 100644
--- a/src/chrome/locale/he/aboutDialog.dtd
+++ b/src/chrome/locale/he/aboutDialog.dtd
@@ -16,4 +16,4 @@
 <!ENTITY bottomLinks.grow        "×¢×?×?ר ×?רשת Tor ×?×?×?×?×?!">
 <!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
 <!ENTITY bottomLinks.license  "×?×?×?×¢ ר×?ש×?×?">
-<!ENTITY tor.TrademarkStatement   "'Tor' ×?-'ס×?×?×?×? ×?×?צ×?' ×?×? ס×?×?× ×?×? ×?ס×?ר×?×?×? רש×?×?×?×? ש×? Tor Project, Inc.">
+<!ENTITY tor.TrademarkStatement   "'Tor' ×?'ס×?×?×?×? ×?×?צ×?' ×?×? ס×?×?× ×?×? ×?ס×?ר×?×?×? רש×?×?×?×? ש×? Tor Project, Inc.">
diff --git a/src/chrome/locale/he/aboutTor.dtd b/src/chrome/locale/he/aboutTor.dtd
index 819cc8e8..46f110f4 100644
--- a/src/chrome/locale/he/aboutTor.dtd
+++ b/src/chrome/locale/he/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "×?×?×?×?ת Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "×?×?×?ר×?: ×?פ×?פ×? ×?×? ×?×?× ×? ×?×¢×?×?×?×?.">
-<!ENTITY aboutTor.outOfDateTorOff.label "×?×?×? ×?×?, ×?פ×?פ×? ×?×? ×?×?× ×? ×?×¢×?×?×?×?.">
-<!ENTITY aboutTor.outOfDate2.label "×?×?×¥ ×¢×? ×?×?צ×? ×?×?×? ×?×?ר ×?×?×?×?ק ×?×?ר ×¢×?×?×?×? ×?×?פ×?פ×? Tor">
-
-<!ENTITY aboutTor.check.label "×?×?×? ×?×?×?ר×?ת רשת Tor">
-
-<!ENTITY aboutTor.success.label "×?ר×?×? ×?×?×? ×?×? ×?פ×?פ×? Tor">
-<!ENTITY aboutTor.success2.label "×?×?×?×?ר ×?×? רשת Tor.">
-<!ENTITY aboutTor.success3.label "×?ת×? ×¢×?ש×?×? ×?×?פש×? ×?×?×?×?ש ×?×?×?× ×?רנ×? ×?×?×?פ×? ×?×?×?×?× ×?.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "×?ש×?×? ×?שת×?ש!">
 <!ENTITY aboutTor.failure2.label "Tor ×?×?× ×? ×¢×?×?×? ×?×?פ×?פ×? ×?×?.">
 
-<!ENTITY aboutTor.search.label "×?פש">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "×?×?×?×¢ × ×?סף:">
-<!ENTITY aboutTor.torInfo2.label "×?×?×?× ×? ×?×?ת×?×?ת IP:">
-<!ENTITY aboutTor.torInfo3.label "צ×?×?ת ×?צ×?×?×?:">
-<!ENTITY aboutTor.torInfo4.label "שרת ×?×? ×?×?× ×? ר×?ש×? ×?×?×?×?×? ×?×?×?×¢ ×?×?ש×?×? ×?×?×?×?ת ×?×?קר×?×?.">
-<!ENTITY aboutTor.whatnextQuestion.label "×?×? ×?×?×?×??">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor ×?×?× ×? ×?×? ×?×? שת×?×?קק ×?×? ×¢×? ×?נת ×?×?×?×?ש ×?×?×?פ×? ×?× ×?× ×?×?×?! ×?×?ת×?×? שתצ×?ר×? ×?שנ×?ת ×?×?ק ×?×?ר×?×?×? ×?×?×?×?ש×? ש×?×? ×?×?×? ×?×?×?×?×?×? ש×?×?×?ת×? ת×?×?×?תר ×?×?×?×?×?.">
-<!ENTITY aboutTor.whatnext.label "×?×?פ×?×? ×?ש×?×?ר×? ×¢×? ×?× ×?× ×?×?×?×?ת ×?רשת »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ש×?×?×?ת?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "×?×?ר×?×? ×?שת×?ש ש×? ×?פ×?פ×? Tor">
-<!ENTITY aboutTor.helpInfo1.label "×?ת×? ×?×?×?×? ×?×¢×?×?ר!">
-<!ENTITY aboutTor.helpInfo2.label "×?שנ×? ×?ר×?×?×? ר×?×?ת ×?×?×? ×?ת×? ×?×?×?×? ×?עש×?ת ×?ת רשת Tor ×?×?×?ר×? ×?×?תר ×?×?×?ק×? ×?×?תר:">
-<!ENTITY aboutTor.helpInfo3.label "×?×?ק×?×? ×?×?×?פע×?×? ×?עצ×?×? שרת Tor">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "× ×?×? ×?ת ש×?ר×?ת×?×? »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "תר×?×? »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "×?×?×?×? Tor ×?×?×? ×?ר×?×?×? US 501(c)(3) ×?×?×? ×?×?ר×?ת ר×?×?×? ×?×?×?ק×?ש ×?×?×?קר, פ×?ת×?×? ×?×?×?× ×?×? ש×? ×?×?×?×?× ×?×?ת ×?ק×?×?נת ×?פר×?×?×?ת.">
-<!ENTITY aboutTor.learnMore.label "×?×?×? ×¢×?×? ×?×?×?×?ת ×?×?×?×? Tor »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/he/brand.properties b/src/chrome/locale/he/brand.properties
index baf4637f..85cd3896 100644
--- a/src/chrome/locale/he/brand.properties
+++ b/src/chrome/locale/he/brand.properties
@@ -8,9 +8,9 @@ brandFullName=×?פ×?פ×? Tor
 vendorShortName=×?×?×?×? Tor
 
 homePageSingleStartMain=Firefox Start, ×?×£ ×?×?ת ×?×?×?ר ×¢×? ×?×?פ×?ש ×?×?×?× ×?
-homePageImport=×?×?×?×? ×?ת ×?×£ ×?×?×?ת ש×?×? ×?-%S
+homePageImport=×?×?×?×? ×?ת ×?×£ ×?×?×?ת ש×?×? ×?×? %S
 
 homePageMigrationPageTitle=×?×?×?רת ×?×£ ×?×?ת
-homePageMigrationDescription=×?× ×? ×?×?ר ×?ת ×?×£ ×?×?×?ת ש×?רצ×?× ×? ×?×?שת×?ש ×?×?:
+homePageMigrationDescription=×?× ×? ×?×?ר ×?ת ×?×£ ×?×?×?ת ש×?ת×? ר×?צ×? ×?×?שת×?ש ×?×?:
 
 syncBrandShortName=סנ×?ר×?
diff --git a/src/chrome/locale/he/browserOnboarding.properties b/src/chrome/locale/he/browserOnboarding.properties
new file mode 100644
index 00000000..a4f1edf0
--- /dev/null
+++ b/src/chrome/locale/he/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=פר×?×?×?ת
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=×?×?×?×?×?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=ש×?ר×?ת×? ×?צ×?
+onboarding.tour-tor-onion-services.title=ש×?ר×?ת×? ×?צ×?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/he/torbutton.properties b/src/chrome/locale/he/torbutton.properties
index c153c619..cdcd18c7 100644
--- a/src/chrome/locale/he/torbutton.properties
+++ b/src/chrome/locale/he/torbutton.properties
@@ -21,20 +21,20 @@ torbutton.popup.external.suggest = ×?×?תר ×?×?×?×?×?×?, ×¢×?×?×? ×?פת×?×? ק
 torbutton.popup.launch = ×?×?ר×? ק×?×?×¥
 torbutton.popup.cancel = ×?×?×?
 torbutton.popup.dontask = ×?×?ר×? ק×?צ×?×? ×?×?×?פ×? ×?×?×?×?×?×?×? ×?עת×? ×?×?×?×?×?
-torbutton.popup.prompted_language = ×?×?×? ×?תת ×?×? ×?×?תר פר×?×?×?ת, Torbutton ×?×?×?×? ×?×?קש ×?ת ×?×?רס×? ×?×?× ×?×?×?ת ש×? ×?תר×? ×?×?× ×?רנ×?. ×?×? עש×?×? ×?×?ר×?×? ×?×?תר×?×? ש×?ת×? ×?×¢×?×?×£ ×?קר×?×? ×?שפת ×?×?×? ש×?×? ×?×?×?×?ת ×?×?צ×?×?×? ×?×?× ×?×?×?ת ×?×?ק×?×?.\n\n×?×?×? ×?רצ×?× ×? ×?×?קש ×?תר×?×? ×?שפ×? ×?×?× ×?×?×?ת ×¢×?×?ר פר×?×?×?ת ×?×?×?×? ×?×?תר?
+torbutton.popup.prompted_language = ×?×?×? ×?תת ×?×? ×?×?תר פר×?×?×?ת, Torbutton ×?×?×?×? ×?×?קש ×?ת ×?×?רס×? ×?×?× ×?×?×?ת ש×? ×?תר×? ×?×?× ×?רנ×?. ×?×? עש×?×? ×?×?ר×?×? ×?×?תר×?×? ש×?ת×? ×?×¢×?×?×£ ×?קר×?×? ×?שפת ×?×?×? ש×?×? ×?×?×?×?ת ×?×?צ×?×?×? ×?×?× ×?×?×?ת ×?×?ק×?×?.\n\n×?×?×? ×?ת×? ר×?צ×? ×?×?קש ×?תר×?×? ×?שפ×? ×?×?× ×?×?×?ת ×¢×?×?ר פר×?×?×?ת ×?×?×?×? ×?×?תר?
 torbutton.popup.no_newnym = Torbutton ×?×?× ×? ×?×?×?×? ×?תת ×?×? ×?×?×?×?×? ×?×?×?ת ×?×?ש×?. ×?×?×? ×?×? ×?×?ש×? ×?×? פת×?ת ×?×?קר×? ש×? Tor.\n\n×?×?×? ×?ת×? ×?ר×?×¥ ×?ת ×?×?×?×?ת ×?פ×?פ×? Tor?
 torbutton.title.prompt_torbrowser = ×?×?×?×¢ ×?ש×?×? ש×? Torbutton
-torbutton.popup.prompt_torbrowser = Torbutton ×¢×?×?×? ×?×?×?×? ×?×?רת: ×?×?× ×? ×?×?×?×? ×?×?×?×?ת ×?×?ת×? ×?×?תר.\n\nעש×?× ×? ש×?× ×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?×?×? ×?×?שת×?ש ×?-Torbutton ×?×?פ×?פ×? ×?× ×?צ×? ×?ש×?×?×?ש ×?×? ×¢×?×?ר ×?×?×?ש×? ש×?×?× ×? Tor. ×?×?×? ×?×?תר ×?×?×? תק×?×?×? ש×?×? ×?×?×?×?× ×? ×?תק×? ×?×?×? ×?ר×? ×?×?רת.\n\n×?×? ×?רצ×?× ×? ×?×?×?ש×?×? ×?×?שת×?ש ×?-Firefox ×?ר×?×?×?, ×¢×?×?×? ×?×?ס×?ר ×?ת Torbutton ×?×?×?×?ר×?×? ×?ת ×?×?×?×?ת ×?פ×?פ×? Tor. ×?×?פ×?×?× ×? ×?פר×?×?×?ת ש×? ×?פ×?פ×? Tor ×?×? × ×¢×?×?×? ×?×?תר ×?×?שר ×?×?×? ש×? Firefox ר×?×?×?, ×?פ×?×?×? ×?×?שר Firefox × ×?צ×? ×?ש×?×?×?ש ×¢×? Torbutton.\n\n×?×?×? ×?×?ס×?ר ×?ת Torbutton, ×?×? ×?×? ×?×?×?×?->ת×?ספ×?ת->×?ר×?×?×?ת ×?×?×? ×?×?×¥ ×¢×? ×?×?פת×?ר ×?סר ×?×?×? Torbutton.
+torbutton.popup.prompt_torbrowser = Torbutton ×¢×?×?×? ×?×?×?×? ×?×?רת: ×?×?× ×? ×?×?×?×? ×?×?×?×?ת ×?×?ת×? ×?×?תר.\n\nעש×?× ×? ש×?× ×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?×?×? ×?×?שת×?ש ×?-Torbutton ×?×?פ×?פ×? ×?× ×?צ×? ×?ש×?×?×?ש ×?×? ×¢×?×?ר ×?×?×?ש×? ש×?×?× ×? Tor. ×?×?×? ×?×?תר ×?×?×? תק×?×?×? ש×?×? ×?×?×?×?× ×? ×?תק×? ×?×?×? ×?ר×? ×?×?רת.\n\n×?×? ×?ת×? ר×?צ×? ×?×?×?ש×?×? ×?×?שת×?ש ×?-Firefox ×?ר×?×?×?, ×¢×?×?×? ×?×?ס×?ר ×?ת Torbutton ×?×?×?×?ר×?×? ×?ת ×?×?×?×?ת ×?פ×?פ×? Tor. ×?×?פ×?×?× ×? ×?פר×?×?×?ת ש×? ×?פ×?פ×? Tor ×?×? × ×¢×?×?×? ×?×?תר ×?×?שר ×?×?×? ש×? Firefox ר×?×?×?, ×?פ×?×?×? ×?×?שר Firefox × ×?צ×? ×?ש×?×?×?ש ×¢×? Torbutton.\n\n×?×?×? ×?×?ס×?ר ×?ת Torbutton, ×?×? ×?×? ×?×?×?×?->ת×?ספ×?ת->×?ר×?×?×?ת ×?×?×? ×?×?×¥ ×¢×? ×?×?פת×?ר ×?סר ×?×?×? Torbutton.
 torbutton.popup.short_torbrowser = ×?×?×?×¢ ×?ש×?×? ×¢×? Torbutton!\nTorbutton ת×?×?×? ×?×?×?פשר ×¢×?ש×?×?.\n×?×?×¥ ×¢×? ×?-Torbutton ×?×¢×?×? ×?×?×?×¢.
 
-torbutton.popup.confirm_plugins = ×?תקע×?×? ×?×?×?×? Flash ×?×?×?×?×?×? ×?פ×?×?×¢ ×?פר×?×?×?ת×? ×?×?×?×?×?×?× ×?×?ת×?.\n\n×?×? ×?×?×?×?×?×? ×?×? ×?עק×?×£ ×?ת Tor ×?×?×? ×?×?ש×?×£ ×?ת ×?×?ק×?×?×? ×?× ×?×?×?×? ×?×?ת ×?ת×?×?ת ×?-IP ש×?×?.\n\n×?×?×? ×?ת×? ×?×?×?×? ש×?רצ×?× ×? ×?×?פשר ×?תקע×?×??\n\n
+torbutton.popup.confirm_plugins = ×?תקע×?×? ×?×?×?×? Flash ×?×?×?×?×?×? ×?פ×?×?×¢ ×?פר×?×?×?ת×? ×?×?×?×?×?×?× ×?×?ת×?.\n\n×?×? ×?×?×?×?×?×? ×?×? ×?עק×?×£ ×?ת Tor ×?×?×? ×?×?ש×?×£ ×?ת ×?×?ק×?×?×? ×?× ×?×?×?×? ×?×?ת ×?ת×?×?ת ×?-IP ש×?×?.\n\n×?×?×? ×?ת×? ×?×?×?×? ש×?ת×? ר×?צ×? ×?×?פשר ×?תקע×?×??\n\n
 torbutton.popup.never_ask_again = ×?×£ פע×? ×?×? תש×?×? ×?×?ת×? ש×?×?
 torbutton.popup.confirm_newnym = ×?פ×?פ×? Tor ×?ס×?×?ר ×?ת ×?×? ×?×?×?×?× ×?ת ×?×?×?ש×?× ×?×?ת. ×?×? ש×?×?×? ×?×?תר×?×? ×?×?×?×?×?. \n\n×?×?פע×?×? ×?×?×?ש ×?ת ×?פ×?פ×? Tor ×¢×?ש×?×? ×?×?×? ×?×?פס ×?ת ×?×?×?ת×??\n\n
 
 torbutton.slider_notification = ×?תפר×?×? ש×? ×?×?צ×? ×?×?ר×?ק ×?ש ×?עת ×?×?×?×?×? ×?×?×?×?×? ×?×?×?פשר ×?×? ×?×?ת×?×?×? ×?ת ר×?ת ×?×?×?×?×?×? ש×?×?. נס×? ×?×?ת×?!
 torbutton.slider_notification_button = פת×? ×?×?×?ר×?ת ×?×?×?×?×?
 
-torbutton.maximize_warning = ×?פע×?ת ×?ס×? ×?×?×? ×?×?פ×?פ×? Tor ×¢×?×?×?×? ×?×?ת×?ר ×?×?תר×?×? ×?ק×?×?×¢ ×?ת ×?×?×?×? ×?צ×? ש×?×?, ×?×? שע×?×?×? ×?ש×?ש ×?×?תר ×?×?ת×?. ×?× ×? ×?×?×?×?צ×?×? שת×?ת×?ר ×?ת ×?×?×?× ×?ת ×?פ×?פ×? Tor ×?×?×?×?×? ×?ר×?רת ×?×?×?×?×? ×?×?ק×?ר×? ש×?×?×?.
+torbutton.maximize_warning = ×?פע×?ת ×?ס×? ×?×?×? ×?×?פ×?פ×? Tor ×¢×?×?×?×? ×?×?ת×?ר ×?×?תר×?×? ×?ק×?×?×¢ ×?ת ×?×?×?×? ×?צ×? ש×?×?, ×?×? שע×?×?×? ×?ש×?ש ×?×?×? ×?×?תר ×?×?ת×?. ×?× ×? ×?×?×?×?צ×?×? שתש×?×?ר ×?ת ×?×?×?× ×?ת ×?פ×?פ×? Tor ×?×?×?×?×? ×?ר×?רת ×?×?×?×?×? ×?×?ק×?ר×? ש×?×?×?.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=×?תר ×?×? (%S) × ×?ס×? ×?×?×?×¥ נת×?× ×? ת×?×?× ×?ת קנ×?ס HTML5, ×?שר עש×?×?×?×? ×?ש×?ש ×?×?×? ×?×?×?×?ת ×?×?×?פ×? ×?×?×?×?×?×? ×?ת ×?×?ש×?×?.\n\n×?×?×? ×¢×? ×?פ×?פ×? Tor ×?×?ת×?ר ×?×?×?×¥ נת×?× ×? ת×?×?× ×?ת קנ×?ס HTML5?
diff --git a/src/chrome/locale/id/aboutDialog.dtd b/src/chrome/locale/id/aboutDialog.dtd
new file mode 100644
index 00000000..4d73913c
--- /dev/null
+++ b/src/chrome/locale/id/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; dikembangkan oleh">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", sebuah perusahaan nirlaba yang bekerja untuk melindungi privasi dan kebebasan penjelajahan Anda.">
+
+<!ENTITY help.start              "Ingin membantu?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Donasi">
+<!ENTITY help.or                 "atau">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "ikut terlibat">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Pertanyaan?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Bantu Kembangakan Jaringan Tor!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Informasi Lisensi">
+<!ENTITY tor.TrademarkStatement   "'Tor' dan 'Logo Onion' adalah merek dagang terdaftar Tor Project, Inc.">
diff --git a/src/chrome/locale/id/aboutTBUpdate.dtd b/src/chrome/locale/id/aboutTBUpdate.dtd
new file mode 100644
index 00000000..ba3aa4df
--- /dev/null
+++ b/src/chrome/locale/id/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Pemutakhiran peramban Tor">
+<!ENTITY aboutTBUpdate.updated "Peramban Tor telah diperbarui.">
+<!ENTITY aboutTBUpdate.linkPrefix "Untuk informasi paling terbaru mengenai rilisan ini,">
+<!ENTITY aboutTBUpdate.linkLabel  "kunjungi situs web kami">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Catatan Perubahan:">
diff --git a/src/chrome/locale/id/aboutTor.dtd b/src/chrome/locale/id/aboutTor.dtd
index 9f14022b..aa7e72fa 100644
--- a/src/chrome/locale/id/aboutTor.dtd
+++ b/src/chrome/locale/id/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Tentang Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Ada Masalah!">
+<!ENTITY aboutTor.failure2.label "Tor tidak dapat digunakan di peramban ini.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pertanyaan?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "m">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/terlibat/relawan.html.id";>
diff --git a/src/chrome/locale/id/aboutTor.properties b/src/chrome/locale/id/aboutTor.properties
index 02088f01..d3ffe671 100644
--- a/src/chrome/locale/id/aboutTor.properties
+++ b/src/chrome/locale/id/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
+aboutTor.searchDDG.privacy=Cari <a href="%1$S">secara aman</a> dengan <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privasi.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Donasi Sekarang!
+
+aboutTor.donationBanner.slogan=Tor: Menggerakan Perlawanan Digital
+aboutTor.donationBanner.mozilla=Beri hari ini dan Mozilla akan mencocokkan hadiah anda
+
+aboutTor.donationBanner.tagline1=Melindungi jurnalis, pelapor pelanggaran dan aktivis sejak 2006
+aboutTor.donationBanner.tagline2=Kebebasan Jaringan di seluruh dunia
+aboutTor.donationBanner.tagline3=Bebas berinternet
+aboutTor.donationBanner.tagline4=Merawat Kebebasan Berekspresi di Seluruh Dunia
+aboutTor.donationBanner.tagline5=Melindungi Privasi Jutaan Orang Setiap Hari
diff --git a/src/chrome/locale/id/brand.dtd b/src/chrome/locale/id/brand.dtd
index 59f665e8..213c71d5 100644
--- a/src/chrome/locale/id/brand.dtd
+++ b/src/chrome/locale/id/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Peramban Tor">
+<!ENTITY  brandShortName        "Peramban Tor">
+<!ENTITY  brandFullName         "Peramban Tor">
+<!ENTITY  vendorShortName       "Proyek Tor">
+<!ENTITY  trademarkInfo.part1   "Firefox dan logo Firefox merupakan merek dagang dari Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klik untuk memuat pengaya sistem yang terpasang">
+<!ENTITY plugins.installed.enable "Fungsikan pengaya">
+<!ENTITY plugins.installed.disable "Nonfungsikan pengaya">
+<!ENTITY plugins.installed.disable.tip "Klik untuk mencegah pemuatan pengaya sistem">
diff --git a/src/chrome/locale/id/brand.properties b/src/chrome/locale/id/brand.properties
index f63def38..8b36aae3 100644
--- a/src/chrome/locale/id/brand.properties
+++ b/src/chrome/locale/id/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Peramban Tor
+brandShortName=Peramban Tor
+brandFullName=Peramban Tor
+vendorShortName=Proyek Tor
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, halaman muka yang cepat dengan pencarian bawaan
+homePageImport=Impor halaman beranda Anda dari %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Pemilihan Halaman Muka
+homePageMigrationDescription=Silahkan pilih halaman beranda yang ingin Anda gunakan:
 
-syncBrandShortName=Sync
+syncBrandShortName=Sinkronkan
diff --git a/src/chrome/locale/id/browserOnboarding.properties b/src/chrome/locale/id/browserOnboarding.properties
new file mode 100644
index 00000000..b914d96c
--- /dev/null
+++ b/src/chrome/locale/id/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Selamat datang
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privasi
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Keamanan
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Layanan Onion
+onboarding.tour-tor-onion-services.title=Layanan Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/id/torbutton.dtd b/src/chrome/locale/id/torbutton.dtd
index 73c4ed73..b3a1c136 100644
--- a/src/chrome/locale/id/torbutton.dtd
+++ b/src/chrome/locale/id/torbutton.dtd
@@ -1,12 +1,19 @@
 <!ENTITY torbutton.context_menu.new_identity "Identitas Baru">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
-<!ENTITY torbutton.context_menu.downloadUpdate.key "A">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.new_circuit "Sirkuit Tor Baru untuk Situs ini">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Pengaturan Keamanan...">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Pengaturan Jaringan Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Cek Versi Peramban Tor Terkini">
+<!ENTITY torbutton.context_menu.downloadUpdate.key "U">
+<!ENTITY torbutton.context_menu.cookieProtections "Perlindungan Cookie...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Kembalikan ke asal">
+<!ENTITY torbutton.button.tooltip "Klik untuk mengaktifkan TombolTor">
+<!ENTITY torbutton.prefs.security_settings "Pengaturan Keamanan Tor Browser">
+<!ENTITY torbutton.prefs.restore_defaults "Kembalikan Kestandar">
+<!ENTITY torbutton.prefs.custom_warning "Preferensi browser khusus anda telah membuat pengaturan keamanan yang tidak biasa. Untuk alasan keamanan dan privasi, kami menyarankan anda untuk memilih satu dari tingkat keamanan bawaan.">
 <!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
 <!ENTITY torbutton.cookiedialog.lockCol "Protected">
 <!ENTITY torbutton.cookiedialog.domainCol "Host">
@@ -19,4 +26,26 @@
 <!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
 <!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Jaga kotak ini tetap tercentang untuk mencegah berbagai fitur browser dari penyalahgunaan untuk melacak anda saat sedang menelusuri web. Fitur modifikasi termasuk URL blob, saluran siaran, cache browser, cookies, favicon, kepala HTTP Auth, link preconnect, localStorage, URL mediaSource, permintaan OCSP, SharedWorkets, dan sesi tiket TLS.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Ubah rincian yang membedakan Anda dari pengguna peramban Tor lain.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Biarkan kotak ini tetap dicentang untuk menyembunyikan hal-hal yang unik tentang Anda dari situs web, termasuk kinerja komputer Anda, susunan keyboard, bahasa, lokasi pengaya terpasang, daftar dari pengaya terpasang, status jaringan, orientasi layar, ukuran layar, tingkat pembesaran situs-spesifik, tipe berkas yang didukung, warna sistem, dan kemampuan WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Tingkat Keamanan">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Penggeser keamanan memungkinkan anda untuk menonaktifkan fitur browser yang dapat membuat browser anda menjadi lebih rentant dari upaya peretasan.">
+<!ENTITY torbutton.prefs.sec_standard_label "Standar">
+<!ENTITY torbutton.prefs.sec_standard_description "Semua fitur dari Tor Browser dan situs web diaktifkan.">
+<!ENTITY torbutton.prefs.sec_safer_label "Lebih aman">
+<!ENTITY torbutton.prefs.sec_safer_description "Menonaktifkan fitur-fitur situs web yang sering berbahaya, ini akan membuat beberapa situs kehilangan fungsionalitas.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Di pengaturan yang lebih aman:">
+<!ENTITY torbutton.prefs.sec_safest_label "Paling aman">
+<!ENTITY torbutton.prefs.sec_safest_description "Hanya menjalankan fitur-fitur situs yang diperlukan untuk menjalankan situs web statis dan servis dasar. Perubahan ini mempengaruhi gambar, media, dan skrip.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Di pengaturan yang paling aman:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Pelajari lebih lanjut">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript dinonaktifkan di semua situs non-HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript dinonaktifkan secara default di semua situs.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Beberapa font dan simbol matematika dinonaktifkan.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Beberapa font, icon, simbol matematika, dan gambar dinonaktifkan.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio dan video (media HTML5 media) dijalankan saat diklik.">
+<!ENTITY torbutton.circuit_display.title "Sirkuit Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Sirkuit Baru untuk Situs Ini">
diff --git a/src/chrome/locale/id/torbutton.properties b/src/chrome/locale/id/torbutton.properties
index ed812e8a..01ec5cae 100644
--- a/src/chrome/locale/id/torbutton.properties
+++ b/src/chrome/locale/id/torbutton.properties
@@ -1,15 +1,26 @@
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = IP tidak diketahui
+torbutton.circuit_display.onion_site = Situs onion
+torbutton.circuit_display.this_browser = Peramban ini
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Jembatan
+torbutton.circuit_display.unknown_country = Negara tidak diketahui
+torbutton.circuit_display.guard = Penjaga
+torbutton.circuit_display.guard_note = Titik [Penjaga] Anda tidak dapat berubah
+torbutton.circuit_display.learn_more = Pelajari lebih lanjut
+torbutton.content_sizer.margin_tooltip = Adds Browser Tor margin ini untuk membuat Lebar dan tinggi dari window anda kurang khas
 torbutton.panel.tooltip.disabled = Klik untuk mengaktifkan Tor
 torbutton.panel.tooltip.enabled = Klik untuk menonaktifkan Tor
 torbutton.panel.label.disabled = Tor dinonaktifkan
 torbutton.panel.label.enabled = Tor diaktifkan
 extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Muat konten eksternal?
-torbutton.popup.external.app = Sebuah aplikasi eksternal butuh untuk ditangani:\n\n
-torbutton.popup.external.note = \n\nCATATAN: secara default, aplikasi eksternal tidaklah aman untuk Tor dan dapat membuka penyamaran Anda!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Luncurkan aplikasi.
+torbutton.popup.external.title = Unduh sebuah tipe file eksternal?
+torbutton.popup.external.app = Browser Tor tidak dapat menampilkan file ini. Anda butuh aplikasi lain untuk membukanya\n
+torbutton.popup.external.note = Beberapa tipe file dapat menyebabkan aplikasi terkoneksi ke internet tanpa menggunakan Tor\n\n
+torbutton.popup.external.suggest = Agar aman, sebaiknya anda hanya membuka file selagi offline, atau gunakan Tor Live CD seperti Tails.\n
+torbutton.popup.launch = Unduh file
 torbutton.popup.cancel = Batal
-torbutton.popup.dontask = Selalu luncurkan aplikasi mulai dari sekarang
+torbutton.popup.dontask = Secara otomatis file-file akan di unduh mulai sekarang
 torbutton.popup.prompted_language = Untuk memberikan Anda kerahasiaan yang lebih, Torbutton akan meminta versi bahasa Inggris dari halaman web. Ini mungkin menyebabkan halaman web yang Anda ingin baca dalam bahasa asli Anda akan ditampilkan dalam bahasa Inggris. â?? â?? Apakah anda mau meminta halaman web bahasa Inggris untuk kerahasiaan yang lebih baik?
 torbutton.popup.no_newnym = Torbution tidak dapat memberikan Anda identitas baru secara aman. Torbutton tidak memiliki akses terhadap Tor Control Port. â??â?? Apakah Anda sedang menjalankan paket browser Tor?
 torbutton.title.prompt_torbrowser = Important Torbutton Information
@@ -17,11 +28,31 @@ torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't t
 torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
 
 torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.never_ask_again = Jangan pernah ditanyakan kembali
+torbutton.popup.confirm_newnym = Peramban Tor akan menutup semua jendela dan tab. Semua sesi website akan terhapus.\n\nJalankan ulang peramban Tor untuk 
+
+torbutton.slider_notification = Menu green onion sekarang memiliki slider keamanan yang memungkinkan anda mengatur level keamanan . silakan cek !
+torbutton.slider_notification_button = Buka pengaturan keamanan
+
+torbutton.maximize_warning = Maksimalkan Browser Tor dapat mengizinkan website untuk menentukan ukuran monitor anda, yang dapat digunakan untuk track/jalur anda. kami menyarankan bahwa nda meninggalkan windows browser Tor dalam ukuran asli default nya
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=Situs ini (%S) butuh untuk mengekstrak data gambar HTML5 , yang mungkin akan mengetahui identitas komputer anda.\n\nApakah anda mengizinkan peramban Tor untuk mengekstrak data gambar HTML5
+canvas.notNow=Tidak untuk Sekarang
+canvas.notNowAccessKey=N
+canvas.allow=Izinkan kedepannya
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Jangan pernah untuk situs ini (disarankan)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S Profile bermasalah
+profileReadOnly=Anda tidak dapat menjalankan %S dari Sistem File Read only. Silakan copy %S ke lokasi lain sebelum mencoba menggunakannya
+profileReadOnlyMac=Anda tidak bisa menjalankan %S dari File sistem  read-only .  Silakan  copy %S ke desktop anda atau folder aplikasi sebelum mencoba menggunakannya.
+profileAccessDenied=%S tidak memiliki izin untuk mengakses profile .Silakan atur perizinan sistem file anda dan coba lagi .
+profileMigrationFailed=Migrasi dari profil %S gagal.\nSetting baru akan digunakan.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Koneksi terenkripsi (Layanan Onion, %1$S, %2$S bit kunci, %3$S)
+pageInfo_OnionEncryption=Koneksi terenkripsi (Layanan Onion)
diff --git a/src/chrome/locale/is/aboutDialog.dtd b/src/chrome/locale/is/aboutDialog.dtd
new file mode 100644
index 00000000..24b79d09
--- /dev/null
+++ b/src/chrome/locale/is/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&brandShortName; er þróað af ">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", frjálsum félagasamtökum sem vinna að því að verja rétt þinn til einkalífs og frelsi þitt á netinu.">
+
+<!ENTITY help.start              "Viltu hjálpa?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Styrkja">
+<!ENTITY help.or                 "eða">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "taka þátt">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Spurningar?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Hjálpaðu Tor-netinu að vaxa!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Upplýsingar um notkunarleyfi">
+<!ENTITY tor.TrademarkStatement   "'Tor' og 'Laukmerkið' (Onion Logo) eru skráð vörumerki Tor Project, Inc.">
diff --git a/src/chrome/locale/is/aboutTBUpdate.dtd b/src/chrome/locale/is/aboutTBUpdate.dtd
new file mode 100644
index 00000000..3a2cdec8
--- /dev/null
+++ b/src/chrome/locale/is/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Uppfærsla Tor-vafra">
+<!ENTITY aboutTBUpdate.updated "Tor-vafrinn var uppfærður.">
+<!ENTITY aboutTBUpdate.linkPrefix "Til að sjá allra nýjustu upplýsingar um þessa útgáfu,">
+<!ENTITY aboutTBUpdate.linkLabel  "heimsæktu vefsvæðið okkar">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Breytingaannáll:">
diff --git a/src/chrome/locale/is/aboutTor.dtd b/src/chrome/locale/is/aboutTor.dtd
index 9f14022b..63152e0a 100644
--- a/src/chrome/locale/is/aboutTor.dtd
+++ b/src/chrome/locale/is/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Um Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Eitthvað fór úrskeiðis!">
+<!ENTITY aboutTor.failure2.label "Tor virkar ekki í þessum vafra.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spurningar?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/is/aboutTor.properties b/src/chrome/locale/is/aboutTor.properties
index 02088f01..fde655f3 100644
--- a/src/chrome/locale/is/aboutTor.properties
+++ b/src/chrome/locale/is/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Leita á <a href="%1$S">öruggan hátt</a> með <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Styrkja núna!
+
+aboutTor.donationBanner.slogan=Tor: Keyrir áfram stafrænu andspyrnuhreyfinguna
+aboutTor.donationBanner.mozilla=Gefðu í dag og Mozilla kemur með mótframlag!
+
+aboutTor.donationBanner.tagline1=Verndar blaðamenn, aðgerðasinna og uppljóstrara síðan 2006
+aboutTor.donationBanner.tagline2=Frelsi á netinu út um allan heim
+aboutTor.donationBanner.tagline3=Frelsi á netinu
+aboutTor.donationBanner.tagline4=Fóstrar frjáls skoðanaskipti út um allan heim
+aboutTor.donationBanner.tagline5=Verndar einkalíf milljóna manna á hverjum degi
diff --git a/src/chrome/locale/is/brand.dtd b/src/chrome/locale/is/brand.dtd
index 59f665e8..5b4ded3a 100644
--- a/src/chrome/locale/is/brand.dtd
+++ b/src/chrome/locale/is/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Tor-vafrinn">
+<!ENTITY  brandShortName        "Tor-vafrinn">
+<!ENTITY  brandFullName         "Tor-vafrinn">
+<!ENTITY  vendorShortName       "Tor-verkefnið">
+<!ENTITY  trademarkInfo.part1   "Firefox og Firefox merkin eru vörumerki Mozilla Foundation.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Smelltu til að hlaða inn uppsettum kerfisviðbótum">
+<!ENTITY plugins.installed.enable "Virkja viðbætur">
+<!ENTITY plugins.installed.disable "Gera viðbætur óvirkar">
+<!ENTITY plugins.installed.disable.tip "Smelltu til að koma í veg fyrir að kerfisviðbótum sé hlaðið inn">
diff --git a/src/chrome/locale/is/brand.properties b/src/chrome/locale/is/brand.properties
index f63def38..d00a3f5f 100644
--- a/src/chrome/locale/is/brand.properties
+++ b/src/chrome/locale/is/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Tor-vafrinn
+brandShortName=Tor-vafrinn
+brandFullName=Tor-vafrinn
+vendorShortName=Tor-verkefnið
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Upphafssíða Firefox, hraðvirk og með innbyggðri leit
+homePageImport=Flytja inn heimasíðuna þína frá %s
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Val heimasíðu
+homePageMigrationDescription=Veldu heimasíðuna sem þú vilt nota:
 
-syncBrandShortName=Sync
+syncBrandShortName=Samræma
diff --git a/src/chrome/locale/is/browserOnboarding.properties b/src/chrome/locale/is/browserOnboarding.properties
new file mode 100644
index 00000000..3da820ef
--- /dev/null
+++ b/src/chrome/locale/is/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Friðhelgi
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Security
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-þjónustur
+onboarding.tour-tor-onion-services.title=Onion-þjónustur
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/is/torbutton.dtd b/src/chrome/locale/is/torbutton.dtd
index 629ea245..de0c5ecc 100644
--- a/src/chrome/locale/is/torbutton.dtd
+++ b/src/chrome/locale/is/torbutton.dtd
@@ -1,22 +1,51 @@
 <!ENTITY torbutton.context_menu.new_identity "Nýtt auðkenni">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Open Network Settingsâ?¦">
-<!ENTITY torbutton.context_menu.downloadUpdate "Download Tor Browser Bundle Update...">
+<!ENTITY torbutton.context_menu.new_circuit "Ný Tor-rás fyrir þetta vefsvæði">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Ã?ryggisstillingarâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Netkerfisstillingar Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Athugaðu með uppfærslur Tor-vafra...">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections">
+<!ENTITY torbutton.context_menu.cookieProtections "Varnir gegn vefkökum...">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Restore Defaults">
-<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections">
-<!ENTITY torbutton.cookiedialog.lockCol "Protected">
-<!ENTITY torbutton.cookiedialog.domainCol "Host">
-<!ENTITY torbutton.cookiedialog.nameCol "Name">
-<!ENTITY torbutton.cookiedialog.pathCol "Path">
-<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie">
-<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie">
-<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies">
-<!ENTITY torbutton.prefs.restrict_thirdparty "Restrict third party cookies and other tracking data">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Change details that distinguish you from other Tor Browser users">
+<!ENTITY torbutton.button.tooltip "Smelltu til að kveikja á Tor-hnapp">
+<!ENTITY torbutton.prefs.security_settings "Ã?ryggisstillingar Tor-vafrans">
+<!ENTITY torbutton.prefs.restore_defaults "Frumstilla á sjálfgefið">
+<!ENTITY torbutton.prefs.custom_warning "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels.">
+<!ENTITY torbutton.cookiedialog.title "Sýsla með varnir gegn vefkökum">
+<!ENTITY torbutton.cookiedialog.lockCol "Varið">
+<!ENTITY torbutton.cookiedialog.domainCol "Hýsilvél">
+<!ENTITY torbutton.cookiedialog.nameCol "Heiti">
+<!ENTITY torbutton.cookiedialog.pathCol "Slóð">
+<!ENTITY torbutton.cookiedialog.protectCookie "Vernda vefköku">
+<!ENTITY torbutton.cookiedialog.removeCookie "Fjarlægja vefköku">
+<!ENTITY torbutton.cookiedialog.unprotectCookie "Afvernda vefköku">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Fjarlægja allar aðrar en verndaðar">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Vernda nýjar vefkökur">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ekki vernda nýjar vefkökur">
+<!ENTITY torbutton.prefs.restrict_thirdparty "Takmarka vefkökur frá þriðja aðila og önnur ferligögn">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Keep this box checked to prevent various browser features from being abused to track you as you browse the web. Modified features include blob URLs, broadcast channels, the browser cache, cookies, favicons, HTTP Auth headers, link preconnects, localStorage, mediaSource URLs, OCSP requests, SharedWorkers, and TLS session tickets.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Breyta atriðum sem gera þig ólíkan öðrum notendum Tor-vafrans">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "Hafðu hakað í þennan reit til að fela fyrir vefsvæðum atriði sem gætu verið einstök hjá þér, þar með talin atriði eins og upplýsingar um afköst tölvunnar, lyklaborðsuppsetningu, staðfærslu, staðsetningu uppsettra viðbóta, lista yfir uppsettar viðbætur, stöðu netkerfis, stærð og stefnu skjás, sértækan aðdrátt fyrir vefsvæði, studdar skráategundir, kerfisliti og getu varðandi WebGL.">
+<!ENTITY torbutton.prefs.sec_caption "Ã?ryggisstig">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts.">
+<!ENTITY torbutton.prefs.sec_standard_label "Staðlað">
+<!ENTITY torbutton.prefs.sec_standard_description "Allir eiginleikar Tor-vafrans og vefsvæðisins eru virkjaðir.">
+<!ENTITY torbutton.prefs.sec_safer_label "Ã?ruggara">
+<!ENTITY torbutton.prefs.sec_safer_description "Gerir óvirka ýmsa eiginleika vefsvæða sem oft eru hættulegir, en veldur því að sum vefsvæði hætta að virka eins og þau eiga að gera.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "Með öruggari stillingum:">
+<!ENTITY torbutton.prefs.sec_safest_label "Ã?ruggast">
+<!ENTITY torbutton.prefs.sec_safest_description "Leyfir aðeins þá eiginleika vefsvæða sem krafist er fyrir beinan lestur (static sites) og grunnþjónustur. �essar breytingar hafa áhrif á myndir, margmiðlunargögn og skriftur.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "Með öruggustu stillingum:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Læra meira">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er óvirkt á öllum ekki-HTTPS vefjum.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er sjálfgefið óvirkt á öllum vefsvæðum.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Sumt letur og stærðfræðitákn eru óvirk.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sumt letur, táknmyndir, myndir og stærðfræðitákn eru óvirk.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Hljóð og myndskeið (HTML5-gagnamiðlar) þarf að smella á til að spila.">
+<!ENTITY torbutton.circuit_display.title "Tor-rás">
+<!ENTITY torbutton.circuit_display.new_circuit "Ný rás fyrir þetta vefsvæði">
diff --git a/src/chrome/locale/is/torbutton.properties b/src/chrome/locale/is/torbutton.properties
index 701209ba..81fc5305 100644
--- a/src/chrome/locale/is/torbutton.properties
+++ b/src/chrome/locale/is/torbutton.properties
@@ -1,27 +1,58 @@
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data.
-torbutton.popup.external.title = Load external content?
-torbutton.popup.external.app = An external application is needed to handle:\n\n
-torbutton.popup.external.note = \n\nNOTE: External applications are NOT Tor safe by default and can unmask you!\n
-torbutton.popup.external.suggest = \nIf this file is untrusted, you should either save it to view while offline or in a VM,\nor consider using a transparent Tor proxy like Tails LiveCD or torsocks.\n
-torbutton.popup.launch = Launch application
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = �þekkt IP-tala
+torbutton.circuit_display.onion_site = Onion-vefsvæði
+torbutton.circuit_display.this_browser = Ã?essi vafri
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Brú
+torbutton.circuit_display.unknown_country = �þekkt land
+torbutton.circuit_display.guard = Guard
+torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.learn_more = Læra meira
+torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online.
+torbutton.panel.tooltip.disabled = Smelltu til að virkja Tor
+torbutton.panel.tooltip.enabled = Smelltu til að afvirkja Tor
+torbutton.panel.label.disabled = Tor óvirkt
+torbutton.panel.label.enabled = Tor virkt
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton útbýr hnapp til uppsetningar á stillingum Tor svo að einfalt og hraðvirkt sé að hreinsa út öll gögn vegna einkavafurs.
+torbutton.popup.external.title = Sækja utanaðkomandi skráartegund?
+torbutton.popup.external.app = Tor-vafrinn getur ekki birt þessa skrá. �ú verður að opna hana með öðru forriti.\n\n
+torbutton.popup.external.note = Sumar skráartegundir geta látið forrit tengjast netinu án þess að fara í gegnum Tor.
+torbutton.popup.external.suggest = To be safe, you should only open downloaded files while offline, or use a Tor Live CD such as Tails.\n
+torbutton.popup.launch = Ná í skrá
 torbutton.popup.cancel = Hætta við
-torbutton.popup.dontask = Always launch applications from now on
+torbutton.popup.dontask = Hlaða sjálfkrafa inn skrám héðan í frá
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.title.prompt_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn
 torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton.
-torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information.
+torbutton.popup.short_torbrowser = Mikilvægar upplýsingar um Tor-hnappinn!\n\nTor-hnappurinn er núna alltaf virkur.\n\nSmelltu á Tor-hnappinn til að sjá nánar.
 
-torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n
-torbutton.popup.never_ask_again = Never ask me again
+torbutton.popup.confirm_plugins = Viðbætur eins og til dæmis Flash geta skaðað friðhelgi þína og gagnaleynd.\n\n�ær geta einnig farið framhjá Tor til að gefa upp staðsetningu þína og IP-vistfang.\n\nErtu viss um að þú viljir virkja viðbætur?\n\n
+torbutton.popup.never_ask_again = Ekki spyrja mig aftur
+torbutton.popup.confirm_newnym = Tor-vafrinn mun núna loka öllum flipum og gluggum. Allar setur á vefsvæðum munu tapast.\n\n� að endurræsa Tor-vafrann til að núllstilla auðkennið þitt?\n\n
+
+torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out!
+torbutton.slider_notification_button = Opna öryggisstillingar
+
+torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=This website (%S) attempted to access image data on a canvas. Since canvas image data can be used to discover information about your computer, blank image data was returned this time.
-canvas.allow=Allow in the Future
+canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data?
+canvas.notNow=Ekki núna
+canvas.notNowAccessKey=N
+canvas.allow=Leyfa í framtíðinni
 canvas.allowAccessKey=A
-canvas.never=Never for This Site
+canvas.never=Aldrei fyrir þetta vefsvæði (mælt með þessu)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=Vandamál við %S snið
+profileReadOnly=You cannot run %S from a read-only file system.  Please copy %S to another location before trying to use it.
+profileReadOnlyMac=You cannot run %S from a read-only file system.  Please copy %S to your Desktop or Applications folder before trying to use it.
+profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again.
+profileMigrationFailed=Yfirfærsla á fyrirliggjandi %S sniðinu þínu mistókst.\nNýjar stillingar verða notaðar.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
diff --git a/src/chrome/locale/it/aboutTor.dtd b/src/chrome/locale/it/aboutTor.dtd
index a016f6bb..f373ceb1 100644
--- a/src/chrome/locale/it/aboutTor.dtd
+++ b/src/chrome/locale/it/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Info su Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "ATTENZIONE: questo browser non è aggiornato.">
-<!ENTITY aboutTor.outOfDateTorOff.label "INOLTRE, questo browser non è aggiornato.">
-<!ENTITY aboutTor.outOfDate2.label "Clicca sulla cipolla e scegli &quot;Scarica Aggiornamento Tor Browser Bundle&quot;.">
-
-<!ENTITY aboutTor.check.label "Test Impostazioni della Rete Tor">
-
-<!ENTITY aboutTor.success.label "Benvenuto nel browser TOR">
-<!ENTITY aboutTor.success2.label "Connesso alla rete TOR.">
-<!ENTITY aboutTor.success3.label "Ora sei libero di navigare in internet anonimamente.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Qualcosa è Andato Storto!">
 <!ENTITY aboutTor.failure2.label "Tor non sta funzionando su questo browser.">
 
-<!ENTITY aboutTor.search.label "Cerca">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ulteriori Info:">
-<!ENTITY aboutTor.torInfo2.label "Nazione &amp; Indirizzo IP:">
-<!ENTITY aboutTor.torInfo3.label "Nodo di Uscita:">
-<!ENTITY aboutTor.torInfo4.label "Questo server non registra alcuna informazione circa i visitatori.">
-<!ENTITY aboutTor.whatnextQuestion.label "E adesso?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor NON è tutto ciò che ti serve per navigare anonimamente! Potresti aver bisogno di cambiare le tue abitudini di navigazione per accertarti che la tua identità rimanga al sicuro.">
-<!ENTITY aboutTor.whatnext.label "Consigli Per Restare Anonimo »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Domande?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manuale utente di Tor Browser">
-<!ENTITY aboutTor.helpInfo1.label "Puoi Aiutare!">
-<!ENTITY aboutTor.helpInfo2.label "Ci sono molti modi in cui puoi aiutare a rendere la Rete Tor più veloce e stabile:">
-<!ENTITY aboutTor.helpInfo3.label "Gestisci un Nodo Relay di Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Aiutaci in Vari Modi »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Fai una Donazione »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Il Tor Project è un'organizzazione 501(c)(3) non-profit americana dedicata alla ricerca, sviluppo ed educazione sull'anonimato e privacy online.">
-<!ENTITY aboutTor.learnMore.label "Maggiori info sul Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/it/browserOnboarding.properties b/src/chrome/locale/it/browserOnboarding.properties
new file mode 100644
index 00000000..c3169b1d
--- /dev/null
+++ b/src/chrome/locale/it/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Benvenuto
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Esplora
+
+onboarding.tour-tor-security=Sicurezza
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Servizi Onion
+onboarding.tour-tor-onion-services.title=Servizi Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/it/torbutton.properties b/src/chrome/locale/it/torbutton.properties
index aa1279b7..3f8f2bac 100644
--- a/src/chrome/locale/it/torbutton.properties
+++ b/src/chrome/locale/it/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = Questo browser
 torbutton.circuit_display.relay = Ripetitore
 torbutton.circuit_display.tor_bridge = Bridge
 torbutton.circuit_display.unknown_country = Paese sconosciuto
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Guardia
+torbutton.circuit_display.guard_note = Il tuo nodo [Guardia] non deve cambiare.
 torbutton.circuit_display.learn_more = Per saperne di più
 torbutton.content_sizer.margin_tooltip = Il browser Tor aggiunge questo margine per rendere l'ampiezza e altezza della tua finestra meno distintiva, così si riduce la possibilità di che tu sia tracciato in linea.
 torbutton.panel.tooltip.disabled = Fai clic per attivare Tor
@@ -40,7 +40,7 @@ torbutton.maximize_warning = Massimizzando Tor Browser, i siti web possono risal
 canvas.siteprompt=Questo sito (%S) ha tentato di estrarre i dati di immagine HTML5 canvas, che possono essere utilizzati per identificare in modo univoco il computer.\n\nPermettere a Tor Browser di estrarre l'immagine HTML5 canvas per questo sito?
 canvas.notNow=Non ora
 canvas.notNowAccessKey=N
-canvas.allow=acconsenti in futuro
+canvas.allow=Acconsenti in futuro
 canvas.allowAccessKey=A
 canvas.never=Mai per questo sito (raccomandato)
 canvas.neverAccessKey=e
diff --git a/src/chrome/locale/ja/aboutTor.dtd b/src/chrome/locale/ja/aboutTor.dtd
index 9d1b9c91..661cfdb9 100644
--- a/src/chrome/locale/ja/aboutTor.dtd
+++ b/src/chrome/locale/ja/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Torã?«ã?¤ã??ã?¦">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è­¦å??ï¼?ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "ã?¾ã??ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?¯å?¤ã??ã??ã?¼ã?¸ã?§ã?³ã?§ã??ã??">
-<!ENTITY aboutTor.outOfDate2.label "Onion ã??ã?¯ã?ªã??ã?¯ã??ã?¦ Tor Browser ã?®ã?¢ã??ã??ã??ã?¼ã??ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??">
-
-<!ENTITY aboutTor.check.label "Torã?®ã??ã??ã??ã?¯ã?¼ã?¯è¨­å®?ã??ã??ã?¹ã??ã??ã??">
-
-<!ENTITY aboutTor.success.label "ï¼´ï½?ï½? ï¼¢ï½?ï½?ï½?ï½?ï½?ï½?ã?«ã??ã??ã??ã??">
-<!ENTITY aboutTor.success2.label "Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¾ã??ã??">
-<!ENTITY aboutTor.success3.label "ç?¾å?¨ã??è?ªç?±ã?«å?¿å??ã?§ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã?©ã?¦ã?ºå?ºæ?¥ã?¾ã??ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ä½?ã??ã??é??é??ã?£ã?¦ã??ã?¾ã??ï¼?">
 <!ENTITY aboutTor.failure2.label "Torã?¯ã??ã??ã?®ã??ã?©ã?¦ã?¶ã?§ã?¯å??ä½?ã??ã?¾ã??ã??ã??">
 
-<!ENTITY aboutTor.search.label "�索">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "追å? æ??å ±: ">
-<!ENTITY aboutTor.torInfo2.label "å?½ã?¨IPã?¢ã??ã?¬ã?¹:">
-<!ENTITY aboutTor.torInfo3.label "å?ºå?£ã??ã?¼ã??:">
-<!ENTITY aboutTor.torInfo4.label "ã??ã?®ã?µã?¼ã??ã?¼ã?¯ã??訪å??è??ã?®ã??ã??ã?ªã??æ??å ±ã??è¨?é?²ã??ã?¾ã??ã??ã??">
-<!ENTITY aboutTor.whatnextQuestion.label "次ã?¯ã?ªã??ã?§ã??ã??ï¼?">
-<!ENTITY aboutTor.whatnextAnswer.label "Torã? ã??ã??å?¿å??ã?«ã??ã?©ã?¦ã?ºã??ã??ã?®ã?«å¿?è¦?ã?¨ã??ã??ã??ã??ã?§ã?¯ã?ªã??ã?®ã?§ã??ï¼? ã??ã?ªã??ã?®èº«å??ã??å®?å?¨ã?«ä¿?ã?¤ã?«ã?¯ã??ã??ã?©ã?¦ã?¸ã?³ã?°ã?®ç¿?æ?£ã?®ä¸?é?¨ã??å¤?ã??ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??">
-<!ENTITY aboutTor.whatnext.label "å?¿å??æ?§ã??ä¿?ã?¤ã??ã?¨ã?«ã?¤ã??ã?¦ã?®ã??ã?³ã?? »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "質å??ã??ã??ã??ã?¾ã??ã??ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser ã?¦ã?¼ã?¶ã?¼ã??ã??ã?¥ã?¢ã?«">
-<!ENTITY aboutTor.helpInfo1.label "å?©ã??ã?¦ã??ã? ã??ã??ï¼?">
-<!ENTITY aboutTor.helpInfo2.label "Torã??ã??ã??ã?¯ã?¼ã?¯ã??ã??ã??ã?«é«?é??ã?«ã??ã??ã??ã?«å¼·å??ã?«ã??ã??ã?®ã?«å½¹ç«?ã?¦ã??ã??ã??ã??ã??ã?®ã??ã??æ?¹ã??ã??ã??ã?¾ã??ã??">
-<!ENTITY aboutTor.helpInfo3.label "Torã?ªã?¬ã?¼ã??ã?¼ã??ã??èµ·å?? »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "ã??ã?©ã?³ã??ã?£ã?¢ã?«å¿?é¡?ã??ã?? &gt;&gt;">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "å¯?ä»?ã??ã?? »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor Projectã?¯ã??ã?ªã?³ã?©ã?¤ã?³ã?®å?¿å??æ?§ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã?®ç ?究ã?»é??ç?ºã?»æ??è?²ã??å°?é??ã?«è¡?ã??ç±³å?½ã?®501(c)(3)é??å?¶å?©å?£ä½?ã?§ã??ã??">
-<!ENTITY aboutTor.learnMore.label "Tor Projectã?«é?¢ã??ã??詳細  »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ja/browserOnboarding.properties b/src/chrome/locale/ja/browserOnboarding.properties
new file mode 100644
index 00000000..b5b7601b
--- /dev/null
+++ b/src/chrome/locale/ja/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=ã??ã??ã??ã??
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ã??ã?©ã?¤ã??ã?·ã?¼
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=�索
+
+onboarding.tour-tor-security=ã?»ã?­ã?¥ã?ªã??ã?£
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ko/aboutTor.dtd b/src/chrome/locale/ko/aboutTor.dtd
index 65b9b769..83ea0c93 100644
--- a/src/chrome/locale/ko/aboutTor.dtd
+++ b/src/chrome/locale/ko/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Torì?? ë??í?´ì??">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "주ì??: í??ì?¬ 구ë²?ì ? ë¸?ë?¼ì?°ì ?를 ì?¬ì?©í??ê³  ê³?ì?­ë??ë?¤.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ë??í??,  í??ì?¬ 구ë²?ì ? ë¸?ë?¼ì?°ì ?를 ì?¬ì?©í??ê³  ê³?ì?­ë??ë?¤.">
-<!ENTITY aboutTor.outOfDate2.label "onionì?? í?´ë¦­í??ê³  Tor Browser ì??ë?°ì?´í?¸ ì²´í?¬ë¥¼ ì? í??í??ì?¸ì??.">
-
-<!ENTITY aboutTor.check.label "Tor ë?¤í?¸ì??í?¬ ì?¤ì ? í??ì?¤í?¸">
-
-<!ENTITY aboutTor.success.label "Tor ë¸?ë?¼ì?°ì ?ì?? ì?¤ì?  ê²?ì?? í??ì??í?©ë??ë?¤">
-<!ENTITY aboutTor.success2.label "Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë??ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.success3.label "ì?´ì ? ì??ì? ë¡­ê²? ì?µëª?ì?¼ë¡? ì?¸í?°ë?·ì?? í??ì??í?  ì?? ì??ì?µë??ë?¤.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ë­?ê°? ì??못ë??ì??ì?µë??ë?¤!">
 <!ENTITY aboutTor.failure2.label "Torë?? ì?´ ë¸?ë?¼ì?°ì ?ì??ì?? ì??ë??í??ì§? ì??ì?µë??ë?¤.">
 
-<!ENTITY aboutTor.search.label "ê²?ì??">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "�� �보 :">
-<!ENTITY aboutTor.torInfo2.label "êµ­ê°? &amp; IP 주ì?? :">
-<!ENTITY aboutTor.torInfo3.label "ì¶?구 ë?¸ë??: ">
-<!ENTITY aboutTor.torInfo4.label "ì?´ ì??ë²?ë?? 방문ì??ì?? ë??í?? ì ?보를 기ë¡?í??ì§? ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.whatnextQuestion.label "ê·¸ ë?¤ì??ì???">
-<!ENTITY aboutTor.whatnextAnswer.label "Torë?? ì??ë²½í?? ì?µëª? ë¸?ë?¼ì?°ì§?ì?? ë³´ì?¥í??ì§? ì??ì?µë??ë?¤! ë?°ë?¼ì?? ì? ë¶?ì?? ì??ì ?í??ê²? ì? ì§?í??기 ì??í?´ì??ë?? ë¸?ë?¼ì?°ì§? ì?µê´?ì?? ë°?꾸ì??ì?¼ í?©ë??ë?¤.">
-<!ENTITY aboutTor.whatnext.label "ì?µëª?ì?¼ë¡? ì??짱거릴 ë??ì?? í?? &gt;&gt;">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "ì§?문ì?´ ì??ì?¼ì? ê°?ì???">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor ë¸?ë?¼ì?°ì ? ì?¬ì?©ì?? ì?¤ëª?ì??">
-<!ENTITY aboutTor.helpInfo1.label "ì?¬ë?¬ë¶?ë?? ë??ì?¸ ì?? ì??ì?µë??ë?¤!">
-<!ENTITY aboutTor.helpInfo2.label "ì?¬ë?¬ë¶?ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ë³´ë?¤ 빠르고 ê°?í??ê²? ë§?ë?¤ ì?? ì??ë?? ë°©ë²?ì?´ ì??ì?µë??ë?¤.">
-<!ENTITY aboutTor.helpInfo3.label "Tor ì¤?ê³? ì??ë²? node ì?¤í?? »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "ì??ì?? ë´?ì?¬ë¡? Tor ë??기 »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "í??ì??í??기 »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor í??ë¡?ì ?í?¸ë??? ì?¨ë?¼ì?¸ ì?µëª? ë°? ê°?ì?¸ ì ?ë³´ ë³´í?¸ì?? ì?°êµ¬, ê°?ë°? ë°? êµ?ì?¡ì?? í??ì?°ë?? US 501(c)(3) ë¹?ì??리 ë?¨ì²´ì??ë??ë?¤.">
-<!ENTITY aboutTor.learnMore.label "Tor í??ë¡?ì ?í?¸ì?? ë??í?´ì?? ë?? ì??ì??보기 »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/ko/browserOnboarding.properties b/src/chrome/locale/ko/browserOnboarding.properties
new file mode 100644
index 00000000..93f3774d
--- /dev/null
+++ b/src/chrome/locale/ko/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=ì?¬ì??í??
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security= ë³´ì??
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion ì??ë¹?ì?¤
+onboarding.tour-tor-onion-services.title=Onion ì??ë¹?ì?¤
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nb/aboutDialog.dtd b/src/chrome/locale/nb/aboutDialog.dtd
new file mode 100644
index 00000000..78293397
--- /dev/null
+++ b/src/chrome/locale/nb/aboutDialog.dtd
@@ -0,0 +1,19 @@
+<!ENTITY project.start           "&amp;bransShortName; blir utviklet av">
+<!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to https://www.torproject.org -->
+<!ENTITY project.tpoLink         "&vendorShortName;">
+<!ENTITY project.end             ", en veldedig organisasjon som jobber for å forsvare ditt personvern og din frihet på nett.">
+
+<!ENTITY help.start              "Vil du bidra?">
+<!-- LOCALIZATION NOTE (help.donate): This is a link title that links to https://www.torproject.org/donate/donate.html.en -->
+<!ENTITY help.donateLink         "Doner">
+<!ENTITY help.or                 "eller">
+<!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links to https://www.torproject.org/getinvolved/volunteer.html.en -->
+<!ENTITY help.getInvolvedLink    "involver deg">
+<!ENTITY help.end                "!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/docs/trademark-faq.html.en -->
+<!ENTITY bottomLinks.questions   "Spørsmål?">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to https://www.torproject.org/getinvolved/relays -->
+<!ENTITY bottomLinks.grow        "Hjelp Tor-nettverket å vokse!">
+<!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to about:license -->
+<!ENTITY bottomLinks.license  "Lisensinformasjon">
+<!ENTITY tor.TrademarkStatement   "&quot;Tor&quot; og &quot;Løk-logoen&quot; er registrerte varemerker tilhørende the Tor Project, Inc.">
diff --git a/src/chrome/locale/nb/aboutTBUpdate.dtd b/src/chrome/locale/nb/aboutTBUpdate.dtd
new file mode 100644
index 00000000..919a7f7b
--- /dev/null
+++ b/src/chrome/locale/nb/aboutTBUpdate.dtd
@@ -0,0 +1,6 @@
+<!ENTITY aboutTBUpdate.title "Oppdatering av Tor-nettleseren">
+<!ENTITY aboutTBUpdate.updated "Tor-nettleseren har blitt oppdatert.">
+<!ENTITY aboutTBUpdate.linkPrefix "For den mest oppdaterte informasjonen om denne utgivelsen,">
+<!ENTITY aboutTBUpdate.linkLabel  "besøk vårt nettsted">
+<!ENTITY aboutTBUpdate.linkSuffix ".">
+<!ENTITY aboutTBUpdate.changeLogHeading "Endringslogg:">
diff --git a/src/chrome/locale/nb/aboutTor.dtd b/src/chrome/locale/nb/aboutTor.dtd
index 9f14022b..7b37ddbe 100644
--- a/src/chrome/locale/nb/aboutTor.dtd
+++ b/src/chrome/locale/nb/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2014, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-<!ENTITY aboutTor.title "About Tor">
+<!ENTITY aboutTor.title "Om Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "HOWEVER, this browser is out of date.">
-<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date.">
-<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Download Tor Browser Bundle Update.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
+<!ENTITY aboutTor.failure.label "Noe gikk galt!">
+<!ENTITY aboutTor.failure2.label "Tor fungerer ikke i denne nettleseren.">
 
-<!ENTITY aboutTor.check.label "Test Tor Network Settings">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
+<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.success.label "Congratulations!">
-<!ENTITY aboutTor.success2.label "This browser is configured to use Tor.">
-<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously.">
-<!ENTITY aboutTor.failure.label "Something Went Wrong!">
-<!ENTITY aboutTor.failure2.label "Tor is not working in this browser.">
-<!ENTITY aboutTor.failure3prefix.label "For assistance, please contact ">
-<!ENTITY aboutTor.failure3Link "help@xxxxxxxxxxxxxxxxx">
-<!ENTITY aboutTor.failure3suffix.label ".">
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Spørsmål?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
+<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.search.label "Search">
-<!ENTITY aboutTor.searchSPPost.link "https://startpage.com/do/search";>
-<!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/";>
-
-<!ENTITY aboutTor.torInfo1.label "Additional Info:">
-<!ENTITY aboutTor.torInfo2.label "Country &amp; IP Address:">
-<!ENTITY aboutTor.torInfo3.label "Exit Node:">
-<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors.">
-<!ENTITY aboutTor.whatnextQuestion.label "What Next?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe.">
-<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
-<!ENTITY aboutTor.helpInfo1.label "You Can Help!">
-<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:">
-<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Make a Donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy.">
-<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/nb/aboutTor.properties b/src/chrome/locale/nb/aboutTor.properties
index 02088f01..b72d167f 100644
--- a/src/chrome/locale/nb/aboutTor.properties
+++ b/src/chrome/locale/nb/aboutTor.properties
@@ -2,14 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">Startpage</a>.
-# The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
-# The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
-
-aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>.
+aboutTor.searchDDG.privacy=Søk <a href="%1$S">sikkert</a> med <a href="%2$S">DuckDuckGo</a>.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.donationBanner.donate=Doner nå.
+
+aboutTor.donationBanner.slogan=Tor: PÃ¥driver for digital motstandsdyktighet
+aboutTor.donationBanner.mozilla=Gi i dag og Mozilla vil matche bidraget ditt!
+
+aboutTor.donationBanner.tagline1=Beskyttelse av journalister, fløyteblåsere og aktivister siden 2006
+aboutTor.donationBanner.tagline2=Verdensomspennende nettverksfrihet
+aboutTor.donationBanner.tagline3=Frihet på nett
+aboutTor.donationBanner.tagline4=Grobunn til verdensomspennende ytringsfrihet
+aboutTor.donationBanner.tagline5=Beskytter privatlivet til millioner hver dag
diff --git a/src/chrome/locale/nb/brand.dtd b/src/chrome/locale/nb/brand.dtd
index 59f665e8..7ae614c1 100644
--- a/src/chrome/locale/nb/brand.dtd
+++ b/src/chrome/locale/nb/brand.dtd
@@ -2,7 +2,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY  brandShortName        "Tor Browser">
-<!ENTITY  brandFullName         "Tor Browser">
-<!ENTITY  vendorShortName       "Tor Project">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  brandShorterName      "Tor-nettleseren">
+<!ENTITY  brandShortName        "Tor-nettleseren">
+<!ENTITY  brandFullName         "Tor-nettleseren">
+<!ENTITY  vendorShortName       "Tor-prosjektet">
+<!ENTITY  trademarkInfo.part1   "Firefox og Firefox-logene er varemarker tilhørende Mozilla-stiftelsen.">
+
+<!-- The following strings are for bug #10280's UI. We place them here for our translators -->
+<!ENTITY plugins.installed.find "Klikk for å laste inn installerte systemtillegg">
+<!ENTITY plugins.installed.enable "Skru på programtillegg">
+<!ENTITY plugins.installed.disable "Skru av programtillegg">
+<!ENTITY plugins.installed.disable.tip "Klikk for å blokkere innlasting av systemtillegg">
diff --git a/src/chrome/locale/nb/brand.properties b/src/chrome/locale/nb/brand.properties
index f63def38..3101ebc6 100644
--- a/src/chrome/locale/nb/brand.properties
+++ b/src/chrome/locale/nb/brand.properties
@@ -2,14 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Tor-nettleseren
+brandShortName=Tor-nettleseren
+brandFullName=Tor-nettleseren
+vendorShortName=Tor-prosjektet
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
-homePageImport=Import your home page from %S
+homePageSingleStartMain=Firefox Start, en rask startside med innebygd søk
+homePageImport=Importer startsiden din fra %S
 
-homePageMigrationPageTitle=Home Page Selection
-homePageMigrationDescription=Please select the home page you wish to use:
+homePageMigrationPageTitle=Utvalg av startsider
+homePageMigrationDescription=Velg startsiden du vil bruke:
 
-syncBrandShortName=Sync
+syncBrandShortName=Synkroniser
diff --git a/src/chrome/locale/nb/browserOnboarding.properties b/src/chrome/locale/nb/browserOnboarding.properties
new file mode 100644
index 00000000..49968370
--- /dev/null
+++ b/src/chrome/locale/nb/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Personvern
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Sikkerhet
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Løk-tjenester
+onboarding.tour-tor-onion-services.title=Løk-tjenester
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nb/torbutton.dtd b/src/chrome/locale/nb/torbutton.dtd
index 7e5150f8..1b58f104 100644
--- a/src/chrome/locale/nb/torbutton.dtd
+++ b/src/chrome/locale/nb/torbutton.dtd
@@ -1,13 +1,20 @@
-<!ENTITY torbutton.context_menu.new_identity "Ny Identitet">
+<!ENTITY torbutton.context_menu.new_identity "Ny identitet">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.networksettings "Ã?pne nettverksinnstillinger...">
-<!ENTITY torbutton.context_menu.downloadUpdate "Last ned Tor Browser Bundle oppdatering...">
+<!ENTITY torbutton.context_menu.new_circuit "Ny Tor-krets for denne siden">
+<!ENTITY torbutton.context_menu.new_circuit_key "C">
+<!ENTITY torbutton.context_menu.preferences "Sikkerhetsinnstillingerâ?¦">
+<!ENTITY torbutton.context_menu.preferences.key "S">
+<!ENTITY torbutton.context_menu.networksettings "Nettverksinnstillinger for Torâ?¦">
+<!ENTITY torbutton.context_menu.networksettings.key "N">
+<!ENTITY torbutton.context_menu.downloadUpdate "Se etter oppdatering for Tor-nettleserenâ?¦">
 <!ENTITY torbutton.context_menu.downloadUpdate.key "U">
-<!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsel Beskyttelser">
+<!ENTITY torbutton.context_menu.cookieProtections "Informasjonskapsels-beskyttelseâ?¦">
 <!ENTITY torbutton.context_menu.cookieProtections.key "C">
-<!ENTITY torbutton.button.tooltip "Klikk for å initialisere Torbutton">
-<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett standard">
-<!ENTITY torbutton.cookiedialog.title "Administrér Informasjonskapslenes Beskyttelser">
+<!ENTITY torbutton.button.tooltip "Klikk for å igangsette Torbutton">
+<!ENTITY torbutton.prefs.security_settings "Sikkerhetsinnstillinger for Tor-nettleseren">
+<!ENTITY torbutton.prefs.restore_defaults "Gjenopprett forvalg">
+<!ENTITY torbutton.prefs.custom_warning "Dine nettleserinnstillinger har ført med seg uvanlige sikkerhetsvalg. Av sikkerhet- og personverns-hensyn anbefaler vi at du velger en av de forvalgte sikkerhetsnivåene.">
+<!ENTITY torbutton.cookiedialog.title "Administrer beskyttelse av informasjonskapsler">
 <!ENTITY torbutton.cookiedialog.lockCol "Beskyttet">
 <!ENTITY torbutton.cookiedialog.domainCol "Vert">
 <!ENTITY torbutton.cookiedialog.nameCol "Navn">
@@ -15,8 +22,30 @@
 <!ENTITY torbutton.cookiedialog.protectCookie "Beskytt Informasjonskapsel">
 <!ENTITY torbutton.cookiedialog.removeCookie "Fjern Informasjonskapsel">
 <!ENTITY torbutton.cookiedialog.unprotectCookie "Ikke Beskytt Informasjonskapsel">
-<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern Alle Bortsett Fra Beskyttede">
-<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt Nye Informasjonskapsler">
-<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke Beskytt Nye Informasjonskapsler">
+<!ENTITY torbutton.cookiedialog.removeAllBut "Fjern alle bortsett fra beskyttede">
+<!ENTITY torbutton.cookiedialog.saveAllCookies "Beskytt nye informasjonskapsler">
+<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Ikke beskytt nye informasjonskapsler">
 <!ENTITY torbutton.prefs.restrict_thirdparty "Begrens tredjeparts informasjonskapsler og andre sporingsdata.">
-<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre Tor Browser brukere.">
+<!ENTITY torbutton.prefs.restrict_thirdparty.accesskey "R">
+<!ENTITY torbutton.prefs.restrict_thirdparty_tooltip "Hold denne boksen avhuket for å forebygge at ulike nettleserfunksjoner blir misbrukt til å spore deg når du surfer på nettet. Modifiserte funksjoner inkluderer blob-nettadresser, kringkastinskanaler, nettleserens mellomlager, informasjonskapsler, favicon, HTTP-autentiserings overskrifter, link preconnects, localstorage , Mediasource-nettadresser, OCSP-forespørsler, SharedWorkers og TLS øktbilletter.">
+<!ENTITY torbutton.prefs.resist_fingerprinting "Endre detaljer som skiller deg fra andre brukere av Tor-nettleseren.">
+<!ENTITY torbutton.prefs.resist_fingerprinting.accesskey "F">
+<!ENTITY torbutton.prefs.resist_fingerprinting_tooltip "La denne avkryssingsboksen være utkrysset for å skjule ting som kan være unikt med deg fra nettsteder, inkludert datamaskinens ytelse, tastaturoppsett , lokale, plasseringen av- og listen over  installerte programtillegg, nettverksstatus, skjermretning , skjermstørrelse , sidespesifikke forstørrelsesnivåer , filtyper som støttes, systemfarger og WebGL-evner.">
+<!ENTITY torbutton.prefs.sec_caption "Sikkerhetsnivå">
+<!ENTITY torbutton.prefs.sec_caption_tooltip "Sikkerhetsglidebryteren lar deg skru av forskjellige nettleserfunksjoner som kan eksponere deg for risiko.">
+<!ENTITY torbutton.prefs.sec_standard_label "Forvalg">
+<!ENTITY torbutton.prefs.sec_standard_description "Alle Tor-nettleser- og nettside-funksjoner er på.">
+<!ENTITY torbutton.prefs.sec_safer_label "Tryggere">
+<!ENTITY torbutton.prefs.sec_safer_description "Skrur av nettsidefunksjoner som ofte er farlige, som gjør at noen sider blir skadelidende.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "PÃ¥ den tryggere innstillingen:">
+<!ENTITY torbutton.prefs.sec_safest_label "Tryggest">
+<!ENTITY torbutton.prefs.sec_safest_description "Tillater bare nettsidefunksjoner som kreves for statiske sider og grunnleggende tjenester. Disse endringene har innvirkning på bilder, media, og skript.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "PÃ¥ den tryggeste innstillingen:">
+<!ENTITY torbutton.prefs.sec_learn_more_label "Lær mer">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript er avskrudd på sider som ikke er HTTPS.">
+<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript er som forvalg slått av for alle nettsteder.">
+<!ENTITY torbutton.prefs.sec_limit_typography "Noen skrifter og mattesymboler er avskrudd.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Noen skrifter, ikoner, mattesymboler og bilder er avskrudd.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Lyd og video (HTML5-media) må klikkes for å spilles av.">
+<!ENTITY torbutton.circuit_display.title "Tor Krets">
+<!ENTITY torbutton.circuit_display.new_circuit "Ny Krets for denne siden">
diff --git a/src/chrome/locale/nb/torbutton.properties b/src/chrome/locale/nb/torbutton.properties
index 12ad8eff..b1942b4a 100644
--- a/src/chrome/locale/nb/torbutton.properties
+++ b/src/chrome/locale/nb/torbutton.properties
@@ -1,27 +1,58 @@
+torbutton.circuit_display.internet = Internett
+torbutton.circuit_display.ip_unknown = Ukjent IP
+torbutton.circuit_display.onion_site = Løk-side
+torbutton.circuit_display.this_browser = Denne nettleseren
+torbutton.circuit_display.relay = Relè
+torbutton.circuit_display.tor_bridge = Bro
+torbutton.circuit_display.unknown_country = Ukjent land
+torbutton.circuit_display.guard = Vakt
+torbutton.circuit_display.guard_note = Din [Vakt] node kan ikke endres.
+torbutton.circuit_display.learn_more = Lær mer
+torbutton.content_sizer.margin_tooltip = Tor nettleseren legger til denne marginen for å lage bredden og høyden på ditt vindu mindre unikt, og reduserer slik muligheten for andre til å spore deg på nett.
 torbutton.panel.tooltip.disabled = Klikk for å aktivere Tor
-torbutton.panel.tooltip.enabled = Klikk for å deaktivere Tor
-torbutton.panel.label.disabled = Tor er deaktivert
+torbutton.panel.tooltip.enabled = Klikk for å skru av Tor
+torbutton.panel.label.disabled = Tor er avskrudd
 torbutton.panel.label.enabled = Tor er aktivert
-extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyr en knapp til å konfigurere Tor-innstillinger, samt rask og enkel tilgang til å slette privat nettleserhistorikk.
-torbutton.popup.external.title = Laste eksternt innhold?
-torbutton.popup.external.app = Et eksternt program er nødvendig for å håndtere:\n\n
-torbutton.popup.external.note = \n\nMERK: Eksterne program er IKKE Tor-sikker som standard og kan røpe deg!\n
-torbutton.popup.external.suggest = \nHvis du ikke vet om denne filen er trygg, bør du enten lagre og åpne den frakoblet, eller i en virtuell maskin,\neventuelt vurdere å bruker en transparent Torproxy som Tails LiveCD eller torsocks.\n
-torbutton.popup.launch = Start program
+extensions.torbutton@xxxxxxxxxxxxxx.description = Torbutton tilbyr en knapp til å sette opp Tor-innstillinger, samt rask og enkel tilgang til å slette privat nettleserhistorikk.
+torbutton.popup.external.title = Last ned en ekstern filtype?
+torbutton.popup.external.app = Tor-nettleseren kan ikke åpne denne filen. Du er nødt til å åpne den med et annet program.\n
+torbutton.popup.external.note = Noen filtyper kan forårsake at programmer kobler til internett uten å bruke Tor.\n
+torbutton.popup.external.suggest = For å være på den sikre siden, bør du kun åpne nedlastede filer når du frakoblet internett, eller bruke en Tor Live CD som Tails.\n
+torbutton.popup.launch = Last ned fil
 torbutton.popup.cancel = Avbryt
-torbutton.popup.dontask = Start alltid programmer fra nå av
+torbutton.popup.dontask = Last ned filer automatisk fra nå av
 torbutton.popup.prompted_language = For å gi deg et bedre personvern, kan Torbutton spørre om en engelskspråklig versjon av nettsider. Dette kan resultere i at nettsider du foretrekker å lese på morsmålet ditt vises på engelsk istedet.\n\nVil du spørre om engelskspråklige nettsider for å bedre personvernet?
-torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor Control Port.\n\nKjører du Tor Browser Bundle?
-torbutton.title.prompt_torbrowser = Viktig Torbutton informasjon
-torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nå. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert å bruke Torbutton i en nettleser som også brukers til annen surfing enn Tor. \nDet var for mange bugs der til at vi kunne fikse det på en annen måte.\n\nHvis du ønsker å bruke Firefox normalt, bør du avinstallere Torbutton og laste ned Tor Browser Bundle. Personvernsinnstillingene til Tor Browser er også overlegen en normal Firefox, selv når Firefox brukes med Torbutton.\n\nFor å fjerne Torbutton, gå til Verktøy->Tillegg->Utvidelser og klikk på Fjern-knappen ved siden av Torbutton.
-torbutton.popup.short_torbrowser = Viktig Torbutton informasjon!\n\nTorbutton er alltid aktivert nå.\n\nKlikk på Torbutton for mer informasjon.
+torbutton.popup.no_newnym = Torbutton kan ikke trygt gi deg en ny identitet. Den har ikke tilgang til Tor-kontrollporten.\n\nKjører du Tor-nettleserpakken?
+torbutton.title.prompt_torbrowser = Viktig Torbutton-informasjon
+torbutton.popup.prompt_torbrowser = Torbutton fungerer annerledes nå. Du kan ikke skru den av lenger.\n\nVi gjorde denne forandringen fordi det ikke er sikkert å bruke Torbutton i en nettleser som også brukers til annen surfing enn Tor. \nDet var for mange feil der til at vi kunne fikse det på en annen måte.\n\nHvis du ønsker å bruke Firefox normalt, bør du avinstallere Torbutton og laste ned Tor-nettleserforpakningen. Personvernsinnstillingene til Tor-nettleseren er også overlegen forvalget i Firefox, selv når Firefox brukes med Torbutton.\n\nFor å fjerne Torbutton, gå til Verktøy->Tillegg->Utvidelser og klikk på Fjern-knappen ved siden av Torbutton.
+torbutton.popup.short_torbrowser = Viktig Torbutton-informasjon!\n\nTorbutton er alltid aktivert nå.\n\nKlikk på Torbutton for mer informasjon.
 
 torbutton.popup.confirm_plugins = Nettlesertillegg som f.eks Flash kan skade personvernet og anonymiteten din.\n\nDe kan også omgå Tor og dermed avsløre din nåværende plassering og IP-adresse.\n\nEr du sikker på at du vil aktivere nettlesertillegg?\n\n
 torbutton.popup.never_ask_again = Ikke spør meg igjen
+torbutton.popup.confirm_newnym = TOR-nettleseren vil stenge alle vinduer og faner. Alle nettstedeøkter vil gå tapt.\n\n\nRestart TOR-nettleseren nå for å tilbakestille din identitet?\n\n
+
+torbutton.slider_notification = Den grønne løk-menyen har nå en sikkerhetsglidebryter som lar deg justere ditt sikkerhetsnivå. Sjekk den ut!
+torbutton.slider_notification_button = Ã?pne sikkerhetsinnstillinger
+
+torbutton.maximize_warning = � blåse opp vinduet Tor-nettleseren befinner seg i  til full størrelse gir nettsteder muligheten til å fastslå din skjermoppløsning, som igjen kan brukes til å spore deg. Vi anbefaler at du lar Tor-nettleservinduet være i orginal størrelse.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Denne nettsiden (%S) forsøkte å få tilgang til bildedata på et lerret. Siden bildedata på lerret kan bli brukt til å avlsøre informasjon om datamaskinen din, ble blank bildedata returnert denne gangen.
-canvas.allow=Tillat i framtiden
+canvas.siteprompt=Denne nettsiden (%S) prøvde å pakke ut HTML5-canvas-billeddata, hvilket kan brukes til å tilkjennegi din datamaskin spesifikt i identifiseringsøyemed.\n\nSkal Tor-nettleseren tillate denne nettsiden å pakke ut HTML5-canvas-billeddata?
+canvas.notNow=Ikke nå
+canvas.notNowAccessKey=N
+canvas.allow=Tillat i fremtiden
 canvas.allowAccessKey=A
-canvas.never=Aldri på denne siden
+canvas.never=Aldri for denne siden (anbefalt)
 canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=%S profil-problem
+profileReadOnly=Du kan ikke kjøre %S fra et filsystem som bare er lesbart. Kopier %S til en annen plass før du prøver å bruke det.
+profileReadOnlyMac=Du kan ikke kjøre %S fra et filsystem som bare er lesbart. Kopier %S til skrivebordet eller programmappa før du bruker det.
+profileAccessDenied=%S har ikke tilgang til endring av profilen. Juster filrettighetene og prøv igjen.
+profileMigrationFailed=Migrering av din eksisterende %S-profil mislykkes.\nNye innstillinger vil bli benyttet.
+
+# .Onion Page Info prompt.  Strings are kept here for ease of translation.
+pageInfo_OnionEncryptionWithBitsAndProtocol=Tilkobling kryptert (Løk Tjeneste, %1$S, %2$S bits nøkler, %3$S)
+pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste)
diff --git a/src/chrome/locale/nl/aboutTor.dtd b/src/chrome/locale/nl/aboutTor.dtd
index 95b19b9c..f1bb675c 100644
--- a/src/chrome/locale/nl/aboutTor.dtd
+++ b/src/chrome/locale/nl/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Over Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Waarschuwing: deze browser is verouderd!">
-<!ENTITY aboutTor.outOfDateTorOff.label "BOVENDIEN is deze browser verouderd.">
-<!ENTITY aboutTor.outOfDate2.label "Klik op de ui en kies Controleer op Tor-browserupdate.">
-
-<!ENTITY aboutTor.check.label "Test Tor-netwerkinstellingen">
-
-<!ENTITY aboutTor.success.label "Welkom bij Tor-browser">
-<!ENTITY aboutTor.success2.label "Verbonden met het Tor-netwerk.">
-<!ENTITY aboutTor.success3.label "Je kan nu anoniem over het internet browsen.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Er ging iets mis!">
 <!ENTITY aboutTor.failure2.label "Tor werkt niet in deze browser.">
 
-<!ENTITY aboutTor.search.label "Zoeken">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/";>
 
-<!ENTITY aboutTor.torInfo1.label "Bijkomende informatie:">
-<!ENTITY aboutTor.torInfo2.label "Land &amp; IP-adres:">
-<!ENTITY aboutTor.torInfo3.label "Exitnode:">
-<!ENTITY aboutTor.torInfo4.label "Deze server houdt geen enkele informatie over bezoekers bij.">
-<!ENTITY aboutTor.whatnextQuestion.label "Wat nu?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor is NIET alles wat je nodig hebt om anoniem te kunnen browsen. Mogelijk is het nodig dat je bepaalde browsegewoontes verandert om te verzekeren dat je identiteit veilig blijft.">
-<!ENTITY aboutTor.whatnext.label "Tips om anoniem te blijven »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Vragen?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Gebruikershandleiding">
-<!ENTITY aboutTor.helpInfo1.label "Jij kan helpen!">
-<!ENTITY aboutTor.helpInfo2.label "Er zijn veel verschillende manieren hoe jij kan helpen het Tor-netwerk sneller en sterker te maken:">
-<!ENTITY aboutTor.helpInfo3.label "Draai een Tor-relaynode »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Word vrijwilliger">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Doneer »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Het Tor Project is een US 501(c)(3) non-profit voor onderzoek, ontwikkeling en onderwijs in online anonimiteit en privacy.">
-<!ENTITY aboutTor.learnMore.label "Leer meer over het Tor-project » ">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/nl/browserOnboarding.properties b/src/chrome/locale/nl/browserOnboarding.properties
new file mode 100644
index 00000000..c5810bdb
--- /dev/null
+++ b/src/chrome/locale/nl/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welkom
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacy
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Verkennen
+
+onboarding.tour-tor-security=Beveiliging
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Services
+onboarding.tour-tor-onion-services.title=Onion Services
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/nl/torbutton.dtd b/src/chrome/locale/nl/torbutton.dtd
index 7b7e6dbb..27e0003d 100644
--- a/src/chrome/locale/nl/torbutton.dtd
+++ b/src/chrome/locale/nl/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "Sommige lettertypen en wiskundige symbolen zijn uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Sommige lettertypen, pictogrammen, wiskundige symbolen en afbeeldingen zijn uitgeschakeld.">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "Audio en video (HTML5-media) zijn klik-bij-afspelen.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Torcircuit">
+<!ENTITY torbutton.circuit_display.new_circuit "Nieuw circuit voor deze website">
diff --git a/src/chrome/locale/nl/torbutton.properties b/src/chrome/locale/nl/torbutton.properties
index d190ceed..9379a730 100644
--- a/src/chrome/locale/nl/torbutton.properties
+++ b/src/chrome/locale/nl/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=%S heeft niet de juiste permissies om toegang te krijgen tot
 profileMigrationFailed=Migreren van uw bestaande %S profiel is mislukt.\nNieuwe instellingen zijn nu van toepassing.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Verbinding versleuteld (Oniondienst, %1$S, %2$S bit sleutels, %3$S)
+pageInfo_OnionEncryption=Verbinding versleuteld (Oniondienst)
diff --git a/src/chrome/locale/pl/aboutTor.dtd b/src/chrome/locale/pl/aboutTor.dtd
index 71d69e78..f7f4c143 100644
--- a/src/chrome/locale/pl/aboutTor.dtd
+++ b/src/chrome/locale/pl/aboutTor.dtd
@@ -1,47 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Informacje na temat Tor'a">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Ostrzeżenie: ta przeglÄ?darka jest nieaktualna.">
-<!ENTITY aboutTor.outOfDateTorOff.label "PONADTO, ta przeglÄ?darka jest nieaktualna.">
-<!ENTITY aboutTor.outOfDate2.label "Kliknij na ikonÄ? cebuli, a nastÄ?pnie wybierz Sprawdź czy sÄ? dostÄ?pne aktualizacje.">
-
-<!ENTITY aboutTor.check.label "Przetestuj Ustawienia Sieci Tor">
-
-<!ENTITY aboutTor.success.label "Witamy w Tor Browser">
-<!ENTITY aboutTor.success2.label "PoÅ?Ä?czono z sieciÄ? Tor">
-<!ENTITY aboutTor.success3.label "Możesz teraz swobodnie przeglÄ?daÄ? Internet anonimowo.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "CoÅ? poszÅ?o nie tak!">
 <!ENTITY aboutTor.failure2.label "Tor nie dziaÅ?a w tej przeglÄ?darce.">
 
-<!ENTITY aboutTor.search.label "Szukaj">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Dodatkowe informacje:">
-<!ENTITY aboutTor.torInfo2.label "Kraj i adres IP:">
-<!ENTITY aboutTor.torInfo3.label "WÄ?zeÅ? WyjÅ?ciowy:">
-<!ENTITY aboutTor.torInfo4.label "Ten serwer nie rejestruje żadnych informacji o odwiedzajÄ?cych.">
-<!ENTITY aboutTor.whatnextQuestion.label "Co dalej?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor, to NIE jest wszystko czego potrzebujesz, aby przeglÄ?daÄ? sieÄ? anonimowo! ByÄ? może potrzeba bÄ?dzie zmieniÄ? niektóre Twoje nawyki internetowe, aby zapewniÄ? Twojej tożsamoÅ?ci bezpieczeÅ?stwo.">
-<!ENTITY aboutTor.whatnext.label "Porady: Jak pozostaÄ? anonimowym w internecie »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Pytania?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Instrukcja korzystania z Tor Browser">
-<!ENTITY aboutTor.helpInfo1.label "Możesz pomóc!">
-<!ENTITY aboutTor.helpInfo2.label "Istnieje wiele sposobów, abyÅ? mógÅ? uczyniÄ? sieÄ? Tor'a szybszÄ? i silniejszÄ?:">
-<!ENTITY aboutTor.helpInfo3.label "Uruchom Przekaźnikowy WÄ?zeÅ? Tora »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "ZgÅ?oÅ? siÄ? na ochotnika »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Przekaż darowiznÄ? »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
-
-<!ENTITY aboutTor.footer.label "Projekt Tor jest organizacjÄ? non-profit*, zajmujÄ?ca siÄ? badaniami, rozwojem i edukacji o anonimowoÅ?ci i prywatnoÅ?ci w internecie.
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-* 501(c)(3)">
-<!ENTITY aboutTor.learnMore.label "Dowiedz siÄ? wiÄ?cej na temat Tor Project »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/pl/browserOnboarding.properties b/src/chrome/locale/pl/browserOnboarding.properties
new file mode 100644
index 00000000..629a09a3
--- /dev/null
+++ b/src/chrome/locale/pl/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Witamy
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=PrywatnoÅ?Ä?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=BezpieczeÅ?stwo
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=UsÅ?ugi Tor
+onboarding.tour-tor-onion-services.title=UsÅ?ugi Tor
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd
index 99a3c6bc..97e5e0f8 100644
--- a/src/chrome/locale/pt-BR/aboutTor.dtd
+++ b/src/chrome/locale/pt-BR/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Sobre Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "AVISO: este navegador está desatualizado.">
-<!ENTITY aboutTor.outOfDateTorOff.label "AINDA, este navegador está desatualizado.">
-<!ENTITY aboutTor.outOfDate2.label "Clique na cebola e escolha Verificar Atualizações do Navegador Tor.">
-
-<!ENTITY aboutTor.check.label "Testar as configurações de rede Tor">
-
-<!ENTITY aboutTor.success.label "Boas-vindas ao Navegador Tor!">
-<!ENTITY aboutTor.success2.label "Conectad0 à rede Tor!">
-<!ENTITY aboutTor.success3.label "Sinta-se à vontade para navegar anonimamente na Internet.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!">
 <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">
 
-<!ENTITY aboutTor.search.label "Buscar">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Para mais informações:">
-<!ENTITY aboutTor.torInfo2.label "País e Endereço IP:">
-<!ENTITY aboutTor.torInfo3.label "Nó de saída:">
-<!ENTITY aboutTor.torInfo4.label "Este servidor não registra nenhuma informação sobre os seus usuários.">
-<!ENTITY aboutTor.whatnextQuestion.label "O que mais?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor N�O é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. ">
-<!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato&quot;">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Perguntas?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor ">
-<!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!">
-<!ENTITY aboutTor.helpInfo2.label "Existem várias maneiras de ajudar a rede Tor a tornar-se mais rápida e eficaz:">
-<!ENTITY aboutTor.helpInfo3.label "Rodar um Nó de Retransmissor Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Trabalhar voluntariamente&quot;">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Fazer uma doação&quot;">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "O Projeto Tor é uma organização sem fins lucrativos - EUA 501(c)(3) -, dedicada à pesquisa, ao desenvolvimento e à educação relacionados ao anonimato e à privacidade na Internet.">
-<!ENTITY aboutTor.learnMore.label "Informe-se mais sobre o Projeto Tor&quot;">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/pt-BR/browserOnboarding.properties b/src/chrome/locale/pt-BR/browserOnboarding.properties
new file mode 100644
index 00000000..3d39f44a
--- /dev/null
+++ b/src/chrome/locale/pt-BR/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Bem Vindo
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Privacidade
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explorar
+
+onboarding.tour-tor-security=Segurança
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Serviços Onion
+onboarding.tour-tor-onion-services.title=Serviços Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/pt-BR/torbutton.properties b/src/chrome/locale/pt-BR/torbutton.properties
index 0a8453c4..09ea7581 100644
--- a/src/chrome/locale/pt-BR/torbutton.properties
+++ b/src/chrome/locale/pt-BR/torbutton.properties
@@ -31,10 +31,10 @@ torbutton.popup.confirm_plugins = Plugins como o Flash podem prejudicar sua priv
 torbutton.popup.never_ask_again = Não me pergunte novamente
 torbutton.popup.confirm_newnym = O navegador Tor fechará todas as janelas e abas. Todas as sessões de websites serão perdidas.\n\nVocê deseja reiniciar o navegador Tor agora para reiniciar a sua identidade?\n\n
 
-torbutton.slider_notification = O menu cebola verde agora dispõe de uma opcão que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida!
+torbutton.slider_notification = O menu cebola verde agora dispõe de uma opção que lhe permite ajustar o seu nivel de seguranca. Dê uma conferida!
 torbutton.slider_notification_button = Abra as definições de segurança.
 
-torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir aos websites determinar o tamanho do seu monitor, que pode ser usado para rastreá-lo. Nós recomendamos que você deixe a janela do Navegador Tor no seu tamanho original.
+torbutton.maximize_warning = Maximizar o Navegador Tor pode permitir que websites determinem o tamanho do monitor, o que pode ser usado para rastreá-lo. Recomenda-se deixar a janela do Navegador Tor no seu tamanho original.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=Este website (%S) tentou extrair dados de imagem CANVAS HTML5, que podem ser usados para identificar o seu computador.\n\nVocê deseja que o Navegador Tor permita que este website extraia dados de imagem CANVAS HTML5?
@@ -48,11 +48,11 @@ canvas.neverAccessKey=e
 # Profile/startup error messages. Strings are kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
 profileProblemTitle=Problema com o Perfil %S 
-profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S em um outro local antes de tentar utilizá-lo.
-profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Por favor, copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar utilizá-lo.\n 
+profileReadOnly=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S em um outro local antes de tentar usá-lo.
+profileReadOnlyMac=Não é possível executar %S a partir de um sistema de arquivo "somente-leitura". Copie %S no seu Desktop ou em uma pasta de Aplicações antes de tentar usá-lo.\n 
 profileAccessDenied=%S não possui permissão para acessar o perfil. Por favor, ajuste as suas permissões de arquivo de sistema e tente novamente. 
-profileMigrationFailed=Migração de seu perfil  %S existente falhou.\nNovas configurações serão utilizadas.
+profileMigrationFailed=Migração de seu perfil  %S existente falhou.\nNovas configurações serão usadas.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Conexão criptografada (Serviço Onion, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Conexão criptografada (Serviço Onion)
diff --git a/src/chrome/locale/ru/aboutTor.dtd b/src/chrome/locale/ru/aboutTor.dtd
index f12276e0..f30e3c4a 100644
--- a/src/chrome/locale/ru/aboutTor.dtd
+++ b/src/chrome/locale/ru/aboutTor.dtd
@@ -1,46 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Ð? пÑ?оекÑ?е Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?Ñ? иÑ?полÑ?зÑ?еÑ?е Ñ?Ñ?аÑ?Ñ?Ñ? веÑ?Ñ?иÑ? бÑ?аÑ?зеÑ?а.">
-<!ENTITY aboutTor.outOfDateTorOff.label "Ð?РÐ?Ð?Ð? ТÐ?Ð?Ð?, даннÑ?й бÑ?аÑ?зеÑ? Ñ?Ñ?Ñ?аÑ?ел.">
-<!ENTITY aboutTor.outOfDate2.label "Ð?ажмиÑ?е на &quot;лÑ?ковиÑ?Ñ?&quot;и заÑ?ем вÑ?беÑ?иÑ?е &quot;Ð?Ñ?овеÑ?иÑ?Ñ? обновлениÑ? бÑ?аÑ?зеÑ?а Tor&quot;">
-
-<!ENTITY aboutTor.check.label "Ð?Ñ?овеÑ?иÑ?Ñ? наÑ?Ñ?Ñ?ойки Ñ?еÑ?и Tor">
-
-<!ENTITY aboutTor.success.label "Ð?аÑ? пÑ?ивеÑ?Ñ?Ñ?вÑ?еÑ? Tor Browser">
-<!ENTITY aboutTor.success2.label "СеÑ?Ñ? Tor подклÑ?Ñ?ена.">
-<!ENTITY aboutTor.success3.label "ТепеÑ?Ñ? Ð?Ñ? можеÑ?е пÑ?оÑ?маÑ?Ñ?иваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?айÑ?Ñ? в анонимном Ñ?ежиме.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ЧÑ?о-Ñ?о поÑ?ло не Ñ?ак!">
 <!ENTITY aboutTor.failure2.label "Tor не Ñ?абоÑ?аеÑ? в Ñ?Ñ?ом бÑ?аÑ?зеÑ?е.">
 
-<!ENTITY aboutTor.search.label "Ð?оиÑ?к">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ð?ополниÑ?елÑ?нÑ?е Ñ?ведениÑ?:">
-<!ENTITY aboutTor.torInfo2.label "СÑ?Ñ?ана и IP-адÑ?еÑ?">
-<!ENTITY aboutTor.torInfo3.label "Ð?онеÑ?нÑ?й Ñ?зел:">
-<!ENTITY aboutTor.torInfo4.label "Ð?аннÑ?й Ñ?еÑ?веÑ? не Ñ?обиÑ?аеÑ? какÑ?Ñ?-либо инÑ?оÑ?маÑ?иÑ? о поÑ?еÑ?иÑ?елÑ?Ñ?.">
-<!ENTITY aboutTor.whatnextQuestion.label "ЧÑ?о далÑ?Ñ?е?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor Ð?Ð? Ñ?влÑ?еÑ?Ñ?Ñ? иÑ?Ñ?еÑ?пÑ?ваÑ?Ñ?им Ñ?Ñ?едÑ?Ñ?вом длÑ? анонимного иÑ?полÑ?зованиÑ? Ñ?еÑ?и! Ð?озможно, Ñ?Ñ?обÑ? обезопаÑ?иÑ?Ñ? Ñ?вои лиÑ?нÑ?е даннÑ?е, Ð?ам пÑ?идеÑ?Ñ?Ñ? измениÑ?Ñ? некоÑ?оÑ?Ñ?е пÑ?ивÑ?Ñ?ки Ñ?абоÑ?Ñ? в Ð?нÑ?еÑ?неÑ?е.">
-<!ENTITY aboutTor.whatnext.label "РекомендаÑ?ии длÑ? Ñ?оÑ?Ñ?анениÑ? анонимноÑ?Ñ?и »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ð?опÑ?оÑ?Ñ??">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "Ð?">
-<!ENTITY aboutTor.torbrowser_user_manual.label "РÑ?ководÑ?Ñ?во иÑ?полÑ?зованиÑ? Tor Browser.">
-<!ENTITY aboutTor.helpInfo1.label "Ð?Ñ? можеÑ?е помоÑ?Ñ?!">
-<!ENTITY aboutTor.helpInfo2.label "Ð?Ñ?Ñ?Ñ? много Ñ?поÑ?обов Ñ?делаÑ?Ñ? Ñ?еÑ?Ñ? Tor более бÑ?Ñ?Ñ?Ñ?ой и Ñ?Ñ?Ñ?ойÑ?ивой:">
-<!ENTITY aboutTor.helpInfo3.label "Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Ñ?епоÑ?кÑ? Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html#ru";>
-<!ENTITY aboutTor.helpInfo4.label "СÑ?анÑ?Ñ?е наÑ?им добÑ?оволÑ?Ñ?ем »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html#ru";>
-<!ENTITY aboutTor.helpInfo5.label "СделайÑ?е взноÑ? »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html#ru";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Ð?Ñ?оекÑ? Tor - Ñ?Ñ?о полÑ?зÑ?Ñ?Ñ?аÑ?Ñ?Ñ? пÑ?ивилегиÑ?ми СШÐ? 501(c)(3) некоммеÑ?Ñ?еÑ?каÑ? оÑ?ганизаÑ?иÑ?, Ñ?елÑ?Ñ? коÑ?оÑ?ой Ñ?влÑ?еÑ?Ñ?Ñ? пÑ?оведение иÑ?Ñ?ледований, Ñ?азвиÑ?ие и обÑ?азование в Ñ?Ñ?еÑ?е анонимноÑ?Ñ?и и лиÑ?нÑ?Ñ? даннÑ?Ñ? онлайн.">
-<!ENTITY aboutTor.learnMore.label "УзнайÑ?е болÑ?Ñ?е о пÑ?оекÑ?е Tor »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html#ru
-">
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html#ru";>
diff --git a/src/chrome/locale/ru/browserOnboarding.properties b/src/chrome/locale/ru/browserOnboarding.properties
new file mode 100644
index 00000000..d7f4a352
--- /dev/null
+++ b/src/chrome/locale/ru/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Ð?обÑ?о пожаловаÑ?Ñ?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Ð?Ñ?иваÑ?ноÑ?Ñ?Ñ?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Ð?бзоÑ?
+
+onboarding.tour-tor-security=Ð?езопаÑ?ноÑ?Ñ?Ñ?
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion-Ñ?еÑ?виÑ?Ñ?
+onboarding.tour-tor-onion-services.title=Onion-Ñ?еÑ?виÑ?Ñ?
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/ru/torbutton.properties b/src/chrome/locale/ru/torbutton.properties
index d3ccbd89..687a52e2 100644
--- a/src/chrome/locale/ru/torbutton.properties
+++ b/src/chrome/locale/ru/torbutton.properties
@@ -54,5 +54,5 @@ profileAccessDenied=У %S неÑ? Ñ?азÑ?еÑ?ениÑ? на доÑ?Ñ?Ñ?п к пÑ?
 profileMigrationFailed=Ð?еÑ?емеÑ?ение ваÑ?его Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?его %S пÑ?оÑ?илÑ? не Ñ?далоÑ?Ñ?.\nÐ?Ñ?дÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? новÑ?е наÑ?Ñ?Ñ?ойки.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Соединение заÑ?иÑ?Ñ?овано (Onion Service, %1$S, %2$S биÑ?нÑ?е клÑ?Ñ?и, %3$S)
+pageInfo_OnionEncryption=Соединение заÑ?иÑ?Ñ?овано (Onion Service)
diff --git a/src/chrome/locale/sv/aboutTor.dtd b/src/chrome/locale/sv/aboutTor.dtd
index 1e4b30fc..2a02c639 100644
--- a/src/chrome/locale/sv/aboutTor.dtd
+++ b/src/chrome/locale/sv/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Om Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "VARNING: den här webbläsaren är inte uppdaterad.">
-<!ENTITY aboutTor.outOfDateTorOff.label "DESSUTOM, denna webbläsare är ej uppdaterad.">
-<!ENTITY aboutTor.outOfDate2.label "Klicka på Tor-löken och välj sedan 'Sök efter uppdateringar för Tor webbläsare'.">
-
-<!ENTITY aboutTor.check.label "Testa nätverksinställningarna för Tor">
-
-<!ENTITY aboutTor.success.label "Välkommen till Tor-webbläsaren">
-<!ENTITY aboutTor.success2.label "Ansluten till Tor-nätverket.">
-<!ENTITY aboutTor.success3.label "Du kan nu surfa på nätet anonymt.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "NÃ¥gonting gick fel!">
 <!ENTITY aboutTor.failure2.label "Tor fungerar inte i den här webbläsaren.">
 
-<!ENTITY aboutTor.search.label "Sök">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ytterligare information:">
-<!ENTITY aboutTor.torInfo2.label "Land och IP-adress:">
-<!ENTITY aboutTor.torInfo3.label "Exitnod:">
-<!ENTITY aboutTor.torInfo4.label "Den här servern sparar inte någon information om besökare.">
-<!ENTITY aboutTor.whatnextQuestion.label "Och nu då?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor är INTE allt som behövs för att vara anonym på nätet! Du behöver kanske ändra några av dina vanor för att säkerställa att din identitet förblir skyddad.">
-<!ENTITY aboutTor.whatnext.label "Tips på hur man förblir anonym »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Frågor?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser användarmanual">
-<!ENTITY aboutTor.helpInfo1.label "Du kan hjälpa till!">
-<!ENTITY aboutTor.helpInfo2.label "Det finns många sätt du kan hjälpa till med att göra Tor-nätverket snabbare och säkrare:">
-<!ENTITY aboutTor.helpInfo3.label "Kör ett Tor-relä »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Erbjud din hjälp »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Gör en donation »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor projektet är en US 501(c)(3) non-profit organisation som utför forskning, utveckling, och utbildning inom online anonymitet och integritet.">
-<!ENTITY aboutTor.learnMore.label "Mer information om Tor-projektet »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/sv/browserOnboarding.properties b/src/chrome/locale/sv/browserOnboarding.properties
new file mode 100644
index 00000000..6ad7b625
--- /dev/null
+++ b/src/chrome/locale/sv/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Welcome
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Sekretess
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Säkerhet
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion tjänster
+onboarding.tour-tor-onion-services.title=Onion tjänster
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/tr/aboutTor.dtd b/src/chrome/locale/tr/aboutTor.dtd
index 9ebd8452..f0f68b49 100644
--- a/src/chrome/locale/tr/aboutTor.dtd
+++ b/src/chrome/locale/tr/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Tor Hakkında">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "UYARI: bu tarayıcı güncel deÄ?il.">
-<!ENTITY aboutTor.outOfDateTorOff.label "AYRICA, bu tarayıcı güncel deÄ?il.">
-<!ENTITY aboutTor.outOfDate2.label "SoÄ?an simgesine tıklayın ve ardından Tor Browser Güncellemesini denetleyin.">
-
-<!ENTITY aboutTor.check.label "Tor AÄ? Ayarlarını Sınayın">
-
-<!ENTITY aboutTor.success.label "Tor Browser Uygulamasına HoÅ? Geldiniz">
-<!ENTITY aboutTor.success2.label "Tor aÄ?ına baÄ?lanıldı.">
-<!ENTITY aboutTor.success3.label "Artık Ä°nternet'te özgürce ve anonim olarak dolaÅ?abilirsiniz.">
+<!ENTITY aboutTor.ready.label "KeÅ?fet. Gizlice.">
+<!ENTITY aboutTor.ready2.label "Dünyanın en kiÅ?isel web tarama deneyimine hazırsınız.">
 <!ENTITY aboutTor.failure.label "Bir Å?eyler Ters Gitti!">
 <!ENTITY aboutTor.failure2.label "Tor bu tarayıcı ile çalıÅ?mıyor.">
 
-<!ENTITY aboutTor.search.label "Arama">
+<!ENTITY aboutTor.search.label "DuckDuckGo ile Arayın">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Ek Bilgiler:">
-<!ENTITY aboutTor.torInfo2.label "Ã?lke ve IP Adresi:">
-<!ENTITY aboutTor.torInfo3.label "Ã?ıkıÅ? Noktası:">
-<!ENTITY aboutTor.torInfo4.label "Bu sunucu ziyaretçiler hakkında herhangi bir bilgi toplamaz.">
-<!ENTITY aboutTor.whatnextQuestion.label "Å?imdi ne olacak?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor, anonim kalmanız için gerek duyacaÄ?ınız her Å?eyi saÄ?lamaz! KimliÄ?inizin güvende kalması için bazı Ä°nternet alıÅ?kanlıklarınızı deÄ?iÅ?tirmeniz gerekebilir.">
-<!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Sorularınız mı var?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Tor Browser Rehberine Bakın">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Kullanım Kılavuzu">
-<!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!">
-<!ENTITY aboutTor.helpInfo2.label "Tor aÄ?ını daha hızlı güçlü kılmaya yardımcı olabilmenin çeÅ?itli yolları var:">
-<!ENTITY aboutTor.helpInfo3.label "Tor Aktarıcı Noktası Ã?alıÅ?tır »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Gönüllü Destekte Bulunun »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "BaÄ?ıÅ? Yapın »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Rehberi">
 
-<!ENTITY aboutTor.footer.label "Tor Projesi, ABD 501(c)(3) kapsamında çevrim içi gizlilik ve mahremiyet üzerine araÅ?tırma, geliÅ?tirme ve eÄ?itim çalıÅ?maları yapan ve kar amacı gütmeyen bir kuruluÅ?tur.">
-<!ENTITY aboutTor.learnMore.label "Tor Projesi hakkında daha çok Å?ey öÄ?renin »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "Tor Projesi, US 501(c)(3) koÅ?ullarına uygun olarak, özgür ve açık kaynaklı anonimlik ve kiÅ?isel gizlilik teknolojileri geliÅ?tirerek insan hakları ve özgürlüklerini ileriye götürmeyi, bu teknolojilerin bilimsel ve kültürel olarak bilinirliÄ?ini arttırmayı ve herkes tarafından eriÅ?ebilmesini saÄ?lamak amacıyla çalıÅ?an, kar amacı gütmeyen bir kuruluÅ?tur.">
+<!ENTITY aboutTor.getInvolved.label "Katkıda Bulunun »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/tr/browserOnboarding.properties b/src/chrome/locale/tr/browserOnboarding.properties
new file mode 100644
index 00000000..22bd337d
--- /dev/null
+++ b/src/chrome/locale/tr/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Courier'a
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Gizlilik
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=KeÅ?fet
+
+onboarding.tour-tor-security=Güvenlik
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Onion Hizmetleri
+onboarding.tour-tor-onion-services.title=Onion Hizmetleri
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/tr/torbutton.dtd b/src/chrome/locale/tr/torbutton.dtd
index ab781315..052c0932 100644
--- a/src/chrome/locale/tr/torbutton.dtd
+++ b/src/chrome/locale/tr/torbutton.dtd
@@ -1,6 +1,6 @@
 <!ENTITY torbutton.context_menu.new_identity "Yeni Kimlik">
 <!ENTITY torbutton.context_menu.new_identity_key "I">
-<!ENTITY torbutton.context_menu.new_circuit "Bu site için Tor devresini yenile">
+<!ENTITY torbutton.context_menu.new_circuit "Bu Sitenin Tor Devresini Yenile">
 <!ENTITY torbutton.context_menu.new_circuit_key "C">
 <!ENTITY torbutton.context_menu.preferences "Güvenlik Ayarları...">
 <!ENTITY torbutton.context_menu.preferences.key "S">
diff --git a/src/chrome/locale/vi/aboutTor.dtd b/src/chrome/locale/vi/aboutTor.dtd
index 4bc3ad53..c79065b5 100644
--- a/src/chrome/locale/vi/aboutTor.dtd
+++ b/src/chrome/locale/vi/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "Thông tin v� Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "CẢNH BÃ?O: trình duyá»?t này Ä?ã lá»?i thá»?i">
-<!ENTITY aboutTor.outOfDateTorOff.label "Thêm nữa, trình duyá»?t này Ä?ã lá»?i thá»?i.">
-<!ENTITY aboutTor.outOfDate2.label "Bấm chuá»?t vào củ hành và sau Ä?ó chá»?n Kiá»?m tra bản cập nhật của Trình duyá»?t Tor">
-
-<!ENTITY aboutTor.check.label "Thá»­ cài Ä?ặt mạng lÆ°á»?i Tor">
-
-<!ENTITY aboutTor.success.label "Chào mừng Ä?ến vá»?i Trình duyá»?t Tor">
-<!ENTITY aboutTor.success2.label "Ä?ã kết ná»?i vá»?i mạng lÆ°á»?i Tor.">
-<!ENTITY aboutTor.success3.label "Bây gi� bạn sẽ tự do lư�t web ẩn danh.">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "Có gì Ä?ó Ä?ã sai!">
 <!ENTITY aboutTor.failure2.label "Tor không hoạt Ä?á»?ng trên trình duyá»?t này.">
 
-<!ENTITY aboutTor.search.label "Tìm kiếm">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "Thông tin thêm:">
-<!ENTITY aboutTor.torInfo2.label "Quá»?c gia &amp; Ä?á»?a chá»? IP:">
-<!ENTITY aboutTor.torInfo3.label "Thoát khá»?i giao Ä?iá»?m:">
-<!ENTITY aboutTor.torInfo4.label "Máy chủ này không ghi lại bất kỳ thông tin nào của khách truy cập.">
-<!ENTITY aboutTor.whatnextQuestion.label "Ä?iá»?u gì tiếp theo?">
-<!ENTITY aboutTor.whatnextAnswer.label "Tor KHÃ?NG phải là tất cả những gì bạn cần Ä?á»? ẩn danh! Bạn cần nên thay Ä?á»?i má»?t vài thói quen lÆ°á»?t net Ä?á»? chắc chắn rằng xác minh danh tính sẽ an toàn.">
-<!ENTITY aboutTor.whatnext.label "Gợi ý cho vi�c ẩn danh »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Những câu h�i?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Hư�ng dẫn sử dụng Trình duy�t Tor">
-<!ENTITY aboutTor.helpInfo1.label "Bạn có thá»? giúp Ä?ỡ!">
-<!ENTITY aboutTor.helpInfo2.label "Có nhi�u cách mà bạn có th� giúp mạng Tor nhanh hơn và t�t hơn.">
-<!ENTITY aboutTor.helpInfo3.label "Chạy má»?t Ä?ầu má»?i tiếp sức Tor »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "Tình nguy�n những d�ch vụ của bạn »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "Ủng h� »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Dự án Tor là m�t t� chức không lợi nhuận theo US 501(c)(3) chuyên v� nghiên cứu, phát tri�n và giáo dục v� vô danh vàjavascript:; riêng tư trực tuyến.">
-<!ENTITY aboutTor.learnMore.label "Tìm hi�u thêm v� Tor Project">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/vi/aboutTor.properties b/src/chrome/locale/vi/aboutTor.properties
index 5542fac9..56a00af1 100644
--- a/src/chrome/locale/vi/aboutTor.properties
+++ b/src/chrome/locale/vi/aboutTor.properties
@@ -17,4 +17,4 @@ aboutTor.donationBanner.tagline1=Protecting Journalists, Whistleblowers, & Activ
 aboutTor.donationBanner.tagline2=Networking Freedom Worldwide
 aboutTor.donationBanner.tagline3=Freedom Online
 aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide
-aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day
+aboutTor.donationBanner.tagline5=Bảo v� riêng tư của hàng tri�u ngư�i m�i ngày
diff --git a/src/chrome/locale/vi/browserOnboarding.properties b/src/chrome/locale/vi/browserOnboarding.properties
new file mode 100644
index 00000000..4c63fa1c
--- /dev/null
+++ b/src/chrome/locale/vi/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Xin chào
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=Riêng tư
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=Bảo mật
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=Các D�ch vụ Onion
+onboarding.tour-tor-onion-services.title=Các D�ch vụ Onion
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/vi/torbutton.dtd b/src/chrome/locale/vi/torbutton.dtd
index 6bbd492d..77f447b9 100644
--- a/src/chrome/locale/vi/torbutton.dtd
+++ b/src/chrome/locale/vi/torbutton.dtd
@@ -34,18 +34,18 @@
 <!ENTITY torbutton.prefs.sec_caption "Mức Ä?á»? Bảo mật">
 <!ENTITY torbutton.prefs.sec_caption_tooltip "Những NgÆ°á»?i Ä?iá»?u chá»?nh an ninh Ä?á»? cho bạn vô hiá»?u má»?t vài tính nÄ?ng của trình duyá»?t mà có thá»? làm trình duyá»?t của bạn dá»? bá»? tá»?n thÆ°Æ¡ng Ä?á»?i vá»?i những cá»? gắng tấn công.">
 <!ENTITY torbutton.prefs.sec_standard_label "Chuẩn">
-<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled.">
-<!ENTITY torbutton.prefs.sec_safer_label "Safer">
-<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality.">
-<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:">
-<!ENTITY torbutton.prefs.sec_safest_label "Safest">
-<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts.">
-<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:">
+<!ENTITY torbutton.prefs.sec_standard_description "Tất cả các tính nÄ?ng của Trình duyá»?t Tor và trang web Ä?á»?u Ä?ược bật.">
+<!ENTITY torbutton.prefs.sec_safer_label "An toàn hơn">
+<!ENTITY torbutton.prefs.sec_safer_description "Vô hiá»?u hóa tính nÄ?ng website thÆ°á»?ng gây nguy hiá»?m, khiến má»?t sá»? trang web mất chức nÄ?ng.">
+<!ENTITY torbutton.prefs.sec_safer_list_label "á»? cài Ä?ặt an toàn hÆ¡n:">
+<!ENTITY torbutton.prefs.sec_safest_label "An toàn nhất">
+<!ENTITY torbutton.prefs.sec_safest_description "Chá»? cho phép các tính nÄ?ng trang web Ä?ược yêu cầu cho các trang web tÄ©nh và các dá»?ch vụ cÆ¡ bản. Những thay Ä?á»?i này ảnh hÆ°á»?ng Ä?ến hình ảnh, phÆ°Æ¡ng tiá»?n và tập lá»?nh.">
+<!ENTITY torbutton.prefs.sec_safest_list_label "á»? cài Ä?ặt an toàn nhất:">
 <!ENTITY torbutton.prefs.sec_learn_more_label "Biết thêm">
-<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites.">
+<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript b� vô hi�u trên các trang web không có HTTPS.">
 <!ENTITY torbutton.prefs.sec_js_disabled "JavaScript mặc Ä?á»?nh bá»? vô hiá»?u trên tất cả các trang.">
-<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled.">
-<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled.">
-<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media) are click-to-play.">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.prefs.sec_limit_typography "M�t s� phông chữ và ký hiêu toán h�c b� vô hi�u.">
+<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "M�t s� phông chữ, bi�u tượng, và hình ảnh b� vô hi�u.">
+<!ENTITY torbutton.prefs.sec_click_to_play_media "Ã?m thanh và video (HTML5 media) phải bấm-Ä?á»?-phát. ">
+<!ENTITY torbutton.circuit_display.title "Mạch Tor">
+<!ENTITY torbutton.circuit_display.new_circuit "Mạch Tor m�i cho trang này">
diff --git a/src/chrome/locale/vi/torbutton.properties b/src/chrome/locale/vi/torbutton.properties
index aa10e5f5..d304b7e8 100644
--- a/src/chrome/locale/vi/torbutton.properties
+++ b/src/chrome/locale/vi/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = Trình duy�t này
 torbutton.circuit_display.relay = Tiếp sức
 torbutton.circuit_display.tor_bridge = Cầu n�i
 torbutton.circuit_display.unknown_country = Ä?ất nÆ°á»?c không Ä?ược biết Ä?ến
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Bảo v�
+torbutton.circuit_display.guard_note = Nút [Bảo vá»?} của bạn có thá»? không thay Ä?á»?i.
 torbutton.circuit_display.learn_more = Biết thêm
 torbutton.content_sizer.margin_tooltip = Trình duyá»?t Tor thêm lá»? này Ä?á»? làm cho chiá»?u rá»?ng và chiá»?u cao của màn hình của bạn ít dá»? bá»? phân biá»?t hÆ¡n, và vì thế giảm khả nÄ?ng của những ngÆ°á»?i theo dõi bạn trá»±c tuyến.
 torbutton.panel.tooltip.disabled = Nhấn Ä?á»? bật Tor
@@ -54,5 +54,5 @@ profileAccessDenied=%S không Ä?ược phép truy cập cấu hình. Vui lòng 
 profileMigrationFailed=Viá»?c di chuyá»?n há»? sÆ¡ %S hiá»?n tại của bạn Ä?ã thất bại.\nNhững cài Ä?ặt má»?i sẽ Ä?ược sá»­ dụng.
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Ä?ã mã hóa kết ná»?i (Onion Service, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=Ä?ã mã hóa kết ná»?i (Onion Service)
diff --git a/src/chrome/locale/zh-CN/aboutTor.dtd b/src/chrome/locale/zh-CN/aboutTor.dtd
index 27283582..47d2a899 100644
--- a/src/chrome/locale/zh-CN/aboutTor.dtd
+++ b/src/chrome/locale/zh-CN/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "�� Tor">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è­¦å??ï¼?æ­¤æµ?è§?å?¨ç??æ?¬è¿?æ?§ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "å?¦å¤?ï¼?该æµ?è§?å?¨å¹¶é??æ??æ?°ç??æ?¬ã??">
-<!ENTITY aboutTor.outOfDate2.label "ç?¹å?»æ´?è?±å?¾æ ?ï¼?ç?¶å??é??æ?©â??Tor Browser æ£?æ?¥æ?´æ?°â??ã??">
-
-<!ENTITY aboutTor.check.label "�� Tor ��设置">
-
-<!ENTITY aboutTor.success.label "欢�使� Tor Browser">
-<!ENTITY aboutTor.success2.label "å·²è¿?æ?¥å?° Tor ç½?ç»?ã??">
-<!ENTITY aboutTor.success3.label "ç?°å?¨å?³å?¯è?ªç?±å?°å?¿å??访é?®äº?è??ç½?ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "å?ºé??äº?ï¼?">
 <!ENTITY aboutTor.failure2.label "Tor æ? æ³?å?¨è¯¥æµ?è§?å?¨ä¸?è¿?è¡?ã??">
 
-<!ENTITY aboutTor.search.label "å®?å?¨ç??æ??ç´¢å¼?æ??">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "��信��">
-<!ENTITY aboutTor.torInfo2.label "å?½å®¶ä¸? IP å?°å??ï¼?">
-<!ENTITY aboutTor.torInfo3.label "å?ºå?£è??ç?¹ï¼?">
-<!ENTITY aboutTor.torInfo4.label "æ?¬æ??å?¡å?¨ä¸?è®°å½?æ??å?³è®¿é?®è??ç??ä»»ä½?ä¿¡æ?¯ã??">
-<!ENTITY aboutTor.whatnextQuestion.label "��步�">
-<!ENTITY aboutTor.whatnextAnswer.label "ä»?ä»?使ç?¨ Tor æ? æ³?å®?ç?°å?¿å??æµ?è§?ã??为äº?ç¡®ä¿?身份å®?å?¨ï¼?ä½ å?¯è?½é??è¦?æ?¹å??æ??äº?æµ?è§?ä¹ æ?¯ã??">
-<!ENTITY aboutTor.whatnext.label "å?¿å??æ??示 »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "æ??ç??é?®ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser ç?¨æ?·æ??å??">
-<!ENTITY aboutTor.helpInfo1.label "你��以帮��">
-<!ENTITY aboutTor.helpInfo2.label "å?¯é??è¿?å¾?å¤?æ?¹å¼?æ??ä¾?帮å?©ï¼?让 Tor ç½?ç»?å??å¾?æ?´å¿«æ?´å¼ºå¤§ï¼?">
-<!ENTITY aboutTor.helpInfo3.label "è¿?è¡? Tor 中继è??ç?¹ »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "æ??ä¾?å¿?æ?¿æ??å?¡ »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "æ??å?© »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "The Tor Project æ?¯ä¸?家ç¾?å?½ 501(c)(3) é??è?¥å?©ç»?ç»?ï¼?è?´å??äº?å?¨çº¿å?¿å??ä¸?é??ç§?ç??ç ?究ã??å¼?å??ä¸?æ??è?²ã??">
-<!ENTITY aboutTor.learnMore.label "äº?解æ?´å¤?æ??å?³ The Tor Project ç??ä¿¡æ?¯ »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/zh-CN/browserOnboarding.properties b/src/chrome/locale/zh-CN/browserOnboarding.properties
new file mode 100644
index 00000000..aa157e16
--- /dev/null
+++ b/src/chrome/locale/zh-CN/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=欢�
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=é??ç§?
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=Explore
+
+onboarding.tour-tor-security=å®?å?¨
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=æ´?è?±æ??å?¡
+onboarding.tour-tor-onion-services.title=æ´?è?±æ??å?¡
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/zh-TW/aboutTor.dtd b/src/chrome/locale/zh-TW/aboutTor.dtd
index 7c5d11cf..e5b4e099 100644
--- a/src/chrome/locale/zh-TW/aboutTor.dtd
+++ b/src/chrome/locale/zh-TW/aboutTor.dtd
@@ -1,45 +1,25 @@
 <!--
-   - Copyright (c) 2015, The Tor Project, Inc.
+   - Copyright (c) 2018, The Tor Project, Inc.
    - See LICENSE for licensing information.
    - vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
 <!ENTITY aboutTor.title "é??æ?¼æ´?è?¥è·¯ç?±">
 
-<!ENTITY aboutTor.outOfDateTorOn.label "è­¦å??ï¼?æ­¤ç??覽å?¨ç??ç??æ?¬å·²ç¶?é??æ??ã??">
-<!ENTITY aboutTor.outOfDateTorOff.label "並ä¸?ï¼?æ­¤ç??覽å?¨å·²é??æ??ã??">
-<!ENTITY aboutTor.outOfDate2.label "é»?æ??æ´?è?¥æ??é??ç?¶å¾?é?¸æ??檢æ?¥æ´?è?¥è·¯ç?±ç??覽å?¨æ?´æ?°">
-
-<!ENTITY aboutTor.check.label "測試��路�網路設�">
-
-<!ENTITY aboutTor.success.label "æ­¡è¿?使ç?¨æ´?è?¥è·¯ç?±ç??覽å?¨">
-<!ENTITY aboutTor.success2.label "已������路�網路">
-<!ENTITY aboutTor.success3.label "æ?¨ç?¾å?¨å?¯ä»¥è?ªç?±è?ªå?¨å?°ä»¥å?¿å??ç??æ??ç??覽網é??網路ã??">
+<!ENTITY aboutTor.ready.label "Explore. Privately.">
+<!ENTITY aboutTor.ready2.label "Youâ??re ready for the worldâ??s most private browsing experience.">
 <!ENTITY aboutTor.failure.label "ç?¼ç??é?¯èª¤ï¼?">
 <!ENTITY aboutTor.failure2.label "æ´?è?¥è·¯ç?±ç?¡æ³?å?¨æ­¤ç??覽å?¨ä¸­é??ä½?ã??">
 
-<!ENTITY aboutTor.search.label "æ??å°?">
+<!ENTITY aboutTor.search.label "Search with DuckDuckGo">
 <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com";>
 
-<!ENTITY aboutTor.torInfo1.label "�����">
-<!ENTITY aboutTor.torInfo2.label "å??家å?? IP ä½?å??ï¼?">
-<!ENTITY aboutTor.torInfo3.label "�����">
-<!ENTITY aboutTor.torInfo4.label "此伺æ??å?¨ä¸?æ??è¨?é??ä»»ä½?æ??é??訪客ç??è³?è¨?ã??">
-<!ENTITY aboutTor.whatnextQuestion.label "��步�">
-<!ENTITY aboutTor.whatnextAnswer.label "æ´?è?¥è·¯ç?±ä¸?æ?¯ç¢ºä¿?æ?¨å?¯ä»¥å?¿å??ç??覽ç??è?¬é??丹ï¼?æ?¨ä»?é??è¦?æ?¹è®?ä¸?äº?å??人ç??ä¸?網ç??覽ç¿?æ?£ï¼?以確ä¿?æ?¨å??人身份ç??å®?å?¨ã??">
-<!ENTITY aboutTor.whatnext.label "ä¿?æ??å?¿å??ç??ç§?訣 »">
-<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning";>
+<!ENTITY aboutTor.torbrowser_user_manual_questions.label "æ??ä»?麼å??é¡?ï¼?">
+<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »">
+<!-- The next two entities are used within the browser's Help menu. -->
 <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M">
-<!ENTITY aboutTor.torbrowser_user_manual.label "æ´?è?¥è·¯ç?±ç??覽å?¨ä¹?使ç?¨è??æ??å??">
-<!ENTITY aboutTor.helpInfo1.label "��以幫��">
-<!ENTITY aboutTor.helpInfo2.label "æ?¨å?¯ä»¥é??é??å¾?å¤?æ?¹æ³?幫å?©è®?æ´?è?¥è·¯ç?±ç¶²è·¯æ?´å¿«é??ä¸?æ?´å¼·å¤§ï¼?">
-<!ENTITY aboutTor.helpInfo3.label "æ?¶è¨­ç??é??ä¸?å??æ´?è?¥è·¯ç?±ç??中繼ç¯?é»? »">
-<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en";>
-<!ENTITY aboutTor.helpInfo4.label "è²¢ç?»æ?¨ç??æ??å?? »">
-<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
-<!ENTITY aboutTor.helpInfo5.label "æ??è´? »">
-<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en";>
+<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual">
 
-<!ENTITY aboutTor.footer.label "Tor Project æ?¯ä¸?å??ç¾?å?? 501(c)(3) é??ç??å?©çµ?ç¹?ï¼?è?´å??æ?¼ç·?ä¸?å?¿å??è??é?±ç§?ç??ç ?究ã??é??ç?¼å??æ??è?²ã??">
-<!ENTITY aboutTor.learnMore.label "äº?解æ?´å¤? Tor Project ç?¸é??è³?è¨? »">
-<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en";>
+<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.">
+<!ENTITY aboutTor.getInvolved.label "Get Involved »">
+<!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en";>
diff --git a/src/chrome/locale/zh-TW/browserOnboarding.properties b/src/chrome/locale/zh-TW/browserOnboarding.properties
new file mode 100644
index 00000000..ca84f692
--- /dev/null
+++ b/src/chrome/locale/zh-TW/browserOnboarding.properties
@@ -0,0 +1,38 @@
+# Copyright (c) 2018, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=æ­¡è¿?
+onboarding.tour-tor-welcome.title=Youâ??re ready.
+onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding.
+onboarding.tour-tor-welcome.button=Start Now
+
+onboarding.tour-tor-privacy=��
+onboarding.tour-tor-privacy.title=Snub trackers and snoopers.
+onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers canâ??t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click â??Tor Networkâ?? to learn how we protect you on the network level.
+onboarding.tour-tor-privacy.button=Go to Tor Network
+
+onboarding.tour-tor-network=Tor Network
+onboarding.tour-tor-network.title=Travel a decentralized network.
+onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, thereâ??s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on â??Circuit Displayâ?? to learn how they work.
+onboarding.tour-tor-network.button=Go to Circuit Display
+
+onboarding.tour-tor-circuit-display=Circuit Display
+onboarding.tour-tor-circuit-display.title=See your path.
+onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking â??New Circuit for this Siteâ?? on our Circuit Display. Click below to see how it works.
+onboarding.tour-tor-circuit-display.button=�索
+
+onboarding.tour-tor-security=å®?å?¨
+onboarding.tour-tor-security.title=Choose your experience.
+onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do.
+onboarding.tour-tor-security.button=Review Settings
+
+onboarding.tour-tor-expect-differences=Experience Tips
+onboarding.tour-tor-expect-differences.title=Experience Tips
+onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users.
+onboarding.tour-tor-expect-differences.button=See FAQs
+
+onboarding.tour-tor-onion-services=æ´?è?¥æ??å??
+onboarding.tour-tor-onion-services.title=æ´?è?¥æ??å??
+onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work.
+onboarding.tour-tor-onion-services.button=Visit an Onion
diff --git a/src/chrome/locale/zh-TW/torbutton.dtd b/src/chrome/locale/zh-TW/torbutton.dtd
index 3cb32b19..0ddbd823 100644
--- a/src/chrome/locale/zh-TW/torbutton.dtd
+++ b/src/chrome/locale/zh-TW/torbutton.dtd
@@ -47,5 +47,5 @@
 <!ENTITY torbutton.prefs.sec_limit_typography "æ??äº?å­?å½¢è??æ?¸å­¸ç¬¦è??被å??ç?¨">
 <!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "æ??äº?å­?å??,å??æ¨?,æ?¸å­¸ç¬¦è??è??å??ç??被å??ç?¨">
 <!ENTITY torbutton.prefs.sec_click_to_play_media "è?²é?³å??å½±ç?? (HTML5 åª?é«?) è¦?é»?æ??æ?­æ?¾">
-<!ENTITY torbutton.circuit_display.title "Tor Circuit">
-<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site">
+<!ENTITY torbutton.circuit_display.title "Tor è¿´è·¯">
+<!ENTITY torbutton.circuit_display.new_circuit "建ç«?æ?°ç??è¿´è·¯ä¾?é?£æ?¥ä¸?此網ç«?">
diff --git a/src/chrome/locale/zh-TW/torbutton.properties b/src/chrome/locale/zh-TW/torbutton.properties
index 864d7fee..bc31f27e 100644
--- a/src/chrome/locale/zh-TW/torbutton.properties
+++ b/src/chrome/locale/zh-TW/torbutton.properties
@@ -6,7 +6,7 @@ torbutton.circuit_display.relay = 中繼
 torbutton.circuit_display.tor_bridge = ���
 torbutton.circuit_display.unknown_country = æ?ªç?¥ç??å??家
 torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard_note = ä½ ç??[Guard]ç¯?é»?å?¯è?½ä¸?æ??æ?´æ?¹ã??
 torbutton.circuit_display.learn_more = 繼���
 torbutton.content_sizer.margin_tooltip = æ´?è?¥è·¯ç?±ç??覽å?¨ç?¹æ??å°?è¦?çª?é??æ¡?ç??寬度å??é«?度é??æ?°è¨­ç½®ï¼?以便è®?æ?¨ç??ç??覽å?¨ç??æ??è³?è¨?ç??èµ·ä¾?æ?´ç?ºæ?®é??ï¼?å¦?æ­¤å?¯ä»¥æ¸?å°?æ?¨ç??網路活å??被è­?å?¥ä¸¦è¿½è¹¤ç??å?¯è?½æ?§ã??
 torbutton.panel.tooltip.disabled = æ??ä¸?ä¸?以å??ç?¨æ´?è?¥è·¯ç?±
@@ -54,5 +54,5 @@ profileAccessDenied=%S æ²?æ??足夠ç??å­?å??æ¬?é??ï¼?è«?é??æ?°èª¿æ?´æ?¨ç??æª?æ¡?
 profileMigrationFailed=ç?¡æ³?è½?移è?³æ?¨ç?¾å­?ç??%Sè³?æ??夾ã??\nå°?使ç?¨æ?°è¨­å®?ã??
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=é?£æ?¥å? å¯?(æ´?è?¥æ??å??, %1$S, %2$S bit keys, %3$S)
+pageInfo_OnionEncryption=é?£æ?¥å? å¯?ï¼?æ´?è?¥æ??å??ï¼?



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