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

[tor-commits] [user-manual/master] Preparing for translation

To: tor-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [user-manual/master] Preparing for translation
From: colin@xxxxxxxxxxxxxx
Date: Tue, 6 Dec 2016 22:45:04 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Tue, 06 Dec 2016 17:45:47 -0500
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Colin C <phoul@epsilon>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit f7b814eee45fd2546e67b4c4769dfc408c050f27
Author: Colin C <phoul@epsilon>
Date:   Tue Dec 6 16:44:20 2016 -0600

    Preparing for translation
---
 ar/ar.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 de/de.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 en-US/en-US.po | 902 +++++++++++++++++++++++++++++++++++++++++++------------
 es-ES/es-ES.po | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 fa/fa.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 fr/fr.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 it/it.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 ko/ko.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 nl/nl.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 pl/pl.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 pt-PT/pt-PT.po | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 tr/tr.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 vi/vi.po       | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 zh-CN/zh-CN.po | 933 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 14 files changed, 10659 insertions(+), 2372 deletions(-)

diff --git a/ar/ar.po b/ar/ar.po
index 03e9cad..afb4d28 100644
--- a/ar/ar.po
+++ b/ar/ar.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/de/de.po b/de/de.po
index 03e9cad..afb4d28 100644
--- a/de/de.po
+++ b/de/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/en-US/en-US.po b/en-US/en-US.po
index 12ef3eb..afb4d28 100644
--- a/en-US/en-US.po
+++ b/en-US/en-US.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-27 18:03+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,438 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:143(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:11(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:13(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:19(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:26(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:31(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:41(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:46(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:54(td/p)
-msgid "obfs3"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:59(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:67(td/p)
-msgid "Scramblesuit"
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:72(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:81(td/p)
-msgid "FTE"
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
+msgstr ""
+
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
 msgstr ""
 
-#: C/bridges.page:86(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:28
+msgid "Getting bridge addresses"
 msgstr ""
 
-#: C/bridges.page:95(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
 msgstr ""
 
-#: C/bridges.page:99(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:105(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:110(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:117(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:123(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:132(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+msgstr ""
+
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
+msgstr ""
+
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:137(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:10
+msgid "Circumvention"
+msgstr ""
+
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:145(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:20(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
+msgstr ""
+
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:27(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
+msgstr ""
+
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
+msgstr ""
+
+#: circumvention.page:60
+msgid "Which transport should I use?"
+msgstr ""
+
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
+msgstr ""
+
+#: downloading.page:10
+msgid "Downloading"
+msgstr ""
+
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
+msgstr ""
+
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
+msgstr ""
+
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:35(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/circumvention.page:7(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/circumvention.page:11(page/title)
-msgid "Circumvention"
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/circumvention.page:13(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/circumvention.page:22(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/circumvention.page:29(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/circumvention.page:37(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser User Manual"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#. <span/> will be replaced by current Tor Browser version
-#: C/index.page:7(page/p)
-msgid "Version: <_:span-1/>"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:11(page/title)
+#: known-issues.page:10
 msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:15(item/p)
+#: known-issues.page:14
 msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:24(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:27(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:30(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:33(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:38(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:45(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:50(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:56(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:62(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:65(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
 msgstr ""
 
-#: C/known-issues.page:70(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/tor.page:120(media)
+#: managing-identities.page:46
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
 msgstr ""
 
-#: C/tor.page:9(info/desc)
-msgid "Learn what Tor can do to protect your privacy and anonymity."
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
 msgstr ""
 
-#: C/tor.page:12(page/title)
-msgid "Tor"
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
 msgstr ""
 
-#: C/tor.page:15(section/title)
-msgid "What Tor will do"
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
 msgstr ""
 
-#: C/tor.page:17(section/p)
-msgid "The <_:app-1/> uses the <_:app-2/> network to protect your privacy and anonymity. Using the <_:app-3/> network has two main properties:"
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
-#: C/tor.page:26(item/p)
-msgid "The Internet access provider will not be able to learn the sites being visited and will not be able to monitor the content of the communication."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:103
+msgctxt "_"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
 msgstr ""
 
-#: C/tor.page:33(item/p)
-msgid "The sites will see a connection coming from the <_:app-1/> network and will not learn the actual Internet connection used to visit them."
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/tor.page:41(section/p)
-msgid "On top of that, the <_:app-1/> is designed to minimize the ability of websites to fingerprint the browser."
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/tor.page:45(section/p)
-msgid "The Tor Browser does not keep any browsing history. <em>Cookies</em> are only valid for a single session: until the <_:app-1/> is exited or a <gui>New Identity</gui> is requested."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/tor.page:57(section/title)
-msgid "What Tor will <em>not</em> do"
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
 msgstr ""
 
-#: C/tor.page:59(section/p)
-msgid "<_:app-1/> and the <_:app-2/> will protect your privacy and anonymity only if used appropriately."
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
 msgstr ""
 
-#: C/tor.page:67(item/p)
-msgid "<_:app-1/> will not encrypt the whole communication. What is sent to the <_:app-2/> network is what leaves the <_:app-3/> network. For web browsing, this means that any confidential information should be sent using the HTTPS protocol."
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
 msgstr ""
 
-#: C/tor.page:79(item/p)
-msgid "If you give a website identifying information (e.g. a name, a <em>login</em>), you will no longer be an anonymous visitor of this website."
+#: onionsites.page:10
+msgid "Onion Services"
 msgstr ""
 
-#: C/tor.page:86(item/p)
-msgid "If you transfer files, they can contain identifying information in their metadata, like the camera serial number."
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
 msgstr ""
 
-#: C/tor.page:92(item/p)
-msgid "Only connections made through the <_:app-1/> will go through the <_:app-2/> network. Unless specific steps are taken, other applications on your computer will continue to do direct Internet connections and can reveal your location."
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
 msgstr ""
 
-#: C/tor.page:104(section/p)
-msgid "If loosing control over some information might have problematic consequences, it is sometimes better to leave it off computers entirely."
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
 msgstr ""
 
-#: C/tor.page:111(section/title)
-msgid "How Tor works"
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
 msgstr ""
 
-#: C/tor.page:113(section/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
 msgstr ""
 
-#: C/tor.page:121(section/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: onionsites.page:58
+#: troubleshooting.page:10
+msgid "Troubleshooting"
+msgstr ""
+
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
 msgstr ""
 
-#: C/tor.page:130(section/title)
-msgid "Tor and HTTPS"
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
 msgstr ""
 
-#: C/tor.page:132(section/p)
-msgid "The following visualization helps understanding what data are visible to eavesdroppers with or without the <_:app-1/> and when encrypted connections (HTTPS) or not:"
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/tor.page:142(item/p)
-msgid "Click the <gui>Tor</gui> button to see what data is visible to eavesdroppers when you're using Tor. The button will turn green to indicate that Tor is on."
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/tor.page:149(item/p)
-msgid "Click the <gui>HTTPS</gui> button to see what data is visible to eavesdroppers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/tor.page:156(item/p)
-msgid "When both buttons are green, you see the data that is visible to eavesdroppers when you are using both tools."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/tor.page:162(item/p)
-msgid "When both buttons are grey, you see the data that is visible to eavesdroppers when you don't use either tool."
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
 msgstr ""
 
-#: C/tor.page:169(terms/title)
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
 msgid "Potentially visible data"
 msgstr ""
 
-#: C/tor.page:177(item/p)
+#: secure-connections.page:70
 msgid "The site being visited."
 msgstr ""
 
-#: C/tor.page:188(item/p)
+#: secure-connections.page:81
 msgid "Username and password used for authentication."
 msgstr ""
 
-#: C/tor.page:199(item/p)
-msgid "Data being transmited."
+#: secure-connections.page:92
+msgid "Data being transmitted."
 msgstr ""
 
-#: C/tor.page:210(item/p)
+#: secure-connections.page:103
 msgid "Network location of the computer used to visit the website (the public IP address)."
 msgstr ""
 
-#: C/tor.page:222(item/p)
+#: secure-connections.page:115
 msgid "Whether or not Tor is being used."
 msgstr ""
 
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:18(media)
+#: security-slider.page:23
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
 msgstr ""
 
-#: C/troubleshooting.page:7(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
 msgstr ""
 
-#: C/troubleshooting.page:11(page/title)
-msgid "Troubleshooting"
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
 msgstr ""
 
-#: C/troubleshooting.page:13(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: transports.page:10
+msgid "Pluggable Transports"
 msgstr ""
 
-#: C/troubleshooting.page:20(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
 msgstr ""
 
-#: C/troubleshooting.page:26(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
 msgstr ""
 
-#: C/troubleshooting.page:30(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: transports.page:42
+msgid "obfs4"
 msgstr ""
 
-#: C/troubleshooting.page:33(item/p)
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:36(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
 msgstr ""
 
-#: C/troubleshooting.page:41(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:47(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:11(page/title)
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
+msgstr ""
+
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
+msgstr ""
+
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:13(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:19(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:25(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:28(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:31(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:35(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/es-ES/es-ES.po b/es-ES/es-ES.po
index 03e9cad..afb4d28 100644
--- a/es-ES/es-ES.po
+++ b/es-ES/es-ES.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/fa/fa.po b/fa/fa.po
index 03e9cad..afb4d28 100644
--- a/fa/fa.po
+++ b/fa/fa.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/fr/fr.po b/fr/fr.po
index 03e9cad..afb4d28 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/it/it.po b/it/it.po
index 03e9cad..afb4d28 100644
--- a/it/it.po
+++ b/it/it.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/ko/ko.po b/ko/ko.po
index 03e9cad..afb4d28 100644
--- a/ko/ko.po
+++ b/ko/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/nl/nl.po b/nl/nl.po
index 03e9cad..afb4d28 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/pl/pl.po b/pl/pl.po
index 03e9cad..afb4d28 100644
--- a/pl/pl.po
+++ b/pl/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/pt-PT/pt-PT.po b/pt-PT/pt-PT.po
index 03e9cad..afb4d28 100644
--- a/pt-PT/pt-PT.po
+++ b/pt-PT/pt-PT.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/tr/tr.po b/tr/tr.po
index 03e9cad..afb4d28 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/vi/vi.po b/vi/vi.po
index 03e9cad..afb4d28 100644
--- a/vi/vi.po
+++ b/vi/vi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""
 
diff --git a/zh-CN/zh-CN.po b/zh-CN/zh-CN.po
index 03e9cad..afb4d28 100644
--- a/zh-CN/zh-CN.po
+++ b/zh-CN/zh-CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-05-15 11:21+0200\n"
+"POT-Creation-Date: 2016-12-06 16:36-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -14,367 +14,964 @@ msgctxt "_"
 msgid "translator-credits"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/bridges.page:144(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
+#: about-tor-browser.page:7
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
 msgstr ""
 
-#: C/bridges.page:7(info/desc)
-msgid "What bridges are and how to use them."
+#: about-tor-browser.page:10
+msgid "About Tor Browser"
 msgstr ""
 
-#: C/bridges.page:8(info/title)
-msgctxt "sort"
-msgid "05 Bridges"
+#: about-tor-browser.page:12
+msgid "Tor Browser uses the Tor network to protect your privacy and anonymity. Using the Tor network has two main properties:"
 msgstr ""
 
-#: C/bridges.page:12(page/title)
-msgid "Bridges"
+#: about-tor-browser.page:18
+msgid "Your internet service provider, and anyone watching your connection locally, will not be able to track your internet activity, including the names and addresses of the websites you visit."
 msgstr ""
 
-#: C/bridges.page:14(page/p)
-msgid "Bridges are quiet gateways into the Tor Network. Like Tor relays, they are run by volunteers. Unlike relays, they are not listed publicly. Using bridges disguise the fact that one is using Tor."
+#: about-tor-browser.page:25
+msgid "The operators of the websites and services that you use, and anyone watching them, will see a connection coming from the Tor network instead of your real Internet (IP) address, and will not know who you are unless you explicitly identify yourself."
 msgstr ""
 
-#: C/bridges.page:20(page/p)
-msgid "Currently there are five bridge types, or transports, available. More are being developed."
+#: about-tor-browser.page:34
+msgid "In addition, Tor Browser is designed to prevent websites from â??fingerprintingâ?? or identifying you based on your browser configuration."
 msgstr ""
 
-#: C/bridges.page:27(td/p)
-msgid "ORPort"
+#: about-tor-browser.page:39
+msgid "By default, Tor Browser does not keep any browsing history. Cookies are only valid for a single session (until Tor Browser is exited or a <link xref=\"managing-identities#new-identity\">New Identity</link> is requested)."
 msgstr ""
 
-#: C/bridges.page:32(td/p)
-msgid "Requesting 'bridges' without specifying the bridge type, will return ORPort bridges, also called Vanilla bridges. ORPort bridges are NOT reliable for circumventing censorship or national firewalls. ORPort bridges can be useful as trusted entry points into the Tor network."
+#: about-tor-browser.page:50
+msgid "How Tor works"
 msgstr ""
 
-#: C/bridges.page:42(td/p)
-msgid "obfs2"
+#: about-tor-browser.page:52
+msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network. The last relay in the circuit (the â??exit relayâ??) then sends the traffic out onto the public Internet."
 msgstr ""
 
-#: C/bridges.page:47(td/p)
-msgid "Censors have learned how to identify obfs2 bridges. This transport is being deprecated."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: about-tor-browser.page:59
+msgctxt "_"
+msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
 msgstr ""
 
-#: C/bridges.page:55(td/p)
-msgid "obfs3"
+#: about-tor-browser.page:60
+msgid "The image above illustrates a user browsing to different websites over Tor. The green middle computers represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
 msgstr ""
 
-#: C/bridges.page:60(td/p)
-msgid "Obfsproxy disguises Tor traffic as random noise. obfs3 bridges work almost everywhere. A few obfs3 bridges have been blocked."
+#: bridges.page:6
+msgid "Learn what bridges are and how to get them"
 msgstr ""
 
-#: C/bridges.page:68(td/p)
-msgid "Scramblesuit"
+#: bridges.page:10
+msgid "Bridges"
 msgstr ""
 
-#: C/bridges.page:73(td/p)
-msgid "Scramblesuit is an additional tool for the obfsproxy transport. Scramblesuit bridges are designed to be hard to identify and hard to block."
+#: bridges.page:12
+msgid "Most <link xref=\"transports\">Pluggable Transports</link>, such as obfs3 and obfs4, rely on the use of â??bridgeâ?? relays. Like ordinary Tor relays, bridges are run by volunteers; unlike ordinary relays, however, they are not listed publicly, so an adversary cannot identify them easily. Using bridges in combination with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
 
-#: C/bridges.page:82(td/p)
-msgid "FTE"
+#: bridges.page:21
+msgid "Other pluggable transports, like meek, use different anti-censorship techniques that do not rely on bridges. You do not need to obtain bridge addresses in order to use these transports."
+msgstr ""
+
+#: bridges.page:28
+msgid "Getting bridge addresses"
+msgstr ""
+
+#: bridges.page:29
+msgid "Because bridge addresses are not public, you will need to request them yourself. You have two options:"
+msgstr ""
+
+#: bridges.page:36
+msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions, or"
 msgstr ""
 
-#: C/bridges.page:87(td/p)
-msgid "Format-Transforming Encryption disguises Tor traffic as web (HTTP) traffic or other types of internet traffic. FTE bridges are effective, but in limited supply."
+#: bridges.page:42
+msgid "Email bridges@xxxxxxxxxxxxxx from a Gmail, Yahoo, or Riseup email address, or"
 msgstr ""
 
-#: C/bridges.page:96(page/p)
-msgid "(Note that flashproxy is a Pluggable Transport, but does not rely on bridges.)"
+#: bridges.page:51
+msgid "Entering bridge addresses"
 msgstr ""
 
-#: C/bridges.page:100(page/p)
-msgid "There are four ways to get a bridge."
+#: bridges.page:52
+msgid "Once you have obtained some bridge addresses, you will need to enter them into Tor Launcher."
 msgstr ""
 
-#: C/bridges.page:106(item/p)
-msgid "Visit <link href=\"https://bridges.torproject.org/\";>https://bridges.torproject.org/</link> and follow the instructions."
+#: bridges.page:57
+msgid "Choose â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network. Select â??Use custom bridgesâ?? and enter each bridge address on a separate line."
 msgstr ""
 
-#: C/bridges.page:111(item/p)
-msgid "Email bridges@xxxxxxxxxxxxxxxxxxxxxx from a gmail or yahoo email address. Put <cmd>get bridges</cmd> in the body for ORPort bridges or <cmd>transport=obfs3</cmd> for obfs3 bridges."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: bridges.page:63
+msgctxt "_"
+msgid "external ref='media/tor-launcher-custom-bridges_en-US.png' md5='93365c2aa3fb4d627497e83f28a39b7e'"
 msgstr ""
 
-#: C/bridges.page:118(item/p)
-msgid "Politely ask a human at help@xxxxxxxxxxxxxxxxx if you cannot access either of the first two methods."
+#: bridges.page:65
+msgid "Click â??Connectâ??. Using bridges may slow down the connection compared to using ordinary Tor relays. If the connection fails, the bridges you received may be down. Please use one of the above methods to obtain more bridge addresses, and try again."
 msgstr ""
 
-#: C/bridges.page:124(item/p)
-msgid "Install and configure a Tor instance to be bridge for yourself. The computer acting as a bridge must have uncensored internet access to the Tor network. A full installation guide can be found at <link href=\"https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en\";>https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en</link>"
+#: circumvention.page:6
+msgid "What to do if the Tor network is blocked"
 msgstr ""
 
-#: C/bridges.page:133(page/p)
-msgid "Enter the bridge information you get from any of the above steps in Tor-launcher."
+#: circumvention.page:10
+msgid "Circumvention"
 msgstr ""
 
-#: C/bridges.page:138(page/p)
-msgid "Choose yes when asked if your Internet Service Provider blocks connections to the Tor network. Select 'Use custom bridges' and enter each bridge identifier on its own line."
+#: circumvention.page:12
+msgid "Direct access to the Tor network may sometimes be blocked by your Internet Service Provider or by a government. Tor Browser includes some circumvention tools for getting around these blocks. These tools are called â??pluggable transportsâ??. See the <link xref=\"transports\">Pluggable Transports</link> page for more information on the types of transport that are currently available."
 msgstr ""
 
-#: C/bridges.page:146(page/p)
-msgid "Click Connect. Using bridges slow down the connection. If the connection fails, the bridges you received may be down. Get more and try again."
+#: circumvention.page:22
+msgid "Using pluggable transports"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:21(media)
+#: circumvention.page:26
+#: first-time.page:35
 msgctxt "_"
-msgid "external ref='media/tor-launcher-configure_en-US.png' md5='966f4bafcb829e59b2b84d08144d885e'"
+msgid "external ref='media/circumvention/configure.png' md5='519d888303eadfe4cb03f178aedd90f5'"
 msgstr ""
 
-#. This is a reference to an external file such as an image or video. When
-#. the file changes, the md5 hash will change to let you know you need to
-#. update your localized copy. The msgstr is not used at all. Set it to
-#. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:28(media)
-msgctxt "_"
-msgid "external ref='media/tor-launcher-wizard_en-US.png' md5='21f80fc3f4e34359bfdc44684d7da09d'"
+#: circumvention.page:28
+msgid "To use pluggable transports, click \"Configure\" in the Tor Launcher window that appears when you first run Tor Browser."
+msgstr ""
+
+#: circumvention.page:33
+msgid "You can also configure pluggable transports while Tor Browser is running, by clicking on the green onion near your address bar and selecting â??Tor Network Settingsâ??."
+msgstr ""
+
+#: circumvention.page:41
+msgid "Select â??yesâ?? when asked if your Internet Service Provider blocks connections to the Tor network."
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/circumvention.page:36(media)
+#: circumvention.page:49
 msgctxt "_"
-msgid "external ref='media/tor-launcher-provided-bridges_en-US.png' md5='70524dccb698a21bb1d20223461e3272'"
+msgid "external ref='media/circumvention/bridges.png' md5='910cdd5e45860b81a1ad4739c589a195'"
 msgstr ""
 
-#: C/circumvention.page:7(info/title)
-msgctxt "sort"
-msgid "04 Circumvention"
+#: circumvention.page:51
+msgid "Select â??Connect with provided bridgesâ??. Tor Browser currently has six pluggable transport options to choose from."
 msgstr ""
 
-#: C/circumvention.page:8(info/desc)
-msgid "What to do if the Tor network is blocked."
+#: circumvention.page:60
+msgid "Which transport should I use?"
 msgstr ""
 
-#: C/circumvention.page:12(page/title)
-msgid "Circumvention"
+#: circumvention.page:61
+msgid "Each of the transports listed in Tor Launcherâ??s menu works in a different way (for more details, see the <link xref=\"transports\">Pluggable Transports</link> page), and their effectiveness depends on your individual circumstances."
+msgstr ""
+
+#: circumvention.page:67
+msgid "If you are trying to circumvent a blocked connection for the first time, you should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-azure, meek-amazon."
+msgstr ""
+
+#: circumvention.page:72
+msgid "If you try all of these options, and none of them gets you online, you will need to enter bridge addresses manually. Read the <link xref=\"bridges\">Bridges</link> section to learn what bridges are and how to obtain them."
+msgstr ""
+
+#: downloading.page:7
+msgid "How to download Tor Browser"
 msgstr ""
 
-#: C/circumvention.page:14(page/p)
-msgid "Some firewalls can detect and block connections to Tor. The Tor Browser includes some circumvention tools for getting around blocking firewalls. These circumvention tools are called Pluggable Transports. To turn them on, click \"Configure\" in the Tor launcher window."
+#: downloading.page:10
+msgid "Downloading"
 msgstr ""
 
-#: C/circumvention.page:23(page/p)
-msgid "Select yes when asked if your internet service provider blocks connections to Tor.\""
+#: downloading.page:12
+msgid "The safest and simplest way to download Tor Browser is from the official Tor Project website at https://www.torproject.org. Your connection to the site will be secured using <link xref=\"secure-connections\">HTTPS</link>, which makes it much harder for somebody to tamper with."
 msgstr ""
 
-#: C/circumvention.page:30(page/p)
-msgid "Select \"Connect with provided bridges\". Tor Browser has three Pluggable Transports to choose from. If one fails to get you online, try selecting a different transport."
+#: downloading.page:19
+msgid "However, there may be times when you cannot access the Tor Project website: for example, it could be blocked on your network. If this happens, you can use one of the alternative download methods listed below."
 msgstr ""
 
-#: C/circumvention.page:38(page/p)
-msgid "If you try all three transports, and none of them get you online, select \"Enter custom bridges\", and enter bridges manually. Read the <link xref=\"bridges\">Getting Bridges</link> section for instructions on getting custom bridges."
+#: downloading.page:27
+msgid "GetTor"
+msgstr ""
+
+#: downloading.page:28
+msgid "GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations, such as Dropbox, Google Drive and Github.."
+msgstr ""
+
+#: downloading.page:34
+msgid "To use GetTor via email:"
+msgstr ""
+
+#: downloading.page:39
+msgid "Send an email to gettor@xxxxxxxxxxxxxx, and in the body of the message simply write â??windowsâ??, â??osxâ??, or â??linuxâ??, (without quotation marks) depending on your operating system."
+msgstr ""
+
+#: downloading.page:46
+msgid "GetTor will respond with an email containing links from which you can download the Tor Browser package, the cryptographic signature (needed for verifying the download), the fingerprint of the key used to make the signature, and the packageâ??s checksum. You may be offered a choice of â??32-bitâ?? or â??64-bitâ?? software: this depends on the model of the computer you are using."
+msgstr ""
+
+#: downloading.page:57
+msgid "To use GetTor via Twitter:"
+msgstr ""
+
+#: downloading.page:62
+msgid "To get links for downloading Tor Browser in English for OS X, send a Direct Message to @get_tor with the words \"osx en\" in it (you don't need to follow the account)."
+msgstr ""
+
+#: downloading.page:70
+msgid "To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):"
+msgstr ""
+
+#: downloading.page:75
+msgid "To get links for downloading Tor Browser in Chinese for Linux, send a message to gettor@xxxxxxxxxxxxxx with the words \"linux zh\" in it."
+msgstr ""
+
+#: downloading.page:84
+msgid "Satori"
+msgstr ""
+
+#: downloading.page:85
+msgid "Satori is an add-on for the Chrome or Chromium browsers that allows you to download several security and privacy programs from different sources."
+msgstr ""
+
+#: downloading.page:90
+msgid "To download Tor Browser using Satori:"
+msgstr ""
+
+#: downloading.page:95
+msgid "Install Satori from the Chrome App Store."
+msgstr ""
+
+#: downloading.page:100
+msgid "Select Satori from your browserâ??s Apps menu."
+msgstr ""
+
+#: downloading.page:105
+msgid "When Satori opens, click on your preferred language. A menu will open listing the available downloads for that language. Find the entry for Tor Browser under the name of your operating system. Select either â??Aâ?? or â??Bâ?? after the name of the program â?? each one represents a different source from which to get the software. Your download will then begin."
+msgstr ""
+
+#: downloading.page:115
+msgid "Wait for your download to finish, then find the â??Generate Hashâ?? section in Satoriâ??s menu and click â??Select Filesâ??."
+msgstr ""
+
+#: downloading.page:121
+msgid "Select the downloaded Tor Browser file. Satori will display the checksum of the file, which you should compare with the softwareâ??s original checksum: you can find this by clicking the word â??checksumâ?? after the link you clicked on to start the download. If the checksums match, your download was successful, and you can <link xref=\"first-time\">begin using Tor Browser</link>. If they do not match, you may need to try downloading again, or from a different source."
+msgstr ""
+
+#: first-time.page:7
+msgid "Learn how to use Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:10
+msgid "Running Tor Browser for the first time"
+msgstr ""
+
+#: first-time.page:12
+msgid "When you run Tor Browser for the first time, you will see the Tor Network Settings window. This offers you the option to connect directly to the Tor network, or to configure Tor Browser for your connection."
+msgstr ""
+
+#: first-time.page:19
+msgid "Connect"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/how-tor-works.page:19(media)
+#: first-time.page:21
+#: troubleshooting.page:18
 msgctxt "_"
-msgid "external ref='media/how-tor-works.png' md5='6fe4151a88b7a518466f0582e40ccc8c'"
+msgid "external ref='media/first-time/connect.png' md5='9d07068f751a3bfd274365a4ba8d90ca'"
 msgstr ""
 
-#: C/how-tor-works.page:6(info/title)
-msgctxt "sort"
-msgid "01 Tor"
+#: first-time.page:23
+msgid "In most cases, choosing \"Connect\" will allow you to connect to the Tor network without any further configuration. Once clicked, a status bar will appear, showing Torâ??s connection progress. If you are on a relatively fast connection, but this bar seems to get stuck at a certain point, see the <link xref=\"troubleshooting\">Troubleshooting</link> page for help solving the problem."
 msgstr ""
 
-#: C/how-tor-works.page:7(info/desc)
-msgid "How Tor works."
+#: first-time.page:33
+msgid "Configure"
 msgstr ""
 
-#: C/how-tor-works.page:11(page/title)
-msgid "Tor"
+#: first-time.page:37
+msgid "If you know that your connection is censored, or uses a proxy, you should select this option. Tor Browser will take you through a series of configuration options."
 msgstr ""
 
-#: C/how-tor-works.page:12(page/p)
-msgid "Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet"
+#: first-time.page:44
+msgid "The first screen asks if access to the Tor network is blocked or censored on your connection. If you do not believe this is the case, select â??Noâ??. If you know your connection is censored, or you have tried and failed to connect to the Tor network and no other solutions have worked, select â??Yesâ??. You will then be taken to the <link xref=\"circumvention\">Circumvention</link> screen to configure a pluggable transport."
 msgstr ""
 
-#: C/how-tor-works.page:20(page/p)
-msgid "The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each relay."
+#: first-time.page:55
+msgid "The next screen asks if your connection uses a proxy. In most cases, this is not necessary. You will usually know if you need to answer â??Yesâ??, as the same settings will be used for other browsers on your system. If possible, ask your network administrator for guidance. If your connection does not use a proxy, click â??Continueâ??."
 msgstr ""
 
-#: C/how-tor-works.page:26(page/p)
-msgid "Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination."
-msgstr ""
-
-#: C/how-tor-works.page:32(page/p)
-msgid "If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <input><em>https</em>://torproject.org/</input>, not <input><em>http</em>://torproject.org/</input>)."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:63
+msgctxt "_"
+msgid "external ref='media/first-time/proxy_question.png' md5='30853b3e86cfd386bbc32e5b8b45a378'"
 msgstr ""
 
-#: C/index.page:6(page/title)
-msgid "Tor Browser Help"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: first-time.page:66
+msgctxt "_"
+msgid "external ref='media/first-time/proxy.png' md5='13f21a351cd0aa1cf11aada690f3dc90'"
 msgstr ""
 
-#: C/index.page:7(page/p)
-msgid "Version: UNKNOWN-dirty"
+#: index.page:6
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: C/known-issues.page:7(info/desc)
+#: known-issues.page:6
 msgid "A list of known issues."
 msgstr ""
 
-#: C/known-issues.page:8(info/title)
-msgctxt "sort"
-msgid "03 Known Issues"
+#: known-issues.page:10
+msgid "Known Issues"
 msgstr ""
 
-#: C/known-issues.page:12(page/title)
-msgid "Known Issues"
+#: known-issues.page:14
+msgid "Tor needs your system clock (and your time zone) set to the correct time."
 msgstr ""
 
-#: C/known-issues.page:16(item/p)
+#: known-issues.page:19
 msgid "The following firewall software have been known to interfere with Tor and may need to be temporarily disabled:"
 msgstr ""
 
-#: C/known-issues.page:20(item/p)
+#: known-issues.page:23
 msgid "Webroot SecureAnywhere"
 msgstr ""
 
-#: C/known-issues.page:23(item/p)
+#: known-issues.page:26
 msgid "Kaspersky Internet Security 2012"
 msgstr ""
 
-#: C/known-issues.page:26(item/p)
+#: known-issues.page:29
 msgid "Sophos Antivirus for Mac"
 msgstr ""
 
-#: C/known-issues.page:29(item/p)
+#: known-issues.page:32
 msgid "Microsoft Security Essentials"
 msgstr ""
 
-#: C/known-issues.page:34(item/p)
-msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons. Most YouTube videos can be played with HTML5 by visiting the video's \"Embed\" â?? \"Share\" link."
+#: known-issues.page:37
+msgid "Videos that require Adobe Flash are unavailable. Flash is disabled for security reasons."
 msgstr ""
 
-#: C/known-issues.page:41(item/p)
+#: known-issues.page:43
 msgid "Tor can not use a bridge if a proxy is set."
 msgstr ""
 
-#: C/known-issues.page:46(item/p)
+#: known-issues.page:48
 msgid "The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to ensure that each software build is exactly reproducible."
 msgstr ""
 
-#: C/known-issues.page:52(item/p)
-msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then OK. Tor Browser can also be started from the command line by running"
+#: known-issues.page:54
+msgid "To run Tor Browser on Ubuntu, users need to execute a shell script. Open \"Files\" (Unity's explorer), open Preferences â?? Behavior Tab â?? Set \"Run executable text files when they are opened\" to \"Ask every time\", then click OK."
 msgstr ""
 
-#: C/known-issues.page:58(item/code)
+#: known-issues.page:62
+msgid "Tor Browser can also be started from the command line by running the following command from inside the Tor Browser directory:"
+msgstr ""
+
+#: known-issues.page:66
 #, no-wrap
 msgid ""
 "\n"
-"    ./start-tor-browser\n"
+"    ./start-tor-browser.desktop\n"
 "    "
 msgstr ""
 
-#: C/known-issues.page:61(item/p)
-msgid "from inside the Tor Browser directory."
+#: managing-identities.page:6
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+
+#: managing-identities.page:10
+msgid "Managing identities"
+msgstr ""
+
+#: managing-identities.page:12
+msgid "When you connect to a website, it is not only the operators of that website who can record information about your visit. Most websites now use numerous third-party services, including social networking â??Likeâ?? buttons, analytics trackers, and advertising beacons, all of which can link your activity across different sites."
+msgstr ""
+
+#: managing-identities.page:20
+msgid "Using the Tor network stops observers from being able to discover your exact location and IP address, but even without this information they might be able to link different areas of your activity together. For this reason, Tor Browser includes some additional features that help you control what information can be tied to your identity."
+msgstr ""
+
+#: managing-identities.page:29
+msgid "The URL bar"
+msgstr ""
+
+#: managing-identities.page:30
+msgid "Tor Browser centers your web experience around your relationship with the website in the URL bar. Even if you connect to two different sites that use the same third-party tracking service, Tor Browser will force the content to be served over two different Tor circuits, so the tracker will not know that both connections originate from your browser."
+msgstr ""
+
+#: managing-identities.page:38
+msgid "On the other hand, all connections to a single website address will be made over the same Tor circuit, meaning you can browse different pages of a single website in separate tabs or windows, without any loss of functionality."
 msgstr ""
 
-#: C/known-issues.page:66(page/p)
-msgid "If you have an issue with Tor Browser that isn't on this list, feel free to email help@xxxxxxxxxxxxxxxxx."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: managing-identities.page:46
+msgctxt "_"
+msgid "external ref='media/managing-identities/circuit_full.png' md5='bd46d22de952fee42643be46d3f95928'"
+msgstr ""
+
+#: managing-identities.page:48
+msgid "You can see a diagram of the circuit that Tor Browser is using for the current tab in the onion menu."
+msgstr ""
+
+#: managing-identities.page:55
+msgid "Logging in over Tor"
+msgstr ""
+
+#: managing-identities.page:56
+msgid "Although Tor Browser is designed to enable total user anonymity on the web, there may be situations in which it makes sense to use Tor with websites that require usernames, passwords, or other identifying information."
+msgstr ""
+
+#: managing-identities.page:62
+msgid "If you log into a website using a regular browser, you also reveal your IP address and geographical location in the process. The same is often true when you send an email. Logging into your social networking or email accounts using Tor Browser allows you to choose exactly which information you reveal to the websites you browse. Logging in using Tor Browser is also useful if the website you are trying to reach is censored on your network."
+msgstr ""
+
+#: managing-identities.page:72
+msgid "When you log in to a website over Tor, there are several points you should bear in mind:"
+msgstr ""
+
+#: managing-identities.page:79
+msgid "See the <link xref=\"secure-connections\">Secure Connections</link> page for important information on how to secure your connection when logging in."
+msgstr ""
+
+#: managing-identities.page:87
+msgid "Tor Browser often makes your connection appear as though it is coming from an entirely different part of the world. Some websites, such as banks or email providers, might interpret this as a sign that your account has been hacked or compromised, and lock you out. The only way to resolve this is by following the siteâ??s recommended procedure for account recovery, or contacting the operators and explaining the situation."
+msgstr ""
+
+#: managing-identities.page:101
+msgid "Changing identities and circuits"
 msgstr ""
 
 #. This is a reference to an external file such as an image or video. When
 #. the file changes, the md5 hash will change to let you know you need to
 #. update your localized copy. The msgstr is not used at all. Set it to
 #. whatever you like once you have updated your copy of the file.
-#: C/troubleshooting.page:19(media)
+#: managing-identities.page:103
 msgctxt "_"
-msgid "external ref='media/tor-launcher-connect_en-US.png' md5='03118f523f4cbc7c001da1ddacc9e394'"
+msgid "external ref='media/managing-identities/new_identity.png' md5='15b01e35fa83185d94b57bf0ccf09d76'"
+msgstr ""
+
+#: managing-identities.page:105
+msgid "Tor Browser features â??New Identityâ?? and â??New Tor Circuit for this Siteâ?? options, located in the Torbutton menu."
 msgstr ""
 
-#: C/troubleshooting.page:7(info/title)
-msgctxt "sort"
-msgid "02 Troubleshooting"
+#: managing-identities.page:111
+msgid "New Identity"
 msgstr ""
 
-#: C/troubleshooting.page:8(info/desc)
-msgid "What to do if Tor Browser doesn't work."
+#: managing-identities.page:112
+msgid "This option is useful if you want to prevent your subsequent browser activity from being linkable to what you were doing before. Selecting it will close all your open tabs and windows, clear all private information such as cookies and browsing history, and use new Tor circuits for all connections. Tor Browser will warn you that all activity and downloads will be stopped, so take this into account before clicking â??New Identityâ??."
 msgstr ""
 
-#: C/troubleshooting.page:12(page/title)
+#: managing-identities.page:123
+msgid "New Tor Circuit for this Site"
+msgstr ""
+
+#: managing-identities.page:124
+msgid "This option is useful if the <link xref=\"about-tor-browser#how-tor-works\">exit relay</link> you are using is unable to connect to the website you require, or is not loading it properly. Selecting it will cause the currently-active tab or window to be reloaded over a new Tor circuit. Other open tabs and windows from the same website will use the new circuit as well once they are reloaded. This option does not clear any private information or unlink your activity, nor does it affect your current connections to other websites."
+msgstr ""
+
+#: onionsites.page:6
+msgid "Services that are only accessible using Tor"
+msgstr ""
+
+#: onionsites.page:10
+msgid "Onion Services"
+msgstr ""
+
+#: onionsites.page:11
+msgid "Onion services (formerly known as â??hidden servicesâ??) are services (like websites) that are only accessible through the Tor network."
+msgstr ""
+
+#: onionsites.page:16
+msgid "Onion services offer several advantages over ordinary services on the non-private web:"
+msgstr ""
+
+#: onionsites.page:23
+msgid "An onion servicesâ??s location and IP address are hidden, making it difficult for adversaries to censor it or identify its operators."
+msgstr ""
+
+#: onionsites.page:29
+msgid "All traffic between Tor users and onion services is end-to-end encrypted, so you do not need to worry about <link xref=\"secure-connections\">connecting over HTTPS</link>."
+msgstr ""
+
+#: onionsites.page:36
+msgid "The address of an onion service is automatically generated, so the operators do not need to purchase a domain name; the .onion URL also helps Tor ensure that it is connecting to the right location and that the connection is not being tampered with."
+msgstr ""
+
+#: onionsites.page:46
+msgid "How to access an onion service"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: onionsites.page:48
+msgctxt "_"
+msgid "external ref='media/onionsites/onion_url.png' md5='f97f7fe10f07c3959c4430934974bbaa'"
+msgstr ""
+
+#: onionsites.page:50
+msgid "Just like any other website, you will need to know the address of an onion service in order to connect to it. An onion address is a string of sixteen mostly random letters and numbers, followed by â??.onionâ??."
+msgstr ""
+
+#: onionsites.page:58
+#: troubleshooting.page:10
 msgid "Troubleshooting"
 msgstr ""
 
-#: C/troubleshooting.page:14(page/p)
-msgid "The Tor Browser should get you online automatically after clicking the \"Connect\" button on the start up screen."
+#: onionsites.page:59
+msgid "If you cannot reach the onion service you require, make sure that you have entered the 16-character onion address correctly: even a small mistake will stop Tor Browser from being able to reach the site."
+msgstr ""
+
+#: onionsites.page:64
+msgid "If you are still unable to connect to the onion service, please try again later. There may be a temporary connection issue, or the site operators may have allowed it to go offline without warning."
+msgstr ""
+
+#: onionsites.page:69
+msgid "You can also ensure that you're able to access other onion services by connecting to <link href=\"http://3g2upl4pq6kufc4m.onion/\";>DuckDuckGo's Onion Service</link>"
+msgstr ""
+
+#: plugins.page:6
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:21(page/p)
-msgid "If it doesn't connect, there may be a simple fix. Try each of the following:"
+#: plugins.page:10
+msgid "Plugins, add-ons and JavaScript"
 msgstr ""
 
-#: C/troubleshooting.page:27(item/p)
-msgid "Make sure another Tor Browser is not already running. If you're not sure if Tor Browser is running, restart your computer."
+#: plugins.page:13
+msgid "Flash Player"
 msgstr ""
 
-#: C/troubleshooting.page:31(item/p)
-msgid "'Allow' Tor in your antivirus program."
+#: plugins.page:14
+msgid "Video websites, such as Vimeo make use of the Flash Player plugin to display video content. Unfortunately, this software operates independently of Tor Browser and cannot easily be made to obey Tor Browserâ??s proxy settings. It can therefore reveal your real location and IP address to the website operators, or to an outside observer. For this reason, Flash is disabled by default in Tor Browser, and enabling it is not recommended."
 msgstr ""
 
-#: C/troubleshooting.page:34(item/p)
+#: plugins.page:23
+msgid "Some video websites (such as YouTube) offer alternative video delivery methods that do not use Flash. These methods may be compatible with Tor Browser."
+msgstr ""
+
+#: plugins.page:31
+msgid "JavaScript"
+msgstr ""
+
+#: plugins.page:32
+msgid "JavaScript is a programming language that websites use to offer interactive elements such as video, animation, audio, and status timelines. Unfortunately, JavaScript can also enable attacks on the security of the browser, which might lead to deanonymization."
+msgstr ""
+
+#: plugins.page:39
+msgid "Tor Browser includes an add-on called NoScript, accessed through the â??Sâ?? icon at the top-left of the window, which allows you to control the JavaScript that runs on individual web pages, or to block it entirely."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: plugins.page:45
+msgctxt "_"
+msgid "external ref='media/plugins/noscript_menu.png' md5='df9e684b76a3c2e2bdcb879a19c20471'"
+msgstr ""
+
+#: plugins.page:47
+msgid "Users who require a high degree of security in their web browsing should set Tor Browserâ??s <link xref=\"security-slider\">Security Slider</link> to â??Medium-Highâ?? (which disables JavaScript for non-HTTPS websites) or â??Highâ?? (which does so for all websites). However, disabling JavaScript will prevent many websites from displaying correctly, so Tor Browserâ??s default setting is to allow all websites to run scripts."
+msgstr ""
+
+#: plugins.page:58
+msgid "Browser Add-ons"
+msgstr ""
+
+#: plugins.page:59
+msgid "Tor Browser is based on Firefox, and any browser add-ons or themes that are compatible with Firefox can also be installed in Tor Browser."
+msgstr ""
+
+#: plugins.page:64
+msgid "However, the only add-ons that have been tested for use with Tor Browser are those included by default. Installing any other browser add-ons may break functionality in Tor Browser or cause more serious problems that affect your privacy and security. It is strongly discouraged to install additional add-ons, and the Tor Project will not offer support for these configurations."
+msgstr ""
+
+#: secure-connections.page:8
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr ""
+
+#: secure-connections.page:12
+msgid "Secure Connections"
+msgstr ""
+
+#: secure-connections.page:14
+msgid "If personal information such as a login password travels unencrypted over the Internet, it can very easily be intercepted by an eavesdropper. If you are logging into any website, you should make sure that the site offers HTTPS encryption, which protects against this kind of eavesdropping. You can verify this in the URL bar: if your connection is encrypted, the address will begin with â??https://â;??, rather than â??http://â??.";
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: secure-connections.page:24
+msgctxt "_"
+msgid "external ref='media/secure-connections/https.png' md5='364bcbde7a649b0cea9ae178007c1a50'"
+msgstr ""
+
+#: secure-connections.page:26
+msgid "The following visualization shows what information is visible to eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+
+#: secure-connections.page:35
+msgid "Click the â??Torâ?? button to see what data is visible to observers when you're using Tor. The button will turn green to indicate that Tor is on."
+msgstr ""
+
+#: secure-connections.page:42
+msgid "Click the â??HTTPSâ?? button to see what data is visible to observers when you're using HTTPS. The button will turn green to indicate that HTTPS is on."
+msgstr ""
+
+#: secure-connections.page:49
+msgid "When both buttons are green, you see the data that is visible to observers when you are using both tools."
+msgstr ""
+
+#: secure-connections.page:55
+msgid "When both buttons are grey, you see the data that is visible to observers when you don't use either tool."
+msgstr ""
+
+#: secure-connections.page:62
+msgid "Potentially visible data"
+msgstr ""
+
+#: secure-connections.page:70
+msgid "The site being visited."
+msgstr ""
+
+#: secure-connections.page:81
+msgid "Username and password used for authentication."
+msgstr ""
+
+#: secure-connections.page:92
+msgid "Data being transmitted."
+msgstr ""
+
+#: secure-connections.page:103
+msgid "Network location of the computer used to visit the website (the public IP address)."
+msgstr ""
+
+#: secure-connections.page:115
+msgid "Whether or not Tor is being used."
+msgstr ""
+
+#: security-slider.page:6
+msgid "Configuring Tor Browser for security and usability"
+msgstr ""
+
+#: security-slider.page:10
+msgid "Security Slider"
+msgstr ""
+
+#: security-slider.page:11
+msgid "Tor Browser includes a â??Security Sliderâ?? that lets you increase your security by disabling certain web features that can be used to attack your security and anonymity. Increasing Tor Browserâ??s security level will stop some web pages from functioning properly, so you should weigh your security needs against the degree of usability you require."
+msgstr ""
+
+#: security-slider.page:21
+msgid "Accessing the Security Slider"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:23
+msgctxt "_"
+msgid "external ref='media/security-slider/slider.png' md5='3c469cd3ed9f60ebb6bbbc63daa90082'"
+msgstr ""
+
+#: security-slider.page:25
+msgid "The Security Slider is located in Torbuttonâ??s â??Privacy and Security Settingsâ?? menu."
+msgstr ""
+
+#: security-slider.page:32
+msgid "Security Levels"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: security-slider.page:34
+msgctxt "_"
+msgid "external ref='media/security-slider/slider_window.png' md5='c733bdccd1731ed1a772777b25bae7a1'"
+msgstr ""
+
+#: security-slider.page:36
+msgid "Increasing the level of the Security Slider will disable or partially disable certain browser features to protect against possible attacks."
+msgstr ""
+
+#: security-slider.page:42
+msgid "High"
+msgstr ""
+
+#: security-slider.page:43
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; Javascript is disabled by default on all sites; most video and audio formats are disabled; and some fonts and icons may not display correctly."
+msgstr ""
+
+#: security-slider.page:53
+msgid "Medium-High"
+msgstr ""
+
+#: security-slider.page:54
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; all JavaScript performance optimizations are disabled; some mathematical equations may not display properly; some font rendering features are disabled; some types of image are disabled; and JavaScript is disabled by default on all non-<link xref=\"secure-connections\">HTTPS</link> sites."
+msgstr ""
+
+#: security-slider.page:64
+msgid "Medium-Low"
+msgstr ""
+
+#: security-slider.page:65
+msgid "At this level, HTML5 video and audio media become click-to-play via NoScript; some <link xref=\"plugins\">JavaScript</link> performance optimizations are disabled, causing some websites to run more slowly; and some mathematical equations may not display properly."
+msgstr ""
+
+#: security-slider.page:73
+msgid "Low"
+msgstr ""
+
+#: security-slider.page:74
+msgid "At this level, all browser features are enabled. This is the most usable option."
+msgstr ""
+
+#: transports.page:6
+#: transports.page:20
+msgid "Types of pluggable transport"
+msgstr ""
+
+#: transports.page:10
+msgid "Pluggable Transports"
+msgstr ""
+
+#: transports.page:12
+msgid "Pluggable transports are tools that Tor can use to disguise the traffic it sends out. This can be useful in situations where an Internet Service Provider or other authority is actively blocking connections to the Tor network."
+msgstr ""
+
+#: transports.page:21
+msgid "Currently there are six pluggable transports available, but more are being developed."
+msgstr ""
+
+#: transports.page:28
+msgid "obfs3"
+msgstr ""
+
+#: transports.page:33
+msgid "obfs3 makes Tor traffic look random, so that it does not look like Tor or any other protocol. obfs3 bridges will work in most places."
+msgstr ""
+
+#: transports.page:42
+msgid "obfs4"
+msgstr ""
+
+#: transports.page:47
+msgid "obfs4 makes Tor traffic look random like obfs3, and also prevents censors from finding bridges by Internet scanning. obfs4 bridges are less likely to be blocked than obfs3 bridges."
+msgstr ""
+
+#: transports.page:56
+msgid "Scramblesuit"
+msgstr ""
+
+#: transports.page:61
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr ""
+
+#: transports.page:69
+msgid "FTE"
+msgstr ""
+
+#: transports.page:74
+msgid "FTE (format-transforming encryption) disguises Tor traffic as ordinary web (HTTP) traffic."
+msgstr ""
+
+#: transports.page:82
+msgid "meek"
+msgstr ""
+
+#: transports.page:87
+msgid "These transports all make it look like you are browsing a major web site instead of using Tor. meek-amazon makes it look like you are using Amazon Web Services; meek-azure makes it look like you are using a Microsoft web site; and meek-google makes it look like you are using Google search."
+msgstr ""
+
+#: troubleshooting.page:6
+msgid "What to do if Tor Browser doesnâ??t work"
+msgstr ""
+
+#: troubleshooting.page:12
+msgid "You should be able to start browsing the web using Tor Browser shortly after running the program, and clicking the â??Connectâ?? button if you are using it for the first time."
+msgstr ""
+
+#: troubleshooting.page:21
+msgid "Quick fixes"
+msgstr ""
+
+#: troubleshooting.page:22
+msgid "If Tor Browser doesnâ??t connect, there may be a simple solution. Try each of the following:"
+msgstr ""
+
+#: troubleshooting.page:29
+msgid "Your computerâ??s system clock must be set correctly, or Tor will not be able to connect."
+msgstr ""
+
+#: troubleshooting.page:35
+msgid "Make sure another Tor Browser is not already running. If youâ??re not sure if Tor Browser is running, restart your computer."
+msgstr ""
+
+#: troubleshooting.page:41
+msgid "Make sure that any antivirus program you have installed is not preventing Tor from running. You may need to consult the documentation for your antivirus software if you do not know how to do this."
+msgstr ""
+
+#: troubleshooting.page:49
 msgid "Temporarily disable your firewall."
 msgstr ""
 
-#: C/troubleshooting.page:37(item/p)
-msgid "Delete Tor Browser and install it again. If updating, do not overwrite your previous Tor Browser files."
+#: troubleshooting.page:54
+msgid "Delete Tor Browser and install it again. If updating, do not just overwrite your previous Tor Browser files; ensure they are fully deleted beforehand."
+msgstr ""
+
+#: troubleshooting.page:64
+msgid "Is your connection censored?"
 msgstr ""
 
-#: C/troubleshooting.page:42(page/p)
-msgid "If you still can't connect, your internet service provider might be censoring connections to Tor. Follow the instructions in the <link xref=\"circumvention\">Circumvention</link> section."
+#: troubleshooting.page:65
+msgid "If you still canâ??t connect, your Internet Service Provider might be censoring connections to the Tor network. Read the <link xref=\"circumvention\">Circumvention</link> section for possible solutions."
 msgstr ""
 
-#: C/troubleshooting.page:48(page/p)
-msgid "If the above steps do not address your problem, email help@xxxxxxxxxxxxxxxxx with your operating system, the details of your problem, and what you've already tried."
+#: troubleshooting.page:74
+msgid "Known issues"
 msgstr ""
 
-#: C/uninstalling.page:7(info/desc)
-msgid "How to remove Tor Browser from your system."
+#: troubleshooting.page:75
+msgid "Tor Browser is under constant development, and some issues are known about but not yet fixed. Please check the <link xref=\"known-issues\">Known Issues</link> page to see if the problem you are experiencing is already listed there."
 msgstr ""
 
-#: C/uninstalling.page:8(info/title)
-msgctxt "sort"
-msgid "06 Uninstalling"
+#: uninstalling.page:6
+msgid "How to remove Tor Browser from your system"
 msgstr ""
 
-#: C/uninstalling.page:12(page/title)
+#: uninstalling.page:10
 msgid "Uninstalling"
 msgstr ""
 
-#: C/uninstalling.page:14(page/p)
-msgid "The Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your system's software or settings either."
+#: uninstalling.page:12
+msgid "Tor Browser does not affect any of the existing software or settings on your computer. Uninstalling Tor Browser will not affect your systemâ??s software or settings."
 msgstr ""
 
-#: C/uninstalling.page:20(page/p)
-msgid "Removing the Tor Browser from your system is simple:"
+#: uninstalling.page:18
+msgid "Removing Tor Browser from your system is simple:"
 msgstr ""
 
-#: C/uninstalling.page:26(item/p)
-msgid "Locate your Tor Browser folder. The default location is your Desktop."
+#: uninstalling.page:24
+msgid "Locate your Tor Browser folder. The default location on Windows is the Desktop; on Mac OS X it is the Applications folder. On Linux, there is no default location, however the folder will be named \"tor-browser_en-US\" if you are running the English Tor Browser."
 msgstr ""
 
-#: C/uninstalling.page:29(item/p)
+#: uninstalling.page:32
 msgid "Delete the Tor Browser folder."
 msgstr ""
 
-#: C/uninstalling.page:32(item/p)
+#: uninstalling.page:35
 msgid "Empty your Trash"
 msgstr ""
 
-#: C/uninstalling.page:36(page/p)
-msgid "Note that your operating system's standard \"Uninstall\" utility is not used."
+#: uninstalling.page:39
+msgid "Note that your operating systemâ??s standard â??Uninstallâ?? utility is not used."
+msgstr ""
+
+#: updating.page:6
+msgid "How to update Tor Browser"
+msgstr ""
+
+#: updating.page:10
+msgid "Updating"
+msgstr ""
+
+#: updating.page:12
+msgid "Tor Browser must be kept updated at all times. If you continue to use an outdated version of the software, you may be vulnerable to serious security flaws that compromise your privacy and anonymity."
+msgstr ""
+
+#: updating.page:18
+msgid "Tor Browser will prompt you to update the software once a new version has been released: the Torbutton icon will display a yellow triangle, and you may see a written update indicator when Tor Browser opens. You can update either automatically or manually."
+msgstr ""
+
+#: updating.page:26
+msgid "Updating Tor Browser automatically"
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:30
+msgctxt "_"
+msgid "external ref='media/updating/update1.png' md5='9ff01eb653d92124746fc31efde2bf07'"
+msgstr ""
+
+#: updating.page:32
+msgid "When you are prompted to update Tor Browser, click on the Torbutton icon, then select â??Check for Tor Browser Updateâ??."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:39
+msgctxt "_"
+msgid "external ref='media/updating/update3.png' md5='4bd08622b0cacf20b13f75c432176ed3'"
+msgstr ""
+
+#: updating.page:41
+msgid "When Tor Browser has finished checking for updates, click on the â??Updateâ?? button."
+msgstr ""
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: updating.page:48
+msgctxt "_"
+msgid "external ref='media/updating/update4.png' md5='1d795e7b695738531db9d4b2b0fb5313'"
+msgstr ""
+
+#: updating.page:50
+msgid "Wait for the update to download and install, then restart Tor Browser. You will now be running the latest version."
+msgstr ""
+
+#: updating.page:58
+msgid "Updating Tor Browser manually"
+msgstr ""
+
+#: updating.page:61
+msgid "When you are prompted to update Tor Browser, finish the browsing session and close the program."
+msgstr ""
+
+#: updating.page:67
+msgid "Remove Tor Browser from your system by deleting the folder that contains it (see the <link xref=\"uninstalling\">Uninstalling</link> section for more information)."
+msgstr ""
+
+#: updating.page:74
+msgid "Visit <link href=\"https://www.torproject.org/projects/torbrowser.html.en\";> https://www.torproject.org/projects/torbrowser.html.en</link> and download a copy of the latest Tor Browser release, then install it as before."
 msgstr ""

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

Prev by Author: [tor-commits] [user-manual/master] Adjusting PT locale to match Tor Browser
Next by Author: [tor-commits] [flashproxy/master] Revert "allow some proxy defaults to be defined from an external script file."
Previous by thread: [tor-commits] [tor-browser-bundle/master] Bug 20758: Make the gb build directory deterministic
Next by thread: [tor-commits] [sandboxed-tor-browser/master] Bug #20899: Dunlib/PulseAudio fixes.
Index(es):
- Author
- Thread