date:20150512

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 403914e5357ccd0322b5a7f248efa10d776c8d94
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 08:16:56 2015 +

Update translations for torbutton-abouttorproperties
---
 de/abouttor.properties|2 +-
 it/abouttor.properties|2 +-
 nl/abouttor.properties|2 +-
 nl_BE/abouttor.properties |2 +-
 pt_BR/abouttor.properties |2 +-
 tr/abouttor.properties|2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/de/abouttor.properties b/de/abouttor.properties
index d607324..1b04753 100644
--- a/de/abouttor.properties
+++ b/de/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
diff --git a/it/abouttor.properties b/it/abouttor.properties
index d607324..e6143a3 100644
--- a/it/abouttor.properties
+++ b/it/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/ita/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
diff --git a/nl/abouttor.properties b/nl/abouttor.properties
index d607324..d68e8c1 100644
--- a/nl/abouttor.properties
+++ b/nl/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
diff --git a/nl_BE/abouttor.properties b/nl_BE/abouttor.properties
index d607324..d68e8c1 100644
--- a/nl_BE/abouttor.properties
+++ b/nl_BE/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/ned/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index d607324..f3266d6 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/por/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
diff --git a/tr/abouttor.properties b/tr/abouttor.properties
index d607324..a9c53ab 100644
--- a/tr/abouttor.properties
+++ b/tr/abouttor.properties
@@ -4,7 +4,7 @@
 
 aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://startpage.com/tur/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit aa2e468dcbc18e226fb350606e24f81158ea5073
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 06:46:10 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 es/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/es/abouttor.properties b/es/abouttor.properties
new file mode 100644
index 000..de53c95
--- /dev/null
+++ b/es/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SPagina de inicio/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://paginainicio.com/es/protecciÃ³n-de-la-privacidad.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://paginainicio.com/
+
+aboutTor.searchDDG.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDuckDuckGo/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDisconnect.me/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 866c7cbb271269b3722d3dd8b8aec60e595bbc36
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 06:46:06 2015 +

Update translations for torbutton-abouttorproperties
---
 es/abouttor.properties |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/es/abouttor.properties b/es/abouttor.properties
index d607324..de53c95 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SPagina de inicio/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+aboutTor.searchSP.privacy.link=https://paginainicio.com/es/protecciÃ³n-de-la-privacidad.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://startpage.com/
+aboutTor.searchSP.search.link=https://paginainicio.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit f78ee4e8a12208a13d303095749d8d0c05a45823
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 08:16:26 2015 +

Update translations for torbutton-aboutdialogdtd
---
 ca/aboutdialog.dtd|2 +-
 cs/aboutdialog.dtd|2 +-
 de/aboutdialog.dtd|2 +-
 es/aboutdialog.dtd|2 +-
 fr/aboutdialog.dtd|2 +-
 fr_CA/aboutdialog.dtd |2 +-
 it/aboutdialog.dtd|2 +-
 nb/aboutdialog.dtd|2 +-
 nl/aboutdialog.dtd|2 +-
 pl/aboutdialog.dtd|2 +-
 pt/aboutdialog.dtd|2 +-
 pt_BR/aboutdialog.dtd |2 +-
 ro/aboutdialog.dtd|2 +-
 sv/aboutdialog.dtd|2 +-
 tr/aboutdialog.dtd|2 +-
 uk/aboutdialog.dtd|2 +-
 zh_CN/aboutdialog.dtd |2 +-
 zh_TW/aboutdialog.dtd |2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/ca/aboutdialog.dtd b/ca/aboutdialog.dtd
index 5099ad7..22e081f 100644
--- a/ca/aboutdialog.dtd
+++ b/ca/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink DÃ³na
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/cs/aboutdialog.dtd b/cs/aboutdialog.dtd
index 5099ad7..6ce6483 100644
--- a/cs/aboutdialog.dtd
+++ b/cs/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink PÅispÄjte
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/de/aboutdialog.dtd b/de/aboutdialog.dtd
index 5099ad7..d14de00 100644
--- a/de/aboutdialog.dtd
+++ b/de/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink Spenden
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/es/aboutdialog.dtd b/es/aboutdialog.dtd
index 5099ad7..2bf861e 100644
--- a/es/aboutdialog.dtd
+++ b/es/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink Donar
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd
index 5099ad7..1b34c83 100644
--- a/fr/aboutdialog.dtd
+++ b/fr/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink Faire une donation
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/fr_CA/aboutdialog.dtd b/fr_CA/aboutdialog.dtd
index 5099ad7..28ea1f3 100644
--- a/fr_CA/aboutdialog.dtd
+++ b/fr_CA/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
-!ENTITY help.donateLink Donate
+!ENTITY help.donateLink Faire un don
 !ENTITY help.or  or 
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
 !ENTITY help.getInvolvedLinkget involved
diff --git a/it/aboutdialog.dtd b/it/aboutdialog.dtd
index 5099ad7..3614fd3 100644
--- a/it/aboutdialog.dtd
+++ b/it/aboutdialog.dtd
@@ -5,7 +5,7 @@
 
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en

[tor-commits] [torsocks/master] Change IsolatePID password from 42 to 0

2015-05-12 Thread dgoulet

commit 2b8c1b7718dc2ca80c1d7dbc5fb46dab782d45eb
Author: David Goulet dgou...@ev0ke.net
Date:   Tue May 12 12:12:25 2015 -0400

Change IsolatePID password from 42 to 0

Signed-off-by: David Goulet dgou...@ev0ke.net
---
 src/common/config-file.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/config-file.c b/src/common/config-file.c
index 2f145fb..2147068 100644
--- a/src/common/config-file.c
+++ b/src/common/config-file.c
@@ -53,7 +53,7 @@ static unsigned int both_socks5_pass_user_set;
  */
 static const char *isolate_username_fmt = torsocks-%ld:%lld;
 /* Default password for the IsolatePID option. */
-static const char *isolate_password = 42;
+static const char *isolate_password = 0;
 
 /*
  * Set the onion pool address range in the configuration object using the value
@@ -476,7 +476,7 @@ int conf_apply_socks_auth(struct configuration *config)
 
/* PID based isolation requested.
 *   Username: 'torsocks-' PID ':' TIME
-*   Password: '42'
+*   Password: '0'
 */
 
pid = getpid();

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

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2015-05-12 Thread translation

commit 494a098bd3cdcfc268de620c7ca963c1ff9e6ed2
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 16:45:03 2015 +

Update translations for bridgedb
---
 en_GB/LC_MESSAGES/bridgedb.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 61bd22a..48fec07 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -10,8 +10,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
-PO-Revision-Date: 2015-04-19 08:23+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-05-12 16:33+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -205,7 +205,7 @@ msgid 
 To enter bridges into Tor Browser, first go to the %s Tor Browser download\n
 page %s and then follow the instructions there for downloading and starting\n
 Tor Browser.
-msgstr 
+msgstr To enter bridges into Tor Browser, first go to the %s Tor Browser 
download\npage %s and then follow the instructions there for downloading and 
starting\nTor Browser.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
 #: lib/bridgedb/strings.py:126

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

[tor-commits] [torsocks/master] Add automatic per process isolation (IsolatePID)

2015-05-12 Thread dgoulet

commit 1875ef7416f9f6108e1bb2a2eea7d6e4a972a988
Author: Yawning Angel yawn...@schwanenlied.me
Date:   Tue May 12 11:39:52 2015 +

Add automatic per process isolation (IsolatePID)

IsolatePID will have torsocks automatically derive a unique SOCKS5
username/password pair of the form:

  'torsocks-' PID ':' unixTime / '42'

To provide automatic per-process isolation (Disabled by default). This
behavior may be better for certain users/applications, and may also be
controlled via the `TORSOCKS_ISOLATE_PID` env var.

Option -i/--isolate to torsocks is added that automatically export the
TORSOCKS_ISOLATE_PID variable.

Implements #16006.

Signed-off-by: Yawning Angel yawn...@schwanenlied.me
Signed-off-by: David Goulet dgou...@ev0ke.net
---
 doc/torsocks.1   |5 +++
 doc/torsocks.8   |6 +++
 doc/torsocks.conf|7 +++
 doc/torsocks.conf.5  |8 
 src/bin/torsocks.in  |4 ++
 src/common/config-file.c |  107 ++
 src/common/config-file.h |   10 +
 src/common/defaults.h|3 ++
 src/lib/torsocks.c   |   16 ++-
 9 files changed, 165 insertions(+), 1 deletion(-)

diff --git a/doc/torsocks.1 b/doc/torsocks.1
index 9fc4361..0e3c341 100644
--- a/doc/torsocks.1
+++ b/doc/torsocks.1
@@ -47,6 +47,11 @@ Set password for the SOCKS5 authentication. Use for circuit 
isolation in Tor.
 Note that you MUST have a username set either by the command line, environment
 variable or configuration file (torsocks.conf(5)).
 .TP
+.BR \-i, \-\-isolate
+Automatic tor isolation. Set the username and password for the SOCKS5
+authentication method to a PID/current time based value automatically. Username
+and Password MUST NOT be set.
+.TP
 .BR \-d, \-\-debug
 Activate the debug mode. Output will be written on stderr.
 .TP
diff --git a/doc/torsocks.8 b/doc/torsocks.8
index 4a14703..ac3863a 100644
--- a/doc/torsocks.8
+++ b/doc/torsocks.8
@@ -99,6 +99,12 @@ also with the variable above.
 Allow inbound connections so the application can accept and listen for
 connections.
 
+.PP
+.IP TORSOCKS_ISOLATE_PID
+Set the username and password for the SOCKS5 authentication method to a
+PID/current time based value automatically. Username and Password MUST NOT
+be set.
+
 .SH KNOWN ISSUES
 
 .SS DNS
diff --git a/doc/torsocks.conf b/doc/torsocks.conf
index 7e82a27..5dd9df6 100644
--- a/doc/torsocks.conf
+++ b/doc/torsocks.conf
@@ -33,3 +33,10 @@ OnionAddrRange 127.42.42.0/24
 # If set to 1, connect() will be allowed to be used to the loopback interface
 # bypassing Tor. This option should not be used by most users. (Default: 0)
 #AllowOutboundLocalhost 1
+
+# Set Torsocks to use an automatically generated SOCKS5 username/password based
+# on the process ID and current time, that makes the connections to Tor use a
+# different circuit from other existing streams in Tor on a per-process basis.
+# If set, the SOCKS5Username and SOCKS5Password options must not be set.
+# (Default: 0)
+#IsolatePID 1
diff --git a/doc/torsocks.conf.5 b/doc/torsocks.conf.5
index 13ac7b9..33fba3e 100644
--- a/doc/torsocks.conf.5
+++ b/doc/torsocks.conf.5
@@ -83,6 +83,14 @@ Allow outbound connections to the loopback interface meaning 
that connect()
 will be allowed to connect to localhost addresses bypassing Tor.  This option
 should not be used by most users. (Default: 0)
 
+.TP
+.I IsolatePID 0|1
+Set Torsocks to use an automatically generated SOCKS5 username/password
+based on the process ID and current time, that makes the connections to Tor
+use a different circuit from other existing streams in Tor on a per-process
+basis.  If set, the SOCKS5Username and SOCKS5Password options must not be
+set. (Default: 0)
+
 .SH EXAMPLE
   $ export TORSOCKS_CONF_FILE=$PWD/torsocks.conf
   $ torsocks ssh acco...@sshserver.com
diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in
index 7fd43d6..2a459b3 100644
--- a/src/bin/torsocks.in
+++ b/src/bin/torsocks.in
@@ -131,6 +131,7 @@ usage ()
echo   -d, --debug Set debug mode.
echo   -u, --user NAME Username for the SOCKS5 authentication
echo   -p, --pass NAME Password for the SOCKS5 authentication
+   echo   -i, --isolate   Automatic tor isolation. Can't be used with 
-u/-p
echo   on, off Set/Unset your shell to use Torsocks by default
echo   Make sure to source the call when using this 
option. (See Examples)
echo   show, shShow the current value of the LD_PRELOAD
@@ -214,6 +215,9 @@ do
export TORSOCKS_PASSWORD=$2
shift
;;
+   -i|--isolate)
+   export TORSOCKS_ISOLATE_PID=1
+   ;;
-d|--debug)
# Set full DEBUG with 5 being the highest possible 
level.
export TORSOCKS_LOG_LEVEL=5
diff --git

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 6d909d1491452986d05b718e9e0b85e09d8cca1f
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 17:16:15 2015 +

Update translations for torbutton-abouttorproperties
---
 pt_BR/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
index f3266d6..6ee87d0 100644
--- a/pt_BR/abouttor.properties
+++ b/pt_BR/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizando 
a href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/por/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizado 
a href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizando 
a href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit c23e8842e3249171879d5df723b80b874c58ec74
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 17:16:18 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 pt_BR/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/pt_BR/abouttor.properties b/pt_BR/abouttor.properties
new file mode 100644
index 000..6ee87d0
--- /dev/null
+++ b/pt_BR/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizando 
a href=%2$SStartpage/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/por/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizado 
a href=%2$SDuckDuckGo/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=Buscar a href=%1$Scom seguranÃ§a/a utilizando 
a href=%2$SDisconnect.me/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 18e2fd65afb316f7c3c9aa4bc0f66f83443b274d
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 17:16:11 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 en_GB/aboutdialog.dtd |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/en_GB/aboutdialog.dtd b/en_GB/aboutdialog.dtd
new file mode 100644
index 000..5099ad7
--- /dev/null
+++ b/en_GB/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; is developed by 
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink the amp;vendorShortName;
+!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+
+!ENTITY help.start  Want to help? 
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Donate
+!ENTITY help.or  or 
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Questions?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  Licensing Information
+!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.

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

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2015-05-12 Thread translation

commit f217084bb7d98f213cb60792724ce9341ad2bff7
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 17:15:55 2015 +

Update translations for torbutton-torbuttondtd
---
 en_GB/torbutton.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/en_GB/torbutton.dtd b/en_GB/torbutton.dtd
index d5a2ae6..7e5d7e1 100644
--- a/en_GB/torbutton.dtd
+++ b/en_GB/torbutton.dtd
@@ -160,7 +160,7 @@
 !ENTITY torbutton.prefs.sec_gen_desc At this security level, the following 
changes apply (mouseover for details):
 !ENTITY torbutton.prefs.sec_html5_desc HTML5 video and audio media become 
click-to-play via NoScript.
 !ENTITY torbutton.prefs.sec_html5_tooltip On some sites, you might need to 
use the NoScript toolbar button to enable these media objects.
-!ENTITY torbutton.prefs.sec_some_jit_desc Some JavaScript performance 
optimizations are disabled.
+!ENTITY torbutton.prefs.sec_some_jit_desc Some JavaScript performance 
optimisations are disabled.
 !ENTITY torbutton.prefs.sec_jit_desc_tooltip ION JIT, Type Inference, 
ASM.JS.
 !ENTITY torbutton.prefs.sec_baseline_jit_desc_tooltip Baseline JIT.
 !ENTITY torbutton.prefs.sec_jit_slower_desc Scripts on some sites may run 
slower.
@@ -169,7 +169,7 @@
 !ENTITY torbutton.prefs.sec_mathml_desc Some mechanisms of displaying math 
equations are disabled.
 !ENTITY torbutton.prefs.sec_mathml_desc_tooltip MathML is disabled.
 !ENTITY torbutton.prefs.sec_med_high Medium-High
-!ENTITY torbutton.prefs.sec_all_jit_desc All JavaScript performance 
optimizations are disabled.
+!ENTITY torbutton.prefs.sec_all_jit_desc All JavaScript performance 
optimisations are disabled.
 !ENTITY torbutton.prefs.sec_font_rend_desc Some font rendering features are 
disabled.
 !ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip The Graphite font 
rendering mechanism is disabled.
 !ENTITY torbutton.prefs.sec_svg_desc Some types of images are disabled.

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

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2015-05-12 Thread translation

commit 4fa07a44fe53edab76d3629cd4a9acb73b27d172
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 16:45:48 2015 +

Update translations for tails-misc
---
 en_GB.po |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/en_GB.po b/en_GB.po
index bf44339..9b3fb70 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -11,8 +11,8 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2015-05-02 23:47+0200\n
-PO-Revision-Date: 2015-05-03 08:25+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-05-12 16:33+\n
+Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -100,7 +100,7 @@ msgstr _Manage Keys
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:208
 msgid _Open Text Editor
-msgstr 
+msgstr _Open Text Editor
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:252
 msgid The clipboard does not contain valid input data.

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

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2015-05-12 Thread translation

commit b149339b3d21af612f50df99b02d8a9cdccc7289
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 16:45:08 2015 +

Update translations for bridgedb_completed
---
 en_GB/LC_MESSAGES/bridgedb.po |   30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index d932f1e..48fec07 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,8 @@
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
-POT-Creation-Date: 2015-02-03 03:24+\n
-PO-Revision-Date: 2015-03-21 20:31+\n
+Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'POT-Creation-Date:
 2015-03-19 22:13+\n
+PO-Revision-Date: 2015-05-12 16:33+\n
 Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
@@ -32,7 +31,7 @@ msgstr 
 #. fteproxy
 #. Tor
 #. Tor Browser
-#: lib/bridgedb/HTTPServer.py:122
+#: lib/bridgedb/HTTPServer.py:107
 msgid Sorry! Something went wrong with your request.
 msgstr Sorry! Something went wrong with your request.
 
@@ -203,26 +202,27 @@ msgstr How to start using your bridges
 #: lib/bridgedb/strings.py:121
 #, python-format
 msgid 
-To enter bridges into Tor Browser, follow the instructions on the %s Tor\n
-Browser download page %s to start Tor Browser.
-msgstr To enter bridges into Tor Browser, follow the instructions on the %s 
Tor\nBrowser download page %s to start Tor Browser.
+To enter bridges into Tor Browser, first go to the %s Tor Browser download\n
+page %s and then follow the instructions there for downloading and starting\n
+Tor Browser.
+msgstr To enter bridges into Tor Browser, first go to the %s Tor Browser 
download\npage %s and then follow the instructions there for downloading and 
starting\nTor Browser.
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:125
+#: lib/bridgedb/strings.py:126
 msgid 
 When the 'Tor Network Settings' dialogue pops up, click 'Configure' and 
follow\n
 the wizard until it asks:
 msgstr When the 'Tor Network Settings' dialogue pops up, click 'Configure' 
and follow\nthe wizard until it asks:
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:129
+#: lib/bridgedb/strings.py:130
 msgid 
 Does your Internet Service Provider (ISP) block or otherwise censor 
connections\n
 to the Tor network?
 msgstr Does your Internet Service Provider (ISP) block or otherwise censor 
connections\nto the Tor network?
 
 #. TRANSLATORS: Please DO NOT translate Tor.
-#: lib/bridgedb/strings.py:133
+#: lib/bridgedb/strings.py:134
 msgid 
 Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n
 paste the bridge lines into the text input box. Finally, click 'Connect', 
and\n
@@ -230,29 +230,29 @@ msgid 
 button in the 'Tor Network Settings' wizard for further assistance.
 msgstr Select 'Yes' and then click 'Next'. To configure your new bridges, 
copy and\npaste the bridge lines into the text input box. Finally, click 
'Connect', and\nyou should be good to go! If you experience trouble, try 
clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further 
assistance.
 
-#: lib/bridgedb/strings.py:141
+#: lib/bridgedb/strings.py:142
 msgid Displays this message.
 msgstr Displays this message.
 
 #. TRANSLATORS: Please try to make it clear that vanilla here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. plain-ol'-vanilla bridges.
-#: lib/bridgedb/strings.py:145
+#: lib/bridgedb/strings.py:146
 msgid Request vanilla bridges.
 msgstr Request vanilla bridges.
 
-#: lib/bridgedb/strings.py:146
+#: lib/bridgedb/strings.py:147
 msgid Request IPv6 bridges.
 msgstr Request IPv6 bridges.
 
 #. TRANSLATORS: Please DO NOT translate the word the word TYPE.
-#: lib/bridgedb/strings.py:148
+#: lib/bridgedb/strings.py:149
 msgid Request a Pluggable Transport by TYPE.
 msgstr Request a Pluggable Transport by TYPE.
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate GnuPG.
-#: lib/bridgedb/strings.py:151
+#: lib/bridgedb/strings.py:152
 msgid Get a copy of BridgeDB's public GnuPG key.
 msgstr Get a copy of BridgeDB's public GnuPG key.
 

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

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2015-05-12 Thread translation

commit b3df61deef3783a2815afb7534e2d1a88d9ec884
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 16:46:06 2015 +

Update translations for torbutton-torbuttonproperties
---
 en_GB/torbutton.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en_GB/torbutton.properties b/en_GB/torbutton.properties
index 2defd9b..5f9f872 100644
--- a/en_GB/torbutton.properties
+++ b/en_GB/torbutton.properties
@@ -59,7 +59,7 @@ torbutton.popup.confirm_newnym = Tor Browser will close all 
windows and tabs. Al
 torbutton.slider_notification = The green onion menu now has a security slider 
which lets you adjust your security level. Check it out!
 torbutton.slider_notification_button = Open security settings
 
-torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
+torbutton.maximize_warning = Maximising Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
 canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?

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

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2015-05-12 Thread translation

commit 2da938d25e925c37fc4ccf1e26514babd7c2c357
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 16:45:52 2015 +

Update translations for tails-misc_completed
---
 en_GB.po |   72 +-
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/en_GB.po b/en_GB.po
index 87c0376..9b3fb70 100644
--- a/en_GB.po
+++ b/en_GB.po
@@ -10,8 +10,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2015-02-23 16:25+0100\n
-PO-Revision-Date: 2015-03-21 20:37+\n
+POT-Creation-Date: 2015-05-02 23:47+0200\n
+PO-Revision-Date: 2015-05-12 16:33+\n
 Last-Translator: Andi Chandler a...@gowling.com\n
 Language-Team: English (United Kingdom) 
(http://www.transifex.com/projects/p/torproject/language/en_GB/)\n
 MIME-Version: 1.0\n
@@ -20,11 +20,11 @@ msgstr 
 Language: en_GB\n
 Plural-Forms: nplurals=2; plural=(n != 1);\n
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
 msgid Tor is ready
 msgstr Tor is ready.
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
 msgid You can now access the Internet.
 msgstr You can now access the Internet
 
@@ -98,128 +98,132 @@ msgstr _Decrypt/Verify Clipboard
 msgid _Manage Keys
 msgstr _Manage Keys
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:244
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:208
+msgid _Open Text Editor
+msgstr _Open Text Editor
+
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:252
 msgid The clipboard does not contain valid input data.
 msgstr The clipboard does not contain valid input data.
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:295
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:297
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:299
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:303
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:305
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:307
 msgid Unknown Trust
 msgstr Unknown Trust
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:301
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:309
 msgid Marginal Trust
 msgstr Marginal Trust
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:303
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:311
 msgid Full Trust
 msgstr Full Trust
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:305
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:313
 msgid Ultimate Trust
 msgstr Ultimate Trust
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:358
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:366
 msgid Name
 msgstr Name
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:359
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:367
 msgid Key ID
 msgstr Key ID
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:360
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:368
 msgid Status
 msgstr Status
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:392
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:400
 msgid Fingerprint:
 msgstr Fingerprint:
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:395
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:403
 msgid User ID:
 msgid_plural User IDs:
 msgstr[0] User ID:
 msgstr[1] User IDs:
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:425
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:433
 msgid None (Don't sign)
 msgstr None (Don't sign)
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:488
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:496
 msgid Select recipients:
 msgstr Select recipients:
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:496
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:504
 msgid Hide recipients
 msgstr Hide recipients
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:499
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:507
 msgid 
 Hide the user IDs of all recipients of an encrypted message. Otherwise 
 anyone that sees the encrypted message can see who the recipients are.
 msgstr Hide the user IDs of all recipients of an encrypted message. Otherwise 
anyone that sees the encrypted message can see who the recipients are.
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:505
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:513
 msgid Sign message as:
 msgstr Sign message as:
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:509
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:517
 msgid Choose keys
 msgstr Choose keys
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:549

[tor-commits] [torsocks/master] Move SOCKS5 auth in a seperate function

2015-05-12 Thread dgoulet

commit ed1e2c6b87f0d3334511ae6c446ddab15a728a54
Author: David Goulet dgou...@ev0ke.net
Date:   Tue May 12 13:56:40 2015 -0400

Move SOCKS5 auth in a seperate function

Too many places were using the same code so create auth_socks5() to do
that using a given connection object.

Signed-off-by: David Goulet dgou...@ev0ke.net
---
 src/lib/torsocks.c |   60 +---
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c
index 5836c31..70014ce 100644
--- a/src/lib/torsocks.c
+++ b/src/lib/torsocks.c
@@ -408,6 +408,35 @@ error:
 }
 
 /*
+ * Using the given connection, do a SOCKS5 authentication with the
+ * username/password in the global configuration.
+ *
+ * Return 0 on success else a negative value on error.
+ */
+static int
+auth_socks5(struct connection *conn)
+{
+   int ret;
+
+   assert(conn);
+
+   ret = socks5_send_user_pass_request(conn,
+   tsocks_config.conf_file.socks5_username,
+   tsocks_config.conf_file.socks5_password);
+   if (ret  0) {
+   goto error;
+   }
+
+   ret = socks5_recv_user_pass_reply(conn);
+   if (ret  0) {
+   goto error;
+   }
+
+error:
+   return ret;
+}
+
+/*
  * Initiate a SOCK5 connection to the Tor network using the given connection.
  * The socks5 API will use the torsocks configuration object to find the tor
  * daemon. If a username/password has been set use that method for the SOCKS5
@@ -439,14 +468,7 @@ int tsocks_connect_to_tor(struct connection *conn)
 
/* For the user/pass method, send the request before connect. */
if (socks5_method == SOCKS5_USER_PASS_METHOD) {
-   ret = socks5_send_user_pass_request(conn,
-   tsocks_config.conf_file.socks5_username,
-   tsocks_config.conf_file.socks5_password);
-   if (ret  0) {
-   goto error;
-   }
-
-   ret = socks5_recv_user_pass_reply(conn);
+   ret = auth_socks5(conn);
if (ret  0) {
goto error;
}
@@ -541,16 +563,9 @@ int tsocks_tor_resolve(int af, const char *hostname, void 
*ip_addr)
 
/* For the user/pass method, send the request before resolve. */
if (socks5_method == SOCKS5_USER_PASS_METHOD) {
-   ret = socks5_send_user_pass_request(conn,
-   tsocks_config.conf_file.socks5_username,
-   tsocks_config.conf_file.socks5_password);
+   ret = auth_socks5(conn);
if (ret  0) {
-   goto end_close;
-   }
-
-   ret = socks5_recv_user_pass_reply(conn);
-   if (ret  0) {
-   goto end_close;
+   goto error;
}
}
 
@@ -612,16 +627,9 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, 
int af)
 
/* For the user/pass method, send the request before resolve ptr. */
if (socks5_method == SOCKS5_USER_PASS_METHOD) {
-   ret = socks5_send_user_pass_request(conn,
-   tsocks_config.conf_file.socks5_username,
-   tsocks_config.conf_file.socks5_password);
+   ret = auth_socks5(conn);
if (ret  0) {
-   goto end_close;
-   }
-
-   ret = socks5_recv_user_pass_reply(conn);
-   if (ret  0) {
-   goto end_close;
+   goto error;
}
}
 

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

[tor-commits] [torsocks/master] Send the SOCKS5 authentication for RESOLVE/RESOLVE_PTR requests.

2015-05-12 Thread dgoulet

commit 88466864b595bd24710b0428c4e3ca483480046d
Author: Yawning Angel yawn...@schwanenlied.me
Date:   Tue May 12 11:37:27 2015 +

Send the SOCKS5 authentication for RESOLVE/RESOLVE_PTR requests.

Signed-off-by: Yawning Angel yawn...@schwanenlied.me
---
 src/lib/torsocks.c |   50 --
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/lib/torsocks.c b/src/lib/torsocks.c
index be00581..5836c31 100644
--- a/src/lib/torsocks.c
+++ b/src/lib/torsocks.c
@@ -476,6 +476,7 @@ int tsocks_tor_resolve(int af, const char *hostname, void 
*ip_addr)
int ret;
size_t addr_len;
struct connection conn;
+   uint8_t socks5_method;
 
assert(hostname);
assert(ip_addr);
@@ -526,11 +527,33 @@ int tsocks_tor_resolve(int af, const char *hostname, void 
*ip_addr)
goto error;
}
 
-   ret = setup_tor_connection(conn, SOCKS5_NO_AUTH_METHOD);
+   /* Is this configuration is set to use SOCKS5 authentication. */
+   if (tsocks_config.socks5_use_auth) {
+   socks5_method = SOCKS5_USER_PASS_METHOD;
+   } else {
+   socks5_method = SOCKS5_NO_AUTH_METHOD;
+   }
+
+   ret = setup_tor_connection(conn, socks5_method);
if (ret  0) {
goto end_close;
}
 
+   /* For the user/pass method, send the request before resolve. */
+   if (socks5_method == SOCKS5_USER_PASS_METHOD) {
+   ret = socks5_send_user_pass_request(conn,
+   tsocks_config.conf_file.socks5_username,
+   tsocks_config.conf_file.socks5_password);
+   if (ret  0) {
+   goto end_close;
+   }
+
+   ret = socks5_recv_user_pass_reply(conn);
+   if (ret  0) {
+   goto end_close;
+   }
+   }
+
ret = socks5_send_resolve_request(hostname, conn);
if (ret  0) {
goto end_close;
@@ -560,6 +583,7 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, int 
af)
 {
int ret;
struct connection conn;
+   uint8_t socks5_method;
 
assert(addr);
assert(ip);
@@ -574,11 +598,33 @@ int tsocks_tor_resolve_ptr(const char *addr, char **ip, 
int af)
}
conn.dest_addr.domain = CONNECTION_DOMAIN_INET;
 
-   ret = setup_tor_connection(conn, SOCKS5_NO_AUTH_METHOD);
+   /* Is this configuration is set to use SOCKS5 authentication. */
+   if (tsocks_config.socks5_use_auth) {
+   socks5_method = SOCKS5_USER_PASS_METHOD;
+   } else {
+   socks5_method = SOCKS5_NO_AUTH_METHOD;
+   }
+
+   ret = setup_tor_connection(conn, socks5_method);
if (ret  0) {
goto end_close;
}
 
+   /* For the user/pass method, send the request before resolve ptr. */
+   if (socks5_method == SOCKS5_USER_PASS_METHOD) {
+   ret = socks5_send_user_pass_request(conn,
+   tsocks_config.conf_file.socks5_username,
+   tsocks_config.conf_file.socks5_password);
+   if (ret  0) {
+   goto end_close;
+   }
+
+   ret = socks5_recv_user_pass_reply(conn);
+   if (ret  0) {
+   goto end_close;
+   }
+   }
+
ret = socks5_send_resolve_ptr_request(conn, addr, af);
if (ret  0) {
goto end_close;



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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit e7c2bffbacdc5e7139edf9da91d29db4bedcc7a0
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 21:46:17 2015 +

Update translations for torbutton-aboutdialogdtd
---
 pt_BR/aboutdialog.dtd |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd
index 044d10d..ad4963e 100644
--- a/pt_BR/aboutdialog.dtd
+++ b/pt_BR/aboutdialog.dtd
@@ -1,19 +1,19 @@
 !ENTITY project.start   amp;brandShortName; Ã© desenvolvida por 
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink o amp;vendorShortName;
+!ENTITY project.end , uma organizacao nÃ£o governamental para 
defender a sua privacidade e liberdade na internet.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  VocÃª gostaria de ajudar?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Doar
-!ENTITY help.or  or 
+!ENTITY help.or ou
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkenvolver-se
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   Perguntas?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growAjude a Rede Tor a crescer!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  InformaÃ§Ãµes de licenciamento 
+!ENTITY tor.TrademarkStatement   'Tor' e o 'Logotipo Cebola' sÃ£o marcas 
registradas do Projeto Tor,  Inc.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 2241ec91e947ad5c8f8909692a9b4f0e7bf674d0
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 21:16:14 2015 +

Update translations for torbutton-aboutdialogdtd
---
 pt_BR/aboutdialog.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd
index c5a3e32..044d10d 100644
--- a/pt_BR/aboutdialog.dtd
+++ b/pt_BR/aboutdialog.dtd
@@ -1,4 +1,4 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;brandShortName; Ã© desenvolvida por 
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
 !ENTITY project.tpoLink the amp;vendorShortName;
 !ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 2bd170ca3eb30503d0c09f7d39d118fd359af2bc
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 21:46:21 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 pt_BR/aboutdialog.dtd |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/pt_BR/aboutdialog.dtd b/pt_BR/aboutdialog.dtd
new file mode 100644
index 000..ad4963e
--- /dev/null
+++ b/pt_BR/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; Ã© desenvolvida por 
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink o amp;vendorShortName;
+!ENTITY project.end , uma organizacao nÃ£o governamental para 
defender a sua privacidade e liberdade na internet.
+
+!ENTITY help.start  VocÃª gostaria de ajudar?
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Doar
+!ENTITY help.or ou
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkenvolver-se
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Perguntas?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growAjude a Rede Tor a crescer!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  InformaÃ§Ãµes de licenciamento 
+!ENTITY tor.TrademarkStatement   'Tor' e o 'Logotipo Cebola' sÃ£o marcas 
registradas do Projeto Tor,  Inc.

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

[tor-commits] [tor-browser-spec/master] Add a scriptlet to relocate the sha256sum files.

2015-05-12 Thread mikeperry

commit df180672f8d5556c130844cd59b965884f158f0b
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue May 12 18:30:07 2015 -0700

Add a scriptlet to relocate the sha256sum files.

Also some minor tweaks and updates.
---
 processes/ReleaseProcess |   18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index 925f3ce..b25764a 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -83,6 +83,18 @@
 #. Sign individual bundle files:
# XXX: Document
 
+
+# XXX: Temporary step to place the sha256sums-presigned-build.txt into place
+# and redirect
+   cd $TORBROWSER_VERSION
+   echo RewriteEngine On  .htaccess
+   for i in sha256sums*
+   do
+ mv $i sha256sums-unsigned-build.${i:11}
+ echo RewriteRule ^$i\$ sha256sums-unsigned-build.${i:11}  .htaccess
+   done
+   cd ..
+
 #. Clear out old builds, transfer builds to staticiforme
 #. Remote:
# We must use $TORBROWSER_VERSION here because signed result dirs should 
omit the build number suffix
@@ -94,7 +106,7 @@
git pull origin
eval $( ./get-tb-version release ) # or alpha / beta
# We must use $TORBROWSER_VERSION here because signed result dirs should 
omit the build number suffix
-   wget -nH --cut-dirs=2 -r -l 1 
https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION
+   wget -nH --cut-dirs=2 -r -l 1 
https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION
rm $TORBROWSER_VERSION/index.html*
mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/
chmod 775 
/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
@@ -135,6 +147,10 @@
torsocks ssh staticiforme.torproject.org static-update-component 
dist.torproject.org
 
 #. Update website's torbrowser versions file to remove old versions
+#  NOTE: You probably want to wait some hours (12-24?) after pushing the
+#  update responses before doing this, so that people have a chance to see
+#  the Firefox notification first before their browser starts weirdly blinking
+#  at them.
cd webwml
torsocks git pull origin
# Now it's time to remove the obsolete version(s)

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 5a9df63862c4cc0f0f212ae046e57021206d4d71
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 00:16:05 2015 +

Update translations for torbutton-aboutdialogdtd
---
 fr/aboutdialog.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd
index fb754f6..ddd6750 100644
--- a/fr/aboutdialog.dtd
+++ b/fr/aboutdialog.dtd
@@ -1,19 +1,19 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;brandShortName; est dÃ©veloppÃ© par
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink le amp;vendorShortName;
+!ENTITY project.end , une organisation Ã  but non lucratif 
travaillant Ã  dÃ©fendre votre vie privÃ©e et libertÃ© en ligne.
 
-!ENTITY help.start  Voulez-vous aider?
+!ENTITY help.start  Vous voulez aider?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Faire une donation
-!ENTITY help.or  or 
+!ENTITY help.or ou
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinks'engager
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   Des questions?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growAider le rÃ©seau Tor Ã  grandir!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  Information sur les licences
+!ENTITY tor.TrademarkStatement   quot;Torquot; et le quot;Logo 
Oignonquot; sont des marques dÃ©posÃ©s du Projet Tor, Inc.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit ddd23f6f8021eccb624bf49102cb3e8fa542d820
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 00:16:16 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 fr/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/fr/abouttor.properties b/fr/abouttor.properties
new file mode 100644
index 000..ec59d81
--- /dev/null
+++ b/fr/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SStartpage/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SDuckDuckGo/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SDisconnect.me/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 38720b9f11e6700da4009f85f817b0d35f83
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 00:16:09 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 fr/aboutdialog.dtd |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd
new file mode 100644
index 000..ddd6750
--- /dev/null
+++ b/fr/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; est dÃ©veloppÃ© par
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink le amp;vendorShortName;
+!ENTITY project.end , une organisation Ã  but non lucratif 
travaillant Ã  dÃ©fendre votre vie privÃ©e et libertÃ© en ligne.
+
+!ENTITY help.start  Vous voulez aider?
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Faire une donation
+!ENTITY help.or ou
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinks'engager
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Des questions?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growAider le rÃ©seau Tor Ã  grandir!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  Information sur les licences
+!ENTITY tor.TrademarkStatement   quot;Torquot; et le quot;Logo 
Oignonquot; sont des marques dÃ©posÃ©s du Projet Tor, Inc.

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit c66ec2f7a49beb74ba858df71d9d87966fd18712
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 00:16:13 2015 +

Update translations for torbutton-abouttorproperties
---
 fr/abouttor.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fr/abouttor.properties b/fr/abouttor.properties
index dc23e01..ec59d81 100644
--- a/fr/abouttor.properties
+++ b/fr/abouttor.properties
@@ -14,7 +14,7 @@ 
aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [webwml/master] List 4.5.1 and 5.0a1 as the latest TBB versions.

2015-05-12 Thread mikeperry

commit 2fbf585b854a586ec7a1dfa4dbdce8034c657606
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue May 12 17:31:41 2015 -0700

List 4.5.1 and 5.0a1 as the latest TBB versions.
---
 include/versions.wmi   |   22 +++---
 projects/torbrowser/RecommendedTBBVersions |   10 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 5754926..1497f04 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -19,11 +19,11 @@
 define-tag version-osx-ppc-stable whitespace=delete0.2.3.25/define-tag
 define-tag version-osx-ppc-alpha whitespace=delete0.2.4.17-rc/define-tag
 
-define-tag version-torbrowserbundledir whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundlebetadir whitespace=delete4.5/define-tag
+define-tag version-torbrowserbundledir whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundlebetadir 
whitespace=delete5.0a1/define-tag
 
-define-tag version-torbrowserbundle whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundlebeta whitespace=delete4.5/define-tag
+define-tag version-torbrowserbundle whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundlebeta whitespace=delete5.0a1/define-tag
 define-tag version-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e/define-tag
 define-tag version-torbrowser-firefox whitespace=delete24.2.0esr/define-tag
@@ -32,18 +32,18 @@
 define-tag version-torbrowser-otr whitespace=delete3.2/define-tag
 define-tag version-torimbrowserbundle whitespace=delete1.3.21/define-tag
 
-define-tag version-torbrowserbundlelinux32 whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundlelinux64 whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5/define-tag
+define-tag version-torbrowserbundlelinux32 
whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundlelinux64 
whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundlelinux32beta 
whitespace=delete5.0a1/define-tag
+define-tag version-torbrowserbundlelinux64beta 
whitespace=delete5.0a1/define-tag
 define-tag version-gnu-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-gnu-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.0k/define-tag
 define-tag version-gnu-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
 define-tag version-gnu-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
 
-define-tag version-torbrowserbundleosx32 whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundleosx64 whitespace=delete4.5/define-tag
-define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5/define-tag
+define-tag version-torbrowserbundleosx32 whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundleosx64 whitespace=delete4.5.1/define-tag
+define-tag version-torbrowserbundleosx64beta 
whitespace=delete5.0a1/define-tag
 define-tag version-osx-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-osx-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
 define-tag version-osx-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 5d097a6..49d2f20 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -10,5 +10,13 @@
 4.5,
 4.5-Linux,
 4.5-MacOS,
-4.5-Windows
+4.5-Windows,
+4.5.1,
+4.5.1-Linux,
+4.5.1-MacOS,
+4.5.1-Windows,
+5.0a1,
+5.0a1-Linux,
+5.0a1-MacOS,
+5.0a1-Windows
 ]

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 1d8711da110d6f780abd2b3aa8d3ea290ea44a20
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:16:06 2015 +

Update translations for torbutton-aboutdialogdtd
---
 es/aboutdialog.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/es/aboutdialog.dtd b/es/aboutdialog.dtd
index 2bf861e..ebd4952 100644
--- a/es/aboutdialog.dtd
+++ b/es/aboutdialog.dtd
@@ -1,19 +1,19 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;brandShortName; estÃ¡ desarrollado por
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink la amp;vendorShortName;
+!ENTITY project.end , una organizaciÃ³n sin Ã¡nimo de lucro que 
trabaja para defender su privacidad y libertad en lÃnea.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  Â¿Quiere colaborar?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Donar
-!ENTITY help.or  or 
+!ENTITY help.or o
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkimplÃquese
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   Â¿Preguntas?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growÂ¡Ayude a que la red Tor crezca!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  InformaciÃ³n de licencia
+!ENTITY tor.TrademarkStatement   'Tor' y el 'Onion Logo' (logo de la 
cebolla) son marcas registradas de la Tor Project, Inc.

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 56e1d0848ec6d462f3f48e4652155f3d82bc0551
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:16:09 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 es/aboutdialog.dtd |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/es/aboutdialog.dtd b/es/aboutdialog.dtd
new file mode 100644
index 000..ebd4952
--- /dev/null
+++ b/es/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; estÃ¡ desarrollado por
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink la amp;vendorShortName;
+!ENTITY project.end , una organizaciÃ³n sin Ã¡nimo de lucro que 
trabaja para defender su privacidad y libertad en lÃnea.
+
+!ENTITY help.start  Â¿Quiere colaborar?
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Donar
+!ENTITY help.or o
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkimplÃquese
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Â¿Preguntas?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growÂ¡Ayude a que la red Tor crezca!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  InformaciÃ³n de licencia
+!ENTITY tor.TrademarkStatement   'Tor' y el 'Onion Logo' (logo de la 
cebolla) son marcas registradas de la Tor Project, Inc.

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 407a42c9ffca27a72e2b61641260d47f95c6ea28
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:15 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 nb/aboutdialog.dtd|   19 +++
 zh_CN/aboutdialog.dtd |   19 +++
 2 files changed, 38 insertions(+)

diff --git a/nb/aboutdialog.dtd b/nb/aboutdialog.dtd
new file mode 100644
index 000..35370fe
--- /dev/null
+++ b/nb/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;bransShortName; blir utviklet av
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink amp;vendorShortName;
+!ENTITY project.end , en non-profit organisasjon som jobber for 
Ã¥ forsvare ditt personvern og frihet pÃ¥ nett.
+
+!ENTITY help.start  Vil du bidra?
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Doner
+!ENTITY help.or eller
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkBli involvert
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   SpÃ¸rsmÃ¥l?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growHjelp Tor nettverket Ã¥ vokse!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  Lisensinformasjon
+!ENTITY tor.TrademarkStatement   quot;Torquot; og quot;Onion Logoquot; 
er registrerte varemerker tilhÃ¸rende the Tor Project, Inc.
diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd
new file mode 100644
index 000..fefa76d
--- /dev/null
+++ b/zh_CN/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; çå¼åèä¸º
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink amp;vendorShortName;
+!ENTITY project.end 
ï¼ä¸ä¸ªæå«æ¨çéç§åèªç±ä¸ç½æçéè¥å©ç»ç»ã
+
+!ENTITY help.start  éè¦å¸®å©ï¼
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink ææ¬¾
+!ENTITY help.or æè
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkå¥é¨
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   æçé®ï¼
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growå¸®å© Tor ç½ç»æé¿ï¼
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  è®¸å¯ä¿¡æ¯
+!ENTITY tor.TrademarkStatement   âTorâåâOnion Logoâæ¯ Tor 
Project, Inc çæ³¨ååæ ã

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit f7cea5b3b9789bc893dab66da631853521184d78
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:23 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 zh_CN/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties
new file mode 100644
index 000..e974862
--- /dev/null
+++ b/zh_CN/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=ä½¿ç¨a href=%2$Så¼å§é¡µ/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=ä½¿ç¨a href=%2$SDuckDuckGo/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=ä½¿ç¨a href=%2$SDisconnect.me/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 1fed04e09e30569d3e52b4851ea3456558eb697f
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:11 2015 +

Update translations for torbutton-aboutdialogdtd
---
 nb/aboutdialog.dtd|   20 ++--
 zh_CN/aboutdialog.dtd |   20 ++--
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/nb/aboutdialog.dtd b/nb/aboutdialog.dtd
index 4a7fb28..35370fe 100644
--- a/nb/aboutdialog.dtd
+++ b/nb/aboutdialog.dtd
@@ -1,19 +1,19 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;bransShortName; blir utviklet av
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink amp;vendorShortName;
+!ENTITY project.end , en non-profit organisasjon som jobber for 
Ã¥ forsvare ditt personvern og frihet pÃ¥ nett.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  Vil du bidra?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Doner
-!ENTITY help.or  or 
+!ENTITY help.or eller
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkBli involvert
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   SpÃ¸rsmÃ¥l?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growHjelp Tor nettverket Ã¥ vokse!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  Lisensinformasjon
+!ENTITY tor.TrademarkStatement   quot;Torquot; og quot;Onion Logoquot; 
er registrerte varemerker tilhÃ¸rende the Tor Project, Inc.
diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd
index 7118a26..fefa76d 100644
--- a/zh_CN/aboutdialog.dtd
+++ b/zh_CN/aboutdialog.dtd
@@ -1,19 +1,19 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;brandShortName; çå¼åèä¸º
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink amp;vendorShortName;
+!ENTITY project.end 
ï¼ä¸ä¸ªæå«æ¨çéç§åèªç±ä¸ç½æçéè¥å©ç»ç»ã
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  éè¦å¸®å©ï¼
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink ææ¬¾
-!ENTITY help.or  or 
+!ENTITY help.or æè
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkå¥é¨
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   æçé®ï¼
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growå¸®å© Tor ç½ç»æé¿ï¼
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  è®¸å¯ä¿¡æ¯
+!ENTITY tor.TrademarkStatement   âTorâåâOnion Logoâæ¯ Tor 
Project, Inc çæ³¨ååæ ã

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [translation/tor_animation] Update translations for tor_animation

2015-05-12 Thread translation

commit e1ecd586cb46732cead48e0346044b06fc67d65b
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:02 2015 +

Update translations for tor_animation
---
 nb.srt |   79 
 1 file changed, 29 insertions(+), 50 deletions(-)

diff --git a/nb.srt b/nb.srt
index 1a26ed0..0359f01 100644
--- a/nb.srt
+++ b/nb.srt
@@ -8,11 +8,11 @@ Vi deler konstant informasjon, om oss selv og privatlivene 
vÃ¥res.
 
 3
 00:00:08,000 -- 00:00:09,960
-food we eat, people we meet,
+mat vi spiser, mennesker vi mÃ¸ter,
 
 4
 00:00:10,180 -- 00:00:12,480
-places we go, and the stuff we read.
+steder vi besÃ¸ker, og det vi leser.
 
 5
 00:00:13,280 -- 00:00:14,640
@@ -34,130 +34,109 @@ hvilken nettleser som blir brukt til Ã¥ surfet med,
 
 9
 00:00:26,700 -- 00:00:29,140
-and so much more information
-about you and your life
+og sÃ¥ mye annen informasjon om deg og ditt liv
 
 10
 00:00:29,200 -- 00:00:31,500
-which you probably didn't mean
-to share with unknown strangers,
+som du kanskje aldri har ment Ã¥ dele med fremmede,
 
 11
 00:00:31,700 -- 00:00:34,000
-who could easily use this data
-to exploit you.
+som enkelt kan utnytte denne informasjon mot deg.
 
 12
 00:00:34,500 -- 00:00:37,000
-But not if you're using Tor!
+Men ikke dersom du bruker Tor!
 
 13
 00:00:37,140 -- 00:00:40,840
-Tor Browser protects our privacy
-and identity on the Internet.
+Tor nettleseren beskytter ditt personvern og din identitet pÃ¥ Internett.
 
 14
 00:00:41,560 -- 00:00:44,760
-Tor secures your connection
-with three layers of encryption
+Tor sikrer forbindelsene med 3 lag av kryptering
 
 15
 00:00:44,940 -- 00:00:49,760
-and passes it through three voluntarily
-operated servers around the world,
+og sender det gjennom tre frillig oppsatte servere rundt om i verden,
 
 16
 00:00:50,280 -- 00:00:53,520
-which enables us to communicate
-anonymously over the Internet.
+noe som gjÃ¸r det mulig for oss Ã¥ kommunisere anonymt pÃ¥ Internett.
 
 17
 00:00:56,560 -- 00:00:58,280
-Tor also protects our data
+Tor beskytter ogsÃ¥ dine data
 
 18
 00:00:58,400 -- 00:01:01,900
-against corporate or government targeted
-and mass surveillance.
+mot bedrifters og myndigheters mÃ¥lrettede og masseinnsamlende overvÃ¥kning.
 
 19
 00:01:02,880 -- 00:01:07,340
-Perhaps you live in a repressive country
-which tries to control and surveil the Internet.
+Kanskje bor du i et undertrykket land som forsÃ¸ker Ã¥ kontrollere og 
overvÃ¥ket Internett.
 
 20
 00:01:07,900 -- 00:01:11,800
-Or perhaps you don't want big corporations
-taking advantage of your personal information.
+Eller kanskje du ikke vil at store selskaper skal utnytte din personlige 
informasjon.
 
 21
 00:01:12,880 -- 00:01:15,640
-Tor makes all of its users
-to look the same
+Tor gjÃ¸r at alle dets bruker ser like ut
 
 22
 00:01:15,920 -- 00:01:18,800
-which confuses the observer
-and makes you anonymous.
+noe som forvirrer de som observerer og gjÃ¸r deg anonym.
 
 23
 00:01:19,500 -- 00:01:22,980
-So, the more people use the Tor network,
-the stronger it gets
+SÃ¥ desto flere personer som bruker Tor nettverket, desto sterkere blir det.
 
 24
 00:01:23,140 -- 00:01:27,800
-as it's easier to hide in a crowd
-of people who look exactly the same.
+siden det er enklere i gjemme seg i en forsamling av mennesker som ser helt 
like ut.
 
 25
 00:01:28,700 -- 00:01:31,240
-You can bypass the censorship
-without being worried about
+Du kan forbigÃ¥ sensuren uten Ã¥ bekymre deg for
 
 26
 00:01:31,400 -- 00:01:34,100
-the censor knowing what you do
-on the Internet.
+at sensuren skal vite hva du gjÃ¸r pÃ¥ Internett.
 
 27
 00:01:36,540 -- 00:01:39,440
-The ads won't follow you
-everywhere for months,
+Reklamen vil ikke fÃ¸lge deg overalt i mÃ¥nedsvis,
 
 28
 00:01:39,640 -- 00:01:41,300
-starting when you first
-clicked on a product.
+noe som starter nÃ¥r du fÃ¸rst klikker pÃ¥ et produkt.
 
 29
 00:01:43,880 -- 00:01:47,380
-By using Tor, the sites you visit
-won't even know who you are,
+Ved Ã¥ bruke Tor sÃ¥ vil ikke sidene du besÃ¸ker vite hvem du er,
 
 30
 00:01:47,540 -- 00:01:49,760
-from what part of the world
-you're visiting them,
+fra hvilken verdensdel du besÃ¸ker dem fra,
 
 31
 00:01:49,920 -- 00:01:51,920
-unless you login and tell them so.
+dersom du ikke logger inn og forteller dem hvor du er.
 
 32
 00:01:54,200 -- 00:01:55,840
-By downloading and using Tor,
+Ved Ã¥ laste ned og bruke Tor,
 
 33
 00:01:56,200 -- 00:01:58,560
-you can protect the people
-who need anonymity,
+kan du beskytte de som trenger anonymitet,
 
 34
 00:01:58,880 -- 00:02:01,640
-like activists, journalists and bloggers.
+som aktivister, journalistere og bloggere.
 
 35
 00:02:02,000 -- 00:02:07,000
-Download and use Tor! Or run a relay!
+Last ned og bruk Tor! Eller kjÃ¸r som en relay!
 

___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [translation/tor_animation_completed] Update translations for tor_animation_completed

2015-05-12 Thread translation

commit 7a26a5078831c5190ae26f3a22764b8d4ea0fb5c
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:06 2015 +

Update translations for tor_animation_completed
---
 nb.srt |  142 
 1 file changed, 142 insertions(+)

diff --git a/nb.srt b/nb.srt
new file mode 100644
index 000..0359f01
--- /dev/null
+++ b/nb.srt
@@ -0,0 +1,142 @@
+1
+00:00:00,660 -- 00:00:02,780
+Vi er blitt veldig avhengig av Internett.
+
+2
+00:00:03,120 -- 00:00:07,700
+Vi deler konstant informasjon, om oss selv og privatlivene vÃ¥res.
+
+3
+00:00:08,000 -- 00:00:09,960
+mat vi spiser, mennesker vi mÃ¸ter,
+
+4
+00:00:10,180 -- 00:00:12,480
+steder vi besÃ¸ker, og det vi leser.
+
+5
+00:00:13,280 -- 00:00:14,640
+La meg utdype det litt nÃ¦rmere.
+
+6
+00:00:14,920 -- 00:00:17,740
+Om noen i dette Ã¸yeblikket har bestemt seg for Ã¥ spore deg,
+
+7
+00:00:18,060 -- 00:00:22,480
+vil de kunne identifisere deg,
+se din nÃ¸yaktig posisjon, hvilket operativ system du bruker,  
+
+8
+00:00:22,800 -- 00:00:26,500
+alle sidene du har vÃ¦rt innom,
+hvilken nettleser som blir brukt til Ã¥ surfet med,
+
+9
+00:00:26,700 -- 00:00:29,140
+og sÃ¥ mye annen informasjon om deg og ditt liv
+
+10
+00:00:29,200 -- 00:00:31,500
+som du kanskje aldri har ment Ã¥ dele med fremmede,
+
+11
+00:00:31,700 -- 00:00:34,000
+som enkelt kan utnytte denne informasjon mot deg.
+
+12
+00:00:34,500 -- 00:00:37,000
+Men ikke dersom du bruker Tor!
+
+13
+00:00:37,140 -- 00:00:40,840
+Tor nettleseren beskytter ditt personvern og din identitet pÃ¥ Internett.
+
+14
+00:00:41,560 -- 00:00:44,760
+Tor sikrer forbindelsene med 3 lag av kryptering
+
+15
+00:00:44,940 -- 00:00:49,760
+og sender det gjennom tre frillig oppsatte servere rundt om i verden,
+
+16
+00:00:50,280 -- 00:00:53,520
+noe som gjÃ¸r det mulig for oss Ã¥ kommunisere anonymt pÃ¥ Internett.
+
+17
+00:00:56,560 -- 00:00:58,280
+Tor beskytter ogsÃ¥ dine data
+
+18
+00:00:58,400 -- 00:01:01,900
+mot bedrifters og myndigheters mÃ¥lrettede og masseinnsamlende overvÃ¥kning.
+
+19
+00:01:02,880 -- 00:01:07,340
+Kanskje bor du i et undertrykket land som forsÃ¸ker Ã¥ kontrollere og 
overvÃ¥ket Internett.
+
+20
+00:01:07,900 -- 00:01:11,800
+Eller kanskje du ikke vil at store selskaper skal utnytte din personlige 
informasjon.
+
+21
+00:01:12,880 -- 00:01:15,640
+Tor gjÃ¸r at alle dets bruker ser like ut
+
+22
+00:01:15,920 -- 00:01:18,800
+noe som forvirrer de som observerer og gjÃ¸r deg anonym.
+
+23
+00:01:19,500 -- 00:01:22,980
+SÃ¥ desto flere personer som bruker Tor nettverket, desto sterkere blir det.
+
+24
+00:01:23,140 -- 00:01:27,800
+siden det er enklere i gjemme seg i en forsamling av mennesker som ser helt 
like ut.
+
+25
+00:01:28,700 -- 00:01:31,240
+Du kan forbigÃ¥ sensuren uten Ã¥ bekymre deg for
+
+26
+00:01:31,400 -- 00:01:34,100
+at sensuren skal vite hva du gjÃ¸r pÃ¥ Internett.
+
+27
+00:01:36,540 -- 00:01:39,440
+Reklamen vil ikke fÃ¸lge deg overalt i mÃ¥nedsvis,
+
+28
+00:01:39,640 -- 00:01:41,300
+noe som starter nÃ¥r du fÃ¸rst klikker pÃ¥ et produkt.
+
+29
+00:01:43,880 -- 00:01:47,380
+Ved Ã¥ bruke Tor sÃ¥ vil ikke sidene du besÃ¸ker vite hvem du er,
+
+30
+00:01:47,540 -- 00:01:49,760
+fra hvilken verdensdel du besÃ¸ker dem fra,
+
+31
+00:01:49,920 -- 00:01:51,920
+dersom du ikke logger inn og forteller dem hvor du er.
+
+32
+00:01:54,200 -- 00:01:55,840
+Ved Ã¥ laste ned og bruke Tor,
+
+33
+00:01:56,200 -- 00:01:58,560
+kan du beskytte de som trenger anonymitet,
+
+34
+00:01:58,880 -- 00:02:01,640
+som aktivister, journalistere og bloggere.
+
+35
+00:02:02,000 -- 00:02:07,000
+Last ned og bruk Tor! Eller kjÃ¸r som en relay!
+

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit f4bdaad36d4db16ebed21d800b1228366103c415
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:16:19 2015 +

Update translations for torbutton-abouttorproperties
---
 zh_CN/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh_CN/abouttor.properties b/zh_CN/abouttor.properties
index d607324..e974862 100644
--- a/zh_CN/abouttor.properties
+++ b/zh_CN/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=ä½¿ç¨a href=%2$Så¼å§é¡µ/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=ä½¿ç¨a href=%2$SDuckDuckGo/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=ä½¿ç¨a href=%2$SDisconnect.me/aa 
href=%1$Så®å¨å°/aè¿è¡æç´¢ã
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit f7799b9e9b6d4b55e1a4e86d12a0b6f0257dc3c3
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 11:16:19 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 de/abouttor.properties |   21 +
 1 file changed, 21 insertions(+)

diff --git a/de/abouttor.properties b/de/abouttor.properties
new file mode 100644
index 000..b7fc4bf
--- /dev/null
+++ b/de/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SStartpage/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SDuckDuckGo/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SDisconnect.me/a.
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 5973c6ddac03e0622ca83fc6dbd50ba55a257983
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 11:16:11 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 de/aboutdialog.dtd |   19 +++
 1 file changed, 19 insertions(+)

diff --git a/de/aboutdialog.dtd b/de/aboutdialog.dtd
new file mode 100644
index 000..b27152d
--- /dev/null
+++ b/de/aboutdialog.dtd
@@ -0,0 +1,19 @@
+!ENTITY project.start   amp;brandShortName; wird entwickelt von 
+!-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
+!ENTITY project.tpoLink das amp;vendorShortName;
+!ENTITY project.end , eine gemeinnÃ¼tzige Organisation, um Ihre 
PrivatsphÃ¤re und Freiheit im Internet zu verteidigen.
+
+!ENTITY help.start  MÃ¶chten Sie helfen? 
+!-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
+!ENTITY help.donateLink Spenden
+!ENTITY help.or oder
+!-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
+!ENTITY help.getInvolvedLinkmachen Sie mit
+!ENTITY help.end!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
+!ENTITY bottomLinks.questions   Fragen?
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
+!ENTITY bottomLinks.growHelfen Sie beim Ausweiten des 
Tor-Netzwerks!
+!-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
+!ENTITY bottomLinks.license  Lizenzinformationen
+!ENTITY tor.TrademarkStatement   quot;Torquot; und das 
quot;Onion-Logoquot; sind eingetragene Warenzeichen von Tor Project, Inc.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 87db2db1f90326b68666a70679f8b6996963e1d7
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 11:16:07 2015 +

Update translations for torbutton-aboutdialogdtd
---
 de/aboutdialog.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/de/aboutdialog.dtd b/de/aboutdialog.dtd
index d14de00..b27152d 100644
--- a/de/aboutdialog.dtd
+++ b/de/aboutdialog.dtd
@@ -1,19 +1,19 @@
-!ENTITY project.start   amp;brandShortName; is developed by 
+!ENTITY project.start   amp;brandShortName; wird entwickelt von 
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink the amp;vendorShortName;
-!ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
+!ENTITY project.tpoLink das amp;vendorShortName;
+!ENTITY project.end , eine gemeinnÃ¼tzige Organisation, um Ihre 
PrivatsphÃ¤re und Freiheit im Internet zu verteidigen.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  MÃ¶chten Sie helfen? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Spenden
-!ENTITY help.or  or 
+!ENTITY help.or oder
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkmachen Sie mit
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
-!ENTITY bottomLinks.questions   Questions?
+!ENTITY bottomLinks.questions   Fragen?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growHelp the Tor Network Grow!
+!ENTITY bottomLinks.growHelfen Sie beim Ausweiten des 
Tor-Netzwerks!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
-!ENTITY bottomLinks.license  Licensing Information
-!ENTITY tor.TrademarkStatement   'Tor' and the 'Onion Logo' are registered 
trademarks of the Tor Project, Inc.
+!ENTITY bottomLinks.license  Lizenzinformationen
+!ENTITY tor.TrademarkStatement   quot;Torquot; und das 
quot;Onion-Logoquot; sind eingetragene Warenzeichen von Tor Project, Inc.

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 41fd7f3d351ec412295da43962739812ed4ebfd7
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 11:16:15 2015 +

Update translations for torbutton-abouttorproperties
---
 de/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/de/abouttor.properties b/de/abouttor.properties
index 1b04753..b7fc4bf 100644
--- a/de/abouttor.properties
+++ b/de/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/deu/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=a href=%1$SSicheres/a Suchen mit a 
href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 493392deb334c21a9e326b7a488efcf068b1939b
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 09:46:05 2015 +

Update translations for torbutton-aboutdialogdtd
---
 nl/aboutdialog.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nl/aboutdialog.dtd b/nl/aboutdialog.dtd
index aa9988d..50c933d 100644
--- a/nl/aboutdialog.dtd
+++ b/nl/aboutdialog.dtd
@@ -6,9 +6,9 @@
 !ENTITY help.start  Want to help? 
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Doneer
-!ENTITY help.or  or 
+!ENTITY help.or of
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkdoe mee
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   Questions?

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit f2813c5cf66535fb1d5606cd178e6f445091b630
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:16:14 2015 +

Update translations for torbutton-abouttorproperties
---
 es/abouttor.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es/abouttor.properties b/es/abouttor.properties
index de53c95..921515e 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -2,13 +2,13 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SPagina de inicio/a.
+aboutTor.searchSP.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://paginainicio.com/es/protecciÃ³n-de-la-privacidad.html
+aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://paginainicio.com/
+aboutTor.searchSP.search.link=https://startpage.com/esp/
 
-aboutTor.searchDDG.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit 5610d069320f2a9a64cb23d0b1d70005188f3f0f
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:16:17 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 es/abouttor.properties |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/es/abouttor.properties b/es/abouttor.properties
index de53c95..921515e 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -2,13 +2,13 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SPagina de inicio/a.
+aboutTor.searchSP.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchSP.privacy.link=https://paginainicio.com/es/protecciÃ³n-de-la-privacidad.html
+aboutTor.searchSP.privacy.link=https://startpage.com/esp/protect-privacy.html
 # The following string is a link which replaces %2$S above.
-aboutTor.searchSP.search.link=https://paginainicio.com/
+aboutTor.searchSP.search.link=https://startpage.com/esp/
 
-aboutTor.searchDDG.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 229a6c2e7750e3a69ac3da0b143c4f370efedd76
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:46:13 2015 +

Update translations for torbutton-abouttorproperties
---
 es/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/abouttor.properties b/es/abouttor.properties
index 921515e..fb92251 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -10,11 +10,11 @@ aboutTor.searchSP.search.link=https://startpage.com/esp/
 
 aboutTor.searchDDG.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es
 # The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
+aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es
 
-aboutTor.searchDC.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2015-05-12 Thread translation

commit 71441dadfaeccdb82681e4d5345f10ed453e2205
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:46:16 2015 +

Update translations for torbutton-abouttorproperties_completed
---
 es/abouttor.properties |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/abouttor.properties b/es/abouttor.properties
index 921515e..fb92251 100644
--- a/es/abouttor.properties
+++ b/es/abouttor.properties
@@ -10,11 +10,11 @@ aboutTor.searchSP.search.link=https://startpage.com/esp/
 
 aboutTor.searchDDG.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
-aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy?kl=-es
 # The following string is a link which replaces %2$S above.
-aboutTor.searchDDG.search.link=https://duckduckgo.com/
+aboutTor.searchDDG.search.link=https://duckduckgo.com/?kl=-es
 
-aboutTor.searchDC.privacy=Busca a href=%1$Ssegura/a con a 
href=%2$SDisconnect.me/a.
+aboutTor.searchDC.privacy=Busque a href=%1$Sde forma segura/a con a 
href=%2$SDisconnect.me/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 1691179bb4c6ec8d20e91aa6d2c56f9d37ef384e
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:46:08 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 es/aboutdialog.dtd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/aboutdialog.dtd b/es/aboutdialog.dtd
index ebd4952..3f84eac 100644
--- a/es/aboutdialog.dtd
+++ b/es/aboutdialog.dtd
@@ -1,9 +1,9 @@
 !ENTITY project.start   amp;brandShortName; estÃ¡ desarrollado por
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink la amp;vendorShortName;
+!ENTITY project.tpoLink el/la amp;vendorShortName;
 !ENTITY project.end , una organizaciÃ³n sin Ã¡nimo de lucro que 
trabaja para defender su privacidad y libertad en lÃnea.
 
-!ENTITY help.start  Â¿Quiere colaborar?
+!ENTITY help.start  Â¿Quiere ayudar?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Donar
 !ENTITY help.or o
@@ -13,7 +13,7 @@
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   Â¿Preguntas?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growÂ¡Ayude a que la red Tor crezca!
+!ENTITY bottomLinks.growÂ¡Colabore a que la red Tor crezca!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
 !ENTITY bottomLinks.license  InformaciÃ³n de licencia
 !ENTITY tor.TrademarkStatement   'Tor' y el 'Onion Logo' (logo de la 
cebolla) son marcas registradas de la Tor Project, Inc.

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 08f8b321d3a5025e0eb3021b38c7cf912e5cc715
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 10:46:04 2015 +

Update translations for torbutton-aboutdialogdtd
---
 es/aboutdialog.dtd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/aboutdialog.dtd b/es/aboutdialog.dtd
index ebd4952..3f84eac 100644
--- a/es/aboutdialog.dtd
+++ b/es/aboutdialog.dtd
@@ -1,9 +1,9 @@
 !ENTITY project.start   amp;brandShortName; estÃ¡ desarrollado por
 !-- LOCALIZATION NOTE (project.tpoLink): This is a link title that links to 
https://www.torproject.org --
-!ENTITY project.tpoLink la amp;vendorShortName;
+!ENTITY project.tpoLink el/la amp;vendorShortName;
 !ENTITY project.end , una organizaciÃ³n sin Ã¡nimo de lucro que 
trabaja para defender su privacidad y libertad en lÃnea.
 
-!ENTITY help.start  Â¿Quiere colaborar?
+!ENTITY help.start  Â¿Quiere ayudar?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Donar
 !ENTITY help.or o
@@ -13,7 +13,7 @@
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   Â¿Preguntas?
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/getinvolved/relays --
-!ENTITY bottomLinks.growÂ¡Ayude a que la red Tor crezca!
+!ENTITY bottomLinks.growÂ¡Colabore a que la red Tor crezca!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
about:license --
 !ENTITY bottomLinks.license  InformaciÃ³n de licencia
 !ENTITY tor.TrademarkStatement   'Tor' y el 'Onion Logo' (logo de la 
cebolla) son marcas registradas de la Tor Project, Inc.

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

[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2015-05-12 Thread translation

commit 1762a235ad16ad604ad6678d168021dc1a84558b
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 23:46:06 2015 +

Update translations for torbutton-abouttorproperties
---
 fr/abouttor.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fr/abouttor.properties b/fr/abouttor.properties
index d607324..dc23e01 100644
--- a/fr/abouttor.properties
+++ b/fr/abouttor.properties
@@ -2,13 +2,13 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SStartpage/a.
+aboutTor.searchSP.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SStartpage/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search a href=%1$Ssecurely/a with a 
href=%2$SDuckDuckGo/a.
+aboutTor.searchDDG.privacy=Rechercher a href=%1$Sde maniÃ¨re 
sÃ©curisÃ©e/a avec a href=%2$SDuckDuckGo/a.
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.

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

[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2015-05-12 Thread translation

commit 7c10b8b059a9c338a5434fa7d74fc7c3faf8c927
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 04:46:12 2015 +

Update translations for torbutton-aboutdialogdtd_completed
---
 zh_CN/aboutdialog.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd
index fefa76d..af6cabb 100644
--- a/zh_CN/aboutdialog.dtd
+++ b/zh_CN/aboutdialog.dtd
@@ -3,12 +3,12 @@
 !ENTITY project.tpoLink amp;vendorShortName;
 !ENTITY project.end 
ï¼ä¸ä¸ªæå«æ¨çéç§åèªç±ä¸ç½æçéè¥å©ç»ç»ã
 
-!ENTITY help.start  éè¦å¸®å©ï¼
+!ENTITY help.start  æ³è¦æä¾å¸®å©ï¼
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink ææ¬¾
 !ENTITY help.or æè
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkå¥é¨
+!ENTITY help.getInvolvedLinkåä¸
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   æçé®ï¼

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

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 1625bed66a140874f5a863661cf5fa402732dc4d
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 04:46:05 2015 +

Update translations for torbutton-aboutdialogdtd
---
 zh_CN/aboutdialog.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/aboutdialog.dtd b/zh_CN/aboutdialog.dtd
index fefa76d..af6cabb 100644
--- a/zh_CN/aboutdialog.dtd
+++ b/zh_CN/aboutdialog.dtd
@@ -3,12 +3,12 @@
 !ENTITY project.tpoLink amp;vendorShortName;
 !ENTITY project.end 
ï¼ä¸ä¸ªæå«æ¨çéç§åèªç±ä¸ç½æçéè¥å©ç»ç»ã
 
-!ENTITY help.start  éè¦å¸®å©ï¼
+!ENTITY help.start  æ³è¦æä¾å¸®å©ï¼
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink ææ¬¾
 !ENTITY help.or æè
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkå¥é¨
+!ENTITY help.getInvolvedLinkåä¸
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   æçé®ï¼

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

[tor-commits] [stem/master] Use full tor path for pidof integ test

2015-05-12 Thread atagar

commit 97b7097c414577d3dcea1ee8eb104c6203f36a01
Author: Damian Johnson ata...@torproject.org
Date:   Tue May 12 22:38:24 2015 -0700

Use full tor path for pidof integ test

When running our tests with the '--tor' argument the first time we run the
pidof test it passes, but further runs fail. I'm not sure why that first one
passes, but in checking the later ones it's picking up our 'run_tests.py 
--tor
/path/to/tor' since it includes tor in it.

The pidof man page suggests providing an absolute path so avoiding 
truncation
of the command for this test.

  ==
  FAIL: test_pid_by_name_pidof
  --
  Traceback (most recent call last):
File /home/atagar/Desktop/stem/test/integ/util/system.py, line 145, 
in test_pid_by_name_pidof
  self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd))
  AssertionError: 10020 != None

  --
  Ran 26 tests in 1.435s
---
 test/integ/util/system.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/integ/util/system.py b/test/integ/util/system.py
index 33fd342..1d36b5f 100644
--- a/test/integ/util/system.py
+++ b/test/integ/util/system.py
@@ -136,7 +136,7 @@ class TestSystem(unittest.TestCase):
   call_mock.side_effect = call_replacement
 
   tor_pid = test.runner.get_runner().get_pid()
-  tor_cmd = test.runner.get_runner().get_tor_command(True)
+  tor_cmd = test.runner.get_runner().get_tor_command()
   self.assertEqual(tor_pid, stem.util.system.pid_by_name(tor_cmd))
 
   def test_pid_by_name_ps_linux(self):

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

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2015-05-12 Thread translation

commit 357e798741f80ebcb7025c8ae9db05ec9076abd2
Author: Translation commit bot translat...@torproject.org
Date:   Wed May 13 05:15:57 2015 +

Update translations for torbutton-torbuttonproperties
---
 zh_CN/torbutton.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/torbutton.properties b/zh_CN/torbutton.properties
index 8871ba6..385ce6c 100644
--- a/zh_CN/torbutton.properties
+++ b/zh_CN/torbutton.properties
@@ -7,7 +7,7 @@ torbutton.circuit_display.this_browser = æ¬æµè§å¨
 torbutton.circuit_display.relay = ä¸ç»§
 torbutton.circuit_display.tor_bridge = ç½æ¡¥
 torbutton.circuit_display.unknown_country = æªç¥å½å®¶
-torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
æ¤å·®é¢ï¼ä½¿æ¨ççªå£å®½åº¦åé«åº¦æ»æ¯ç¨æå·®å¼ï¼ä»èåå°äººä»¬è·è¸ªæ¨çå¨çº¿æ´»å¨çè½åã
+torbutton.content_sizer.margin_tooltip = Tor æµè§å¨æ·»å 
äºè¿äºè¾¹æ¡ï¼ä½¿æµè§å¨çªå£çå®½é«åå¾ä¸åé£ä¹ç¬ç¹ï¼ä»èè®©å¨çº¿è·è¸ªçè§åå¾æ´é¾ã
 torbutton.panel.tooltip.disabled = ç¹å»å¯ç¨ Tor
 torbutton.panel.tooltip.enabled = ç¹å»ç¦ç¨ Tor
 torbutton.panel.plugins.disabled = ç¹å»å¯ç¨æä»¶

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

[tor-commits] [torsocks/master] Ensure that torsocks initializes itself in the presence of C++.

2015-05-12 Thread dgoulet

commit d45e4f2329e2630a9471ea72a48e9c77556100f1
Author: Yawning Angel yawn...@schwanenlied.me
Date:   Sun Apr 5 06:55:11 2015 +

Ensure that torsocks initializes itself in the presence of C++.

Fun fact, `__attribute__(constructor)` functions aren't guaranteed to be
called before C++ static object constructors.  This change ensures that
initialization will always be called once (and only once), as needed
even if C++ codebases chose to use hijacked symbols in ctors for static
objects.

Things that got changed:
 * Added `tsocks_once()` that is a functional replica of pthread_once,
   but doesn't require linking in a real pthread library if the
   application does not.
 * Changed the initialization/cleanup to use tsocks_once.
 * Call the initialization from within all of the hijacked libc calls.

Fixes bug #15584.

Signed-off-by: Yawning Angel yawn...@schwanenlied.me
Signed-off-by: David Goulet dgou...@ev0ke.net
---
 src/common/compat.c |   25 +
 src/common/compat.h |   14 +-
 src/common/connection.c |   11 +--
 src/common/connection.h |1 -
 src/lib/accept.c|2 ++
 src/lib/close.c |3 +++
 src/lib/connect.c   |2 ++
 src/lib/fclose.c|5 -
 src/lib/getaddrinfo.c   |1 +
 src/lib/gethostbyname.c |6 ++
 src/lib/getpeername.c   |1 +
 src/lib/listen.c|1 +
 src/lib/recv.c  |2 +-
 src/lib/sendto.c|1 +
 src/lib/socket.c|2 ++
 src/lib/socketpair.c|2 +-
 src/lib/syscall.c   |1 +
 src/lib/torsocks.c  |   42 ++
 src/lib/torsocks.h  |1 +
 19 files changed, 88 insertions(+), 35 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c
index 7d8431d..a861b3d 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -71,4 +71,29 @@ void tsocks_mutex_unlock(tsocks_mutex_t *m)
assert(!ret);
 }
 
+/*
+ * Call the given routine once, and only once. tsocks_once returning
+ * guarantees that the routine has succeded.
+ */
+void tsocks_once(tsocks_once_t *o, void (*init_routine)(void))
+{
+
+   /* Why, yes, pthread_once(3P) exists. Said routine requires linking in a
+* real pthread library on Linux, while this does not and will do the 
right
+* thing even with the stub implementation. */
+   assert(o);
+
+   /* This looks scary and incorrect, till you realize that the
+* pthread_mutex routines include memory barriers. */
+   if (!o-once) {
+   return;
+   }
+   tsocks_mutex_lock(o-mutex);
+   if (o-once) {
+   init_routine();
+   o-once = 0;
+   }
+   tsocks_mutex_unlock(o-mutex);
+}
+
 #endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
diff --git a/src/common/compat.h b/src/common/compat.h
index e7e5812..ce47129 100644
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -33,14 +33,26 @@ typedef struct tsocks_mutex_t {
 } tsocks_mutex_t;
 
 /* Define a tsock mutex variable with the mutex statically initialized. */
+#define TSOCKS_MUTEX_INIT { .mutex = PTHREAD_MUTEX_INITIALIZER }
 #define TSOCKS_INIT_MUTEX(name) \
-   tsocks_mutex_t name = { .mutex = PTHREAD_MUTEX_INITIALIZER }
+   tsocks_mutex_t name = TSOCKS_MUTEX_INIT
 
 void tsocks_mutex_init(tsocks_mutex_t *m);
 void tsocks_mutex_destroy(tsocks_mutex_t *m);
 void tsocks_mutex_lock(tsocks_mutex_t *m);
 void tsocks_mutex_unlock(tsocks_mutex_t *m);
 
+typedef struct tsocks_once_t {
+   int once:1;
+   tsocks_mutex_t mutex;
+} tsocks_once_t;
+
+/* Define a tsock once variable, statically initialized. */
+#define TSOCKS_INIT_ONCE(name) \
+   tsocks_once_t name = { .once = 1, .mutex = TSOCKS_MUTEX_INIT }
+
+void tsocks_once(tsocks_once_t *o, void (*init_routine)(void));
+
 #else
 #error OS not supported.
 #endif /* __GLIBC__, __darwin__, __FreeBSD__, __NetBSD__ */
diff --git a/src/common/connection.c b/src/common/connection.c
index 4c75579..d4ae722 100644
--- a/src/common/connection.c
+++ b/src/common/connection.c
@@ -82,7 +82,7 @@ static inline unsigned int conn_hash_fct(struct connection *c)
 /*
  * Declare the connection registry.
  */
-static HT_HEAD(connection_registry, connection) connection_registry_root;
+static HT_HEAD(connection_registry, connection) connection_registry_root = 
HT_INITIALIZER();
 HT_PROTOTYPE(connection_registry, connection, node, conn_hash_fct,
conn_equal_fct);
 HT_GENERATE(connection_registry, connection, node, conn_hash_fct,
@@ -107,15 +107,6 @@ void connection_registry_unlock(void)
 }
 
 /*
- * Initialize connection registry.
- */
-ATTR_HIDDEN
-void connection_registry_init(void)
-{
-   HT_INIT(connection_registry, connection_registry_root);
-}
-
-/*
  * Set an already allocated connection address using the given IPv4/6 address,
  * domain and port.
  *
diff --git

[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2015-05-12 Thread translation

commit 2f6d57f555a18a4f312365aac8bc68f200dbea6c
Author: Translation commit bot translat...@torproject.org
Date:   Tue May 12 14:46:06 2015 +

Update translations for torbutton-aboutdialogdtd
---
 fr/aboutdialog.dtd|2 +-
 fr_CA/aboutdialog.dtd |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fr/aboutdialog.dtd b/fr/aboutdialog.dtd
index 1b34c83..fb754f6 100644
--- a/fr/aboutdialog.dtd
+++ b/fr/aboutdialog.dtd
@@ -3,7 +3,7 @@
 !ENTITY project.tpoLink the amp;vendorShortName;
 !ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  Voulez-vous aider?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Faire une donation
 !ENTITY help.or  or 
diff --git a/fr_CA/aboutdialog.dtd b/fr_CA/aboutdialog.dtd
index 28ea1f3..9c54c8a 100644
--- a/fr_CA/aboutdialog.dtd
+++ b/fr_CA/aboutdialog.dtd
@@ -3,12 +3,12 @@
 !ENTITY project.tpoLink the amp;vendorShortName;
 !ENTITY project.end , a nonprofit working to defend your privacy 
and freedom online.
 
-!ENTITY help.start  Want to help? 
+!ENTITY help.start  Vous voulez aider?
 !-- LOCALIZATION NOTE (help.donate): This is a link title that links to 
https://www.torproject.org/donate/donate.html.en --
 !ENTITY help.donateLink Faire un don
-!ENTITY help.or  or 
+!ENTITY help.or ou
 !-- LOCALIZATION NOTE (help.getInvolvedLink): This is a link title that links 
to https://www.torproject.org/getinvolved/volunteer.html.en --
-!ENTITY help.getInvolvedLinkget involved
+!ENTITY help.getInvolvedLinkimpliquez-vous
 !ENTITY help.end!
 !-- LOCALIZATION NOTE (bottom.questions): This is a link title that links to 
https://www.torproject.org/docs/trademark-faq.html.en --
 !ENTITY bottomLinks.questions   Questions?

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

[tor-commits] [webwml/master] Release 0.2.7.1-alpha

2015-05-12 Thread nickm

commit 7aec2c9290901266d1b17416cf57154f5432570d
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 12 11:42:23 2015 -0400

Release 0.2.7.1-alpha
---
 Makefile |4 ++--
 include/versions.wmi |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 79d0b34..72c8a54 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.2.5.12
-export DEVTAG=tor-0.2.6.7
+export STABLETAG=tor-0.2.6.7
+export DEVTAG=tor-0.2.7.1-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index c83c573..5754926 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 define-tag version-stable whitespace=delete0.2.6.7/define-tag
-define-tag version-alpha whitespace=delete0.2.6.7/define-tag
+define-tag version-alpha whitespace=delete0.2.7.1-alpha/define-tag
 
 define-tag version-win32-stable whitespace=delete0.2.6.7/define-tag
 define-tag version-win32-alpha whitespace=delete0.2.5.10/define-tag

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

[tor-commits] [tor/master] Bump version to 0.2.7.1-alpha-dev

2015-05-12 Thread nickm

commit 95a9920461dd3322280a13c8d99e363c91028ab2
Author: Nick Mathewson ni...@torproject.org
Date:   Tue May 12 11:54:06 2015 -0400

Bump version to 0.2.7.1-alpha-dev
---
 ChangeLog   |6 +-
 configure.ac|2 +-
 contrib/win32build/tor-mingw.nsi.in |2 +-
 src/win32/orconfig.h|2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b17613a..c79a399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Changes in version 0.2.7.1-alpha - 2015-05-1?
+Changes in version 0.2.7.2-alpha - 2015-0?-??
+
+
+
+Changes in version 0.2.7.1-alpha - 2015-05-12
   Tor 0.2.7.1-alpha is the first alpha release in its series. It
   includes numerous small features and bugfixes against previous Tor
   versions, and numerous small infrastructure improvements. The most
diff --git a/configure.ac b/configure.ac
index 2645ed9..a51c71e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.7.1-alpha])
+AC_INIT([tor],[0.2.7.1-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index b3c8428..928aced 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.2.7.1-alpha
+!define VERSION 0.2.7.1-alpha-dev
 !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 623f4bd..9c780e8 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -232,7 +232,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION 0.2.7.1-alpha
+#define VERSION 0.2.7.1-alpha-dev
 
 
 

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

54 matches

Mail list logo