tor-commits
Threads by month
- ----- 2025 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
November 2018
- 19 participants
- 2292 discussions

[translation/tbmanual-contentspot] Update translations for tbmanual-contentspot
by translation@torproject.org 16 Nov '18
by translation@torproject.org 16 Nov '18
16 Nov '18
commit 08dd3f2171814f0b299333b672cf119939f03f07
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Nov 16 13:47:16 2018 +0000
Update translations for tbmanual-contentspot
---
contents+es.po | 2 +-
contents+ga.po | 4 ++++
contents+id.po | 7 +++++--
contents+it.po | 4 +++-
contents+pt-BR.po | 12 ++++++++++--
contents+zh-CN.po | 4 ++--
6 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/contents+es.po b/contents+es.po
index f4d1ac595..0a6740310 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -469,7 +469,7 @@ msgstr ""
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
"* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr "Visita https://bridges.torproject.org/ y sigue las instrucciones, o"
+msgstr "* Visita https://bridges.torproject.org/ y sigue las instrucciones, o"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
diff --git a/contents+ga.po b/contents+ga.po
index fd98a313a..160c3758b 100644
--- a/contents+ga.po
+++ b/contents+ga.po
@@ -414,6 +414,8 @@ msgid ""
"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
"“bridge” relays."
msgstr ""
+"Úsáideann an chuid is mó de na Córais Iompair Ionphlugáilte, mar shampla "
+"obfs3 agus obfs4, athsheachadáin \"droichid\"."
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
@@ -459,6 +461,8 @@ msgstr ""
msgid ""
"* Visit https://bridges.torproject.org/ and follow the instructions, or"
msgstr ""
+"* Tabhair cuairt ar https://bridges.torproject.org/ agus lean na treoracha, "
+"nó"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
diff --git a/contents+id.po b/contents+id.po
index 58a964ec1..d650bcd03 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -428,6 +428,8 @@ msgid ""
"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
"“bridge” relays."
msgstr ""
+"Kebanyakan Angkutan Colok, seperti obfs3 dan obfs4, bergantung pada "
+"penggunaan \"jembatan\" relay."
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
@@ -471,13 +473,14 @@ msgstr ""
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
"* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr "Kunjungi https://bridges.torproject.org/ dan ikuti petunjuk, atau"
+msgstr "* Kunjungi https://bridges.torproject.org/ dan ikuti petunjuk, atau"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
"* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address"
msgstr ""
-"Email bridges(a)torproject.org melalui alamat email Gmail, Yahoo, atau Riseup"
+"* Email bridges(a)torproject.org melalui alamat email Gmail, Yahoo, atau "
+"Riseup"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid "##### Entering bridge addresses"
diff --git a/contents+it.po b/contents+it.po
index ef64bbd41..79aaae627 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -430,6 +430,8 @@ msgid ""
"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
"“bridge” relays."
msgstr ""
+"La maggior parte dei Pluggable transports, come obfs3 e ofsf4, si basano su "
+"dei nodi relay."
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
@@ -473,7 +475,7 @@ msgstr ""
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
"* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr ""
+msgstr "Visita https://bridges.torproject.org/ e segui le istruzioni"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 32f774358..06e764dc1 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -1,9 +1,9 @@
# Translators:
# erinm, 2018
# Eduardo Bonsi, 2018
-# Emma Peel, 2018
# Reurison Silva Rodrigues, 2018
# Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2018
+# Emma Peel, 2018
#
msgid ""
msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-16 12:25+CET\n"
"PO-Revision-Date: 2018-11-14 12:31+0000\n"
-"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2018\n"
+"Last-Translator: Emma Peel, 2018\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -410,6 +410,8 @@ msgid ""
"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
"“bridge” relays."
msgstr ""
+"A maioria dos Transportadores Plugáveis, como obfs3 e obfs4, baseiam-se no "
+"uso de retransmissores \"ponte\"."
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
@@ -420,6 +422,12 @@ msgid ""
"combination with pluggable transports helps to disguise the fact that you "
"are using Tor."
msgstr ""
+"A maioria dos <a href=\"/transports\">Transportadores Plugáveis</a>, como "
+"obfs3 e obfs4, baseiam-se no uso de retransmissores \"ponte\". Assim como "
+"retransmissores comuns do Tor, pontes são executadas por voluntárias/os. A "
+"diferença é que elas não se encontram em listas públicas, de modo que não é "
+"fácil para um adversário identificá-las. O uso combinado de pontes et de "
+"transportadores plugáveis ajuda a disfarçar o fato de que você usa Tor."
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 87c0e2e84..4c19dd827 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -363,7 +363,7 @@ msgstr "网桥"
msgid ""
"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
"“bridge” relays."
-msgstr ""
+msgstr "大多数 可插拔传输(诸如 obfs3 和 obfs4)依赖于使用“网桥”中继。"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
@@ -398,7 +398,7 @@ msgstr "因为网桥地址非公开,您需要自行请求。您有两个选项
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
"* Visit https://bridges.torproject.org/ and follow the instructions, or"
-msgstr "访问 https://bridges.torproject.org/ 并按照流程操作,或者"
+msgstr "* 访问 https://bridges.torproject.org/ 并按照流程操作,或者"
#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
msgid ""
1
0
commit c9906cc3f6b7ba529173612ad87a8a9ce2dd6cf8
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:28:45 2018 -0500
Bump to 0.3.5.5-alpha
---
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index caccba892..ebfdf57af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.4-alpha-dev])
+AC_INIT([tor],[0.3.5.5-alpha])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 5dba14837..ee4b7a1a9 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.3.5.4-alpha-dev"
+!define VERSION "0.3.5.5-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2a6382b40..7576410b3 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.3.5.4-alpha-dev"
+#define VERSION "0.3.5.5-alpha"
1
0
commit c9906cc3f6b7ba529173612ad87a8a9ce2dd6cf8
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:28:45 2018 -0500
Bump to 0.3.5.5-alpha
---
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index caccba892..ebfdf57af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.4-alpha-dev])
+AC_INIT([tor],[0.3.5.5-alpha])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 5dba14837..ee4b7a1a9 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.3.5.4-alpha-dev"
+!define VERSION "0.3.5.5-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2a6382b40..7576410b3 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.3.5.4-alpha-dev"
+#define VERSION "0.3.5.5-alpha"
1
0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm@torproject.org 16 Nov '18
by nickm@torproject.org 16 Nov '18
16 Nov '18
commit 346f117b858fb419cf553354a1621f7658020289
Merge: bebfae568 c9906cc3f
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:29:12 2018 -0500
Merge branch 'maint-0.3.5' into release-0.3.5
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
1
0
commit 306098f851e936ab253f4ef3b815d4e9bf23eca7
Merge: be88f12b7 c9906cc3f
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:28:59 2018 -0500
Merge branch 'maint-0.3.5'
"ours" to avoid version bump.
1
0
commit c9906cc3f6b7ba529173612ad87a8a9ce2dd6cf8
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:28:45 2018 -0500
Bump to 0.3.5.5-alpha
---
configure.ac | 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index caccba892..ebfdf57af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2018, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.4-alpha-dev])
+AC_INIT([tor],[0.3.5.5-alpha])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 5dba14837..ee4b7a1a9 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.3.5.4-alpha-dev"
+!define VERSION "0.3.5.5-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2a6382b40..7576410b3 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.3.5.4-alpha-dev"
+#define VERSION "0.3.5.5-alpha"
1
0
commit bebfae56822ff501519fbd913d2293e8e9230bb8
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Fri Nov 16 08:25:48 2018 -0500
start changelog for 0.3.5.5-alpha
---
ChangeLog | 63 ++++++++++++++++++++++++++++++++++++++++++++++++
changes/bug27750 | 6 -----
changes/bug27841 | 7 ------
changes/bug28183 | 4 ---
changes/bug28245 | 6 -----
changes/bug28399 | 4 ---
changes/bug28413 | 4 ---
changes/bug28419 | 3 ---
changes/bug28435 | 3 ---
changes/bug28441 | 4 ---
changes/bug28454 | 4 ---
changes/geoip-2018-11-06 | 4 ---
12 files changed, 63 insertions(+), 49 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cdf724905..2d1a08394 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+Changes in version 0.3.5.5-alpha - 2018-11-16
+ Tor 0.3.5.5-alpha includes numerous bugfixes on earlier releases,
+ including several that we hope to backport to older release series in
+ the future.
+
+ o Major bugfixes (OpenSSL, portability):
+ - Fix our usage of named groups when running as a TLS 1.3 client in
+ OpenSSL 1.1.1. Previously, we only initialized EC groups when
+ running as a relay, which caused clients to fail to negotiate TLS
+ 1.3 with relays. Fixes bug 28245; bugfix on 0.2.9.15 (when TLS 1.3
+ support was added).
+
+ o Minor features (geoip):
+ - Update geoip and geoip6 to the November 6 2018 Maxmind GeoLite2
+ Country database. Closes ticket 28395.
+
+ o Minor bugfixes (compilation):
+ - Initialize a variable unconditionally in aes_new_cipher(), since
+ some compilers cannot tell that we always initialize it before
+ use. Fixes bug 28413; bugfix on 0.2.9.3-alpha.
+
+ o Minor bugfixes (connection, relay):
+ - Avoid a logging a BUG() stacktrace when closing connection held
+ open because the write side is rate limited but not the read side.
+ Now, the connection read side is simply shut down until Tor is
+ able to flush the connection and close it. Fixes bug 27750; bugfix
+ on 0.3.4.1-alpha.
+
+ o Minor bugfixes (continuous integration, Windows):
+ - Manually configure the zstd compiler options, when building using
+ mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does
+ not come with a pkg-config file. Fixes bug 28454; bugfix
+ on 0.3.4.1-alpha.
+ - Stop using an external OpenSSL install, and stop installing MSYS2
+ packages, when building using mingw on Appveyor Windows CI. Fixes
+ bug 28399; bugfix on 0.3.4.1-alpha.
+
+ o Minor bugfixes (documentation):
+ - Make Doxygen work again after the code movement in the 0.3.5
+ source tree. Fixes bug 28435; bugfix on 0.3.5.1-alpha.
+
+ o Minor bugfixes (Linux seccomp2 sandbox):
+ - Permit the "shutdown()" system call, which is apparently used by
+ OpenSSL under some circumstances. Fixes bug 28183; bugfix
+ on 0.2.5.1-alpha.
+
+ o Minor bugfixes (logging):
+ - Stop talking about the Named flag in log messages. Clients have
+ ignored the Named flag since 0.3.2. Fixes bug 28441; bugfix
+ on 0.3.2.1-alpha.
+
+ o Minor bugfixes (memory leaks):
+ - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419;
+ bugfix on 0.3.3.1-alpha. Patch from Martin Kepplinger.
+
+ o Minor bugfixes (onion services):
+ - On an intro point for a version 3 onion service, stop closing
+ introduction circuits on an NACK. This lets the client decide
+ whether to reuse the circuit or discard it. Previously, we closed
+ intro circuits when sending NACKs. Fixes bug 27841; bugfix on
+ 0.3.2.1-alpha. Patch by Neel Chaunan.
+
+
Changes in version 0.3.5.4-alpha - 2018-11-08
Tor 0.3.5.4-alpha includes numerous bugfixes on earlier versions and
improves our continuous integration support. It continues our attempts
diff --git a/changes/bug27750 b/changes/bug27750
deleted file mode 100644
index c234788b1..000000000
--- a/changes/bug27750
+++ /dev/null
@@ -1,6 +0,0 @@
- o Minor bugfixes (connection, relay):
- - Avoid a wrong BUG() stacktrace in case a closing connection is being held
- open because the write side is rate limited but not the read side. Now,
- the connection read side is simply shutdown instead of kept open until tor
- is able to flush the connection and then fully close it. Fixes bug 27750;
- bugfix on 0.3.4.1-alpha.
diff --git a/changes/bug27841 b/changes/bug27841
deleted file mode 100644
index 9cd1da727..000000000
--- a/changes/bug27841
+++ /dev/null
@@ -1,7 +0,0 @@
- o Minor bugfixes (onion services):
- - On an intro point for a version 3 onion service, we do not close
- an introduction circuit on an NACK. This lets the client decide
- whether to reuse the circuit or discard it. Previously, we closed
- intro circuits on NACKs. Fixes bug 27841; bugfix on 0.3.2.1-alpha.
- Patch by Neel Chaunan
-
diff --git a/changes/bug28183 b/changes/bug28183
deleted file mode 100644
index 8d35dcdc0..000000000
--- a/changes/bug28183
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (Linux seccomp2 sandbox):
- - Permit the "shutdown()" system call, which is apparently
- used by OpenSSL under some circumstances. Fixes bug 28183;
- bugfix on 0.2.5.1-alpha.
diff --git a/changes/bug28245 b/changes/bug28245
deleted file mode 100644
index d7e6deb81..000000000
--- a/changes/bug28245
+++ /dev/null
@@ -1,6 +0,0 @@
- o Major bugfixes (OpenSSL, portability):
- - Fix our usage of named groups when running as a TLS 1.3 client in
- OpenSSL 1.1.1. Previously, we only initialized EC groups when running
- as a server, which caused clients to fail to negotiate TLS 1.3 with
- relays. Fixes bug 28245; bugfix on 0.2.9.15 when TLS 1.3 support was
- added.
diff --git a/changes/bug28399 b/changes/bug28399
deleted file mode 100644
index 9096db70b..000000000
--- a/changes/bug28399
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (continuous integration, Windows):
- - Stop using an external OpenSSL install, and stop installing MSYS2
- packages, when building using mingw on Appveyor Windows CI.
- Fixes bug 28399; bugfix on 0.3.4.1-alpha.
diff --git a/changes/bug28413 b/changes/bug28413
deleted file mode 100644
index 4c88bea7e..000000000
--- a/changes/bug28413
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (compilation):
- - Initialize a variable in aes_new_cipher(), since some compilers
- cannot tell that we always initialize it before use. Fixes bug 28413;
- bugfix on 0.2.9.3-alpha.
diff --git a/changes/bug28419 b/changes/bug28419
deleted file mode 100644
index 52ceb0a2a..000000000
--- a/changes/bug28419
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (memory leaks):
- - Fix a harmless memory leak in libtorrunner.a. Fixes bug 28419;
- bugfix on 0.3.3.1-alpha. Patch from Martin Kepplinger.
\ No newline at end of file
diff --git a/changes/bug28435 b/changes/bug28435
deleted file mode 100644
index 2a886cb8b..000000000
--- a/changes/bug28435
+++ /dev/null
@@ -1,3 +0,0 @@
- o Minor bugfixes (documentation):
- - Make Doxygen work again after the 0.3.5 source tree moves.
- Fixes bug 28435; bugfix on 0.3.5.1-alpha.
diff --git a/changes/bug28441 b/changes/bug28441
deleted file mode 100644
index d259b9f74..000000000
--- a/changes/bug28441
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (logging):
- - Stop talking about the Named flag in log messages. Clients have
- ignored the Named flag since 0.3.2. Fixes bug 28441;
- bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug28454 b/changes/bug28454
deleted file mode 100644
index ca46ae277..000000000
--- a/changes/bug28454
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (continuous integration, Windows):
- - Manually configure the zstd compiler options, when building using
- mingw on Appveyor Windows CI. The MSYS2 mingw zstd package does not
- come with a pkg-config file. Fixes bug 28454; bugfix on 0.3.4.1-alpha.
diff --git a/changes/geoip-2018-11-06 b/changes/geoip-2018-11-06
deleted file mode 100644
index 5c18ea424..000000000
--- a/changes/geoip-2018-11-06
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor features (geoip):
- - Update geoip and geoip6 to the November 6 2018 Maxmind GeoLite2
- Country database. Closes ticket 28395.
-
1
0

16 Nov '18
commit 9f9040ad56e776bb68ae2dc719968a181ea75bd1
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Nov 16 13:09:19 2018 +0000
better language mapping
---
contents+bn.po => contents+bn-BD.po | 0
contents+en_GB.po => contents+en-GB.po | 0
contents+en.po | 2199 ++++++++++++++++++++++++++++++++
contents+es_AR.po => contents+es-AR.po | 0
contents+pt_BR.po => contents+pt-BR.po | 0
contents+zh_CN.po => contents+zh-CN.po | 0
contents+zh_TW.po => contents+zh-TW.po | 0
7 files changed, 2199 insertions(+)
diff --git a/contents+bn.po b/contents+bn-BD.po
similarity index 100%
rename from contents+bn.po
rename to contents+bn-BD.po
diff --git a/contents+en_GB.po b/contents+en-GB.po
similarity index 100%
rename from contents+en_GB.po
rename to contents+en-GB.po
diff --git a/contents+en.po b/contents+en.po
new file mode 100644
index 000000000..60ac1caa3
--- /dev/null
+++ b/contents+en.po
@@ -0,0 +1,2199 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-11-16 12:25+CET\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: en <LL(a)li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
+
+#: http//localhost/ (content/contents+en.lrshowcase.title)
+msgid "How can we help?"
+msgstr "How can we help?"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.title)
+msgid "About Tor Browser"
+msgstr "About Tor Browser"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr "Learn what Tor Browser can do to protect your privacy and anonymity"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+msgid ""
+"In addition, Tor Browser is designed to prevent websites from "
+"“fingerprinting” or identifying you based on your browser configuration."
+msgstr ""
+"In addition, Tor Browser is designed to prevent websites from "
+"“fingerprinting” or identifying you based on your browser configuration."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+msgid ""
+"By default, Tor Browser does not keep any browsing history. Cookies are only"
+" valid for a single session (until Tor Browser is exited or a <a href"
+"=\"/managing-identities.html#new-identity\">New Identity</a> is requested)."
+msgstr ""
+"By default, Tor Browser does not keep any browsing history. Cookies are only"
+" valid for a single session (until Tor Browser is exited or a <a href"
+"=\"/managing-identities.html#new-identity\">New Identity</a> is requested)."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+msgid "##### How Tor works"
+msgstr "##### How Tor works"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+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 *relays*) in the Tor network. The last "
+"relay in the circuit (the “exit relay”) then sends the traffic out onto the "
+"public Internet."
+msgstr ""
+"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 *relays*) in the Tor network. The last "
+"relay in the circuit (the “exit relay”) then sends the traffic out onto the "
+"public Internet."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"\" src=\"/static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+msgstr ""
+"<img class=\"\" src=\"/static/images/how-tor-works.png\" alt=\"How Tor "
+"Browser works\">"
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/about/ (content/about/contents+en.lrtopic.seo_slug)
+msgid "about"
+msgstr "about"
+
+#: http//localhost/downloading/
+#: (content/downloading/contents+en.lrtopic.title)
+msgid "Downloading"
+msgstr "Downloading"
+
+#: http//localhost/downloading/
+#: (content/downloading/contents+en.lrtopic.description)
+msgid "How to download Tor Browser"
+msgstr "How to download Tor Browser"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 <a href=\"https://tb-manual.torproject.org/en-US"
+"/secure-connections.html\">HTTPS</a>, which makes it much harder for "
+"somebody to tamper with."
+msgstr ""
+"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 <a href=\"https://tb-manual.torproject.org/en-US"
+"/secure-connections.html\">HTTPS</a>, which makes it much harder for "
+"somebody to tamper with."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "##### GetTor"
+msgstr "##### GetTor"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "###### To use GetTor via email:"
+msgstr "###### To use GetTor via email:"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"Send an email to gettor(a)torproject.org, and in the body of the message "
+"simply write “windows”, “osx”, or “linux”, (without quotation marks) "
+"depending on your operating system."
+msgstr ""
+"Send an email to gettor(a)torproject.org, and in the body of the message "
+"simply write “windows”, “osx”, or “linux”, (without quotation marks) "
+"depending on your operating system."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "###### To use GetTor via Twitter:"
+msgstr "###### To use GetTor via Twitter:"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"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)."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "###### To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):"
+msgstr "###### To use GetTor via Jabber/XMPP (Jitsi, CoyIM, etc.):"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"To get links for downloading Tor Browser in Chinese for Linux, send a "
+"message to gettor(a)torproject.org with the words \"linux zh\" in it."
+msgstr ""
+"To get links for downloading Tor Browser in Chinese for Linux, send a "
+"message to gettor(a)torproject.org with the words \"linux zh\" in it."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "##### Satori"
+msgstr "##### Satori"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"Satori is an add-on for the Chrome or Chromium browsers that allows you to "
+"download several security and privacy programs from different sources."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "To download Tor Browser using Satori:"
+msgstr "To download Tor Browser using Satori:"
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "Install Satori from the Chrome App Store."
+msgstr "Install Satori from the Chrome App Store."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid "Select Satori from your browser’s Apps menu."
+msgstr "Select Satori from your browser’s Apps menu."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+msgid ""
+"Wait for your download to finish, then find the “Generate Hash” section in "
+"Satori’s menu and click “Select Files”."
+msgstr ""
+"Wait for your download to finish, then find the “Generate Hash” section in "
+"Satori’s menu and click “Select Files”."
+
+#: http//localhost/downloading/ (content/downloading/contents+en.lrtopic.body)
+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 <a href=\"https://tb-manual.torproject.org/en-US"
+"/first-time.html\">begin using Tor Browser</a>. If they do not match, you "
+"may need to try downloading again, or from a different source."
+msgstr ""
+"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 <a href=\"https://tb-manual.torproject.org/en-US"
+"/first-time.html\">begin using Tor Browser</a>. If they do not match, you "
+"may need to try downloading again, or from a different source."
+
+#: http//localhost/downloading/
+#: (content/downloading/contents+en.lrtopic.seo_slug)
+msgid "downloading"
+msgstr "downloading"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.title)
+msgid "Running Tor Browser for the first time"
+msgstr "Running Tor Browser for the first time"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.description)
+msgid "Learn how to use Tor Browser for the first time"
+msgstr "Learn how to use Tor Browser for the first time"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "##### Connect"
+msgstr "##### Connect"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/connect.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/connect.png\">"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid ""
+"In most cases, choosing \"Connect\" will allow you to connect to the Tor "
+"network without any further configuration. Once clicked, a status bar will "
+"appear, showing Tor’s connection progress. If you are on a relatively fast "
+"connection, but this bar seems to get stuck at a certain point, see the <a "
+"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
+"problem."
+msgstr ""
+"In most cases, choosing \"Connect\" will allow you to connect to the Tor "
+"network without any further configuration. Once clicked, a status bar will "
+"appear, showing Tor’s connection progress. If you are on a relatively fast "
+"connection, but this bar seems to get stuck at a certain point, see the <a "
+"href=\"/troubleshooting\">Troubleshooting</a> page for help solving the "
+"problem."
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "##### Configure"
+msgstr "##### Configure"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/configure.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/configure.png\">"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+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 <a href=\"/circumvention\">Circumvention</a> "
+"screen to configure a pluggable transport."
+msgstr ""
+"The first screen asks if access to the Tor network is blocked or censored on"
+" your connection. If you do not believe this is the case, select “No”. If "
+"you know your connection is censored, or you have tried and failed to "
+"connect to the Tor network and no other solutions have worked, select “Yes”."
+" You will then be taken to the <a href=\"/circumvention\">Circumvention</a> "
+"screen to configure a pluggable transport."
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+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 ""
+"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”."
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/proxy_question.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/proxy_question.png\">"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/proxy.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/proxy.png\">"
+
+#: http//localhost/running-tor-browser/
+#: (content/running-tor-browser/contents+en.lrtopic.seo_slug)
+msgid "running-tor-browser"
+msgstr "running-tor-browser"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.title)
+msgid "Bridges"
+msgstr "Bridges"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.description)
+msgid ""
+"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
+"“bridge” relays."
+msgstr ""
+"Most Pluggable Transports, such as obfs3 and obfs4, rely on the use of "
+"“bridge” relays."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
+"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
+" are run by volunteers; unlike ordinary relays, however, they are not listed"
+" publicly, so an adversary cannot identify them easily. Using bridges in "
+"combination with pluggable transports helps to disguise the fact that you "
+"are using Tor."
+msgstr ""
+"Most <a href=\"/transports\">Pluggable Transports</a>, such as obfs3 and "
+"obfs4, rely on the use of “bridge” relays. Like ordinary Tor relays, bridges"
+" are run by volunteers; unlike ordinary relays, however, they are not listed"
+" publicly, so an adversary cannot identify them easily. Using bridges in "
+"combination with pluggable transports helps to disguise the fact that you "
+"are using Tor."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid "##### Getting bridge addresses"
+msgstr "##### Getting bridge addresses"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Because bridge addresses are not public, you will need to request them "
+"yourself. You have two options:"
+msgstr ""
+"Because bridge addresses are not public, you will need to request them "
+"yourself. You have two options:"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"* Visit https://bridges.torproject.org/ and follow the instructions, or"
+msgstr ""
+"* Visit https://bridges.torproject.org/ and follow the instructions, or"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address"
+msgstr ""
+"* Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid "##### Entering bridge addresses"
+msgstr "##### Entering bridge addresses"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Once you have obtained some bridge addresses, you will need to enter them "
+"into Tor Launcher."
+msgstr ""
+"Once you have obtained some bridge addresses, you will need to enter them "
+"into Tor Launcher."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"If you're starting Tor Browser for the first time, click 'Configure' to open"
+" the Tor Network Settings window. Otherwise, click the Torbutton to the left"
+" of the URL bar, then select 'Tor Network Settings...' to access these "
+"options."
+msgstr ""
+"If you're starting Tor Browser for the first time, click 'Configure' to open"
+" the Tor Network Settings window. Otherwise, click the Torbutton to the left"
+" of the URL bar, then select 'Tor Network Settings...' to access these "
+"options."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"In the Tor Network Settings window, select 'Tor is censored in my country.' "
+"Then, select 'Provide a bridge I know' and enter each bridge address on a "
+"separate line."
+msgstr ""
+"In the Tor Network Settings window, select 'Tor is censored in my country.' "
+"Then, select 'Provide a bridge I know' and enter each bridge address on a "
+"separate line."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"<img class=\"col-md-6\" src=\"/static/images/tor-launcher-custom-"
+"bridges.png\">"
+msgstr ""
+"<img class=\"col-md-6\" src=\"/static/images/tor-launcher-custom-"
+"bridges.png\">"
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"Click “OK” to save your settings. Using bridges may slow down the connection"
+" compared to using ordinary Tor relays."
+msgstr ""
+"Click “OK” to save your settings. Using bridges may slow down the connection"
+" compared to using ordinary Tor relays."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.body)
+msgid ""
+"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 ""
+"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."
+
+#: http//localhost/bridges/ (content/bridges/contents+en.lrtopic.seo_slug)
+msgid "bridges"
+msgstr "bridges"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.title)
+msgid "Pluggable transports"
+msgstr "Pluggable transports"
+
+#: http//localhost/transports/
+#: (content/transports/contents+en.lrtopic.description)
+msgid ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out."
+msgstr ""
+"Pluggable transports are tools that Tor can use to disguise the traffic it "
+"sends out."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "##### Types of pluggable transport"
+msgstr "##### Types of pluggable transport"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Currently there are six pluggable transports available, but more are being "
+"developed."
+msgstr ""
+"Currently there are six pluggable transports available, but more are being "
+"developed."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "<table>"
+msgstr "<table>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "<tbody>"
+msgstr "<tbody>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "<tr class=\"odd\">"
+msgstr "<tr class=\"odd\">"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "<td>"
+msgstr "<td>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "obfs3"
+msgstr "obfs3"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "</td>"
+msgstr "</td>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid ""
+"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
+"any other protocol. While still included by default, it is reccomended to "
+"use obfs4 instead, as it has several security improvements over obfs3."
+msgstr ""
+"obfs3 makes Tor traffic look random, so that it does not look like Tor or "
+"any other protocol. While still included by default, it is reccomended to "
+"use obfs4 instead, as it has several security improvements over obfs3."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "</tr>"
+msgstr "</tr>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "<tr class=\"even\">"
+msgstr "<tr class=\"even\">"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "obfs4"
+msgstr "obfs4"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid ""
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
+msgstr ""
+"obfs4 makes Tor traffic look random like obfs3, and also prevents censors "
+"from finding bridges by Internet scanning. obfs4 bridges are less likely to "
+"be blocked than obfs3 bridges."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "Scramblesuit"
+msgstr "Scramblesuit"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+msgstr "ScrambleSuit is similar to obfs4 but has a different set of bridges."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "FTE"
+msgstr "FTE"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid ""
+"FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
+"(HTTP) traffic."
+msgstr ""
+"FTE (format-transforming encryption) disguises Tor traffic as ordinary web "
+"(HTTP) traffic."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "meek"
+msgstr "meek"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "Snowflake"
+msgstr "Snowflake"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid ""
+"Snowflake is an improvement upon Flashproxy. It sends your traffic through "
+"WebRTC, a peer-to-peer protocol with built-in NAT punching."
+msgstr ""
+"Snowflake is an improvement upon Flashproxy. It sends your traffic through "
+"WebRTC, a peer-to-peer protocol with built-in NAT punching."
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "</tbody>"
+msgstr "</tbody>"
+
+#: http//localhost/transports/ (content/transports/contents+en.lrtopic.body)
+msgid "</table>"
+msgstr "</table>"
+
+#: http//localhost/transports/
+#: (content/transports/contents+en.lrtopic.seo_slug)
+msgid "plugable-transports"
+msgstr "plugable-transports"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.title)
+msgid "Circumvention"
+msgstr "Circumvention"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.description)
+msgid "What to do if the Tor network is blocked"
+msgstr "What to do if the Tor network is blocked"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Direct access to the Tor network may sometimes be blocked by your Internet "
+"Service Provider or by a government. Tor Browser includes some circumvention"
+" tools for getting around these blocks. These tools are called “pluggable "
+"transports”. See the <a href=\"/transports\">Pluggable Transports</a> page "
+"for more information on the types of transport that are currently available."
+msgstr ""
+"Direct access to the Tor network may sometimes be blocked by your Internet "
+"Service Provider or by a government. Tor Browser includes some circumvention"
+" tools for getting around these blocks. These tools are called “pluggable "
+"transports”. See the <a href=\"/transports\">Pluggable Transports</a> page "
+"for more information on the types of transport that are currently available."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "##### Using pluggable transports"
+msgstr "##### Using pluggable transports"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"To use pluggable transports, click \"Configure\" in the Tor Launcher window "
+"that appears when you first run Tor Browser."
+msgstr ""
+"To use pluggable transports, click \"Configure\" in the Tor Launcher window "
+"that appears when you first run Tor Browser."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+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 ""
+"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”."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Select “yes” when asked if your Internet Service Provider blocks connections"
+" to the Tor network."
+msgstr ""
+"Select “yes” when asked if your Internet Service Provider blocks connections"
+" to the Tor network."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/bridges.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/bridges.png\">"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Select “Connect with provided bridges”. Tor Browser currently has six "
+"pluggable transport options to choose from."
+msgstr ""
+"Select “Connect with provided bridges”. Tor Browser currently has six "
+"pluggable transport options to choose from."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid "##### Which transport should I use?"
+msgstr "##### Which transport should I use?"
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"Each of the transports listed in Tor Launcher’s menu works in a different "
+"way (for more details, see the <a href=\"/transports\">Pluggable "
+"Transports</a> page), and their effectiveness depends on your individual "
+"circumstances."
+msgstr ""
+"Each of the transports listed in Tor Launcher’s menu works in a different "
+"way (for more details, see the <a href=\"/transports\">Pluggable "
+"Transports</a> page), and their effectiveness depends on your individual "
+"circumstances."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"If you are trying to circumvent a blocked connection for the first time, you"
+" should try the different transports: obfs3, obfs4, ScrambleSuit, fte, meek-"
+"azure and Snowflake."
+msgstr ""
+"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 and Snowflake."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.body)
+msgid ""
+"If you try all of these options, and none of them gets you online, you will "
+"need to enter bridge addresses manually. Read the <a "
+"href=\"/bridges/\">Bridges</a> section to learn what bridges are and how to "
+"obtain them."
+msgstr ""
+"If you try all of these options, and none of them gets you online, you will "
+"need to enter bridge addresses manually. Read the <a "
+"href=\"/bridges/\">Bridges</a> section to learn what bridges are and how to "
+"obtain them."
+
+#: http//localhost/circumvention/
+#: (content/circumvention/contents+en.lrtopic.seo_slug)
+msgid "circumvention"
+msgstr "circumvention"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.title)
+msgid "Managing identities"
+msgstr "Managing identities"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.description)
+msgid "Learn how to control personally-identifying information in Tor Browser"
+msgstr ""
+"Learn how to control personally-identifying information in Tor Browser"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### The URL bar"
+msgstr "##### The URL bar"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/circuit_full.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/circuit_full.png\">"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"You can see a diagram of the circuit that Tor Browser is using for the "
+"current tab in the site information menu, in the URL bar."
+msgstr ""
+"You can see a diagram of the circuit that Tor Browser is using for the "
+"current tab in the site information menu, in the URL bar."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"In the circuit, the Guard or entry node is the first node and it's "
+"automatically and randomly selected by Tor. But it is different from the "
+"other nodes in the circuit. In order to avoid profiling attacks, the Guard "
+"node changes only after 2-3 months, unlike the other nodes, which change "
+"with every new domain. For more information about Guards, consult the <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+msgstr ""
+"In the circuit, the Guard or entry node is the first node and it's "
+"automatically and randomly selected by Tor. But it is different from the "
+"other nodes in the circuit. In order to avoid profiling attacks, the Guard "
+"node changes only after 2-3 months, unlike the other nodes, which change "
+"with every new domain. For more information about Guards, consult the <a "
+"href=\"https://www.torproject.org/docs/faq#EntryGuards\">FAQ</a> and <a "
+"href=\"https://support.torproject.org/tbb/tbb-2/\">Support Portal</a>."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### Logging in over Tor"
+msgstr "##### Logging in over Tor"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"When you log in to a website over Tor, there are several points you should "
+"bear in mind:"
+msgstr ""
+"When you log in to a website over Tor, there are several points you should "
+"bear in mind:"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"* See the <a href=\"/secure-connections\">Secure Connections</a> page for "
+"important information on how to secure your connection when logging in."
+msgstr ""
+"* See the <a href=\"/secure-connections\">Secure Connections</a> page for "
+"important information on how to secure your connection when logging in."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "##### Changing identities and circuits"
+msgstr "##### Changing identities and circuits"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/new_identity.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/new_identity.png\">"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser features “New Identity” and “New Tor Circuit for this Site” "
+"options, located in the main menu (hamburger menu)."
+msgstr ""
+"Tor Browser features “New Identity” and “New Tor Circuit for this Site” "
+"options, located in the main menu (hamburger menu)."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "###### New Identity"
+msgstr "###### New Identity"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+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 ""
+"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”."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid "###### New Tor circuit for this site"
+msgstr "###### New Tor circuit for this site"
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
+"relay</a> you are using is unable to connect to the website you require, or "
+"is not loading it properly. Selecting it will cause the currently-active tab"
+" or window to be reloaded over a new Tor circuit. Other open tabs and "
+"windows from the same website will use the new circuit as well once they are"
+" reloaded. This option does not clear any private information or unlink your"
+" activity, nor does it affect your current connections to other websites."
+msgstr ""
+"This option is useful if the <a href=\"/about/#how-tor-works\">exit "
+"relay</a> you are using is unable to connect to the website you require, or "
+"is not loading it properly. Selecting it will cause the currently-active tab"
+" or window to be reloaded over a new Tor circuit. Other open tabs and "
+"windows from the same website will use the new circuit as well once they are"
+" reloaded. This option does not clear any private information or unlink your"
+" activity, nor does it affect your current connections to other websites."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.body)
+msgid ""
+"You can also access this option in the new circuit display, in the site "
+"information menu, in the URL bar."
+msgstr ""
+"You can also access this option in the new circuit display, in the site "
+"information menu, in the URL bar."
+
+#: http//localhost/managing-identities/
+#: (content/managing-identities/contents+en.lrtopic.seo_slug)
+msgid "managing-identities"
+msgstr "managing-identities"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.title)
+msgid "Onion Services"
+msgstr "Onion Services"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.description)
+msgid "Services that are only accessible using Tor"
+msgstr "Services that are only accessible using Tor"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"Onion services (formerly known as “hidden services”) are services (like "
+"websites) that are only accessible through the Tor network."
+msgstr ""
+"Onion services (formerly known as “hidden services”) are services (like "
+"websites) that are only accessible through the Tor network."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"Onion services offer several advantages over ordinary services on the non-"
+"private web:"
+msgstr ""
+"Onion services offer several advantages over ordinary services on the non-"
+"private web:"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"* An onion services’s location and IP address are hidden, making it "
+"difficult for adversaries to censor it or identify its operators."
+msgstr ""
+"* An onion services’s location and IP address are hidden, making it "
+"difficult for adversaries to censor it or identify its operators."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"* All traffic between Tor users and onion services is end-to-end encrypted, "
+"so you do not need to worry about <a href=\"/secure-connections\">connecting"
+" over HTTPS</a>."
+msgstr ""
+"* All traffic between Tor users and onion services is end-to-end encrypted, "
+"so you do not need to worry about <a href=\"/secure-connections\">connecting"
+" over HTTPS</a>."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid "##### How to access an onion service"
+msgstr "##### How to access an onion service"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+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 16 (and "
+"in V3 format, 56) mostly random letters and numbers, followed by “.onion”."
+msgstr ""
+"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 16 (and "
+"in V3 format, 56) mostly random letters and numbers, followed by “.onion”."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"When accessing a website that uses an onion service, Tor Browser will show "
+"at the URL bar an icon of a little green onion displaying the state of your "
+"connection: secure and using an onion service. And if you're accessing a "
+"website with https and onion service, it will show an icon of a green onion "
+"and a padlock."
+msgstr ""
+"When accessing a website that uses an onion service, Tor Browser will show "
+"at the URL bar an icon of a little green onion displaying the state of your "
+"connection: secure and using an onion service. And if you're accessing a "
+"website with https and onion service, it will show an icon of a green onion "
+"and a padlock."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid "##### Troubleshooting"
+msgstr "##### Troubleshooting"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"If you cannot reach the onion service you require, make sure that you have "
+"entered the onion address correctly: even a small mistake will stop Tor "
+"Browser from being able to reach the site."
+msgstr ""
+"If you cannot reach the onion service you require, make sure that you have "
+"entered the onion address correctly: even a small mistake will stop Tor "
+"Browser from being able to reach the site."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.body)
+msgid ""
+"You can also ensure that you're able to access other onion services by "
+"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
+"Service</a>"
+msgstr ""
+"You can also ensure that you're able to access other onion services by "
+"connecting to <a href=\"http://3g2upl4pq6kufc4m.onion/\">DuckDuckGo's Onion "
+"Service</a>"
+
+#: http//localhost/onion-services/
+#: (content/onion-services/contents+en.lrtopic.seo_slug)
+msgid "onion-services"
+msgstr "onion-services"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.title)
+msgid "Secure Connections"
+msgstr "Secure Connections"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.description)
+msgid "Learn how to protect your data using Tor Browser and HTTPS"
+msgstr "Learn how to protect your data using Tor Browser and HTTPS"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+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 ""
+"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://”."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/https.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/https.png\">"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"The following visualization shows what information is visible to "
+"eavesdroppers with and without Tor Browser and HTTPS encryption:"
+msgstr ""
+"The following visualization shows what information is visible to "
+"eavesdroppers with and without Tor Browser and HTTPS encryption:"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "<img class=\"\" src=\"/static/images/tor-and-https.svg\">"
+msgstr "<img class=\"\" src=\"/static/images/tor-and-https.svg\">"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* When both buttons are green, you see the data that is visible to observers"
+" when you are using both tools."
+msgstr ""
+"* When both buttons are green, you see the data that is visible to observers"
+" when you are using both tools."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"* When both buttons are grey, you see the data that is visible to observers "
+"when you don't use either tool."
+msgstr ""
+"* When both buttons are grey, you see the data that is visible to observers "
+"when you don't use either tool."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "##### Potentially visible data"
+msgstr "##### Potentially visible data"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<dl>"
+msgstr "<dl>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<dt>"
+msgstr "<dt>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Site.com"
+msgstr "Site.com"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "</dt>"
+msgstr "</dt>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<dd>"
+msgstr "<dd>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "The site being visited."
+msgstr "The site being visited."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "</dd>"
+msgstr "</dd>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "user / pw"
+msgstr "user / pw"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Username and password used for authentication."
+msgstr "Username and password used for authentication."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "data"
+msgstr "data"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Data being transmitted."
+msgstr "Data being transmitted."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "location"
+msgstr "location"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid ""
+"Network location of the computer used to visit the website (the public IP "
+"address)."
+msgstr ""
+"Network location of the computer used to visit the website (the public IP "
+"address)."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Tor"
+msgstr "Tor"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+msgid "Whether or not Tor is being used."
+msgstr "Whether or not Tor is being used."
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.body)
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "</dl>"
+msgstr "</dl>"
+
+#: http//localhost/secure-connections/
+#: (content/secure-connections/contents+en.lrtopic.seo_slug)
+msgid "secure-connections"
+msgstr "secure-connections"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.title)
+msgid "Security Slider"
+msgstr "Security Slider"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.description)
+msgid "Configuring Tor Browser for security and usability"
+msgstr "Configuring Tor Browser for security and usability"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "##### Accessing the Security Slider"
+msgstr "##### Accessing the Security Slider"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/slider.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/slider.png\">"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"The Security Slider is located in Torbutton’s “Security Settings” menu."
+msgstr ""
+"The Security Slider is located in Torbutton’s “Security Settings” menu."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "##### Security Levels"
+msgstr "##### Security Levels"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/slider_window.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/slider_window.png\">"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"Increasing the level of the Security Slider will disable or partially "
+"disable certain browser features to protect against possible attacks."
+msgstr ""
+"Increasing the level of the Security Slider will disable or partially "
+"disable certain browser features to protect against possible attacks."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "Safest"
+msgstr "Safest"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "Safer"
+msgstr "Safer"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+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-<a href=\"/secure-connections\">HTTPS</a> "
+"sites."
+msgstr ""
+"At this level, HTML5 video and audio media become click-to-play via "
+"NoScript; all JavaScript performance optimizations are disabled; some "
+"mathematical equations may not display properly; some font rendering "
+"features are disabled; some types of image are disabled; and JavaScript is "
+"disabled by default on all non-<a href=\"/secure-connections\">HTTPS</a> "
+"sites."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid "Standard"
+msgstr "Standard"
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.body)
+msgid ""
+"At this level, all browser features are enabled. This is the most usable "
+"option."
+msgstr ""
+"At this level, all browser features are enabled. This is the most usable "
+"option."
+
+#: http//localhost/security-slider/
+#: (content/security-slider/contents+en.lrtopic.seo_slug)
+msgid "security-slider"
+msgstr "security-slider"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.title)
+msgid "Updating"
+msgstr "Updating"
+
+#: http//localhost/updating/
+#: (content/updating/contents+en.lrtopic.description)
+msgid "How to update Tor Browser"
+msgstr "How to update Tor Browser"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid "##### Updating Tor Browser automatically"
+msgstr "##### Updating Tor Browser automatically"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"400\" src=\"media/updating/update1.png\" />"
+msgstr "<img width=\"400\" src=\"media/updating/update1.png\" />"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, click on the Torbutton icon, "
+"then select “Check for Tor Browser Update”."
+msgstr ""
+"When you are prompted to update Tor Browser, click on the Torbutton icon, "
+"then select “Check for Tor Browser Update”."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"600\" src=\"media/updating/update3.png\" />"
+msgstr "<img width=\"600\" src=\"media/updating/update3.png\" />"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When Tor Browser has finished checking for updates, click on the “Update” "
+"button."
+msgstr ""
+"When Tor Browser has finished checking for updates, click on the “Update” "
+"button."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid "<img width=\"600\" src=\"media/updating/update4.png\" />"
+msgstr "<img width=\"600\" src=\"media/updating/update4.png\" />"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Wait for the update to download and install, then restart Tor Browser. You "
+"will now be running the latest version."
+msgstr ""
+"Wait for the update to download and install, then restart Tor Browser. You "
+"will now be running the latest version."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid "##### Updating Tor Browser manually"
+msgstr "##### Updating Tor Browser manually"
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"When you are prompted to update Tor Browser, finish the browsing session and"
+" close the program."
+msgstr ""
+"When you are prompted to update Tor Browser, finish the browsing session and"
+" close the program."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Remove Tor Browser from your system by deleting the folder that contains it "
+"(see the <a href='uninstalling'>Uninstalling</a> section for more "
+"information)."
+msgstr ""
+"Remove Tor Browser from your system by deleting the folder that contains it "
+"(see the <a href='uninstalling'>Uninstalling</a> section for more "
+"information)."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.body)
+msgid ""
+"Visit <a "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\">https://www.torproject.org/projects/torbrowser.html.en</a>"
+" and download a copy of the latest Tor Browser release, then install it as "
+"before."
+msgstr ""
+"Visit <a "
+"href=\"https://www.torproject.org/projects/torbrowser.html.en\">https://www.torproject.org/projects/torbrowser.html.en</a>"
+" and download a copy of the latest Tor Browser release, then install it as "
+"before."
+
+#: http//localhost/updating/ (content/updating/contents+en.lrtopic.seo_slug)
+msgid "updating"
+msgstr "updating"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.title)
+msgid "Plugins, add-ons and JavaScript"
+msgstr "Plugins, add-ons and JavaScript"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.description)
+msgid "How Tor Browser handles add-ons, plugins and JavaScript"
+msgstr "How Tor Browser handles add-ons, plugins and JavaScript"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid "##### Flash Player"
+msgstr "##### Flash Player"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+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 ""
+"Some video websites (such as YouTube) offer alternative video delivery "
+"methods that do not use Flash. These methods may be compatible with Tor "
+"Browser."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid "##### JavaScript"
+msgstr "##### JavaScript"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser includes an add-on called NoScript, accessible through the “S” "
+"icon at the top-right of the window. NoScript allows you to control the "
+"JavaScript (and other scripts) that runs on individual web pages, or block "
+"it entirely."
+msgstr ""
+"Tor Browser includes an add-on called NoScript, accessible through the “S” "
+"icon at the top-right of the window. NoScript allows you to control the "
+"JavaScript (and other scripts) that runs on individual web pages, or block "
+"it entirely."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/noscript_menu.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/noscript_menu.png\">"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid ""
+"Users who require a high degree of security in their web browsing should set"
+" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
+"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
+"so for all websites). However, disabling JavaScript will prevent many "
+"websites from displaying correctly, so Tor Browser’s default setting is to "
+"allow all websites to run scripts in \"Standard\" mode."
+msgstr ""
+"Users who require a high degree of security in their web browsing should set"
+" Tor Browser’s <a href=\"/security-slider\">Security Slider</a> to “Safer” "
+"(which disables JavaScript for non-HTTPS websites) or “Safest” (which does "
+"so for all websites). However, disabling JavaScript will prevent many "
+"websites from displaying correctly, so Tor Browser’s default setting is to "
+"allow all websites to run scripts in \"Standard\" mode."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+msgid "##### Browser Add-ons"
+msgstr "##### Browser Add-ons"
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/plugins/ (content/plugins/contents+en.lrtopic.seo_slug)
+msgid "plugins"
+msgstr "plugins"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.title)
+msgid "Troubleshooting"
+msgstr "Troubleshooting"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.description)
+msgid "What to do if Tor Browser doesn’t work"
+msgstr "What to do if Tor Browser doesn’t work"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+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 ""
+"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."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### Quick fixes"
+msgstr "##### Quick fixes"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"If Tor Browser doesn’t connect, there may be a simple solution. Try each of "
+"the following:"
+msgstr ""
+"If Tor Browser doesn’t connect, there may be a simple solution. Try each of "
+"the following:"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Your computer’s system clock must be set correctly, or Tor will not be "
+"able to connect."
+msgstr ""
+"* Your computer’s system clock must be set correctly, or Tor will not be "
+"able to connect."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"* Make sure another Tor Browser is not already running. If you’re not sure "
+"if Tor Browser is running, restart your computer."
+msgstr ""
+"* Make sure another Tor Browser is not already running. If you’re not sure "
+"if Tor Browser is running, restart your computer."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "* Temporarily disable your firewall."
+msgstr "* Temporarily disable your firewall."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+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 ""
+"* Delete Tor Browser and install it again. If updating, do not just "
+"overwrite your previous Tor Browser files; ensure they are fully deleted "
+"beforehand."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### Is your connection censored?"
+msgstr "##### Is your connection censored?"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"If you still can’t connect, your Internet Service Provider might be "
+"censoring connections to the Tor network. Read the <a "
+"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+msgstr ""
+"If you still can’t connect, your Internet Service Provider might be "
+"censoring connections to the Tor network. Read the <a "
+"href=\"/circumvention\">Circumvention</a> section for possible solutions."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid "##### Known issues"
+msgstr "##### Known issues"
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser is under constant development, and some issues are known about "
+"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
+"Issues</a> page to see if the problem you are experiencing is already listed"
+" there."
+msgstr ""
+"Tor Browser is under constant development, and some issues are known about "
+"but not yet fixed. Please check the <a href=\"/known-issues\">Known "
+"Issues</a> page to see if the problem you are experiencing is already listed"
+" there."
+
+#: http//localhost/troubleshooting/
+#: (content/troubleshooting/contents+en.lrtopic.seo_slug)
+msgid "troubleshooting"
+msgstr "troubleshooting"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.title)
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "Known issues"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Tor needs your system clock (and your time zone) set to the correct time."
+msgstr ""
+"* Tor needs your system clock (and your time zone) set to the correct time."
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* The following firewall software have been known to interfere with Tor and "
+"may need to be temporarily disabled:"
+msgstr ""
+"* The following firewall software have been known to interfere with Tor and "
+"may need to be temporarily disabled:"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Webroot SecureAnywhere"
+msgstr "* Webroot SecureAnywhere"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Kaspersky Internet Security 2012"
+msgstr "* Kaspersky Internet Security 2012"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Sophos Antivirus for Mac"
+msgstr "* Sophos Antivirus for Mac"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Microsoft Security Essentials"
+msgstr "* Microsoft Security Essentials"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Videos that require Adobe Flash are unavailable. Flash is disabled for "
+"security reasons."
+msgstr ""
+"* Videos that require Adobe Flash are unavailable. Flash is disabled for "
+"security reasons."
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "* Tor can not use a bridge if a proxy is set."
+msgstr "* Tor can not use a bridge if a proxy is set."
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+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 ""
+"* The Tor Browser package is dated January 1, 2000 00:00:00 UTC. This is to "
+"ensure that each software build is exactly reproducible."
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+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 ""
+"* 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."
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid ""
+"* Tor Browser can also be started from the command line by running the "
+"following command from inside the Tor Browser directory:"
+msgstr ""
+"* Tor Browser can also be started from the command line by running the "
+"following command from inside the Tor Browser directory:"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.body)
+msgid "./start-tor-browser.desktop"
+msgstr "./start-tor-browser.desktop"
+
+#: http//localhost/known-issues/
+#: (content/known-issues/contents+en.lrtopic.seo_slug)
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.seo_slug)
+msgid "uninstalling"
+msgstr "uninstalling"
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.title)
+msgid "Uninstalling"
+msgstr "Uninstalling"
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.description)
+msgid "How to remove Tor Browser from your system"
+msgstr "How to remove Tor Browser from your system"
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser does not affect any of the existing software or settings on your"
+" computer. Uninstalling Tor Browser will not affect your system’s software "
+"or settings."
+msgstr ""
+"Tor 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."
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "Removing Tor Browser from your system is simple:"
+msgstr "Removing Tor Browser from your system is simple:"
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"1. 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 ""
+"1. 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."
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "2. Delete the Tor Browser folder."
+msgstr "2. Delete the Tor Browser folder."
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid "3. Empty your Trash"
+msgstr "3. Empty your Trash"
+
+#: http//localhost/uninstalling/
+#: (content/uninstalling/contents+en.lrtopic.body)
+msgid ""
+"Note that your operating system’s standard “Uninstall” utility is not used."
+msgstr ""
+"Note that your operating system’s standard “Uninstall” utility is not used."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.title)
+msgid "Becoming a Tor Translator"
+msgstr "Becoming a Tor Translator"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.description)
+msgid "Becoming a translator for the Tor Project"
+msgstr "Becoming a translator for the Tor Project"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"If you are interested in helping out the project by translating the manual "
+"or the Tor Browser to your language, your help would be greatly appreciated!"
+" In order to begin contributing you will have to sign up with Transifex, the"
+" third-party that faciliates our translations. Below is an outline of how to"
+" sign up and begin."
+msgstr ""
+"If you are interested in helping out the project by translating the manual "
+"or the Tor Browser to your language, your help would be greatly appreciated!"
+" In order to begin contributing you will have to sign up with Transifex, the"
+" third-party that faciliates our translations. Below is an outline of how to"
+" sign up and begin."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "##### Signing up on Transifex"
+msgstr "##### Signing up on Transifex"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"* Head over to the <a href=\"https://transifex.com/signup/\">Transifex "
+"signup page</a>."
+msgstr ""
+"* Head over to the <a href=\"https://transifex.com/signup/\">Transifex "
+"signup page</a>."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "Enter your information into the fields and click the 'Sign Up' button:"
+msgstr ""
+"Enter your information into the fields and click the 'Sign Up' button:"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/tr1.png\">"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"* Fill out the next page with your name and select \"Localization\" and "
+"\"Translator\" from the drop-down menus:"
+msgstr ""
+"* Fill out the next page with your name and select \"Localization\" and "
+"\"Translator\" from the drop-down menus:"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/tr2.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/tr2.png\">"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "* On the next page, select 'Join an existing project' and continue."
+msgstr "* On the next page, select 'Join an existing project' and continue."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"* On the next page, select the languages you speak from the drop-down menu "
+"and continue."
+msgstr ""
+"* On the next page, select the languages you speak from the drop-down menu "
+"and continue."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"* You are now signed up! Go to the <a "
+"href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex page</a>."
+msgstr ""
+"* You are now signed up! Go to the <a "
+"href=\"https://www.transifex.com/otf/torproject/\">Tor Transifex page</a>."
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "* Click the blue 'Join Team' button on the far right:"
+msgstr "* Click the blue 'Join Team' button on the far right:"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/tr3.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/tr3.png\">"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"* Select the language you would like to translate from the dropdown menu:"
+msgstr ""
+"* Select the language you would like to translate from the dropdown menu:"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/tr4.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/tr4.png\">"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "* A notification will now show up on the top of the page like so:"
+msgstr "* A notification will now show up on the top of the page like so:"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid "<img class=\"col-md-6\" src=\"/static/images/tr5.png\">"
+msgstr "<img class=\"col-md-6\" src=\"/static/images/tr5.png\">"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.body)
+msgid ""
+"After your membership is approved you can begin translating; simply navigate"
+" back to the <a href=\"https://www.transifex.com/otf/torproject/\">Tor "
+"Transifex page</a> when you are ready to begin. Thanks for your interest in "
+"helping the project!"
+msgstr ""
+"After your membership is approved you can begin translating; simply navigate"
+" back to the <a href=\"https://www.transifex.com/otf/torproject/\">Tor "
+"Transifex page</a> when you are ready to begin. Thanks for your interest in "
+"helping the project!"
+
+#: http//localhost/becoming-tor-translator/
+#: (content/becoming-tor-translator/contents+en.lrtopic.seo_slug)
+msgid "becoming-tor-translator"
+msgstr "becoming-tor-translator"
+
+#: templates/footer.html:5
+msgid "Our mission:"
+msgstr "Our mission:"
+
+#: templates/footer.html:5
+msgid ""
+"to advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+"to advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+
+#: templates/footer.html:24
+msgid "Subscribe to our Newsletter"
+msgstr "Subscribe to our Newsletter"
+
+#: templates/footer.html:25
+msgid "Get monthly updates and opportunities from the Tor Project"
+msgstr "Get monthly updates and opportunities from the Tor Project"
+
+#: templates/footer.html:32
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our "
+msgstr ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our "
+
+#: templates/layout.html:7
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser Manual"
+
+#: templates/navbar.html:4
+msgid "Tor Logo"
+msgstr "Tor Logo"
+
+#: templates/navbar.html:40
+msgid "Download Tor Browser"
+msgstr "Download Tor Browser"
+
+#: templates/search.html:5
+msgid "Search"
+msgstr "Search"
+
+#: templates/sidenav.html:4 templates/sidenav.html:30
+msgid "Topics"
+msgstr "Topics"
+
+#: templates/macros/topic.html:18
+msgid "Permalink"
+msgstr "Permalink"
diff --git a/contents+es_AR.po b/contents+es-AR.po
similarity index 100%
rename from contents+es_AR.po
rename to contents+es-AR.po
diff --git a/contents+pt_BR.po b/contents+pt-BR.po
similarity index 100%
rename from contents+pt_BR.po
rename to contents+pt-BR.po
diff --git a/contents+zh_CN.po b/contents+zh-CN.po
similarity index 100%
rename from contents+zh_CN.po
rename to contents+zh-CN.po
diff --git a/contents+zh_TW.po b/contents+zh-TW.po
similarity index 100%
rename from contents+zh_TW.po
rename to contents+zh-TW.po
1
0

[tor-browser-build/master] Bug 28467: Update hacking doc for working with submodules
by boklm@torproject.org 16 Nov '18
by boklm@torproject.org 16 Nov '18
16 Nov '18
commit f8d9731ad7dd2c3cf66d4aaa6b5d78ad0dcac671
Author: Georg Koppen <gk(a)torproject.org>
Date: Fri Nov 16 09:36:31 2018 +0000
Bug 28467: Update hacking doc for working with submodules
Additionally, minor clean-ups got done (like adding our 64bit Windows
target where needed).
---
README.HACKING | 29 ++++++++++++++++++++---------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/README.HACKING b/README.HACKING
index d9ebf63..9b846a7 100644
--- a/README.HACKING
+++ b/README.HACKING
@@ -44,15 +44,15 @@ In each of those places, an option can be defined:
The targets are usually used to select:
- the platform: torbrowser-linux-x86_64, torbrowser-linux-i686,
- torbrowser-windows-i686, torbrowser-osx-x86_64
+ torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64
- the channel: release, nightly, alpha
The targets torbrowser-linux-x86_64, torbrowser-linux-i686,
-torbrowser-windows-i686, torbrowser-osx-x86_64 are special cases. They
-do not contain options directly, instead they contain a list of other
-targets. For instance, the torbrowser-linux-x86_64 target is pointing
-to the linux-x86_64 and linux targets. You should define an option under
-the linux target if it applies to Linux on both architectures, or under
+torbrowser-windows-i686, torbrowser-windows-x86_64, torbrowser-osx-x86_64 are
+special cases. They do not contain options directly, instead they contain a
+list of other targets. For instance, the torbrowser-linux-x86_64 target is
+pointing to the linux-x86_64 and linux targets. You should define an option
+under the linux target if it applies to Linux on both architectures, or under
the linux-x86_64 if it only applies to the x86_64 architecture.
An option that is defined at the root of rbm.conf can be overridden by
@@ -148,6 +148,8 @@ $platform should be one of the following:
- torbrowser-windows-i686
+ - torbrowser-windows-x86_64
+
- torbrowser-osx-x86_64
For example, to see tor's build script for linux x86_64 on the alpha
@@ -242,6 +244,16 @@ Remember that the git_hash option has different definitions for alpha
and nightly builds, so you should modify the right one depending on
what type of build you are doing (see also the "Types of builds" section).
+The first alternative is not working in case patches contain binary diffs,
+which the patch command can't handle. However, working with submodules can
+make the git branch alternative tricky to use. In that case you can resort
+to a third option by installing git in the build container (via var/deps in
+the respective config file). Then you can change to the submodule directory
+in the build script and do a
+
+ git apply patch-for-XXXX.patch
+
+after adding the patch to the project's config file (see above).
The Firefox mozconfig files
---------------------------
@@ -298,8 +310,8 @@ For example, if you want to try a Linux x86_64 alpha build, you can run:
torbrowser-linux-x86_64
-Types of builds: nightly, alpha, release and testbuild
-------------------------------------------------------
+Types of builds: nightly, alpha, release, and testbuild
+-------------------------------------------------------
The testbuild makefile target allows you to do a build quickly in the
testbuild directory, skipping the generation of all the locales and the
@@ -313,4 +325,3 @@ builds in order to point to the master branch.
If you want your testbuild target to create builds based on nightly
rather than alpha, you can edit your rbm.local.conf file and uncomment
the targets/torbrowser-testbuild definition.
-
1
0

[translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed
by translation@torproject.org 16 Nov '18
by translation@torproject.org 16 Nov '18
16 Nov '18
commit f2e628d5cfbc2803b92ad0776760d6081e562e3b
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Nov 16 12:20:34 2018 +0000
Update translations for tor-browser-manual_completed
---
pt/pt.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pt/pt.po b/pt/pt.po
index 873dfe1f1..3376bb57c 100644
--- a/pt/pt.po
+++ b/pt/pt.po
@@ -4,7 +4,7 @@
# Francisco P. <sonhosdigitais(a)gmx.com>, 2016
# Cesar Silva <cesarsilvabx(a)gmail.com>, 2017
# Alberto Castro, 2017
-# MS, 2018
+# MS <manuelarodsilva(a)gmail.com>, 2018
# Allan Werneck <edielwerneck(a)gmail.com>, 2018
#
msgid ""
1
0