date:20160319

[tor-commits] [translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties

2016-03-19 Thread translation

commit 29c50b33ee544efb50914803f1d4710638ee4751
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:00 2016 +

Update translations for tor-messenger-facebookproperties
---
 hr_HR/facebook.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/facebook.properties b/hr_HR/facebook.properties
index 016f24d..aaf7cdc 100644
--- a/hr_HR/facebook.properties
+++ b/hr_HR/facebook.properties
@@ -2,6 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-connection.error.useUsernameNotEmailAddress=Molimo Vas da koristite svoje 
Facebook korisniÄko ime, ne email adresu
+connection.error.useUsernameNotEmailAddress=Please use your Facebook username, 
not an email address
 
-facebook.chat.name=Facebook chat
+facebook.chat.name=Facebook Chat

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

[tor-commits] [nyx/master] Fix menu stacktrace

2016-03-19 Thread atagar

commit c730a6c69fd972a3b760d3f9195db3a453b15aef
Author: Damian Johnson 
Date:   Sat Mar 19 21:06:17 2016 -0700

Fix menu stacktrace

Oops, turns out these attributes are still used after all by our menu.
---
 nyx/popups.py | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nyx/popups.py b/nyx/popups.py
index 89fa26e..6190a09 100644
--- a/nyx/popups.py
+++ b/nyx/popups.py
@@ -24,7 +24,7 @@ UNRESOLVED_MSG = 'No consensus data available'
 ERROR_MSG = 'Unable to retrieve data'
 
 
-def popup_window(height = -1, width = -1, below_static = True):
+def popup_window(height = -1, width = -1, top = 0, left = 0, below_static = 
True):
   """
   Provides a popup dialog you can use in a 'with' block...
 
@@ -38,6 +38,8 @@ def popup_window(height = -1, width = -1, below_static = 
True):
 
   :param int height: maximum height of the popup
   :param int width: maximum width of the popup
+  :param int top: top position, relative to the sticky content
+  :param int left: left position from the screen
   :param bool below_static: positions popup below static content if True
 
   :returns: tuple of the form (subwindow, width, height) when used in a with 
block
@@ -52,7 +54,7 @@ def popup_window(height = -1, width = -1, below_static = 
True):
   else:
 sticky_height = 0
 
-  popup = nyx.panel.Panel('popup', top = sticky_height, height = height, 
width = width)
+  popup = nyx.panel.Panel('popup', top + sticky_height, left, height, 
width)
   popup.set_visible(True)
 
   # Redraws the popup to prepare a subwindow instance. If none is spawned 
then

___
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

2016-03-19 Thread translation

commit 6f42090d06f3e88ed6fb57cbc403b86e520ae47c
Author: Translation commit bot 
Date:   Thu Mar 17 18:47:17 2016 +

Update translations for torbutton-aboutdialogdtd
---
 hr_HR/aboutdialog.dtd | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hr_HR/aboutdialog.dtd b/hr_HR/aboutdialog.dtd
index 9cd366d..5099ad7 100644
--- a/hr_HR/aboutdialog.dtd
+++ b/hr_HR/aboutdialog.dtd
@@ -1,19 +1,19 @@
-
+
 
-
-
+
+
 
-
+
 
-
-
+
+
 
-
+
 
 
-
+
 
-
+
 
-
-
+
+

___
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

2016-03-19 Thread translation

commit 1165986d9e8d782fafe36d060bc166445572a83b
Author: Translation commit bot 
Date:   Fri Mar 18 20:45:45 2016 +

Update translations for tails-misc
---
 ja.po | 82 +--
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/ja.po b/ja.po
index fdf21d2..16be1c0 100644
--- a/ja.po
+++ b/ja.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-01-04 11:56+0100\n"
-"PO-Revision-Date: 2016-01-06 09:25+\n"
+"POT-Creation-Date: 2016-03-07 18:07+0100\n"
+"PO-Revision-Date: 2016-03-18 20:44+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -51,30 +51,30 @@ msgid ""
 "\n"
 msgstr "ãã°ä¿®æ£ã«ååãã¦ãã ããï¼\nãã°ã®å ±åæ¹æ³ãèªãã§ãã 
ããã\nä¸å¿è¦ãªåäººæå ±ãå«ããªãã§ãã 
ããï¼\nã¡ã¼ã«ã¢ãã¬ã¹ã®æä¾ã«ã¤ãã¦\n\næã

ãåé¡ãç¹å®ããããã«é£çµ¡ã§ãããããããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ãæãã¦ãã
 ããã\næãã«å±ãæå ±ã®å¤§åã¯ãè¿½å æå 
±ãªãã§ã¯å½¹ã«ç«ããªãããã§ãã\nä¸æ¹ã§ãããã¯ã¡ã¼ã«æ©è½ã®æä¾è
ããããã¤ãã¼ãªã©ã®çè´èã«ãããªãã Tails 
ãå©ç¨ãã¦ãããã¨ãç¥ãããæ©æ¢°ãä¸ããäºã«ããªãã¾ãã\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "Electrum ã®ä¿åæ©è½ãç¡å¹ã§ã"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Tails ãåèµ·åããã¨ãBitcoin ã¦ã©ã¬ãããå«ãå
¨ã¦ã® Electrum 
ã®ãã¼ã¿ã¯å¤±ããã¾ããä¿åæ©è½ãæå¹ãªã¨ãã®ã¿ Electrum 
ãå®è¡ããããã¨ãå¼·ããããããã¾ãã"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"
 msgstr "ããã§ã Electrum ãèµ·åãã¾ããï¼"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/bin/icedove:22
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "èµ·å (_L)"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/bin/icedove:23
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "çµäº (_E)"
 
@@ -232,11 +232,11 @@ msgstr "GnuPGã®åºå:"
 msgid "Other messages provided by GnuPG:"
 msgstr "GnuPGããã®ãã®ã»ãã®ã¡ãã»ã¼ã¸:"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:18
+#: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
 msgstr ""
 
-#: config/chroot_local-includes/usr/local/bin/icedove:20
+#: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
@@ -317,40 +317,40 @@ msgstr 
"Tailsã®ãã®ãã¼ã¸ã§ã³ã«ã¯ãæ¢ç¥ã®ã»ãã¥ãªãã£åé¡
 msgid "Known security issues"
 msgstr "æ¢ç¥ã®ã»ãã¥ãªãã£ã¼åé¡"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "ãããã¯ã¼ã¯ã«ã¼ã ${nic} ãç¡å¹ã«ãªãã¾ãã"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "MAC ã¹ãã¼ãã£ã³ã°ãããããã¯ã¼ã¯ã«ã¼ã ${nic_name} 
(${nic}) 
ã®ããã«å¤±æããã®ã§ãä¸æçã«ç¡å¹åããã¾ãã\nTails 
ãåèµ·åãã¦ã MAC 
ã¹ãã¼ãã£ã¼ã³ã°ãç¡å¹åãããããããã¾ããã"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:61
+#:

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

2016-03-19 Thread translation

commit 33cb647efe35093f730093440d46fd3cac388760
Author: Translation commit bot 
Date:   Fri Mar 18 20:45:16 2016 +

Update translations for https_everywhere
---
 ja/https-everywhere.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd
index b73709e..1ddd984 100644
--- a/ja/https-everywhere.dtd
+++ b/ja/https-everywhere.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 
@@ -44,13 +44,13 @@
 
 
 
-
-
-
-
+
+
+
+
 
 
-
-
+
+
 
 

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2016-03-19 Thread translation

commit 27988b144cbfa7cf14f9846584b4dfab778e73f8
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:22 2016 +

Update translations for tor-messenger-otrproperties
---
 hr_HR/otr.properties | 62 ++--
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/hr_HR/otr.properties b/hr_HR/otr.properties
index a7b059a..11b23be 100644
--- a/hr_HR/otr.properties
+++ b/hr_HR/otr.properties
@@ -1,31 +1,31 @@
-msgevent.encryption_required_part1=PokuÅ¡ali ste poslati neenkriptiranu poruku 
%S. Neenkriptirane poruke nisu dozvoljene.
-msgevent.encryption_required_part2=PokuÅ¡avam zapoÄeti privatni razgovor. 
VaÅ¡a poruka Äe biti ponovno poslana kad privatni razgovor zapoÄne.
-msgevent.encryption_error=DoÅ¡lo je do pogreÅ¡ke prilikom enkripcije VaÅ¡e 
poruke. Poruka nije poslana.
-msgevent.connection_ended=%S je veÄ zatvorio svoju privatnu vezu prema Vama. 
VaÅ¡a poruka nije poslana. Ili zavrÅ¡ite svoj privatni razgovor ili ga ponovno 
pokrenite.
-msgevent.setup_error=DoÅ¡lo je do pogreÅ¡ke prilikom uspostave privatnog 
razgovora s %S.
-msgevent.msg_reflected=Primate vlastite OTR poruke. Ili Å¾elite priÄati sami 
sa sobom, ili netko reflektira VaÅ¡e poruke natrag Vama.
-msgevent.msg_resent=Posljednja poruka za %S je poslana ponovno.
-msgevent.rcvdmsg_not_private=Enkriptirana poruka primljena od %S je 
neÄitljiva, jer trenutno ne komunicirate privatno.
-msgevent.rcvdmsg_unreadable=Primili smo neÄitljivu enkriptiranu poruku od %S.
-msgevent.rcvdmsg_malformed=Primili smo poruku malformiranih podataka od %S.
-msgevent.log_heartbeat_rcvd=Otkucaj srca primljen od %S.
-msgevent.log_heartbeat_sent=Otkucaj srca poslan prema %S.
-msgevent.rcvdmsg_general_err=DoÅ¡lo je do OTR pogreÅ¡ke.
-msgevent.rcvdmsg_unecrypted=SljedeÄa poruka primljena od %S nije 
enkriptirana: %S
-msgevent.rcvdmsg_unrecognized=Primili smo neprepoznatu OTR poruku od %S.
-msgevent.rcvdmsg_for_other_instance=%S je poslao poruku namjenjenu za 
razliÄitu sesiju. Ako ste prijavljeni viÅ¡e puta, moÅ¾da je neka druga sesija 
primila tu poruku.
-context.gone_secure_private=Privatni razgovor s %S pokrenut.
-context.gone_secure_unverified=Privatni razgovor s %S pokrenut. Kako bilo, 
identitet kontakta nije verificiran.
-context.still_secure=UspjeÅ¡no osvjeÅ¾en privatni razgovor s %S.
-error.enc=DoÅ¡lo je do pogreÅ¡ke prilikom enkripcije poruke.
-error.not_priv=Poslali ste enkriptirane podatke prema %S, koji to nije 
oÄekivao.
-error.unreadable=Poslali ste neÄitljivu enkriptiranu poruku.
-error.malformed=Poslali ste poruku malformiranih podataka.
-resent=[ponovno poslano]
-tlv.disconnected=%S je zavrÅ¡io privatni razgovor s Vama; i Vi bi trebali 
uÄiniti isto.
-query.msg=%S je zatraÅ¾io NesluÅ¾beni privatni razgovor. Kako bilo, Vi nemate 
prikljuÄak koji to podrÅ¾ava. Pogledajte http://otr.cypherpunks.ca/ za viÅ¡e 
informacija.
-trust.unused=NekoriÅ¡teno
-trust.not_private=Nije privatno
-trust.unverified=Neverificirano
-trust.private=Privatno
-trust.finished=ZavrÅ¡eno
+msgevent.encryption_required_part1=You attempted to send an unencrypted 
message to %S. As a policy, unencrypted messages are not allowed.
+msgevent.encryption_required_part2=Attempting to start a private conversation. 
Your message will be retransmitted when the private conversation starts.
+msgevent.encryption_error=An error occurred when encrypting your message. The 
message was not sent.
+msgevent.connection_ended=%S has already closed their private connection to 
you. Your message was not sent. Either end your private conversation, or 
restart it.
+msgevent.setup_error=An error occured while setting up a private conversation 
with %S.
+msgevent.msg_reflected=You are receiving your own OTR messages. You are either 
trying to talk to yourself, or someone is reflecting your messages back at you.
+msgevent.msg_resent=The last message to %S was resent.
+msgevent.rcvdmsg_not_private=The encrypted message received from %S is 
unreadable, as you are not currently communicating privately.
+msgevent.rcvdmsg_unreadable=We received an unreadable encrypted message from 
%S.
+msgevent.rcvdmsg_malformed=We received a malformed data message from %S.
+msgevent.log_heartbeat_rcvd=Heartbeat received from %S.
+msgevent.log_heartbeat_sent=Heartbeat sent to %S.
+msgevent.rcvdmsg_general_err=An OTR error occured.
+msgevent.rcvdmsg_unecrypted=The following message received from %S was not 
encrypted: %S
+msgevent.rcvdmsg_unrecognized=We received an unrecognized OTR message from %S.
+msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a 
different session. If you are logged in multiple times, another session may 
have received the message.
+context.gone_secure_private=Private conversation with %S started.
+context.gone_secure_unverified=Private conversation with %S started. However, 
their identity has not been verified.
+context.still_secure=Successfully refreshed the private conversation with %S.

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

2016-03-19 Thread translation

commit e58508aabb9b9111cfbfabdfd629f700c28d4a37
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:41 2016 +

Update translations for torbutton-branddtd
---
 hr_HR/brand.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hr_HR/brand.dtd b/hr_HR/brand.dtd
index c8f2465..3df1a08 100644
--- a/hr_HR/brand.dtd
+++ b/hr_HR/brand.dtd
@@ -2,14 +2,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
-
-
+
+
+
+
+
 
 
-
-
-
-
+
+
+
+

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2016-03-19 Thread translation

commit 202291fa6cf09daef4779bbcd10d0ed1b80781d8
Author: Translation commit bot 
Date:   Fri Mar 18 21:17:14 2016 +

Update translations for tor-messenger-otrproperties
---
 ja/otr.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/otr.properties b/ja/otr.properties
index 11b23be..9ba9f54 100644
--- a/ja/otr.properties
+++ b/ja/otr.properties
@@ -21,10 +21,10 @@ error.enc=Error occurred encrypting message.
 error.not_priv=You sent encrypted data to %S, who wasn't expecting it.
 error.unreadable=You transmitted an unreadable encrypted message.
 error.malformed=You transmitted a malformed data message.
-resent=[resent]
+resent=[åéä¿¡]
 tlv.disconnected=%S has ended their private conversation with you; you should 
do the same.
 query.msg=%S has requested an Off-the Record private conversation. However, 
you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for 
more information.
-trust.unused=Unused
+trust.unused=æªä½¿ç¨
 trust.not_private=Not Private
 trust.unverified=Unverified
 trust.private=Private

___
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

2016-03-19 Thread translation

commit 61d934c78cf8874d221a9b1c9364889fa27d6a8b
Author: Translation commit bot 
Date:   Wed Mar 16 15:45:48 2016 +

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

diff --git a/de.po b/de.po
index 8fc6b74..cd00c5e 100644
--- a/de.po
+++ b/de.po
@@ -19,7 +19,7 @@
 # max weber, 2015
 # Sandra R , 2014
 # Sebastian , 2015
-# spriver , 2015
+# spriver , 2015
 # sycamoreone , 2014
 # Tobias Bannert , 2014,2016
 # try once, 2015
@@ -28,8 +28,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-24 21:38+0100\n"
-"PO-Revision-Date: 2016-02-26 16:54+\n"
+"POT-Creation-Date: 2016-03-07 18:07+0100\n"
+"PO-Revision-Date: 2016-03-16 15:31+\n"
 "Last-Translator: Christian Spaan \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tor-messenger-privdtd] Update translations for tor-messenger-privdtd

2016-03-19 Thread translation

commit fb3ba2f9ea52e8de71864d0045eb6a856053734d
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:39 2016 +

Update translations for tor-messenger-privdtd
---
 hr_HR/priv.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/priv.dtd b/hr_HR/priv.dtd
index 6c4d395..7007979 100644
--- a/hr_HR/priv.dtd
+++ b/hr_HR/priv.dtd
@@ -1,2 +1,2 @@
-
-
\ No newline at end of file
+
+
\ No newline at end of file

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

[tor-commits] [nyx/master] Move CURSES_LOCK to nyx.curses

2016-03-19 Thread atagar

commit b18a2e48f63e2fb15107f2a818f5cc4c0e0688d7
Author: Damian Johnson 
Date:   Wed Mar 16 09:52:38 2016 -0700

Move CURSES_LOCK to nyx.curses

This belongs with the curses screen. Eventually all curses interactions 
will go
through us so nobody outside this module will need the lock.
---
 nyx/curses.py |  5 +
 nyx/panel/__init__.py | 10 ++
 nyx/panel/graph.py|  2 +-
 nyx/panel/log.py  |  2 +-
 nyx/popups.py |  8 
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/nyx/curses.py b/nyx/curses.py
index 0b6e24a..97ad02a 100644
--- a/nyx/curses.py
+++ b/nyx/curses.py
@@ -66,6 +66,7 @@ if we want Windows support in the future too.
 from __future__ import absolute_import
 
 import curses
+import threading
 
 import stem.util.conf
 import stem.util.enum
@@ -73,7 +74,11 @@ import stem.util.system
 
 from nyx import msg, log
 
+# Curses screen we've initialized and lock for interacting with it. Curses
+# isn't thread safe and concurrency bugs produce especially sinister glitches.
+
 CURSES_SCREEN = None
+CURSES_LOCK = threading.RLock()
 
 # Text colors and attributes. These are *very* commonly used so including
 # shorter aliases (so they can be referenced as just GREEN or BOLD).
diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index 0394d55..287d756 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -7,7 +7,6 @@ import time
 import curses
 import curses.ascii
 import curses.textpad
-from threading import RLock
 
 import nyx.curses
 import stem.util.log
@@ -15,11 +14,6 @@ import stem.util.log
 from nyx.curses import HIGHLIGHT
 from stem.util import conf, str_tools
 
-# global ui lock governing all panel instances (curses isn't thread save and
-# concurrency bugs produce especially sinister glitches)
-
-CURSES_LOCK = RLock()
-
 PASS = -1
 
 __all__ = [
@@ -457,7 +451,7 @@ class Panel(object):
 
 self.max_y, self.max_x = subwin_max_y, subwin_max_x
 
-if not CURSES_LOCK.acquire(False):
+if not nyx.curses.CURSES_LOCK.acquire(False):
   return
 
 try:
@@ -466,7 +460,7 @@ class Panel(object):
 self.draw(self.max_x, self.max_y)
   self.win.refresh()
 finally:
-  CURSES_LOCK.release()
+  nyx.curses.CURSES_LOCK.release()
 
   def hline(self, y, x, length, *attributes):
 """
diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py
index 257716e..20a64c0 100644
--- a/nyx/panel/graph.py
+++ b/nyx/panel/graph.py
@@ -475,7 +475,7 @@ class GraphPanel(nyx.panel.Panel):
 
 control = nyx.controller.get_controller()
 
-with nyx.panel.CURSES_LOCK:
+with nyx.curses.CURSES_LOCK:
   try:
 while True:
   msg = 'press the down/up to resize the graph, and enter when done'
diff --git a/nyx/panel/log.py b/nyx/panel/log.py
index 92e3f90..3ab53f3 100644
--- a/nyx/panel/log.py
+++ b/nyx/panel/log.py
@@ -239,7 +239,7 @@ class LogPanel(nyx.panel.Panel, threading.Thread):
   if key_press.match('c'):
 self.clear()
 elif key.match('f'):
-  with nyx.panel.CURSES_LOCK:
+  with nyx.curses.CURSES_LOCK:
 initial_selection = 1 if self._filter.selection() else 0
 options = ['None'] + self._filter.latest_selections() + ['New...']
 selection = nyx.popups.show_menu('Log Filter:', options, 
initial_selection)
diff --git a/nyx/popups.py b/nyx/popups.py
index 61273f3..f29c9c8 100644
--- a/nyx/popups.py
+++ b/nyx/popups.py
@@ -63,13 +63,13 @@ def popup_window(height = -1, width = -1, top = 0, left = 
0, below_static = True
   popup.redraw(True)
 
   if popup.win is not None:
-nyx.panel.CURSES_LOCK.acquire()
+nyx.curses.CURSES_LOCK.acquire()
 return (popup, popup.max_x - 1, popup.max_y)
   else:
 return (None, 0, 0)
 
 def __exit__(self, exit_type, value, traceback):
-  nyx.panel.CURSES_LOCK.release()
+  nyx.curses.CURSES_LOCK.release()
   nyx.controller.get_controller().redraw(False)
 
   return _Popup()
@@ -85,7 +85,7 @@ def input_prompt(msg, initial_value = ''):
 initial_value - initial value of the field
   """
 
-  with nyx.panel.CURSES_LOCK:
+  with nyx.curses.CURSES_LOCK:
 control = nyx.controller.get_controller()
 msg_panel = control.get_panel('msg')
 msg_panel.set_message(msg)
@@ -107,7 +107,7 @@ def show_msg(msg, max_wait = None, attr = HIGHLIGHT):
 attr- attributes with which to draw the message
   """
 
-  with nyx.panel.CURSES_LOCK:
+  with nyx.curses.CURSES_LOCK:
 control = nyx.controller.get_controller()
 control.set_msg(msg, attr, True)
 



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

[tor-commits] [nyx/master] Drop Panel's set_height() and set_width()

2016-03-19 Thread atagar

commit 75661a9d109f73eeedd76f93b5c88e5f06990adb
Author: Damian Johnson 
Date:   Sat Mar 19 17:08:32 2016 -0700

Drop Panel's set_height() and set_width()

Couple unused resizing funcitons.
---
 nyx/panel/__init__.py | 48 +++-
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index 77884ac..62ae709 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -246,18 +246,6 @@ class Panel(object):
 
 return self.height
 
-  def set_height(self, height):
-"""
-Changes the height used for subwindows. This uses all available space if 
-1.
-
-Arguments:
-  height - maximum height of panel (uses all available space if -1)
-"""
-
-if self.height != height:
-  self.height = height
-  self.win = None
-
   def get_width(self):
 """
 Provides the width used for subwindows (-1 if it isn't limited).
@@ -265,18 +253,6 @@ class Panel(object):
 
 return self.width
 
-  def set_width(self, width):
-"""
-Changes the width used for subwindows. This uses all available space if -1.
-
-Arguments:
-  width - maximum width of panel (uses all available space if -1)
-"""
-
-if self.width != width:
-  self.width = width
-  self.win = None
-
   def get_preferred_size(self):
 """
 Provides the dimensions the subwindow would use when next redrawn, given
@@ -566,7 +542,7 @@ class Panel(object):
 
 return user_input
 
-  def add_scroll_bar(self, top, bottom, size, draw_top = 0, draw_bottom = -1, 
draw_left = 0):
+  def add_scroll_bar(self, top, bottom, size, draw_top = 0):
 """
 Draws a left justified scroll bar reflecting position within a vertical
 listing. This is shorted if necessary, and left undrawn if no space is
@@ -585,24 +561,14 @@ class Panel(object):
   bottom - list index for the bottom-most visible element
   size   - size of the list in which the listed elements are contained
   draw_top- starting row where the scroll bar should be drawn
-  draw_bottom - ending row where the scroll bar should end, -1 if it should
-   span to the bottom of the panel
-  draw_left   - left offset at which to draw the scroll bar
 """
 
 if (self.max_y - draw_top) < 2:
   return  # not enough room
 
-# sets draw_bottom to be the actual row on which the scrollbar should end
-
-if draw_bottom == -1:
-  draw_bottom = self.max_y - 1
-else:
-  draw_bottom = min(draw_bottom, self.max_y - 1)
-
 # determines scrollbar dimensions
 
-scrollbar_height = draw_bottom - draw_top
+scrollbar_height = self.max_y - draw_top - 1
 slider_top = scrollbar_height * top / size
 slider_size = scrollbar_height * (bottom - top) / size
 
@@ -624,15 +590,15 @@ class Panel(object):
 
 for i in range(scrollbar_height):
   if i >= slider_top and i <= slider_top + slider_size:
-self.addstr(i + draw_top, draw_left, ' ', HIGHLIGHT)
+self.addstr(i + draw_top, 0, ' ', HIGHLIGHT)
   else:
-self.addstr(i + draw_top, draw_left, ' ')
+self.addstr(i + draw_top, 0, ' ')
 
 # draws box around the scroll bar
 
-self.vline(draw_top, draw_left + 1, draw_bottom - 1)
-self.addch(draw_bottom, draw_left + 1, curses.ACS_LRCORNER)
-self.addch(draw_bottom, draw_left, curses.ACS_HLINE)
+self.vline(draw_top, 1, self.max_y - 2)
+self.addch(self.max_y - 1, 1, curses.ACS_LRCORNER)
+self.addch(self.max_y - 1, 0, curses.ACS_HLINE)
 
   def _reset_subwindow(self):
 """

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

[tor-commits] [nyx/master] Drop Panel's get_parent() method

2016-03-19 Thread atagar

commit 2cdee9afa60c8d72654a503a0975936b1e351add
Author: Damian Johnson 
Date:   Wed Mar 16 10:22:34 2016 -0700

Drop Panel's get_parent() method

Only used in one spot, and a weird one at that. I want to get rid of this
attribute entirely but it's still used within the Panel itself.
---
 nyx/panel/__init__.py |  7 ---
 nyx/panel/header.py   | 11 +--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index 287d756..176eea9 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -192,13 +192,6 @@ class Panel(object):
 
 self.title_visible = is_visible
 
-  def get_parent(self):
-"""
-Provides the parent used to create subwindows.
-"""
-
-return self.parent
-
   def set_visible(self, is_visible):
 """
 Toggles if the panel is visible or not.
diff --git a/nyx/panel/header.py b/nyx/panel/header.py
index 3ee0e84..51245ee 100644
--- a/nyx/panel/header.py
+++ b/nyx/panel/header.py
@@ -44,21 +44,19 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread):
 
 self._vals = get_sampling()
 
+self._last_width = 100
 self._pause_condition = threading.Condition()
 self._halt = False  # terminates thread if true
 self._reported_inactive = False
 
 tor_controller().add_status_listener(self.reset_listener)
 
-  def is_wide(self, width = None):
+  def is_wide(self):
 """
 True if we should show two columns of information, False otherwise.
 """
 
-if width is None:
-  width = self.get_parent().getmaxyx()[1]
-
-return width >= MIN_DUAL_COL_WIDTH
+return self._last_width >= MIN_DUAL_COL_WIDTH
 
   def get_height(self):
 """
@@ -127,7 +125,8 @@ class HeaderPanel(nyx.panel.Panel, threading.Thread):
 
   def draw(self, width, height):
 vals = self._vals  # local reference to avoid concurrency concerns
-is_wide = self.is_wide(width)
+self._last_width = width
+is_wide = self.is_wide()
 
 # space available for content
 



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

[tor-commits] [nyx/master] Move raw curses usage behind raw_screen()

2016-03-19 Thread atagar

commit 5d9c3dde6315b1ceb9ba9017823ea036501b909c
Author: Damian Johnson 
Date:   Thu Mar 17 09:53:18 2016 -0700

Move raw curses usage behind raw_screen()

Providing a function for raw access to the curses screen rather than 
passing a
reference around. This is an intermediate step since we want to abstract 
this
all away but for now better to have them go through nyx.curses to get this.
---
 nyx/controller.py   | 46 +-
 nyx/curses.py   | 35 ---
 nyx/panel/__init__.py   | 14 --
 nyx/panel/config.py |  4 ++--
 nyx/panel/connection.py |  4 ++--
 nyx/panel/graph.py  |  4 ++--
 nyx/panel/header.py |  4 ++--
 nyx/panel/log.py|  4 ++--
 nyx/panel/torrc.py  |  4 ++--
 nyx/popups.py   |  2 +-
 10 files changed, 70 insertions(+), 51 deletions(-)

diff --git a/nyx/controller.py b/nyx/controller.py
index 602c85e..32f4db5 100644
--- a/nyx/controller.py
+++ b/nyx/controller.py
@@ -63,8 +63,8 @@ class LabelPanel(nyx.panel.Panel):
   Panel that just displays a single line of text.
   """
 
-  def __init__(self, stdscr):
-nyx.panel.Panel.__init__(self, stdscr, 'msg', 0, height=1)
+  def __init__(self):
+nyx.panel.Panel.__init__(self, 'msg', 0, height=1)
 self.msg_text = ''
 self.msg_attr = NORMAL
 
@@ -92,41 +92,36 @@ class Controller:
   Tracks the global state of the interface
   """
 
-  def __init__(self, stdscr):
+  def __init__(self):
 """
 Creates a new controller instance. Panel lists are ordered as they appear,
 top to bottom on the page.
-
-Arguments:
-  stdscr - curses window
 """
 
-self._screen = stdscr
-
 self._sticky_panels = [
-  nyx.panel.header.HeaderPanel(stdscr),
-  LabelPanel(stdscr),
+  nyx.panel.header.HeaderPanel(),
+  LabelPanel(),
 ]
 
 self._page_panels, first_page_panels = [], []
 
 if CONFIG['features.panels.show.graph']:
-  first_page_panels.append(nyx.panel.graph.GraphPanel(stdscr))
+  first_page_panels.append(nyx.panel.graph.GraphPanel())
 
 if CONFIG['features.panels.show.log']:
-  first_page_panels.append(nyx.panel.log.LogPanel(stdscr))
+  first_page_panels.append(nyx.panel.log.LogPanel())
 
 if first_page_panels:
   self._page_panels.append(first_page_panels)
 
 if CONFIG['features.panels.show.connection']:
-  self._page_panels.append([nyx.panel.connection.ConnectionPanel(stdscr)])
+  self._page_panels.append([nyx.panel.connection.ConnectionPanel()])
 
 if CONFIG['features.panels.show.config']:
-  self._page_panels.append([nyx.panel.config.ConfigPanel(stdscr)])
+  self._page_panels.append([nyx.panel.config.ConfigPanel()])
 
 if CONFIG['features.panels.show.torrc']:
-  self._page_panels.append([nyx.panel.torrc.TorrcPanel(stdscr)])
+  self._page_panels.append([nyx.panel.torrc.TorrcPanel()])
 
 self.quit_signal = False
 self._page = 0
@@ -135,13 +130,6 @@ class Controller:
 self._last_drawn = 0
 self.set_msg()  # initializes our control message
 
-  def get_screen(self):
-"""
-Provides our curses window.
-"""
-
-return self._screen
-
   def get_page_count(self):
 """
 Provides the number of pages the interface has. This may be zero if all
@@ -306,7 +294,8 @@ class Controller:
 # https://trac.torproject.org/projects/tor/ticket/2830#comment:9
 
 if force:
-  self._screen.clear()
+  with nyx.curses.raw_screen() as stdscr:
+stdscr.clear()
 
 for panel_impl in display_panels:
   panel_impl.redraw(force)
@@ -365,17 +354,14 @@ class Controller:
 return halt_thread
 
 
-def start_nyx(stdscr):
+def start_nyx():
   """
   Main draw loop context.
-
-  Arguments:
-stdscr - curses window
   """
 
   global NYX_CONTROLLER
 
-  NYX_CONTROLLER = Controller(stdscr)
+  NYX_CONTROLLER = Controller()
   control = get_controller()
 
   if not CONFIG['features.acsSupport']:
@@ -411,7 +397,9 @@ def start_nyx(stdscr):
 # redraws the interface if it's needed
 
 control.redraw(False)
-stdscr.refresh()
+
+with nyx.curses.raw_screen() as stdscr:
+  stdscr.refresh()
 
 # wait for user keyboard input until timeout, unless an override was set
 
diff --git a/nyx/curses.py b/nyx/curses.py
index 97ad02a..4d9571b 100644
--- a/nyx/curses.py
+++ b/nyx/curses.py
@@ -9,6 +9,7 @@ if we want Windows support in the future too.
 ::
 
   start - initializes curses with the given function
+  raw_screen - provides direct access to the curses screen
   key_input - get keypress by user
   curses_attr - curses encoded text attribute
 
@@ -139,8 +140,7 @@ CONFIG = stem.util.conf.config_dict('nyx', {
 
 def start(function, transparent_background = False, cursor = True):
   """
-  Starts a curses interface, delegating to the given function. The function
-  should accept a single argument for the curses screen.
+  Starts a curses

[tor-commits] [nyx/master] Move paused attribute handling out of Panel

2016-03-19 Thread atagar

commit 5484afb38e2ab7475c22b5194ba3dccefbadea22
Author: Damian Johnson 
Date:   Sat Mar 19 16:15:10 2016 -0700

Move paused attribute handling out of Panel

This is simpler and less error prone when done by the panels. Actually, the
graph panel was the only spot still using these helpers so easy thing to
remove. :P
---
 nyx/panel/__init__.py | 69 ---
 nyx/panel/graph.py| 42 ++-
 2 files changed, 25 insertions(+), 86 deletions(-)

diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index c47ac59..77884ac 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -2,7 +2,6 @@
 Panels consisting the nyx interface.
 """
 
-import copy
 import time
 import curses
 import curses.ascii
@@ -142,13 +141,7 @@ class Panel(object):
 self.visible = False
 self.title_visible = True
 
-# Attributes for pausing. The pause_attr contains variables our get_attr
-# method is tracking, and the pause buffer has copies of the values from
-# when we were last unpaused (unused unless we're paused).
-
 self.paused = False
-self.pause_attr = []
-self.pause_buffer = {}
 self.pause_time = -1
 
 self.top = top
@@ -207,56 +200,6 @@ class Panel(object):
 
 return self.paused
 
-  def set_pause_attr(self, attr):
-"""
-Configures the panel to track the given attribute so that get_attr provides
-the value when it was last unpaused (or its current value if we're
-currently unpaused). For instance...
-
-> self.set_pause_attr('myVar')
-> self.myVar = 5
-> self.myVar = 6  # self.get_attr('myVar') -> 6
-> self.set_paused(True)
-> self.myVar = 7  # self.get_attr('myVar') -> 6
-> self.set_paused(False)
-> self.myVar = 7  # self.get_attr('myVar') -> 7
-
-Arguments:
-  attr - parameter to be tracked for get_attr
-"""
-
-self.pause_attr.append(attr)
-self.pause_buffer[attr] = self.copy_attr(attr)
-
-  def get_attr(self, attr):
-"""
-Provides the value of the given attribute when we were last unpaused. If
-we're currently unpaused then this is the current value. If untracked this
-returns None.
-
-Arguments:
-  attr - local variable to be returned
-"""
-
-if attr not in self.pause_attr:
-  return None
-elif self.paused:
-  return self.pause_buffer[attr]
-else:
-  return self.__dict__.get(attr)
-
-  def copy_attr(self, attr):
-"""
-Provides a duplicate of the given configuration value, suitable for the
-pause buffer.
-
-Arguments:
-  attr - parameter to be provided back
-"""
-
-current_value = self.__dict__.get(attr)
-return copy.copy(current_value)
-
   def set_paused(self, is_pause):
 """
 Toggles if the panel is paused or not. This causes the panel to be redrawn
@@ -264,8 +207,6 @@ class Panel(object):
 important when pausing since otherwise the panel's display could change
 when redrawn for other reasons.
 
-This returns True if the panel's pause state was changed, False otherwise.
-
 Arguments:
   is_pause- freezes the state of the pause attributes if true, 
makes
 them editable otherwise
@@ -276,17 +217,7 @@ class Panel(object):
 self.pause_time = time.time()
 
   self.paused = is_pause
-
-  if is_pause:
-# copies tracked attributes so we know what they were before pausing
-
-for attr in self.pause_attr:
-  self.pause_buffer[attr] = self.copy_attr(attr)
-
   self.redraw(True)
-  return True
-else:
-  return False
 
   def get_pause_time(self):
 """
diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py
index 20a6110..b325dd1 100644
--- a/nyx/panel/graph.py
+++ b/nyx/panel/graph.py
@@ -390,21 +390,21 @@ class GraphPanel(nyx.panel.Panel):
 self._graph_height = CONFIG['features.graph.height']
 
 self._accounting_stats = None
+self._accounting_stats_paused = None
 
 self._stats = {
   GraphStat.BANDWIDTH: BandwidthStats(),
   GraphStat.SYSTEM_RESOURCES: ResourceStats(),
 }
 
+self._stats_paused = None
+
 if CONFIG['features.panels.show.connection']:
   self._stats[GraphStat.CONNECTIONS] = ConnectionStats()
 elif self._displayed_stat == GraphStat.CONNECTIONS:
   log.warn("The connection graph is unavailble when you set 
'features.panels.show.connection false'.")
   self._displayed_stat = GraphStat.BANDWIDTH
 
-self.set_pause_attr('_stats')
-self.set_pause_attr('_accounting_stats')
-
 controller = tor_controller()
 controller.add_event_listener(self._update_accounting, EventType.BW)
 controller.add_event_listener(self._update_stats, EventType.BW)
@@ -455,8 +455,9 @@ class GraphPanel(nyx.panel.Panel):
   return 0
 
 height = DEFAULT_CONTENT_HEIGHT + self._graph_height
+accounting_stats = self._accounting_stats if self.is_paused()

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-03-19 Thread translation

commit 4de8f2e2af2e29860d69493126025f919c508dd2
Author: Translation commit bot 
Date:   Wed Mar 16 13:45:44 2016 +

Update translations for abouttor-homepage
---
 af/aboutTor.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/af/aboutTor.dtd b/af/aboutTor.dtd
index ae34457..996297f 100644
--- a/af/aboutTor.dtd
+++ b/af/aboutTor.dtd
@@ -4,16 +4,16 @@
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-
+
 
-
-
-
+
+
+
 
-
+
 
-
-
+
+
 
 
 

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit 5533a798e6fc495ab3fffd3fb38d9579de12ab7f
Author: Translation commit bot 
Date:   Thu Mar 17 14:46:31 2016 +

Update translations for tor-messenger-ircproperties
---
 it/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/it/irc.properties b/it/irc.properties
index 26f6fac..aec2615 100644
--- a/it/irc.properties
+++ b/it/irc.properties
@@ -174,7 +174,7 @@ error.sendMessageFailed=C'Ã¨ stato un errore nell'invio del 
tuo ultimo messaggio
 error.channelForward=Non puoi entrare in %1$S, sei stato reindirizzato 
automaticamente a %2$S.
 #%S is the mode that the user tried to set but was not recognized
 #by the server as a valid mode.
-error.unknownMode='%S' is not a valid user mode on this server.
+error.unknownMode='%S' non Ã¨ una modalitÃ  utente valida su questo server.
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

[tor-commits] [nyx/master] Fix log panel's ability to pause

2016-03-19 Thread atagar

commit 78355ab3700aa86eeae14e56b75368a082677362
Author: Damian Johnson 
Date:   Sat Mar 19 15:41:55 2016 -0700

Fix log panel's ability to pause

When paused the log panel didn't actually freeze its content. To do this
implementing clone method for our LogGroup.
---
 nyx/controller.py   |  2 +-
 nyx/log.py  | 32 
 nyx/panel/__init__.py   |  9 +++--
 nyx/panel/config.py |  2 +-
 nyx/panel/connection.py |  2 +-
 nyx/panel/graph.py  |  2 +-
 nyx/panel/header.py |  2 +-
 nyx/panel/log.py| 13 +
 nyx/popups.py   |  6 ++
 9 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/nyx/controller.py b/nyx/controller.py
index 32f4db5..e469358 100644
--- a/nyx/controller.py
+++ b/nyx/controller.py
@@ -64,7 +64,7 @@ class LabelPanel(nyx.panel.Panel):
   """
 
   def __init__(self):
-nyx.panel.Panel.__init__(self, 'msg', 0, height=1)
+nyx.panel.Panel.__init__(self, 'msg', height = 1)
 self.msg_text = ''
 self.msg_attr = NORMAL
 
diff --git a/nyx/log.py b/nyx/log.py
index 642e97c..aeae399 100644
--- a/nyx/log.py
+++ b/nyx/log.py
@@ -19,11 +19,13 @@ runlevels.
 
   LogGroup - thread safe, deduplicated grouping of events
 |- add - adds an event to the group
-+- pop - removes and returns an event
+|- pop - removes and returns an event
++- clone - deep copy of this LogGroup
 
   LogEntry - individual log event
 |- is_duplicate_of - checks if a duplicate message of another LogEntry
-+- day_count - number of days since this even occured
+|- day_count - number of days since this even occured
++- clone - deep copy of this LogEntry
 
   LogFileOutput - writes log events to a file
 +- write - persist a given message
@@ -33,7 +35,7 @@ runlevels.
 |- selection - current regex filter
 |- latest_selections - past regex selections
 |- match - checks if a LogEntry matches this filter
-+- clone - deep clone of this LogFilters
++- clone - deep copy of this LogFilters
 """
 
 import collections
@@ -261,6 +263,12 @@ class LogGroup(object):
   if last_entry.is_duplicate:
 last_entry.duplicates.pop()
 
+  def clone(self):
+with self._lock:
+  copy = LogGroup(self._max_size, self._group_by_day)
+  copy._entries = [entry.clone() for entry in self._entries]
+  return copy
+
   def __len__(self):
 with self._lock:
   return len(self._entries)
@@ -285,7 +293,7 @@ class LogEntry(object):
 
   :var bool is_duplicate: true if this matches other messages in the group and
 isn't the first
-  :var list duplicates: messages that are identical to thsi one
+  :var list duplicates: messages that are identical to this one
   """
 
   def __init__(self, timestamp, type, message):
@@ -340,6 +348,13 @@ class LogEntry(object):
 
 return day_count(self.timestamp)
 
+  def clone(self):
+copy = LogEntry(self.timestamp, self.type, self.message)
+copy.is_duplicate = self.is_duplicate
+copy.duplicates = None if self.duplicates is None else 
list(self.duplicates)
+
+return copy
+
   def __eq__(self, other):
 if isinstance(other, LogEntry):
   return hash(self) == hash(other)
@@ -431,10 +446,11 @@ class LogFilters(object):
 
   def clone(self):
 with self._lock:
-  clone = LogFilters(max_filters = self._max_filters)
-  clone._selected = self._selected
-  clone._past_filters = self._past_filters
-  return clone
+  copy = LogFilters(max_filters = self._max_filters)
+  copy._selected = self._selected
+  copy._past_filters = self._past_filters
+
+  return copy
 
 
 def trace(msg, **attr):
diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index bab0cc7..c47ac59 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -122,7 +122,7 @@ class Panel(object):
   redraw().
   """
 
-  def __init__(self, name, top, left = 0, height = -1, width = -1):
+  def __init__(self, name, top = 0, left = 0, height = -1, width = -1):
 """
 Creates a durable wrapper for a curses subwindow in the given parent.
 
@@ -257,7 +257,7 @@ class Panel(object):
 current_value = self.__dict__.get(attr)
 return copy.copy(current_value)
 
-  def set_paused(self, is_pause, suppress_redraw = False):
+  def set_paused(self, is_pause):
 """
 Toggles if the panel is paused or not. This causes the panel to be redrawn
 when toggling is pause state unless told to do otherwise. This is
@@ -269,7 +269,6 @@ class Panel(object):
 Arguments:
   is_pause- freezes the state of the pause attributes if true, 
makes
 them editable otherwise
-  suppress_redraw - if true then this will never redraw the panel
 """
 
 if is_pause != self.paused:
@@ -284,9 +283,7 @@ class Panel(object):
 for attr in self.pause_attr:
   self.pause_buffer[attr] = self.copy_attr(attr)
 
-  if not suppress_redraw:
-

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit 00617565b3b10bd2bbcc153dc78bf27ffc702f3d
Author: Translation commit bot 
Date:   Sat Mar 19 23:46:46 2016 +

Update translations for tor-messenger-ircproperties
---
 pt_BR/irc.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/irc.properties b/pt_BR/irc.properties
index e39cdaa..eeab9d8 100644
--- a/pt_BR/irc.properties
+++ b/pt_BR/irc.properties
@@ -13,7 +13,7 @@ irc.usernameHint=pseudÃ´nimo
 #   disconnected because of an error.
 connection.error.lost=Perda de conexÃ£o com o servidor
 connection.error.timeOut=A conexÃ£o expirou
-connection.error.invalidUsername=%S nÃ£o Ã© um nome vÃ¡lido de usuÃ¡rio
+connection.error.invalidUsername=%S Ã© um nome de usuÃ¡rio interdito
 connection.error.invalidPassword=Senha de servidor invÃ¡lida
 connection.error.passwordRequired=Senha requerida
 
@@ -28,9 +28,9 @@ joinChat.password=_Senha
 options.server=Servidor
 options.port=Porta
 options.ssl=Use SSL
-options.encoding=Definir caractere
+options.encoding=Conjunto de caracteres
 options.quitMessage=Abandonar a mensagem
-options.partMessage=Partilhar a mensagem
+options.partMessage=Dividir a mensagem
 options.showServerTab=Mostrar as mensagens do servidor
 options.alternateNicks=Alternar pseudÃ´nimos
 

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

[tor-commits] [translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties

2016-03-19 Thread translation

commit 973d094b21f04d110ab9ec6f6bc3cdebbd2be8e4
Author: Translation commit bot 
Date:   Sat Mar 19 23:46:32 2016 +

Update translations for tor-messenger-facebookproperties
---
 pt_BR/facebook.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/facebook.properties b/pt_BR/facebook.properties
index 1c50767..063b079 100644
--- a/pt_BR/facebook.properties
+++ b/pt_BR/facebook.properties
@@ -2,6 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-connection.error.useUsernameNotEmailAddress=Por favor, use o nome de usuÃ¡rio 
Facebook, nÃ£o um endereÃ§o e-mail.
+connection.error.useUsernameNotEmailAddress=Por favor, use seu nome de 
usuÃ¡rio Facebook, nÃ£o um endereÃ§o e-mail.
 
 facebook.chat.name=Conversa Facebook

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

[tor-commits] [translation/tor-messenger-commandsproperties] Update translations for tor-messenger-commandsproperties

2016-03-19 Thread translation

commit f8eedb191206d4929ae2767e43cb04b14831c754
Author: Translation commit bot 
Date:   Sat Mar 19 23:46:18 2016 +

Update translations for tor-messenger-commandsproperties
---
 pt_BR/commands.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pt_BR/commands.properties b/pt_BR/commands.properties
index 100839d..7e98d0b 100644
--- a/pt_BR/commands.properties
+++ b/pt_BR/commands.properties
@@ -4,11 +4,11 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands=Comandos: %S.\nUsar /help command para mais informaÃ§Ãµes.
+commands=Comandos: %S.\nUse /help command para mais informaÃ§Ãµes.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
-noCommand=Nenhum comando '%S'.
-noHelp=Desculpe, nÃ£o hÃ¡ nenhuma mensagem de ajuda para o comando '%S'!
+noCommand= '%S'.
+noHelp=Desculpe, nÃ£o hÃ¡ nenhuma mensagem de ajuda para  '%S'!
 
 sayHelpString=say message: send a message without processing commands.
 rawHelpString=cru message: Envie uma mensagem sem escapar entidades 
HTML.
@@ -22,6 +22,6 @@ helpHelpString=Ajuda name: Mostra a mensagem de ajuda 
para name
 statusCommand=%1$S mensagem de status: modificar status para %2$S com 
uma mensagem opcional de status.
 back=disponÃvel
 away=saiu
-busy=indisponÃvel
-dnd=indisponÃvel
+busy=nÃ£o-disponÃvel
+dnd=nÃ£o-disponÃvel
 offline=desconectad_

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

[tor-commits] [translation/tor-messenger-commandsproperties_completed] Update translations for tor-messenger-commandsproperties_completed

2016-03-19 Thread translation

commit 1733da3c79d33d9f4935d2f7d5efeb62a8a39ab4
Author: Translation commit bot 
Date:   Sat Mar 19 23:46:22 2016 +

Update translations for tor-messenger-commandsproperties_completed
---
 pt_BR/commands.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pt_BR/commands.properties b/pt_BR/commands.properties
index 100839d..7e98d0b 100644
--- a/pt_BR/commands.properties
+++ b/pt_BR/commands.properties
@@ -4,11 +4,11 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands=Comandos: %S.\nUsar /help command para mais informaÃ§Ãµes.
+commands=Comandos: %S.\nUse /help command para mais informaÃ§Ãµes.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
-noCommand=Nenhum comando '%S'.
-noHelp=Desculpe, nÃ£o hÃ¡ nenhuma mensagem de ajuda para o comando '%S'!
+noCommand= '%S'.
+noHelp=Desculpe, nÃ£o hÃ¡ nenhuma mensagem de ajuda para  '%S'!
 
 sayHelpString=say message: send a message without processing commands.
 rawHelpString=cru message: Envie uma mensagem sem escapar entidades 
HTML.
@@ -22,6 +22,6 @@ helpHelpString=Ajuda name: Mostra a mensagem de ajuda 
para name
 statusCommand=%1$S mensagem de status: modificar status para %2$S com 
uma mensagem opcional de status.
 back=disponÃvel
 away=saiu
-busy=indisponÃvel
-dnd=indisponÃvel
+busy=nÃ£o-disponÃvel
+dnd=nÃ£o-disponÃvel
 offline=desconectad_

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2016-03-19 Thread translation

commit 30f2ed0a3352ee98a8ab87d38a0464685c990ee5
Author: Translation commit bot 
Date:   Sat Mar 19 23:17:02 2016 +

Update translations for tails-openpgp-applet_completed
---
 pt_BR/openpgp-applet.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/openpgp-applet.pot b/pt_BR/openpgp-applet.pot
index 8f3fe64..7d545dd 100644
--- a/pt_BR/openpgp-applet.pot
+++ b/pt_BR/openpgp-applet.pot
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Communia , 2015
+# Communia , 2015-2016
 # Danton Medrado, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-11-23 10:39+\n"
+"PO-Revision-Date: 2016-03-19 23:10+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: bin/openpgp-applet:163
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
-msgstr "VocÃª estÃ¡ prestes a sair do Applet OpenPGP. VocÃª tem certeza?"
+msgstr "VocÃª estÃ¡ prestes a sair do Applet OpenPGP. VocÃª quer sair mesmo?"
 
 #: bin/openpgp-applet:175
 msgid "OpenPGP encryption applet"
-msgstr "Applet de encriptaÃ§Ã£o OpenPGP"
+msgstr "Miniaplicativo de criptografia OpenPGP"
 
 #: bin/openpgp-applet:178
 msgid "Exit"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-03-19 Thread translation

commit 02c56cf3a47e8be0f3c8b825ed8bc09f0559823c
Author: Translation commit bot 
Date:   Sat Mar 19 23:16:58 2016 +

Update translations for tails-openpgp-applet
---
 pt_BR/openpgp-applet.pot | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pt_BR/openpgp-applet.pot b/pt_BR/openpgp-applet.pot
index 8f3fe64..7d545dd 100644
--- a/pt_BR/openpgp-applet.pot
+++ b/pt_BR/openpgp-applet.pot
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Communia , 2015
+# Communia , 2015-2016
 # Danton Medrado, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-11-23 10:39+\n"
+"PO-Revision-Date: 2016-03-19 23:10+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgstr ""
 
 #: bin/openpgp-applet:163
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
-msgstr "VocÃª estÃ¡ prestes a sair do Applet OpenPGP. VocÃª tem certeza?"
+msgstr "VocÃª estÃ¡ prestes a sair do Applet OpenPGP. VocÃª quer sair mesmo?"
 
 #: bin/openpgp-applet:175
 msgid "OpenPGP encryption applet"
-msgstr "Applet de encriptaÃ§Ã£o OpenPGP"
+msgstr "Miniaplicativo de criptografia OpenPGP"
 
 #: bin/openpgp-applet:178
 msgid "Exit"

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

[tor-commits] [translation/tor-messenger-authdtd_completed] Update translations for tor-messenger-authdtd_completed

2016-03-19 Thread translation

commit 2fa2184eaced0650ea246a924f9d64129bdda289
Author: Translation commit bot 
Date:   Sat Mar 19 23:16:22 2016 +

Update translations for tor-messenger-authdtd_completed
---
 pt_BR/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/auth.dtd b/pt_BR/auth.dtd
index adfb115..90c278b 100644
--- a/pt_BR/auth.dtd
+++ b/pt_BR/auth.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

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

[tor-commits] [translation/tor-messenger-authdtd] Update translations for tor-messenger-authdtd

2016-03-19 Thread translation

commit a6b4f9c731c302a7dcc50061769249feb0e3e9a6
Author: Translation commit bot 
Date:   Sat Mar 19 23:16:18 2016 +

Update translations for tor-messenger-authdtd
---
 pt_BR/auth.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/auth.dtd b/pt_BR/auth.dtd
index adfb115..90c278b 100644
--- a/pt_BR/auth.dtd
+++ b/pt_BR/auth.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
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

2016-03-19 Thread translation

commit e8175b950e2b2986447d9bdf32cea899869bedad
Author: Translation commit bot 
Date:   Sat Mar 19 23:15:43 2016 +

Update translations for tails-misc
---
 pt_BR.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 09e730e..db36e12 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-12 13:52+0100\n"
-"PO-Revision-Date: 2016-02-23 16:39+\n"
+"POT-Creation-Date: 2016-03-17 15:03+0100\n"
+"PO-Revision-Date: 2016-03-19 23:10+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -56,36 +56,36 @@ msgid ""
 "\n"
 msgstr "Ajude a consertar o seu erro!\nLeia as 
instruÃ§Ãµes de relatÃ³rios de erros.\nNÃ£o inclua 
informaÃ§Ãµes pessoais alÃ©m do necessÃ¡rio!\nSobre nos 
informar um endereÃ§o de email\n\nSe infomar seu email, podemos fazer 
contato para esclarecer o problema. Isto Ã© necessÃ¡rio para a maioria dos 
relatÃ³rios que recebemos (muitos deles sem informaÃ§Ãµes de contato sÃ£o 
inÃºteis). Por outro lado, pode ser uma oportunidade para bisbilhoteiros como 
seu email ou provedor de Internet confirmarem que vocÃª estÃ¡ usando Tails. 
\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "O PersistÃªncia estÃ¡ desabilitado para usar Electrum"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Ao reiniciar o Tails, todos os dados do Electrum serÃ£o perdidos, 
inclusive as carteiras de Bitcoin. Assim, o mais recomendado Ã© executar 
Electrum quando o persistÃªncia deste estiver ativado."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"
 msgstr "VocÃª deseja iniciar o Electrum assim mesmo?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/bin/icedove:22
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_LanÃ§ar"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/bin/icedove:23
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_SaÃda"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:136
 msgid "OpenPGP encryption applet"
-msgstr "Applet de encriptaÃ§Ã£o OpenPGP"
+msgstr "Miniaplicativo de criptografia OpenPGP"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:139
 msgid "Exit"
@@ -240,11 +240,11 @@ msgstr "SaÃda do GnuPG:"
 msgid "Other messages provided by GnuPG:"
 msgstr "Outras mensagens fornecidas pelo GnuPG:"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:18
+#: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
 msgstr "O recurso persistente Claws Mail foi ativado."
 
-#: config/chroot_local-includes/usr/local/bin/icedove:20
+#: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
@@ -325,40 +325,40 @@ msgstr "Esta versÃ£o do Tails tem problemas de seguranÃ§a 
conhecidos:"
 msgid "Known security issues"
 msgstr "Problemas de seguranca conhecidos"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "Placa de rede ${nic} desabilitada"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "A mÃ¡scara de identidade MAC falhou para a placa de rede ${nic_name} 
(${nic}), portanto, estÃ¡ temporariamente desabilitada.\nTalvez seja melhor 
reiniciar o Tails e desabilitar a mÃ¡scara de

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

2016-03-19 Thread translation

commit 8e8a164e57ae0d2e83176b24135340818715c4ff
Author: Translation commit bot 
Date:   Sat Mar 19 23:15:47 2016 +

Update translations for tails-misc_completed
---
 pt_BR.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/pt_BR.po b/pt_BR.po
index 09e730e..db36e12 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-12 13:52+0100\n"
-"PO-Revision-Date: 2016-02-23 16:39+\n"
+"POT-Creation-Date: 2016-03-17 15:03+0100\n"
+"PO-Revision-Date: 2016-03-19 23:10+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -56,36 +56,36 @@ msgid ""
 "\n"
 msgstr "Ajude a consertar o seu erro!\nLeia as 
instruÃ§Ãµes de relatÃ³rios de erros.\nNÃ£o inclua 
informaÃ§Ãµes pessoais alÃ©m do necessÃ¡rio!\nSobre nos 
informar um endereÃ§o de email\n\nSe infomar seu email, podemos fazer 
contato para esclarecer o problema. Isto Ã© necessÃ¡rio para a maioria dos 
relatÃ³rios que recebemos (muitos deles sem informaÃ§Ãµes de contato sÃ£o 
inÃºteis). Por outro lado, pode ser uma oportunidade para bisbilhoteiros como 
seu email ou provedor de Internet confirmarem que vocÃª estÃ¡ usando Tails. 
\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "O PersistÃªncia estÃ¡ desabilitado para usar Electrum"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Ao reiniciar o Tails, todos os dados do Electrum serÃ£o perdidos, 
inclusive as carteiras de Bitcoin. Assim, o mais recomendado Ã© executar 
Electrum quando o persistÃªncia deste estiver ativado."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:21
 msgid "Do you want to start Electrum anyway?"
 msgstr "VocÃª deseja iniciar o Electrum assim mesmo?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/bin/icedove:22
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_LanÃ§ar"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/bin/icedove:23
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_SaÃda"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:136
 msgid "OpenPGP encryption applet"
-msgstr "Applet de encriptaÃ§Ã£o OpenPGP"
+msgstr "Miniaplicativo de criptografia OpenPGP"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:139
 msgid "Exit"
@@ -240,11 +240,11 @@ msgstr "SaÃda do GnuPG:"
 msgid "Other messages provided by GnuPG:"
 msgstr "Outras mensagens fornecidas pelo GnuPG:"
 
-#: config/chroot_local-includes/usr/local/bin/icedove:18
+#: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
 msgstr "O recurso persistente Claws Mail foi ativado."
 
-#: config/chroot_local-includes/usr/local/bin/icedove:20
+#: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
@@ -325,40 +325,40 @@ msgstr "Esta versÃ£o do Tails tem problemas de seguranÃ§a 
conhecidos:"
 msgid "Known security issues"
 msgstr "Problemas de seguranca conhecidos"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
 #, sh-format
 msgid "Network card ${nic} disabled"
 msgstr "Placa de rede ${nic} desabilitada"
 
-#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:52
+#: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:53
 #, sh-format
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
 msgstr "A mÃ¡scara de identidade MAC falhou para a placa de rede ${nic_name} 
(${nic}), portanto, estÃ¡ temporariamente desabilitada.\nTalvez seja melhor 
reiniciar o Tails e desabilitar a mÃ¡scara

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2016-03-19 Thread translation

commit fe7b523ecc100df6e6347bb8c4ccdf8c660e777c
Author: Translation commit bot 
Date:   Wed Mar 16 15:46:57 2016 +

Update translations for tails-openpgp-applet_completed
---
 de/openpgp-applet.pot | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/de/openpgp-applet.pot b/de/openpgp-applet.pot
index 5538810..02ce4a8 100644
--- a/de/openpgp-applet.pot
+++ b/de/openpgp-applet.pot
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # konstibae, 2015
+# spriver , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-12-01 17:40+\n"
-"Last-Translator: konstibae\n"
+"PO-Revision-Date: 2016-03-16 15:31+\n"
+"Last-Translator: spriver \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "Zwischenablage mit _Passphrase verschlÃ¼sseln"
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "Zwischenablage mit Ãffentlichem _SchlÃ¼ssel signieren/verschlÃ¼sseln"
+msgstr "Zwischenablage mit Ã¶ffentlichem _SchlÃ¼ssel signieren/verschlÃ¼sseln"
 
 #: bin/openpgp-applet:243
 msgid "_Decrypt/Verify Clipboard"

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit f58cca2ddf3d5d8d755b3764eecefc78c15abbea
Author: Translation commit bot 
Date:   Wed Mar 16 17:46:30 2016 +

Update translations for tor-messenger-ircproperties
---
 ca/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/irc.properties b/ca/irc.properties
index 963650f..55aa9eb 100644
--- a/ca/irc.properties
+++ b/ca/irc.properties
@@ -155,7 +155,7 @@ error.banned=You are banned from this server.
 error.bannedSoon=You will soon be banned from this server.
 error.mode.wrongUser=You cannot change modes for other users.
 #%S is the nickname or channel name that isn't available.
-error.noSuchNick=%S is not online.
+error.noSuchNick=%S no estÃ  en lÃnia
 error.wasNoSuchNick=There was no nickname: %S
 error.noSuchChannel=There is no channel: %S.
 error.unavailable=%S is temporarily unavailable.

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

[tor-commits] [snowflake/master] per-proxypair Snowflake ID generation instead of just one for the Broker (#11)

2016-03-19 Thread arlo

commit b1e76420bd7c3838d128407c9822b089c0296bc2
Author: Serene Han 
Date:   Mon Mar 14 22:12:28 2016 -0700

per-proxypair Snowflake ID generation instead of just one for the Broker 
(#11)
---
 proxy/broker.coffee   | 19 +++
 proxy/proxypair.coffee|  8 ++--
 proxy/snowflake.coffee| 30 --
 proxy/spec/broker.spec.coffee |  6 +++---
 proxy/util.coffee |  4 
 5 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/proxy/broker.coffee b/proxy/broker.coffee
index 78577e7..9eb378c 100644
--- a/proxy/broker.coffee
+++ b/proxy/broker.coffee
@@ -12,21 +12,16 @@ STATUS_GATEWAY_TIMEOUT = 504
 MESSAGE_TIMEOUT = 'Timed out waiting for a client offer.'
 MESSAGE_UNEXPECTED = 'Unexpected status.'
 
-genSnowflakeID = ->
-  Math.random().toString(36).substring(2)
-
 # Represents a broker running remotely.
 class Broker
 
   clients: 0
-  id: null
 
   # When interacting with the Broker, snowflake must generate a unique session
   # ID so the Broker can keep track of which signalling channel it's speaking
   # to.
   constructor: (@url) ->
 @clients = 0
-@id = genSnowflakeID()
 # Ensure url has the right protocol + trailing slash.
 @url = 'http://' + @url if 0 == @url.indexOf('localhost', 0)
 @url = 'https://' + @url if 0 != @url.indexOf('http', 0)
@@ -37,7 +32,7 @@ class Broker
   # waits for a response containing some client offer that the Broker chooses
   # for this proxy..
   # TODO: Actually support multiple clients.
-  getClientOffer: =>
+  getClientOffer: (id) =>
 new Promise (fulfill, reject) =>
   xhr = new XMLHttpRequest()
   xhr.onreadystatechange = ->
@@ -53,12 +48,12 @@ class Broker
 snowflake.ui.setStatus ' failure. Please refresh.'
 reject MESSAGE_UNEXPECTED
   @_xhr = xhr  # Used by spec to fake async Broker interaction
-  @_postRequest xhr, 'proxy', @id
+  @_postRequest id, xhr, 'proxy', id
 
   # Assumes getClientOffer happened, and a WebRTC SDP answer has been 
generated.
   # Sends it back to the broker, which passes it to back to the original 
client.
-  sendAnswer: (answer) ->
-dbg @id + ' - Sending answer back to broker...\n'
+  sendAnswer: (id, answer) ->
+dbg id + ' - Sending answer back to broker...\n'
 dbg answer.sdp
 xhr = new XMLHttpRequest()
 xhr.onreadystatechange = ->
@@ -73,14 +68,14 @@ class Broker
   dbg 'Broker ERROR: Unexpected ' + xhr.status +
   ' - ' + xhr.statusText
   snowflake.ui.setStatus ' failure. Please refresh.'
-@_postRequest xhr, 'answer', JSON.stringify(answer)
+@_postRequest id, xhr, 'answer', JSON.stringify(answer)
 
   # urlSuffix for the broker is different depending on what action
   # is desired.
-  _postRequest: (xhr, urlSuffix, payload) =>
+  _postRequest: (id, xhr, urlSuffix, payload) =>
 try
   xhr.open 'POST', @url + urlSuffix
-  xhr.setRequestHeader('X-Session-ID', @id)
+  xhr.setRequestHeader('X-Session-ID', id)
 catch err
   ###
   An exception happens here when, for example, NoScript allows the domain
diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index db53612..3a3fb01 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -3,6 +3,8 @@ Represents a single:
 
client <-- webrtc --> snowflake <-- websocket --> relay
 
+Every ProxyPair has a Snowflake ID, which is necessary when responding to the
+Broker with an WebRTC answer.
 ###
 
 class ProxyPair
@@ -16,10 +18,12 @@ class ProxyPair
   running: true
   active:  false  # Whether serving a client.
   flush_timeout_id: null
-  onCleanup:  null
+  onCleanup:   null
+  id:  null
 
   constructor: (@clientAddr, @relayAddr, @rateLimit) ->
 @active = false
+@id = genSnowflakeID()
 
   # Prepare a WebRTC PeerConnection and await for an SDP offer.
   begin: ->
@@ -38,7 +42,7 @@ class ProxyPair
 if COPY_PASTE_ENABLED
   Signalling.send @pc.localDescription
 else
-  snowflake.broker.sendAnswer @pc.localDescription
+  snowflake.broker.sendAnswer @id, @pc.localDescription
 # OnDataChannel triggered remotely from the client when connection 
succeeds.
 @pc.ondatachannel = (dc) =>
   channel = dc.channel
diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index e8c00aa..7cc01c9 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -84,6 +84,9 @@ class Snowflake
 for i in [1..CONNECTIONS_PER_CLIENT]
   @makeProxyPair @relayAddr
 return if COPY_PASTE_ENABLED
+log 'ProxyPair Slots: ' + @proxyPairs.length
+log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
+
 timer = null
 # Temporary countdown.
 countdown = (msg, sec) =>
@@ -99,22 +102,37 @@ class Snowflake
   msg = 'polling for client... '
   msg += '[retries: ' + @retries + ']' if @retries > 0
   @ui.setStatus msg
-

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

2016-03-19 Thread translation

commit 77e5c3a20841de045eaee2d86655033e8b0a4514
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:55 2016 +

Update translations for tails-iuk
---
 hr_HR.po | 84 
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index cf0ae50..a6faa5a 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-03-07 17:51+0100\n"
-"PO-Revision-Date: 2016-03-14 06:37+\n"
-"Last-Translator: Igor \n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr ""
 msgid ""
 "For debugging information, execute the following command: sudo tails-"
 "debugging-info"
-msgstr "Za informacije o otklanjanju pogreÅ¡ki, izvedite sljedeÄu naredbu: 
sudo tails-debugging-info"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:215
 msgid "Error while checking for upgrades"
-msgstr "GreÅ¡ka pri provjeri nadogradnji"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:218
 msgid ""
@@ -38,64 +38,64 @@ msgid ""
 "Check your network connection, and restart Tails to try upgrading again.\n"
 "\n"
 "If the problem persists, go to 
file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
-msgstr "Neuspjelo utvrÄivanje ima li dostupnih nadogradnji s naÅ¡e 
stranice.\n\nProvjerite svoju mreÅ¾nu vezu i ponovno pokrenite Tails kako 
biste ponovno pokuÅ¡ali nadogradnju.\n\nAko se problem i dalje pojavljuje, 
idite na file:///usr/share/doc/tails/website/doc/upgrade/error/check.en.html"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:233
 msgid "no automatic upgrade is available from our website for this version"
-msgstr "nema dostupne automatske nadogradnje s naÅ¡e stranice za ovu verziju"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:239
 msgid "your device was not created using Tails Installer"
-msgstr "VaÅ¡ ureÄaj nije kreiran pomoÄu Tails Instalatora"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:244
 msgid "Tails was started from a DVD or a read-only device"
-msgstr "Tails je pokrenut s DVD-a ili samo-Äitljivog ureÄaja"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:249
 msgid "there is not enough free space on the Tails system partition"
-msgstr "nema dovoljno slobodnog prostora na particiji Tails sustava"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:254
 msgid "not enough memory is available on this system"
-msgstr "nema dovoljno slobodne memorije na ovom sustavu"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:260
 #, perl-brace-format
 msgid "No explanation available for reason '%{reason}s'."
-msgstr "Nema dostupnog objaÅ¡njenja za razlog %{reason}s'."
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:280
 msgid "The system is up-to-date"
-msgstr "Sustav je aÅ¾uriran"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:285
 msgid "This version of Tails is outdated, and may have security issues."
-msgstr "Ovo je starija verzija Tails-a i moÅ¾e imati sigurnosnih problema."
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:317
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{space_needed}s of free space on"
 " Tails system partition,  but only %{free_space}s is available."
-msgstr "Dostupna dodatna nadogradnja zahtjeva %{space_needed}s slobodnog 
prostora na particiji Tails sustava, a slobodno je samo %{free_space}s."
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:333
 #, perl-brace-format
 msgid ""
 "The available incremental upgrade requires %{memory_needed}s of free memory,"
 " but only %{free_memory}s is available."
-msgstr "Dostupna dodatna nadogradnja zahtjeva %{memory_needed}s slobodne 
memorije, a slobodno je samo %{free_memory}s."
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:355
 msgid ""
 "An incremental upgrade is available, but no full upgrade is.\n"
 "This should not happen. Please report a bug."
-msgstr "Dostupna je dodatna nadogradnja, ali nema potpune nadogradnje.\nTo se 
ne bi trebalo deÅ¡avati. Molimo, prijavite greÅ¡ku."
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:359
 msgid "Error while detecting available upgrades"
-msgstr "PogreÅ¡ka u otkrivanju dostupnih nadogradnji"
+msgstr ""
 
 #: ../lib/Tails/IUK/Frontend.pm:369
 #, perl-brace-format
@@ -111,19 +111,19 @@ msgid ""
 "Download size: %{size}s\n"
 "\n"
 "Do you want to upgrade now?"
-msgstr "Trebali biste nadograditi na %{name}s %{version}s.\n\nZa viÅ¡e 
informacija o novoj verziji, idite na %{details_url}s\n\nPreporuÄamo da 
zatvorite sve otvorene aplikacije tijekom nadogradnje.\nPreuzimanje nadogradnje 
bi moglo potrajati dulje vremena, od nekoliko minuta do nekoliko sati.\nNakon 
preuzimanja nadogradnje, mreÅ¾a Äe biti onemoguÄena.\n\nVeliÄina

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-03-19 Thread translation

commit ec144a2074612b2370a93aa5ab6d54335537fcc6
Author: Translation commit bot 
Date:   Wed Mar 16 23:15:31 2016 +

Update translations for mat-gui
---
 fo.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fo.po b/fo.po
index e024f79..43230ce 100644
--- a/fo.po
+++ b/fo.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# boginw , 2016
 # Sigmund JÃ¸rgensen , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-02-11 09:31+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-03-16 22:52+\n"
+"Last-Translator: boginw \n"
 "Language-Team: Faroese 
(http://www.transifex.com/otf/torproject/language/fo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +75,7 @@ msgstr "Minka um stÃ¸ddina og gÃ³Ã°skuna Ã¡ PDF"
 
 #: mat-gui:238
 msgid "Remove unsupported file from archives"
-msgstr ""
+msgstr "Strika fÃlin iÃ° ikki var skiltur, frÃ¡ skjalasavn"
 
 #: mat-gui:241
 msgid "Remove non-supported (and so non-anonymised) file from output archive"
@@ -94,7 +95,7 @@ msgstr "ÃskaÃ°iligt fÃlusniÃ°"
 
 #: mat-gui:341
 msgid "Cant read file"
-msgstr ""
+msgstr "Kann ikki lesa fÃlu"
 
 #: mat-gui:343
 msgid "Fileformat not supported"

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

[tor-commits] [tor-browser-bundle/master] Bumping nightly versions

2016-03-19 Thread gk

commit a5b4e622577749e596a536bda8c83d3eee751d90
Author: Georg Koppen 
Date:   Thu Mar 17 12:41:46 2016 +

Bumping nightly versions
---
 gitian/versions.nightly | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index b8af54d..1ce29a0 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -14,7 +14,7 @@ MULTI_LINGUAL=1
 
 VERIFY_TAGS=0
 
-FIREFOX_VERSION=38.6.1esr
+FIREFOX_VERSION=38.7.1esr
 
 TORBROWSER_UPDATE_CHANNEL=default
 
@@ -45,7 +45,7 @@ NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
 GITIAN_TAG=tor-browser-builder-3.x-9
 
-OPENSSL_VER=1.0.1q
+OPENSSL_VER=1.0.1s
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
 FIREFOX_LANG_BUILD=build1
@@ -65,7 +65,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.4-fx+fn+sm.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 
TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -91,13 +91,13 @@ NOTOSCFONT_PACKAGE=NotoSansSC-Regular.otf
 NOTOTCFONT_PACKAGE=NotoSansTC-Regular.otf
 
 # Hashes for packages with weak sigs or no sigs
-OPENSSL_HASH=b3658b84e9ea606a5ded3c972a5517cd785282e7ea86b20c78aa4b773a047fb7
+OPENSSL_HASH=e7e81d82f3cd538ab0cdba494006d44aab9dd96b7f6233ce9971fb7c7916d511
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 
OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 
TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 
TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9
+NOSCRIPT_HASH=94d036ff45116023bde97e6dee6c79daf2d28804764bfa8937f5d4d3463173f5
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4

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

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

2016-03-19 Thread translation

commit bd1201108c236663f5b2443ff5cb4229ebd63fd6
Author: Translation commit bot 
Date:   Thu Mar 17 01:15:34 2016 +

Update translations for tails-greeter_completed
---
 es/es.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/es/es.po b/es/es.po
index 5b8f8c4..94bfd7f 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Carlos Marin , 2016
 # her_tor_es_ar , 2014
 # Animalcustomize , 2014
 # Noel Torres , 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-02-29 14:32+0100\n"
+"PO-Revision-Date: 2016-03-17 01:01+\n"
+"Last-Translator: Carlos Marin \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:1
 msgid "Forward"
-msgstr "enviar"
+msgstr "Continuar"
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid "Login"

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

[tor-commits] [snowflake/master] snowflake proxy continues to poll broker until at capacity (#11)

2016-03-19 Thread arlo

commit afd814773ac8cdc4ad4f3d2eac05b0e41ff6f964
Author: Serene Han 
Date:   Thu Mar 17 15:57:38 2016 -0700

snowflake proxy continues to poll broker until at capacity (#11)
---
 proxy/snowflake.coffee | 26 +++---
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 4f38029..9686f30 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -85,11 +85,14 @@ class Snowflake
 return if COPY_PASTE_ENABLED
 log 'ProxyPair Slots: ' + @proxyPairs.length
 log 'Snowflake IDs: ' + (@proxyPairs.map (p) -> p.id).join ' | '
+@pollBroker()
 
-timer = null
-# Temporary countdown.
+  # Regularly poll Broker for clients to serve until this snowflake is
+  # serving at capacity, at which point stop polling.
+  pollBroker: ->
+# Temporary countdown. TODO: Simplify
 countdown = (msg, sec) =>
-  @ui.setStatus msg + ' (Retrying in ' + sec + ' seconds...)'
+  @ui.setStatus msg + ' (Polling in ' + sec + ' seconds...)'
   sec--
   if sec >= 0
 setTimeout((-> countdown(msg, sec)), 1000)
@@ -97,18 +100,18 @@ class Snowflake
 findClients()
 # Poll broker for clients.
 findClients = =>
-  clearTimeout timer
-  msg = 'polling for client... '
-  msg += '[retries: ' + @retries + ']' if @retries > 0
-  @ui.setStatus msg
-  # Pick an available ProxyPair to poll with.
   pair = @nextAvailableProxyPair()
   if !pair
-log 'No more available ProxyPair slots.'
-countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000)
+log 'At client capacity.'
+# Do nothing until a new proxyPair is available.
 return
+  msg = 'polling for client... '
+  msg += '[retries: ' + @retries + ']' if @retries > 0
+  @ui.setStatus msg
   recv = @broker.getClientOffer pair.id
-  recv.then (desc) => @receiveOffer pair, desc
+  recv.then (desc) =>
+@receiveOffer pair, desc
+countdown('Serving 1 new client.', DEFAULT_BROKER_POLL_INTERVAL / 1000)
   , (err) ->
 countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000)
   @retries++
@@ -144,6 +147,7 @@ class Snowflake
 pair.onCleanup = (event) =>
   # Delete from the list of active proxy pairs.
   @proxyPairs.splice(@proxyPairs.indexOf(pair), 1)
+  @pollBroker()
 pair.begin()
 
   # Stop all proxypairs.

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

[tor-commits] [translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd

2016-03-19 Thread translation

commit 4a21d7cd3942b56b7137affb6734a4cc88279765
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:06 2016 +

Update translations for tor-messenger-fingerdtd
---
 hr_HR/finger.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hr_HR/finger.dtd b/hr_HR/finger.dtd
index 223b650..7e611a4 100644
--- a/hr_HR/finger.dtd
+++ b/hr_HR/finger.dtd
@@ -1,10 +1,10 @@
-
-
+
+
 
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file

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

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

2016-03-19 Thread translation

commit a789336c91d111021385490c780e9247ccd76f27
Author: Translation commit bot 
Date:   Fri Mar 18 00:15:14 2016 +

Update translations for torcheck_completed
---
 id/torcheck.po | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/id/torcheck.po b/id/torcheck.po
index 9e2740b..5001101 100644
--- a/id/torcheck.po
+++ b/id/torcheck.po
@@ -7,8 +7,10 @@
 # cholif yulian , 2015
 # Ferriandy Chianiago , 2015
 # brain90 , 2012
-# Mohamad Hasan Al Banna , 2014
+# Mohamad Hasan Al Banna , 2014
 # Jaya Wijaya , 2012
+# Mohamad Hasan Al Banna , 2016
+# Mohamad Hasan Al Banna , 2016
 # Jaya Wijaya , 2012
 # ba dwi , 2014
 # sutama tamasu , 2013
@@ -18,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-10-25 02:43+\n"
-"Last-Translator: Ferriandy Chianiago \n"
+"PO-Revision-Date: 2016-03-18 00:02+\n"
+"Last-Translator: Mohamad Hasan Al Banna \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +58,7 @@ msgid ""
 msgstr "Jika Anda ingin mencoba menggunakan aplikasi Tor, mohon kunjungi https://www.torproject.org/\;>situs web Tor dan khususnya https://www.torproject.org/docs/faq#DoesntWork\;>panduan untuk 
mengkonfigurasi aplikasi Tor Anda."
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr "Maaf, kueri Anda gagal atau respons yang tidak terduga telah diterima."
+msgstr "Maaf, permintaan anda gagal atau respon yang tidak terduga telah 
diterima."
 
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
@@ -64,10 +66,10 @@ msgid ""
 msgstr "Layanan yang berhenti bekerja sementara mencegah kami menentukan jika 
sumber alamat IP Anda adalah node https://www.torproject.org/\;>Tor."
 
 msgid "Your IP address appears to be: "
-msgstr "Alamat IP Anda mungkin adalah:"
+msgstr "Alamat IP anda mungkin adalah:"
 
 msgid "Are you using Tor?"
-msgstr "Apakah Anda menggunakan Tor?"
+msgstr "Apakah anda menggunakan Tor?"
 
 msgid "This page is also available in the following languages:"
 msgstr "Halaman ini juga tersedia dalam bahasa berikut:"
@@ -96,7 +98,7 @@ msgid "Tor Q Site"
 msgstr "Situs Tanya-Jawab Tor"
 
 msgid "Volunteer"
-msgstr "Sukarelawan"
+msgstr "Relawan"
 
 msgid "JavaScript is enabled."
 msgstr "JavaScript difungsikan."
@@ -105,7 +107,7 @@ msgid "JavaScript is disabled."
 msgstr "JavaScript dinonfungsikan."
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr "Namun, hal tersebut tidak tampak sebagai Peramban Tor"
+msgstr "Namun, hal tersebut tidak tampak sebagai Peramban Tor."
 
 msgid "Run a Relay"
 msgstr "Jalankan sebuah Relai"

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

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

2016-03-19 Thread translation

commit f43004792dbdb41b9b64fff9af80079c08a37765
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:21 2016 +

Update translations for whisperback
---
 hr_HR/hr_HR.po | 127 -
 1 file changed, 63 insertions(+), 64 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 56440a9..66acd69 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # Ana B, 2013
-# skiddiep , 2015
+# Igor , 2015
 # Tea Horvatic , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-17 17:40+0100\n"
-"PO-Revision-Date: 2015-07-22 11:05+\n"
-"Last-Translator: skiddiep \n"
-"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"POT-Creation-Date: 2015-12-16 19:54+0100\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
+"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,84 +21,83 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. XXX use a better exception
-#: ../whisperBack/whisperback.py:63
+#: ../whisperBack/whisperback.py:56
 #, python-format
 msgid "Invalid contact email: %s"
-msgstr "NevaÅ¾eÄi kontakt email: %s"
+msgstr ""
 
-#: ../whisperBack/whisperback.py:80
+#: ../whisperBack/whisperback.py:73
 #, python-format
 msgid "Invalid contact OpenPGP key: %s"
-msgstr "NevaÅ¾eÄi kontakt OpenPGP kljuÄ: %s"
+msgstr ""
 
-#: ../whisperBack/whisperback.py:82
+#: ../whisperBack/whisperback.py:75
 msgid "Invalid contact OpenPGP public key block"
-msgstr "NevaÅ¾eÄi kontakt OpenPGP blok javnog kljuÄa"
+msgstr ""
 
 #: ../whisperBack/exceptions.py:41
 #, python-format
 msgid ""
 "The %s variable was not found in any of the configuration files "
 "/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
-msgstr "%s varijabla nije pronaÄena ni u jednoj od datoteka konfiguracije 
/etc/whisperback/config.py, ~/.whisperback/config.py, ./config.py"
+msgstr ""
 
-#: ../whisperBack/gui.py:154
+#: ../whisperBack/gui.py:148
 msgid "Unable to load a valid configuration."
-msgstr "Nije moguÄe uÄitati vaÅ¾eÄu konfiguraciju."
+msgstr ""
 
-#: ../whisperBack/gui.py:220
+#: ../whisperBack/gui.py:214
 msgid "Sending mail..."
-msgstr "Å aljem mail..."
+msgstr ""
 
-#: ../whisperBack/gui.py:221
+#: ../whisperBack/gui.py:215
 msgid "Sending mail"
-msgstr "Å aljem mail"
+msgstr ""
 
 #. pylint: disable=C0301
-#: ../whisperBack/gui.py:223
+#: ../whisperBack/gui.py:217
 msgid "This could take a while..."
-msgstr "Ovo moÅ¾e potrajati..."
+msgstr ""
 
-#: ../whisperBack/gui.py:237
+#: ../whisperBack/gui.py:232
 msgid "The contact email adress doesn't seem valid."
-msgstr "Kontakt email adresa nije vaÅ¾eÄa."
+msgstr ""
 
-#: ../whisperBack/gui.py:254
+#: ../whisperBack/gui.py:249
 msgid "Unable to send the mail: SMTP error."
-msgstr "Nije moguÄe poslati mail: SMTP greÅ¡ka."
+msgstr ""
 
-#: ../whisperBack/gui.py:256
+#: ../whisperBack/gui.py:251
 msgid "Unable to connect to the server."
-msgstr "Nije se moguÄe povezati na server."
+msgstr ""
 
-#: ../whisperBack/gui.py:258
+#: ../whisperBack/gui.py:253
 msgid "Unable to create or to send the mail."
-msgstr "Nije moguÄe stvoriti ili poslati mail."
+msgstr ""
 
-#: ../whisperBack/gui.py:261
+#: ../whisperBack/gui.py:256
 msgid ""
 "\n"
 "\n"
 "The bug report could not be sent, likely due to network problems. Please try 
to reconnect to the network and click send again.\n"
 "\n"
 "If it does not work, you will be offered to save the bug report."
-msgstr "\n\nIzvjeÅ¡Äe o greÅ¡ki nije poslano, vjerojatno zbog problema 
mreÅ¾e. Molimo pokuÅ¡ajte se ponovno povezati s mreÅ¾om i ponovno kliknite 
poÅ¡alji.\n\nAko ne radi, moÄi Äete spremiti izvjeÅ¡Äe o greÅ¡ki."
+msgstr ""
 
-#: ../whisperBack/gui.py:274
+#: ../whisperBack/gui.py:269
 msgid "Your message has been sent."
-msgstr "VaÅ¡a poruka je poslana."
+msgstr ""
 
-#: ../whisperBack/gui.py:281
+#: ../whisperBack/gui.py:276
 msgid "An error occured during encryption."
-msgstr "Dogodila se greÅ¡ka prilikom Å¡ifriranja."
+msgstr ""
 
-#: ../whisperBack/gui.py:301
+#: ../whisperBack/gui.py:296
 #, python-format
 msgid "Unable to save %s."
-msgstr "Nije moguÄe spremiti %s."
+msgstr ""
 
-#. XXX: fix string
-#: ../whisperBack/gui.py:325
+#: ../whisperBack/gui.py:319
 #, python-format
 msgid ""
 "The bug report could not be sent, likely due to network problems.\n"
@@ -106,39 +105,39 @@ msgid ""
 "As a work-around you can save the bug report as a file on a USB drive and try 
to send it to us at %s from your email account using

[tor-commits] [snowflake/master] Fix receiving cp/paste offer

2016-03-19 Thread arlo

commit 2ac12c5b8d48ffeb2472069e5b893abc6950e9ce
Author: Arlo Breault 
Date:   Fri Mar 18 13:11:45 2016 -0700

Fix receiving cp/paste offer
---
 proxy/snowflake.coffee | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 1cdccda..eff96de 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -191,7 +191,11 @@ Signalling =
 if !desc
   log 'Invalid SDP.'
   return false
-snowflake.receiveOffer recv if desc
+pair = snowflake.nextAvailableProxyPair()
+if !pair
+  log 'At client capacity.'
+  return false
+snowflake.receiveOffer pair, msg
 
 # Log to both console and UI if applicable.
 log = (msg) ->

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

[tor-commits] [tor-browser-bundle/master] Bug 13252: Use the special meek tag (nighlies)

2016-03-19 Thread gk

commit 3a5626618641ff45e3431700fe74932644a4e98b
Author: Georg Koppen 
Date:   Sat Mar 19 20:24:45 2016 +

Bug 13252: Use the special meek tag (nighlies)

We need to use a special meek tag to test the changes needed for
signing the OS X builds the OS X way. dcf created it for this purpose.
---
 gitian/versions.nightly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index 1ce29a0..f3d0937 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -34,7 +34,7 @@ FTEPROXY_TAG=master
 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014
 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned 
habnabit/1.13.0.2
 GOPTLIB_TAG=master
-MEEK_TAG=master
+MEEK_TAG=0.22-18371-2 #master
 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
 GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd

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

[tor-commits] [tor-browser/tor-browser-38.7.1esr-6.0-1] Bug 13252 - Do not store data in the app bundle

2016-03-19 Thread gk

commit a9354c824b2435054c3d8d853606a2c7f8622f0b
Author: Kathy Brade 
Date:   Fri Mar 18 14:20:02 2016 -0400

Bug 13252 - Do not store data in the app bundle

Add an --enable-tor-browser-data-outside-app-dir configure option.
When this is enabled, all user data is stored in a directory named
TorBrowser-Data which is located next to the application directory.

The first time an updated browser is opened, migrate the existing
browser profile, Tor data directory contents, and UpdateInfo to the
TorBrowser-Data directory. If migration of the browser profile
fails, an error alert is displayed and the browser is started
using a new profile.

Display an informative error messages if the TorBrowser-Data
directory cannot be created due to an "access denied" or a
"read only volume" error.

Add support for installing "override" preferences within the user's
browser profile. All .js files in distribution/preferences (on
Mac OS, Contents/Resources/distribution/preferences) will be copied
to the preferences directory within the user's browser profile when
the profile is created and each time Tor Browser is updated. This
mechanism will be used to install the extension-overrides.js file
into the profile.

On Mac OS, add support for the --invisible command line option which
is used by the meek-http-helper to avoid showing an icon for the
helper browser on the dock.
---
 .mozconfig-mac |   1 +
 configure.in   |  11 +
 .../mozapps/profile/profileSelection.properties|   1 +
 toolkit/mozapps/extensions/AddonManager.jsm|  29 ++
 .../mozapps/extensions/internal/XPIProvider.jsm|  59 
 toolkit/xre/nsAppRunner.cpp| 303 -
 toolkit/xre/nsXREDirProvider.cpp   |  10 +
 xpcom/io/nsAppFileLocationProvider.cpp |  14 +
 8 files changed, 417 insertions(+), 11 deletions(-)

diff --git a/.mozconfig-mac b/.mozconfig-mac
index 8ae44da..dc77c3b 100644
--- a/.mozconfig-mac
+++ b/.mozconfig-mac
@@ -23,6 +23,7 @@ ac_add_options --disable-debug
 
 ac_add_options --with-macos-private-frameworks="$CROSS_PRIVATE_FRAMEWORKS"
 
+ac_add_options --enable-tor-browser-data-outside-app-dir
 ac_add_options --enable-tor-browser-update
 ac_add_options --enable-update-packaging
 ac_add_options --enable-signmar
diff --git a/configure.in b/configure.in
index 132c72e..45dee7c 100644
--- a/configure.in
+++ b/configure.in
@@ -6518,9 +6518,20 @@ if test -n "$TOR_BROWSER_UPDATE"; then
 AC_DEFINE(TOR_BROWSER_UPDATE)
 fi
 
+MOZ_ARG_ENABLE_BOOL(tor-browser-data-outside-app-dir,
+[  --enable-tor-browser-data-outside-app-dir
+  Enable Tor Browser data outside of app directory],
+TOR_BROWSER_DATA_OUTSIDE_APP_DIR=1,
+TOR_BROWSER_DATA_OUTSIDE_APP_DIR= )
+
+if test -n "$TOR_BROWSER_DATA_OUTSIDE_APP_DIR"; then
+AC_DEFINE(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
+fi
+
 AC_DEFINE_UNQUOTED(TOR_BROWSER_VERSION,"$TOR_BROWSER_VERSION")
 AC_SUBST(TOR_BROWSER_VERSION)
 AC_SUBST(TOR_BROWSER_UPDATE)
+AC_SUBST(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
 
 dnl 
 dnl build the tests by default
diff --git 
a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties 
b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
index 3cf48ff..f5cb77a 100644
--- a/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
+++ b/toolkit/locales/en-US/chrome/mozapps/profile/profileSelection.properties
@@ -17,6 +17,7 @@ profileProblemTitle=%S Profile Problem
 profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
 profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
+profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.
 # Profile manager
 # LOCALIZATION NOTE (profileTooltip): First %S is the profile name, second %S 
is the path to the profile folder.
 profileTooltip=Profile: '%S' - Path: '%S'
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm 
b/toolkit/mozapps/extensions/AddonManager.jsm
index ed07718..52eebf2 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -42,6 +42,11 @@ const PREF_MATCH_OS_LOCALE= 
"intl.locale.matchOS";
 const PREF_SELECTED_LOCALE= "general.useragent.locale";
 const UNKNOWN_XPCOM_ABI   = "unknownABI";
 
+#ifdef TOR_BROWSER_VERSION
+#expand const TOR_BROWSER_VERSION = __TOR_BROWSER_VERSION__;
+const PREF_EM_LAST_TORBROWSER_VERSION

[tor-commits] [tor-browser/tor-browser-38.7.1esr-6.0-1] fixup! Bug 16940: After update, load local change notes.

2016-03-19 Thread gk

commit c1b7d7e2f51f89ab19018e99fe62f8654d3cecb8
Author: Kathy Brade 
Date:   Mon Feb 29 14:47:01 2016 -0500

fixup! Bug 16940: After update, load local change notes.

When built with --enable-tor-browser-data-outside-app-dir, account
for the new Mac OS directory structure (see bug #13252).
---
 browser/base/content/content.js | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index d1afdb9..a56d7ff 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -597,15 +597,30 @@ let AboutTBUpdateListener = {
 
   // Read and return the text from the beginning of the changelog file that is
   // located at TorBrowser/Docs/ChangeLog.txt.
+  // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir
+  // to support Gatekeeper signing, the file is located in
+  // TorBrowser.app/Contents/Resources/TorBrowser/Docs/.
+  //
   // When electrolysis is enabled we will need to adopt an architecture that is
   // more similar to the one that is used for about:home (see AboutHomeListener
   // in this file and browser/modules/AboutHome.jsm).
   getChangeLogText: function() {
 try {
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+  // "XREExeF".parent is the directory that contains firefox, i.e.,
+  // Browser/ or, on Mac OS, TorBrowser.app/Contents/MacOS/.
+  let f = Services.dirsvc.get("XREExeF", Ci.nsIFile).parent;
+#ifdef XP_MACOSX
+  f = f.parent;
+  f.append("Resources");
+#endif
+  f.append("TorBrowser");
+#else
   // "DefProfRt" is .../TorBrowser/Data/Browser
   let f = Cc["@mozilla.org/file/directory_service;1"]
 .getService(Ci.nsIProperties).get("DefProfRt", Ci.nsIFile);
   f = f.parent.parent;  // Remove "Data/Browser"
+#endif
   f.append("Docs");
   f.append("ChangeLog.txt");
 

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

[tor-commits] [tor-browser/tor-browser-38.7.1esr-6.0-1] fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

2016-03-19 Thread gk

commit 38e31a62d48dd8ea8bee02673b7050338fc1c22a
Author: Kathy Brade 
Date:   Mon Feb 29 16:55:06 2016 -0500

fixup! Bug #4234: Use the Firefox Update Process for Tor Browser.

When built with --enable-tor-browser-data-outside-app-dir, account
for the new Mac OS directory structure (see bug #13252). Many of the
updater changes we made earlier are no longer needed.

Also, fix a JS warning inside toolkit/mozapps/update/nsUpdateService.js
and improve startup time logging of update status.
---
 config/createprecomplete.py   |  4 ++
 toolkit/mozapps/update/nsUpdateService.js |  3 +-
 toolkit/mozapps/update/updater/updater.cpp| 18 --
 toolkit/xre/nsUpdateDriver.cpp| 36 +++-
 toolkit/xre/nsXREDirProvider.cpp  | 14 +
 tools/update-packaging/common.sh  |  4 ++
 tools/update-packaging/make_full_update.sh| 21 +--
 tools/update-packaging/make_incremental_update.sh | 71 ++-
 8 files changed, 128 insertions(+), 43 deletions(-)

diff --git a/config/createprecomplete.py b/config/createprecomplete.py
index 48cba96..be571be 100644
--- a/config/createprecomplete.py
+++ b/config/createprecomplete.py
@@ -10,6 +10,10 @@
 import sys
 import os
 
+# TODO When TOR_BROWSER_DATA_OUTSIDE_APP_DIR is used on all platforms,
+# we should remove all lines in this file that contain:
+#  TorBrowser/Data
+
 def get_build_entries(root_path):
 """ Iterates through the root_path, creating a list for each file and
 directory. Excludes any file paths ending with channel-prefs.js.
diff --git a/toolkit/mozapps/update/nsUpdateService.js 
b/toolkit/mozapps/update/nsUpdateService.js
index e720ae4..2d443a7 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1025,7 +1025,7 @@ function getUpdatesDirInApplyToDir() {
 #endif
   dir.append(UPDATED_DIR);
 #ifdef XP_MACOSX
-#ifdef TOR_BROWSER_UPDATE
+#if defined(TOR_BROWSER_UPDATE) && !defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
   dir.append("TorBrowser");
   dir.append("UpdateInfo");
 #else
@@ -4051,6 +4051,7 @@ Downloader.prototype = {
  createInstance(Ci.nsIFileInputStream);
 fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 
0);
 
+let digest;
 try {
   var hash = Cc["@mozilla.org/security/hash;1"].
  createInstance(Ci.nsICryptoHash);
diff --git a/toolkit/mozapps/update/updater/updater.cpp 
b/toolkit/mozapps/update/updater/updater.cpp
index 31a5dac..e089a2a 100644
--- a/toolkit/mozapps/update/updater/updater.cpp
+++ b/toolkit/mozapps/update/updater/updater.cpp
@@ -2281,7 +2281,7 @@ static int
 CopyInstallDirToDestDir()
 {
   // These files should not be copied over to the updated app
-#ifdef TOR_BROWSER_UPDATE
+#if defined(TOR_BROWSER_UPDATE) && !defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
   #ifdef XP_WIN
   #define SKIPLIST_COUNT 6
   #else
@@ -2297,7 +2297,7 @@ CopyInstallDirToDestDir()
   #endif
 #endif
   copy_recursive_skiplist skiplist;
-#ifdef TOR_BROWSER_UPDATE
+#if defined(TOR_BROWSER_UPDATE) && !defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
 #ifdef XP_MACOSX
   skiplist.append(0, gInstallDirPath, NS_T("Updated.app"));
   skiplist.append(1, gInstallDirPath, NS_T("TorBrowser/UpdateInfo/updates/0"));
@@ -2312,7 +2312,7 @@ CopyInstallDirToDestDir()
 #endif
 #endif
 
-#ifdef TOR_BROWSER_UPDATE
+#if defined(TOR_BROWSER_UPDATE) && !defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
 #ifdef XP_WIN
   skiplist.append(SKIPLIST_COUNT - 3, gInstallDirPath,
   NS_T("TorBrowser/Data/Browser/profile.default/parent.lock"));
@@ -2454,7 +2454,7 @@ ProcessReplaceRequest()
   // On OS X, we we need to remove the staging directory after its Contents
   // directory has been moved.
   NS_tchar updatedAppDir[MAXPATHLEN];
-#ifdef TOR_BROWSER_UPDATE
+#if defined(TOR_BROWSER_UPDATE) && !defined(TOR_BROWSER_DATA_OUTSIDE_APP_DIR)
   NS_tsnprintf(updatedAppDir, sizeof(updatedAppDir)/sizeof(updatedAppDir[0]),
NS_T("%s/Updated.app"), gInstallDirPath);
   // For Tor Browser on OS X, we also need to copy everything else that is 
inside Updated.app.
@@ -3229,6 +3229,15 @@ int NS_main(int argc, NS_tchar **argv)
   if (!useService && !noServiceFallback &&
   updateLockFileHandle == INVALID_HANDLE_VALUE) {
 #ifdef TOR_BROWSER_UPDATE
+#ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+// Because the TorBrowser-Data directory that contains the user's
+// profile is a sibling of the Tor Browser installation directory,
+// the user probably has permission to apply updates. Therefore, to
+// avoid potential security issues such as CVE-2015-0833, do not
+// attempt to elevate privileges. Instead, write a "failed" message
+// to the update status file (this function will return immediately
+// after the

[tor-commits] [tor-browser-bundle/master] Bug 13252: Do not store data in the app bundle

2016-03-19 Thread gk

commit de8b74299c2235cfe42d04df15b621b8807903e2
Author: Kathy Brade 
Date:   Fri Mar 18 13:05:52 2016 -0400

Bug 13252: Do not store data in the app bundle

On Mac OS, set DATA_OUTSIDE_APP_DIR=1 for alpha builds. When this
option is enabled, the package layout is altered to be compatible with
Apple's Gatekeeper code signing. All user data will be created in a
TorBrowser-Data directory which sits next to the app bundle and all code
(and only code) is placed under Contents/MacOS.

Currently, FTE is not included when DATA_OUTSIDE_APP_DIR=1 because FTE
needs to be repackaged to separate the Python scripts from the compiled
libraries (see bug 18495).
---
 Bundle-Data/mac-tor.sh |   4 +
 gitian/descriptors/mac/gitian-bundle.yml   | 100 ++---
 .../mac/gitian-pluggable-transports.yml|  57 
 gitian/descriptors/mac/gitian-tor.yml  |  23 +++--
 gitian/mkbundle-mac.sh |  40 +++--
 gitian/versions.alpha  |   3 +
 6 files changed, 163 insertions(+), 64 deletions(-)

diff --git a/Bundle-Data/mac-tor.sh b/Bundle-Data/mac-tor.sh
index 03d6f9d..78b3348 100755
--- a/Bundle-Data/mac-tor.sh
+++ b/Bundle-Data/mac-tor.sh
@@ -8,4 +8,8 @@ export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH
 # otherwise set to "/" when an application bundle is started from Finder.
 # https://trac.torproject.org/projects/tor/ticket/10030
 cd "$(dirname "$0")"
+if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then
+  # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.
+  cd ../../../MacOS/Tor
+fi
 exec ./tor.real "$@"
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index 0199cca..aa6a09d 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -69,6 +69,22 @@ script: |
   export TORBROWSER_APP="TorBrowser"
   export TORBROWSER_NAME="TorBrowserBundle"
 
+  if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
+DOCSPATH=Contents/Resources/TorBrowser/Docs
+EXTSPATH=Contents/Resources/distribution/extensions
+TORBINPATH=Contents/MacOS/Tor
+TORCONFIGPATH=Contents/Resources/TorBrowser/Tor
+
EXTOVERRIDESPATH=Contents/Resources/distribution/preferences//extension-overrides.js
+
MEEKPROFILEPATH=Contents/Resources/TorBrowser/Tor/PluggableTransports/template-profile.meek-http-helper
+  else
+DOCSPATH=TorBrowser/Docs
+EXTSPATH=TorBrowser/Data/Browser/profile.default/extensions
+TORBINPATH=TorBrowser/Tor
+TORCONFIGPATH=TorBrowser/Data/Tor
+
EXTOVERRIDESPATH=TorBrowser/Data/Browser/profile.default/preferences/extension-overrides.js
+MEEKPROFILEPATH=TorBrowser/Data/Browser/profile.meek-http-helper
+  fi
+
   # Building libfaketime.
   cd faketime
   make
@@ -83,10 +99,9 @@ script: |
   MARTOOLS=~/build/mar-tools
   #
   mkdir -p $OUTDIR/
-  mkdir -p 
$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywhere-...@eff.org
-  mkdir -p 
$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.meek-http-helper/extensions
-  mkdir -p $TORBROWSER_NAME.app/TorBrowser/Data/Browser/Caches
-  mkdir -p $TORBROWSER_NAME.app/TorBrowser/Docs/sources
+  mkdir -p $TORBROWSER_NAME.app/$EXTSPATH/https-everywhere-...@eff.org
+  mkdir -p $TORBROWSER_NAME.app/$MEEKPROFILEPATH/extensions
+  mkdir -p $TORBROWSER_NAME.app/$DOCSPATH/sources
   mkdir -p $TORBROWSER_NAME.app/Contents/MacOS
   mkdir -p dmg
   #
@@ -97,7 +112,7 @@ script: |
   mkdir pkg/tmp
   cd pkg/tmp
   unzip ../*.xpi
-  ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/tor-launc...@torproject.org.xpi
 .
+  ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/$EXTSPATH/tor-launc...@torproject.org.xpi .
   cd ../../../
   #
   cd torbutton
@@ -107,7 +122,7 @@ script: |
   mkdir pkg/tmp
   cd pkg/tmp
   unzip ../*.xpi
-  ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
 .
+  ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/$EXTSPATH/torbut...@torproject.org.xpi .
   cd ../../../
   #
   cd https-everywhere
@@ -120,11 +135,11 @@ script: |
   ./makexpi.sh
   # Since 5.0.2 a .xpi for AMO is built, too. We don't need it.
   rm ./pkg/*-amo.xpi
-  cp pkg/*.xpi 
../$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+  cp pkg/*.xpi ../$TORBROWSER_NAME.app/$EXTSPATH/https-everywh...@eff.org.xpi
   cd ..
   #
-  cp *.xpi 
./$TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
-  cd $TORBROWSER_NAME.app/TorBrowser/Data/Browser/profile.default/extensions/
+  cp *.xpi ./$TORBROWSER_NAME.app/$EXTSPATH/
+  cd $TORBROWSER_NAME.app/$EXTSPATH/
   mv noscr...@noscript.net.xpi {73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
   cd https-everywhere-...@eff.org
   unzip

[tor-commits] [tor-browser-bundle/master] Bug 18455: modify Tor Browser packaging to avoid language prompt.

2016-03-19 Thread gk

commit fef35058f76c5605fd631ff86f65adfa9bb78be7
Author: Kathy Brade 
Date:   Fri Mar 18 15:03:55 2016 -0400

Bug 18455: modify Tor Browser packaging to avoid language prompt.

When not building a multi-lingual bundle, disable Tor Launcher's
language prompt by appending these two preference values to the
extension-overrides.js file:
  intl.locale.matchOS = false
  extensions.torlauncher.prompt_for_locale = false
---
 gitian/descriptors/linux/gitian-bundle.yml   | 8 +++-
 gitian/descriptors/mac/gitian-bundle.yml | 5 +
 gitian/descriptors/windows/gitian-bundle.yml | 8 +++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index 28e94b4..28bd006 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -159,12 +159,18 @@ script: |
   unzip ~/build/tor-linux$GBUILD_BITS-gbuilt.zip
   unzip ~/build/linux-skeleton.zip
   unzip ~/build/tbb-docs.zip
+  
EXTOVERRIDESPATH=Data/Browser/profile.default/preferences/extension-overrides.js
   if [ $BUILD_PT_BUNDLES ]; then
 unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip
 cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults
-cat ~/build/bridge_prefs.js >> 
Data/Browser/profile.default/preferences/extension-overrides.js
+cat ~/build/bridge_prefs.js >> $EXTOVERRIDESPATH
 cat ~/build/meek-http-helper-user.js >> 
Data/Browser/profile.meek-http-helper/user.js
   fi
+  # If not building a multi-lingual package, suppress the language prompt.
+  if [ "z$MULTI_LINGUAL" != "z1" ]; then
+echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> 
$EXTOVERRIDESPATH
+echo 'pref("intl.locale.matchOS", false);' >> $EXTOVERRIDESPATH
+  fi
   chmod 700 Data/Browser
   chmod 700 Data/Tor
   cd ../../..
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index aa6a09d..a7ef7bc 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -180,6 +180,11 @@ script: |
 cat ~/build/bridge_prefs.js >> $EXTOVERRIDESPATH
 cat ~/build/meek-http-helper-user.js >> $MEEKPROFILEPATH/user.js
   fi
+  # If not building a multi-lingual package, suppress the language prompt.
+  if [ "z$MULTI_LINGUAL" != "z1" ]; then
+echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> 
$EXTOVERRIDESPATH
+echo 'pref("intl.locale.matchOS", false);' >> $EXTOVERRIDESPATH
+  fi
   # Install a "tor" shim that sets the working directory. See #10030.
   mv $TORBINPATH/tor $TORBINPATH/tor.real
   if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
diff --git a/gitian/descriptors/windows/gitian-bundle.yml 
b/gitian/descriptors/windows/gitian-bundle.yml
index 51565bf..5a165a7 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -140,12 +140,18 @@ script: |
   unzip ~/build/tor-win32-gbuilt.zip
   unzip ~/build/windows-skeleton.zip
   unzip ~/build/tbb-docs.zip
+  
EXTOVERRIDESPATH=Data/Browser/profile.default/preferences/extension-overrides.js
   if [ $BUILD_PT_BUNDLES ]; then
 unzip ~/build/pluggable-transports-win32-gbuilt.zip
 cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults
-cat ~/build/bridge_prefs.js >> 
Data/Browser/profile.default/preferences/extension-overrides.js
+cat ~/build/bridge_prefs.js >> $EXTOVERRIDESPATH
 cat ~/build/meek-http-helper-user.js >> 
Data/Browser/profile.meek-http-helper/user.js
   fi
+  # If not building a multi-lingual package, suppress the language prompt.
+  if [ "z$MULTI_LINGUAL" != "z1" ]; then
+echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> 
$EXTOVERRIDESPATH
+echo 'pref("intl.locale.matchOS", false);' >> $EXTOVERRIDESPATH
+  fi
   cd ../../..
   #
   # Copy reproducibility info

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

[tor-commits] [tor-launcher/master] Bug 13252 - Do not store data in the app bundle

2016-03-19 Thread gk

commit 64d3139e72587372223d0795ca715991d7423adb
Author: Kathy Brade 
Date:   Mon Mar 14 11:15:43 2016 -0400

Bug 13252 - Do not store data in the app bundle

Add support for a "side-by-side" directory structure where
the writable data is stored in the TorBrowser-Data/ directory
next to the application directory.
---
 src/chrome/locale/en/torlauncher.properties |   6 +-
 src/components/tl-process.js| 232 +---
 src/defaults/preferences/prefs.js   |   9 +-
 3 files changed, 184 insertions(+), 63 deletions(-)

diff --git a/src/chrome/locale/en/torlauncher.properties 
b/src/chrome/locale/en/torlauncher.properties
index 02be756..0ef4437 100644
--- a/src/chrome/locale/en/torlauncher.properties
+++ b/src/chrome/locale/en/torlauncher.properties
@@ -1,4 +1,4 @@
-### Copyright (c) 2014, The Tor Project, Inc.
+### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
 torlauncher.error_title=Tor Launcher
@@ -13,8 +13,8 @@ torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
 torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing.
-torlauncher.datadir_missing=The Tor data directory does not exist.
+torlauncher.torrc_missing=The torrc file is missing and could not be created.
+torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
 torlauncher.password_hash_missing=Failed to get hashed password.
 
 torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index bb327dc..ccbee12 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2015, The Tor Project, Inc.
+// Copyright (c) 2016, The Tor Project, Inc.
 // See LICENSE for licensing information.
 //
 // vim: set sw=2 sts=2 ts=8 et syntax=javascript:
@@ -16,6 +16,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil",
   "resource://torlauncher/modules/tl-util.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger",
   "resource://torlauncher/modules/tl-logger.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "FileUtils",
+  "resource://gre/modules/FileUtils.jsm");
 
 function TorProcessService()
 {
@@ -287,7 +289,11 @@ TorProcessService.prototype =
   mProtocolSvc: null,
   mTorProcess: null,// nsIProcess
   mTorProcessStartTime: null, // JS Date.now()
-  mTorFileBaseDir: null,  // nsIFile (cached)
+  // mIsUserDataOutsideOfAppDir is true when TorBrowser-Data is used.
+  // (cached; access via this._isUserDataOutsideOfAppDir)
+  mIsUserDataOutsideOfAppDir: undefined,
+  mAppDir: null,// nsIFile (cached; access via this._appDir)
+  mDataDir: null,   // nsIFile (cached; access via this._dataDir)
   mControlConnTimer: null,
   mControlConnDelayMS: 0,
   mQuitSoon: false, // Quit was requested by the user; do so soon.
@@ -305,10 +311,13 @@ TorProcessService.prototype =
   // Ideally, we would cd to the Firefox application directory before
   // starting tor (but we don't know how to do that).  Instead, we
   // rely on the TBB launcher to start Firefox from the right place.
-  var exeFile = this._getTorFile("tor");
-  var torrcFile = this._getTorFile("torrc");
-  var torrcDefaultsFile = this._getTorFile("torrc-defaults");
-  var dataDir = this._getTorFile("tordatadir");
+
+  // Get the Tor data directory first so it is created before we try to
+  // construct paths to files that will be inside it.
+  var dataDir = this._getTorFile("tordatadir", true);
+  var exeFile = this._getTorFile("tor", false);
+  var torrcFile = this._getTorFile("torrc", true);
+  var torrcDefaultsFile = this._getTorFile("torrc-defaults", false);
   var hashedPassword = this.mProtocolSvc.TorGetPassword(true);
 
   var detailsKey;
@@ -331,11 +340,13 @@ TorProcessService.prototype =
 return;
   }
 
-  var geoipFile = dataDir.clone();
-  geoipFile.append("geoip");
 
-  var geoip6File = dataDir.clone();
-  geoip6File.append("geoip6");
+  // The geoip and geoip6 files are in the same directory as 
torrc-defaults.
+  var geoipFile = torrcDefaultsFile.clone();
+  geoipFile.leafName = "geoip";
+
+  var geoip6File = torrcDefaultsFile.clone();
+  geoip6File.leafName = "geoip6";
 
   var args = [];
   if (torrcDefaultsFile)
@@ -663,25 +674,65 @@ TorProcessService.prototype =
   },
 
   // Returns an nsIFile.
-  // If file doesn't exist, null is returned.
-  _getTorFile: function(aTorFileType)
+  // If aCreate is true and the file doesn't exist, it is created.
+  _getTorFile: function(aTorFileType, aCreate)
   {
 if (!aTorFileType)
   return

[tor-commits] [torbutton/master] Bug 13252: Do not store data in the app bundle

2016-03-19 Thread gk

commit ccf71174bcd6037560436280b93a7dfed84a7d3f
Author: Kathy Brade 
Date:   Fri Mar 4 14:21:10 2016 -0500

Bug 13252: Do not store data in the app bundle

Add profileMigrationFailed string that is used by Tor Browser.
---
 src/chrome/locale/en/torbutton.properties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/locale/en/torbutton.properties 
b/src/chrome/locale/en/torbutton.properties
index 76c0c0d..67c630b 100644
--- a/src/chrome/locale/en/torbutton.properties
+++ b/src/chrome/locale/en/torbutton.properties
@@ -76,3 +76,4 @@ profileProblemTitle=%S Profile Problem
 profileReadOnly=You cannot run %S from a read-only file system.  Please copy 
%S to another location before trying to use it.
 profileReadOnlyMac=You cannot run %S from a read-only file system.  Please 
copy %S to your Desktop or Applications folder before trying to use it.
 profileAccessDenied=%S does not have permission to access the profile. Please 
adjust your file system permissions and try again.
+profileMigrationFailed=Migration of your existing %S profile failed.\nNew 
settings will be used.

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-03-19 Thread translation

commit 69b06a0fdbf8ca6582bcd5f8eea46ee8632ea1d0
Author: Translation commit bot 
Date:   Thu Mar 17 17:15:44 2016 +

Update translations for tor-launcher-network-settings
---
 pt/network-settings.dtd | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pt/network-settings.dtd b/pt/network-settings.dtd
index 03dfb80..0ef6cc6 100644
--- a/pt/network-settings.dtd
+++ b/pt/network-settings.dtd
@@ -1,8 +1,8 @@
 
 
 
-
-
+
+
 
 
 
@@ -11,16 +11,16 @@
 
 
 
-
+
 
-
+
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -34,11 +34,11 @@
 
 
 
-
-
+
+
 
 
-
+
 
 
 
@@ -52,7 +52,7 @@
 
 
 
-
+
 
 
 
@@ -64,12 +64,12 @@
 
 
 
-
-
+
+
 
 https://bridges.torproject.org;>
-
-
+
+
 https://www.riseup.net, 
https://mail.google.com, ou https://mail.yahoo.com;>
 
 

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

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2016-03-19 Thread translation

commit fa0884832477ebdfba1e8b7eb7a9a9c4c3d385eb
Author: Translation commit bot 
Date:   Thu Mar 17 18:47:06 2016 +

Update translations for tor-and-https
---
 hr_HR.po | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index fea27d0..7bd077a 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -1,14 +1,14 @@
 # 
 # Translators:
 # Ana B, 2014
-# skiddiep , 2015
+# Igor , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2015-02-18 13:01+\n"
-"Last-Translator: skiddiep \n"
-"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
+"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,117 +21,117 @@ msgstr ""
 #. languages (e.g. Arabic or Hebrew).
 #: C/tor-and-https.svg:3
 msgid "ltr"
-msgstr "ltr"
+msgstr ""
 
 #. (itstool) path: svg/title
 #: C/tor-and-https.svg:14
 #, no-wrap
 msgid "Tor and HTTPS"
-msgstr "Tor i HTTPS"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Site.com"
-msgstr "Site.com"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "user / pw"
-msgstr "korisnik / lozinka"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "data"
-msgstr "podatci"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 7em max. Seven times the capital letter "M".
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "location"
-msgstr "lokacija"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 3em max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "WiFi"
-msgstr "WiFi"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 4em max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "ISP"
-msgstr "ISP"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Hacker"
-msgstr "Haker"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Lawyer"
-msgstr "Odvjetnik"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Sysadmin"
-msgstr "Sysadmin"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Police"
-msgstr "Policija"
+msgstr ""
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "NSA"
-msgstr "NSA"
+msgstr ""
 
 #. (itstool) path: defs/text
 #. Keep it short: 8em is ok, 9em is max.
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Tor relay"
-msgstr "Tor relej"
+msgstr ""
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Key"
-msgstr "KljuÄ"
+msgstr ""
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Internet connection"
-msgstr "Internetska veza"
+msgstr ""
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Eavesdropping"
-msgstr "PrisluÅ¡kivanje"
+msgstr ""
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Data sharing"
-msgstr "Dijeljenje podataka"
+msgstr ""

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

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2016-03-19 Thread translation

commit 7acf91c1aebf9ef61977a41b53f52ac1ce2006d0
Author: Translation commit bot 
Date:   Thu Mar 17 05:16:33 2016 +

Update translations for tor-messenger-ircproperties_completed
---
 zh_TW/irc.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/zh_TW/irc.properties b/zh_TW/irc.properties
index 4c9e042..c22cdb1 100644
--- a/zh_TW/irc.properties
+++ b/zh_TW/irc.properties
@@ -172,6 +172,9 @@ 
error.sendMessageFailed=å³éæ¨çæå¾ä¸æ¢è¨æ¯æåºé¯ãè«å¨é£ç·
 #%1$S is the channel the user tried to join, %2$S is the channel
 #he was forwarded to.
 error.channelForward=æ¨å¯è½æªå å¥ %1$Sï¼æåå·²èªåéå®åå° 
%2$Sã
+#%S is the mode that the user tried to set but was not recognized
+#by the server as a valid mode.
+error.unknownMode='%S' éæ¬ä¼ºæå¨ä¸ææçä½¿ç¨èæ¨¡å¼
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

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

2016-03-19 Thread translation

commit e9b0d8c79f55412935f53e823e3a0260513252c5
Author: Translation commit bot 
Date:   Fri Mar 18 00:15:09 2016 +

Update translations for torcheck
---
 id/torcheck.po | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/id/torcheck.po b/id/torcheck.po
index 9e2740b..5001101 100644
--- a/id/torcheck.po
+++ b/id/torcheck.po
@@ -7,8 +7,10 @@
 # cholif yulian , 2015
 # Ferriandy Chianiago , 2015
 # brain90 , 2012
-# Mohamad Hasan Al Banna , 2014
+# Mohamad Hasan Al Banna , 2014
 # Jaya Wijaya , 2012
+# Mohamad Hasan Al Banna , 2016
+# Mohamad Hasan Al Banna , 2016
 # Jaya Wijaya , 2012
 # ba dwi , 2014
 # sutama tamasu , 2013
@@ -18,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-10-25 02:43+\n"
-"Last-Translator: Ferriandy Chianiago \n"
+"PO-Revision-Date: 2016-03-18 00:02+\n"
+"Last-Translator: Mohamad Hasan Al Banna \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +58,7 @@ msgid ""
 msgstr "Jika Anda ingin mencoba menggunakan aplikasi Tor, mohon kunjungi https://www.torproject.org/\;>situs web Tor dan khususnya https://www.torproject.org/docs/faq#DoesntWork\;>panduan untuk 
mengkonfigurasi aplikasi Tor Anda."
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr "Maaf, kueri Anda gagal atau respons yang tidak terduga telah diterima."
+msgstr "Maaf, permintaan anda gagal atau respon yang tidak terduga telah 
diterima."
 
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
@@ -64,10 +66,10 @@ msgid ""
 msgstr "Layanan yang berhenti bekerja sementara mencegah kami menentukan jika 
sumber alamat IP Anda adalah node https://www.torproject.org/\;>Tor."
 
 msgid "Your IP address appears to be: "
-msgstr "Alamat IP Anda mungkin adalah:"
+msgstr "Alamat IP anda mungkin adalah:"
 
 msgid "Are you using Tor?"
-msgstr "Apakah Anda menggunakan Tor?"
+msgstr "Apakah anda menggunakan Tor?"
 
 msgid "This page is also available in the following languages:"
 msgstr "Halaman ini juga tersedia dalam bahasa berikut:"
@@ -96,7 +98,7 @@ msgid "Tor Q Site"
 msgstr "Situs Tanya-Jawab Tor"
 
 msgid "Volunteer"
-msgstr "Sukarelawan"
+msgstr "Relawan"
 
 msgid "JavaScript is enabled."
 msgstr "JavaScript difungsikan."
@@ -105,7 +107,7 @@ msgid "JavaScript is disabled."
 msgstr "JavaScript dinonfungsikan."
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr "Namun, hal tersebut tidak tampak sebagai Peramban Tor"
+msgstr "Namun, hal tersebut tidak tampak sebagai Peramban Tor."
 
 msgid "Run a Relay"
 msgstr "Jalankan sebuah Relai"

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit ab2bf3bf1f85761e0ee4de863570dd4c34b65dd4
Author: Translation commit bot 
Date:   Fri Mar 18 21:17:09 2016 +

Update translations for tor-messenger-ircproperties
---
 ja/irc.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ja/irc.properties b/ja/irc.properties
index 271c970..7c50815 100644
--- a/ja/irc.properties
+++ b/ja/irc.properties
@@ -25,10 +25,10 @@ joinChat.password=_Password
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
-options.server=Server
+options.server=ãµã¼ãã¼
 options.port=ãã¼ã
-options.ssl=Use SSL
-options.encoding=Character Set
+options.ssl=SSLãä½¿ç¨ãã
+options.encoding=æåã»ãã
 options.quitMessage=Quit message
 options.partMessage=Part message
 options.showServerTab=Show messages from the server
@@ -180,7 +180,7 @@ error.unknownMode='%S' is not a valid user mode on this 
server.
 #These are the descriptions given in a tooltip with information received
 #from a whois response.
 #The human readable ("realname") description of the user.
-tooltip.realname=Name
+tooltip.realname=åå
 tooltip.server=Connected to
 #The username and hostname that the user connects from (usually based on 
the
 #reverse DNS of the user's IP, but often mangled by the server to

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

[tor-commits] [webwml/master] Drop volunteer page footer idea blob

2016-03-19 Thread atagar

commit c9398e89cdae3a6e00da2da5d221414f184507b6
Author: Damian Johnson 
Date:   Thu Mar 17 08:26:19 2016 -0700

Drop volunteer page footer idea blob

This is an antique, horribly unreadable wad of text as denser than a legal
footer. We should invest effort in making project ideas readable or not have
them at all. Actually, this section predates me (meaning it's over six years
old) and never been maintained in that time. Guess it's so dense even we
ignored it. :P

If we want to resurrect any of these then it should be done so as tickets.
---
 getinvolved/en/volunteer.wml | 210 ---
 1 file changed, 210 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index b243544..fef7c3e 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1556,216 +1556,6 @@ implementation.
 
 
 
-
-
-Other Coding and Design related 
ideas
-
-Tor relays don't work well on Windows XP. On
-Windows, Tor uses the standard select() system
-call, which uses space in the non-page pool. This means
-that a medium sized Tor relay will empty the non-page pool, causing
-havoc and system crashes. We should probably be using overlapped IO
-instead. One solution would be to teach http://www.monkey.org/~provos/libevent/;>libevent how to use
-overlapped IO rather than select() on Windows, and then adapt Tor to
-the new libevent interface. Christian King made a
-https://svn.torproject.org/svn/libevent-urz/trunk/;>good
-start on this in the summer of 2007.
-
-We need a flexible simulator framework for studying end-to-end
-traffic confirmation attacks. Many researchers have whipped up ad hoc
-simulators to support their intuition either that the attacks work
-really well or that some defense works great. Can we build a simulator
-that's clearly documented and open enough that everybody knows it's
-giving a reasonable answer? This will spur a lot of new research.
-See the entry below on confirmation attacks for
-details on the research side of this task  who knows, when it's
-done maybe you can help write a paper or three also.
-
-Tor 0.1.1.x and later include support for hardware crypto
-accelerators via OpenSSL. It has been lightly tested and is
-possibly very buggy.  We're looking for more rigorous testing,
-performance analysis, and optimally, code fixes to OpenSSL and
-Tor if needed.
-
-Write a https://secure.wikimedia.org/wikipedia/en/wiki/Fuzz_testing;>fuzzer
-for Tor to discover security vulnerabilities. Determine if there
-are good fuzzing frameworks out there for what we want. Win fame by
-getting credit when we put out a new release because of you!
-
-Tor uses TCP for transport and TLS for link
-encryption. This is nice and simple, but it means all cells
-on a link are delayed when a single packet gets dropped, and
-it means we can only reasonably support TCP streams. We have a list
-of reasons why we haven't shifted to UDP transport, but it would
-be great to see that list get shorter. We also have a proposed specification
-for Tor and
-UDP  please let us know what's wrong with it.
-
-We're not that far from having IPv6 support for destination addresses
-(at exit nodes). If you care strongly about IPv6, that's probably the
-first place to start.
-
-We need a way to generate the website diagrams (for example, the "How
-Tor Works" pictures on the overview 
page
-from source, so we can translate them as UTF-8 text rather than edit
-them by hand with Gimp. We might want to
-integrate this as an wml file so translations are easy and images are
-generated in multiple languages whenever we build the website.
-
-How can we make the various LiveCD/USB systems easier
-to maintain, improve, and document?  One example is https://tails.boum.org/;>The Amnesic Incognito Live
-System.
-
-
-
-Another anti-censorship project is to try to make Tor
-more scanning-resistant.  Right now, an adversary can identify Tor bridges
-just by trying to connect to them, following the Tor protocol,
-and seeing if they respond.  To solve this, bridges could act like
-webservers (HTTP or HTTPS) when contacted by port-scanning tools,
-and not act like bridges until the user provides a bridge-specific key.
-To start, check out Shane Pope's http://dl.dropbox.com/u/37735/index.html;>thesis and prototype.
-
-
-
-
-
-Research
-
-The "end-to-end traffic confirmation attack":
-by watching traffic at Alice and at Bob, we can http://freehaven.net/anonbib/#danezis:pet2004;>compare
-traffic signatures and become convinced that we're watching the same
-stream. So far Tor accepts this as a fact of life and assumes this
-attack is trivial in all

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

2016-03-19 Thread translation

commit 28e1978ac4e5a8baa244a0d964c600b7d128dbe8
Author: Translation commit bot 
Date:   Fri Mar 18 21:15:31 2016 +

Update translations for tails-greeter
---
 ja/ja.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index bfcb3a4..4d8c945 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
+"POT-Creation-Date: 2016-02-29 14:32+0100\n"
+"PO-Revision-Date: 2016-03-18 20:54+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

___
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

2016-03-19 Thread translation

commit b087203670432e0908caec3ed0179324573acd43
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:04 2016 +

Update translations for bridgedb
---
 hr_HR/LC_MESSAGES/bridgedb.po | 415 +-
 1 file changed, 208 insertions(+), 207 deletions(-)

diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po
index e75971a..b3c3dac 100644
--- a/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/hr_HR/LC_MESSAGES/bridgedb.po
@@ -5,20 +5,21 @@
 # Translators:
 # Ana B, 2013-2014
 # Armando Vega , 2012
-# skiddiep , 2014-2015
+# Igor , 2014-2015
 # Tomislav SiroglaviÄ , 2014
 # gogo , 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'POT-Creation-Date:
 2015-03-19 22:13+\n"
-"PO-Revision-Date: 2015-07-22 11:41+\n"
-"Last-Translator: skiddiep \n"
-"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
+"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
 "Language: hr_HR\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -33,68 +34,193 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
 msgid "Sorry! Something went wrong with your request."
-msgstr "Oprostite! NeÅ¡to je poÅ¡lo po krivu s VaÅ¡im zahtjevom."
+msgstr ""
+
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
 
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#.

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

2016-03-19 Thread translation

commit dae3a5b3bb621cfd0d3bb035d2342b04417ff676
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:49 2016 +

Update translations for tails-greeter
---
 hr_HR/hr_HR.po | 78 +-
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index d9cf553..053105b 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -5,15 +5,15 @@
 # Translators:
 # Ana B, 2014
 # cisterna, 2013
-# skiddiep , 2015
+# Igor , 2015
 # Neven LovriÄ , 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-02-29 14:32+0100\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,150 +23,150 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:1
 msgid "Forward"
-msgstr "Naprijed"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid "Login"
-msgstr "Prijava"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid "Welcome to Tails"
-msgstr "DobrodoÅ¡li u Tails"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:4
 msgid "Use persistence?"
-msgstr "Koristiti ustrajnost?"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:5
 msgid "Documentation"
-msgstr "Dokumentacija"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:6
 msgid "Yes"
-msgstr "Da"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:7
 msgid "No"
-msgstr "Ne"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:8
 msgid "Passphrase:"
-msgstr "Lozinka:"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:9
 msgid "Read-Only?"
-msgstr "Samo Äitanje?"
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:10
 msgid "Wrong passphrase. Please try again."
-msgstr "PogreÅ¡na lozinka. Molimo pokuÅ¡ajte ponovno."
+msgstr ""
 
 #: ../glade/persistencewindow.glade.h:11
 msgid "More options?"
-msgstr "ViÅ¡e moguÄnosti?"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:3
 msgid "Administration password"
-msgstr "Administratorska lozinka"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:4
 msgid ""
 "Documentation"
-msgstr "Dokumentacija"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:5
 msgid ""
 "Enter an administration password in case you need to perform administration 
tasks.\n"
 "Otherwise it will be disabled for better security."
-msgstr "Unesite administratorsku lozinku za sluÄaj da trebate izvoditi 
administratorske zadaÄe. One Äe u suprotnom biti onemoguÄene radi bolje 
sigurnosti."
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:7
 msgid "Password:"
-msgstr "Lozinka:"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:8
 msgid "Verify Password:"
-msgstr "Potvrdite lozinku:"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:9
 msgid "Passwords do not match"
-msgstr "Lozinke se ne podudaraju"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:10
 msgid "MAC address spoofing"
-msgstr "Maskiranje MAC adrese"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:11
 msgid ""
 "Documentation"
-msgstr "Dokumentacija"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:12
 msgid ""
 "Spoofing MAC addresses hides the serial number of your network cards to the "
 "local networks. This can help you hide your geographical location."
-msgstr "Maskiranje MAC adresa skriva lokalnim mreÅ¾ama serijski broj VaÅ¡ih 
mreÅ¾nih kartica. Ovo Vam moÅ¾e pomoÄi sakriti VaÅ¡ zemljopisni poloÅ¾aj."
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:13
 msgid ""
 "It is generally safer to spoof MAC addresses, but it might also raise "
 "suspicion or cause network connection problems."
-msgstr "OpÄenito je sigurnije maskirati MAC adrese, ali to bi takoÄer moglo 
izazvati sumnju ili prouzroÄiti probleme mreÅ¾ne veze."
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:14
 msgid "Spoof all MAC addresses"
-msgstr "Maskiraj sve MAC adrese"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:15
 msgid "Network configuration"
-msgstr "Postavljanje mreÅ¾e"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:16
 msgid ""
 "Documentation"
-msgstr "Dokumentacija"
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:17
 msgid ""
 "This computer's Internet connection is clear of obstacles. You would like to"
 " connect directly to the Tor network."
-msgstr "Internet veza ovoga raÄunala nema prepreka. Å½eljeli bi ste se 
spojiti izravno u Tor mreÅ¾u."
+msgstr ""
 
 #: ../glade/optionswindow.glade.h:18
 msgid ""
 "This computer's Internet connection is censored, filtered, or proxied. You "
 "need to configure bridge, firewall, or proxy settings."
-msgstr "Internet veza

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

2016-03-19 Thread translation

commit 1d2cbce18dd87267ab7c33a75124cba122611b17
Author: Translation commit bot 
Date:   Fri Mar 18 13:15:04 2016 +

Update translations for bridgedb
---
 lt/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index b274592..a461f49 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
+# AG , 2016
 # Moo, 2015
 # Saule Papeckyte , 2015
 # Edgaras7 , 2014
@@ -12,8 +13,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2015-12-02 23:02+\n"
-"Last-Translator: Moo\n"
+"PO-Revision-Date: 2016-03-18 13:15+\n"
+"Last-Translator: AG \n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,11 +56,11 @@ msgstr "Kontaktai"
 
 #: bridgedb/https/templates/bridges.html:35
 msgid "Select All"
-msgstr ""
+msgstr "PaÅ¾ymÄti viskÄ"
 
 #: bridgedb/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr ""
+msgstr "Rodyti QR kodÄ"
 
 #: bridgedb/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"

___
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

2016-03-19 Thread translation

commit a5e2dd962a0c5a0081e7d6d462768d3c858894ab
Author: Translation commit bot 
Date:   Fri Mar 18 13:45:04 2016 +

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

diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index a461f49..9369b17 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-18 13:15+\n"
+"PO-Revision-Date: 2016-03-18 13:20+\n"
 "Last-Translator: AG \n"
 "Language-Team: Lithuanian 
(http://www.transifex.com/otf/torproject/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 
 #: bridgedb/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "Ä®vyko klaida Ä¯keliant jÅ«sÅ³ QR kodÄ."
 
 #: bridgedb/https/templates/bridges.html:73
 msgid ""
@@ -275,7 +275,7 @@ msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "Mano tiltai neveikia! Man reikia pagalbos!"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
 #: bridgedb/strings.py:117

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

[tor-commits] [metrics-web/master] Add new module on disagreement among dirauths.

2016-03-19 Thread karsten

commit 19572294cf53147693a41cf2cac3916f4bb2a633
Author: Karsten Loesing 
Date:   Thu Mar 17 13:58:41 2016 +0100

Add new module on disagreement among dirauths.
---
 .../org/torproject/metrics/collectdescs/Main.java  |   1 +
 modules/disagreement/.gitignore|   2 +
 modules/disagreement/build.xml |  37 ++
 .../org/torproject/metrics/disagreement/Main.java  | 618 +
 shared/bin/20-run-disagreement-stats.sh|   5 +
 shared/bin/99-copy-stats-files.sh  |   1 +
 website/etc/metrics.json   |  22 +
 website/etc/web.xml|   1 +
 .../metrics/web/research/ResearchStatsServlet.java |   1 +
 9 files changed, 688 insertions(+)

diff --git 
a/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java 
b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java
index c95df18..dc6ef82 100644
--- a/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java
+++ b/modules/collectdescs/src/org/torproject/metrics/collectdescs/Main.java
@@ -21,6 +21,7 @@ public class Main {
 "/recent/relay-descriptors/consensuses/",
 "/recent/relay-descriptors/extra-infos/",
 "/recent/relay-descriptors/server-descriptors/",
+"/recent/relay-descriptors/votes/",
 "/recent/torperf/" }, 0L, new File("../../shared/in"), true);
   }
 }
diff --git a/modules/disagreement/.gitignore b/modules/disagreement/.gitignore
new file mode 100644
index 000..bb84c80
--- /dev/null
+++ b/modules/disagreement/.gitignore
@@ -0,0 +1,2 @@
+stats/
+
diff --git a/modules/disagreement/build.xml b/modules/disagreement/build.xml
new file mode 100644
index 000..ce1c022
--- /dev/null
+++ b/modules/disagreement/build.xml
@@ -0,0 +1,37 @@
+
+
+  
+  
+  
+
+
+  
+  
+  
+
+  
+
+  
+
+
+  
+
+  
+
+  
+
+  
+
+  
+
+
diff --git 
a/modules/disagreement/src/main/java/org/torproject/metrics/disagreement/Main.java
 
b/modules/disagreement/src/main/java/org/torproject/metrics/disagreement/Main.java
new file mode 100644
index 000..b612c43
--- /dev/null
+++ 
b/modules/disagreement/src/main/java/org/torproject/metrics/disagreement/Main.java
@@ -0,0 +1,618 @@
+package org.torproject.metrics.disagreement;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TimeZone;
+import java.util.TreeMap;
+
+import org.torproject.descriptor.Descriptor;
+import org.torproject.descriptor.DescriptorFile;
+import org.torproject.descriptor.DescriptorReader;
+import org.torproject.descriptor.DescriptorSourceFactory;
+import org.torproject.descriptor.NetworkStatusEntry;
+import org.torproject.descriptor.RelayNetworkStatusVote;
+
+/* Read all relay network status votes from the in/ subdirectory with a
+ * valid-after time of 12:00:00, extract attributes like relay flags or
+ * bandwidth measurements that the directory authorities assigned to
+ * relays, and output aggregate statistics on disagreement among the
+ * directory authorities.
+ *
+ * When initializing from descriptor archives, put tarballs in the in/
+ * subdirectory, run this code, and then move the tarballs away.
+ * Otherwise, tarballs will be re-processed in each subsequent execution.
+ *
+ * Recent descriptors can stay in the in/ subdirectory and be re-processed
+ * in each execution. */
+public class Main {
+
+  public static void main(String[] args) throws Exception {
+new Main().run();
+  }
+
+  public void run() throws Exception {
+readResults();
+readDescriptors();
+aggregate();
+writeResults();
+  }
+
+  /* We're processing a lot of strings, including authority identities,
+   * relay fingerprints, and attributes like relay flags.  It would be
+   * wasteful to store more than one instance of these strings in memory.
+   * We also want to store them as part of long integers below.
+   *
+   * That's why we're resolving all strings to integers and keeping maps
+   * from string to integers.  In case of authority identities and relay
+   * fingerprints we don't need to resolve integers back to strings, but
+   * in case of attributes we need to put attribute strings into the
+   * output file, so we're also keeping a list of attribute strings in
+   * insertion order. */
+  private Map authorityIndexes =
+  new HashMap();
+  private Map fingerprintIndexes =
+

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-03-19 Thread translation

commit eb608a9e8e1edb336c6e47a58b45f03a38d4d714
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:33 2016 +

Update translations for tor-messenger-prefsdtd
---
 hr_HR/prefs.dtd | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/hr_HR/prefs.dtd b/hr_HR/prefs.dtd
index e2bd232..1441b0e 100644
--- a/hr_HR/prefs.dtd
+++ b/hr_HR/prefs.dtd
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-commandsproperties] Update translations for tor-messenger-commandsproperties

2016-03-19 Thread translation

commit e53839dc19cb50e294728916943183cf5a85dec6
Author: Translation commit bot 
Date:   Thu Mar 17 18:47:44 2016 +

Update translations for tor-messenger-commandsproperties
---
 hr_HR/commands.properties | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hr_HR/commands.properties b/hr_HR/commands.properties
index fdb680b..d4e3a91 100644
--- a/hr_HR/commands.properties
+++ b/hr_HR/commands.properties
@@ -4,24 +4,24 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands=Naredbe: %S.\nKoristite /help naredba za viÅ¡e informacija.
+commands=Commands: %S.\nUse /help command for more information.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
-noCommand=Nema '%S' naredbe.
-noHelp=Nema poruke pomoÄi za '%S' naredbu, Å¾ao nam je!
+noCommand=No '%S' command.
+noHelp=No help message for the '%S' command, sorry!
 
-sayHelpString=say poruka: poÅ¡alji poruku bez naredbi obrade.
-rawHelpString=raw poruka: poÅ¡alji poruku bez izbjegavanja HTML 
entiteta.
-helpHelpString=help ime: prikaÅ¾i poruku pomoÄi za ime 
naredbu, ili popis moguÄih naredbi kad je koriÅ¡teno bez parametra.
+sayHelpString=say message: send a message without processing commands.
+rawHelpString=raw message: send a message without escaping HTML 
entities.
+helpHelpString=help name: show the help message for the name 
command, or the list of possible commands when used without parameter.
 
 # LOCALIZATION NOTE (statusCommand):
 #  %1$S is replaced with a status command name
 #   (one of "back", "away", "busy", "dnd", or "offline").
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
-statusCommand=%1$S poruka stanja: postavi status na %2$S s opcionalno 
porukom stanja.
-back=dostupno
-away=odsutno
-busy=nedostupno
-dnd=nedostupno
+statusCommand=%1$S status message: set the status to %2$S with an 
optional status message.
+back=available
+away=away
+busy=unavailable
+dnd=unavailable
 offline=offline

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

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2016-03-19 Thread translation

commit f342e16a7694d40c61ecc1c0477b96ef1d52c193
Author: Translation commit bot 
Date:   Sat Mar 19 16:46:38 2016 +

Update translations for tor-messenger-ircproperties_completed
---
 sv/irc.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sv/irc.properties b/sv/irc.properties
index 13c550a..ef6f6ef 100644
--- a/sv/irc.properties
+++ b/sv/irc.properties
@@ -172,6 +172,9 @@ error.sendMessageFailed=Ett fel uppstod nÃ¤r det senaste 
meddelandet skickades.
 #%1$S is the channel the user tried to join, %2$S is the channel
 #he was forwarded to.
 error.channelForward=Du kan inte gÃ¥ in i %1$S, och skickades automatiskt 
vidare till %2$S.
+#%S is the mode that the user tried to set but was not recognized
+#by the server as a valid mode.
+error.unknownMode='%S' Ã¤r inte ett giltigt anvÃ¤ndarlÃ¤ge pÃ¥ den hÃ¤r 
servern.
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

[tor-commits] [translation/tor-messenger-accountsproperties] Update translations for tor-messenger-accountsproperties

2016-03-19 Thread translation

commit d632ce8bb33b47701b2bbb7841745aaef12691d3
Author: Translation commit bot 
Date:   Thu Mar 17 18:47:28 2016 +

Update translations for tor-messenger-accountsproperties
---
 hr_HR/accounts.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/accounts.properties b/hr_HR/accounts.properties
index e44819e..051ba0d 100644
--- a/hr_HR/accounts.properties
+++ b/hr_HR/accounts.properties
@@ -4,6 +4,6 @@
 
 # LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
 # %S is replaced with the name of the account
-passwordPromptTitle=Lozinka za %S
-passwordPromptText=Molimo Vas unesite svoju lozinku za %S kako bi se spojili.
-passwordPromptSaveCheckbox=Koristi Upravitelj lozinki da zapamti ovu lozinku.
+passwordPromptTitle=Password for %S
+passwordPromptText=Please enter your password for %S in order to connect it.
+passwordPromptSaveCheckbox=Use Password Manager to remember this password.

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-03-19 Thread translation

commit 5cdd28a95332a30185636e4f81b82869187fc51b
Author: Translation commit bot 
Date:   Fri Mar 18 21:15:43 2016 +

Update translations for mat-gui
---
 ja.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja.po b/ja.po
index 7ff9e7c..decd96d 100644
--- a/ja.po
+++ b/ja.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-02-11 09:31+\n"
+"PO-Revision-Date: 2016-03-18 20:55+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit b48e0ca2990b43467c17b3107bebda338d9422d5
Author: Translation commit bot 
Date:   Sat Mar 19 16:46:33 2016 +

Update translations for tor-messenger-ircproperties
---
 sv/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/irc.properties b/sv/irc.properties
index 64ef64c..ef6f6ef 100644
--- a/sv/irc.properties
+++ b/sv/irc.properties
@@ -174,7 +174,7 @@ error.sendMessageFailed=Ett fel uppstod nÃ¤r det senaste 
meddelandet skickades.
 error.channelForward=Du kan inte gÃ¥ in i %1$S, och skickades automatiskt 
vidare till %2$S.
 #%S is the mode that the user tried to set but was not recognized
 #by the server as a valid mode.
-error.unknownMode='%S' is not a valid user mode on this server.
+error.unknownMode='%S' Ã¤r inte ett giltigt anvÃ¤ndarlÃ¤ge pÃ¥ den hÃ¤r 
servern.
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

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

2016-03-19 Thread translation

commit 80690f6a51763f4c08670d5c6bb5a0c421d69b5a
Author: Translation commit bot 
Date:   Thu Mar 17 01:15:29 2016 +

Update translations for tails-greeter
---
 es/es.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/es/es.po b/es/es.po
index 5b8f8c4..94bfd7f 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Carlos Marin , 2016
 # her_tor_es_ar , 2014
 # Animalcustomize , 2014
 # Noel Torres , 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-02-29 14:32+0100\n"
+"PO-Revision-Date: 2016-03-17 01:01+\n"
+"Last-Translator: Carlos Marin \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: ../glade/persistencewindow.glade.h:1
 msgid "Forward"
-msgstr "enviar"
+msgstr "Continuar"
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid "Login"

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2016-03-19 Thread translation

commit 8dcd96a3ea231aab6541ef6ea27105f79342f148
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:43 2016 +

Update translations for tails-persistence-setup
---
 hr_HR/hr_HR.po | 142 -
 1 file changed, 71 insertions(+), 71 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 3083613..17400f5 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-01-25 17:34+0100\n"
-"PO-Revision-Date: 2016-03-05 09:52+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,187 +22,187 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:48
 msgid "Personal Data"
-msgstr "Osobni podatci"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:50
 msgid "Keep files stored in the `Persistent' directory"
-msgstr "DrÅ¾ati datoteke spremljene u 'Trajnom' direktoriju"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:58
 msgid "GnuPG"
-msgstr "GnuPG"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:60
 msgid "GnuPG keyrings and configuration"
-msgstr "GnuPG prsteni kljuÄeva i postavke"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:68
 msgid "SSH Client"
-msgstr "SSH klijent"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:70
 msgid "SSH keys, configuration and known hosts"
-msgstr "SSH kljuÄevi, postavke i poznati domaÄini"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:78
 msgid "Pidgin"
-msgstr "Pidgin"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:80
 msgid "Pidgin profiles and OTR keyring"
-msgstr "Pidgin profili i OTR prsten kljuÄeva"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
 msgid "Icedove"
-msgstr "Icedove"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:90
 msgid "Icedove profiles and locally stored email"
-msgstr "Icedove profili i lokalno pohranjen email"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
-msgstr "GNOME prsten kljuÄeva"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
-msgstr "Tajne spremljene od strane GNOME prstena kljuÄeva"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
-msgstr "MreÅ¾ne veze"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:110
 msgid "Configuration of network devices and connections"
-msgstr "Postavke mreÅ¾nih ureÄaja i veza"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
-msgstr "Oznake preglednika"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
-msgstr "Oznake spremljene u Tor Pregledniku"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
-msgstr "PisaÄi"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
-msgstr "Postavke pisaÄa"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
-msgstr "Bitcoin klijent"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
-msgstr "Electrum bitcoin lisnica i postavke"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
-msgstr "APT paketi"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
-msgstr "Paketi preuzeti od strane APTâa"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"
-msgstr "APT popisi"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:160
 msgid "Lists downloaded by APT"
-msgstr "Popisi preuzeti od strane APTâa"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Dotfiles"
-msgstr "Dotfiles"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:170
 msgid ""
 "Symlink into $HOME every file or directory found in the `dotfiles' directory"
-msgstr "SimboliÄki poveÅ¾i svaku datoteku ili direktorij pronaÄen u 
'dotfiles' direktoriju  u $HOME"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Setup.pm:230
 msgid "Setup Tails persistent volume"
-msgstr "Postavi Tails trajni pogon"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
 msgid "Error"
-msgstr "GreÅ¡ka"
+msgstr ""
 
 #: ../lib/Tails/Persistence/Setup.pm:344

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-03-19 Thread translation

commit 7c4f835288a9c7a3d595b4ae53db60703de0ac9b
Author: Translation commit bot 
Date:   Fri Mar 18 20:46:51 2016 +

Update translations for tails-openpgp-applet
---
 ja/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/openpgp-applet.pot b/ja/openpgp-applet.pot
index b98480f..b38d81e 100644
--- a/ja/openpgp-applet.pot
+++ b/ja/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-12-19 16:41+\n"
+"PO-Revision-Date: 2016-03-18 20:46+\n"
 "Last-Translator: Tokumei Nanashi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2016-03-19 Thread translation

commit c37ad22e07fd35f5bbc130e7f74aebb02a001d46
Author: Translation commit bot 
Date:   Fri Mar 18 21:15:27 2016 +

Update translations for tails-persistence-setup_completed
---
 ja/ja.po | 74 
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 774d500..1539582 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-12-16 17:55+0100\n"
-"PO-Revision-Date: 2015-12-19 16:45+\n"
+"POT-Creation-Date: 2016-01-25 17:34+0100\n"
+"PO-Revision-Date: 2016-03-18 20:54+\n"
 "Last-Translator: Tokumei Nanashi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -55,69 +55,69 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidginã®ãããã¡ã¤ã«ã¨OTRãã¼ãã«ãã¼"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid "Icedove"
+msgstr "Icedove"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid "Icedove profiles and locally stored email"
+msgstr 
"Icedoveã®ãããã¡ã¤ã«ã¨ãã¼ã«ã«ã«ä¿åãããé»åã¡ã¼ã«"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
 msgstr "GNOMEãã¼ãã«ãã¼"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
 msgstr "GNOMEãã¼ãã«ãã¼ã«ãã£ã¦ä¿åãããç§å¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
 msgstr "ãããã¯ã¼ã¯æ¥ç¶"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
 msgid "Configuration of network devices and connections"
 msgstr "ãããã¯ã¼ã¯ããã¤ã¹ã¨æ¥ç¶ã®è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
 msgstr "ãã©ã¦ã¶ã®ããã¯ãã¼ã¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Torãã©ã¦ã¶ã«ä¿åãããããã¯ãã¼ã¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
 msgstr "ããªã³ã¿ã¼"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
 msgstr "ããªã³ã¿ã¼ã®è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
 msgstr "Bitcoin ã¯ã©ã¤ã¢ã³ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrum ã®Bitcoin ã¦ã©ã¬ããã¨è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
 msgstr "APTããã±ã¼ã¸"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
 msgstr "APTããã¦ã³ãã¼ãããããã±ã¼ã¸"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"
 msgstr "APTãªã¹ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
 msgid "Lists downloaded by APT"
 msgstr "APTããã¦ã³ãã¼ããããªã¹ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "Icedove"
-msgstr "Icedove"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Icedove profiles and locally stored email"
-msgstr 
"Icedoveã®ãããã¡ã¤ã«ã¨ãã¼ã«ã«ã«ä¿åãããé»åã¡ã¼ã«"
-
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Dotfiles"
 msgstr "ããããã¡ã¤ã«"
@@ -131,67 +131,67 @@ msgstr 
"`ããããã¡ã¤ã«'ãã£ã¬ã¯ããªã§è¦ã¤ãã£ã$HOMEã®å
 msgid "Setup Tails persistent volume"
 msgstr "Talisã®æ°¸ç¶çããªã¥ã¼ã ãã»ããã¢ãã"
 
-#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458
+#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
 msgid "Error"
 msgstr "ã¨ã©ã¼"
 
-#: ../lib/Tails/Persistence/Setup.pm:343
+#: ../lib/Tails/Persistence/Setup.pm:344
 #, perl-format
 msgid "Device %s already has a persistent volume."
 msgstr "ããã¤ã¹ %s

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-03-19 Thread translation

commit 4d8191e952092951e542af0d37ab0f0cd4289661
Author: Translation commit bot 
Date:   Fri Mar 18 21:17:21 2016 +

Update translations for tor-messenger-prefsdtd
---
 ja/prefs.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ja/prefs.dtd b/ja/prefs.dtd
index 1441b0e..8526b57 100644
--- a/ja/prefs.dtd
+++ b/ja/prefs.dtd
@@ -1,13 +1,13 @@
-
-
-
-
+
+
+
+
 
-
+
 
 
-
+
 
 
 
-
\ No newline at end of file
+
\ No newline at end of file

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

[tor-commits] [tor/master] test_options.c: NULL a pointer after free #18447

2016-03-19 Thread nickm

commit 45681f695c6096e280bc7ec3bf0a67c27708dbbc
Author: Steven Chamberlain 
Date:   Mon Feb 29 14:09:07 2016 +

test_options.c: NULL a pointer after free #18447

tdata will be double-freed if none of linux, __FreeBSD__, DARWIN or
__OpenBSD__ are defined.  (For example, FreeBSD derivatives).
---
 src/test/test_options.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/test_options.c b/src/test/test_options.c
index d294e60..9ea5718 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -1078,6 +1078,7 @@ test_options_validate__transproxy(void *ignored)
 
   // Test trans proxy success
   free_options_test_data(tdata);
+  tdata = NULL;
 
 #if defined(linux)
   tdata = get_options_test_data("TransProxyType tproxy\n"

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

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

2016-03-19 Thread translation

commit 8350da7be1165ed70ad3573d0e9c43a67d20011c
Author: Translation commit bot 
Date:   Fri Mar 18 21:16:17 2016 +

Update translations for tails-perl5lib
---
 ja.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ja.po b/ja.po
index 9487b71..ef72d7d 100644
--- a/ja.po
+++ b/ja.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Eshin Kunishima , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2016-01-11 15:40+0100\n"
-"PO-Revision-Date: 2016-01-12 08:13+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-01-25 16:59+0100\n"
+"PO-Revision-Date: 2016-03-18 20:46+\n"
+"Last-Translator: Eshin Kunishima \n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../lib/Tails/RunningSystem.pm:159
 msgid "Error"
-msgstr ""
+msgstr "ã¨ã©ã¼"
 
 #: ../lib/Tails/RunningSystem.pm:161
 msgid ""

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

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

2016-03-19 Thread translation

commit b7f6825f8bc3a7c41e530bb9a538997027e51164
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:15 2016 +

Update translations for torcheck
---
 hr_HR/torcheck.po | 56 +++
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/hr_HR/torcheck.po b/hr_HR/torcheck.po
index 982fc8a..90e45e5 100644
--- a/hr_HR/torcheck.po
+++ b/hr_HR/torcheck.po
@@ -2,16 +2,16 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
-# skiddiep , 2014-2015
+# Igor , 2014-2015
 # nvucinic , 2012
 # Tea Horvatic , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-02-17 21:38+\n"
-"Last-Translator: skiddiep \n"
-"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
+"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,86 +20,86 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && 
n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
-msgstr "Äestitamo. Ovaj preglednik je konfiguriran za uporabu Tor-a."
+msgstr ""
 
 msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "
 "for further information about using Tor safely.  You are now free to browse "
 "the Internet anonymously."
-msgstr "Pogledajte  https://www.torproject.org/\;>Tor web stranicu 
 za daljnje informacije o tome kako sigurno koristiti Tor.  Sad moÅ¾ete 
anonimno pregledavati internet."
+msgstr ""
 
 msgid "There is a security update available for Tor Browser."
-msgstr "Dostupno je sigurnosno aÅ¾uriranje za Tor Preglednik."
+msgstr ""
 
 msgid ""
 "https://www.torproject.org/download/download-easy.html\;>Click "
 "here to go to the download page"
-msgstr "https://www.torproject.org/download/download-easy.html\;>Preuzmite Tor 
ovdje"
+msgstr ""
 
 msgid "Sorry. You are not using Tor."
-msgstr "NaÅ¾alost, Vi ne koristite Tor."
+msgstr ""
 
 msgid ""
 "If you are attempting to use a Tor client, please refer to the https://www.torproject.org/\;>Tor website and specifically the instructions for "
 "configuring your Tor client."
-msgstr "Ako pokuÅ¡avate koristiti Tor klijent  provjerite https://www.torproject.org/\;>Tor web stranicu, posebice https://www.torproject.org/docs/faq#DoesntWork\;>upute za konfiguraciju 
VaÅ¡eg Tor klijenta."
+msgstr ""
 
 msgid "Sorry, your query failed or an unexpected response was received."
-msgstr "NaÅ¾alost VaÅ¡ upit nije uspio ili je primljen neoÄekivan odgovor."
+msgstr ""
 
 msgid ""
 "A temporary service outage prevents us from determining if your source IP "
 "address is a https://www.torproject.org/\;>Tor node."
-msgstr "Privremni tehniÄki problemi sprijeÄavaju nas da potvrdimo da li je 
VaÅ¡a IP adresa  https://www.torproject.org/\;>Tor Ävor."
+msgstr ""
 
 msgid "Your IP address appears to be: "
-msgstr "Äini se da je VaÅ¡a IP adresa:"
+msgstr ""
 
 msgid "Are you using Tor?"
-msgstr "Koristite li Tor?"
+msgstr ""
 
 msgid "This page is also available in the following languages:"
-msgstr "Ova stranica je takoÄer dostupna na sljedeÄim jezicima:"
+msgstr ""
 
 msgid "For more information about this exit relay, see:"
-msgstr "Za viÅ¡e informacija o ovom izlaznom releju pogledajte:"
+msgstr ""
 
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr "Tor Projekt je US 501(c)(3) neprofitna organizacija koja je posveÄena 
istraÅ¾ivanju, razvoju i obrazovanju o online anonimnosti i privatnosti."
+msgstr ""
 
 msgid "Learn More "
-msgstr "Saznajte viÅ¡e "
+msgstr ""
 
 msgid "Go"
-msgstr "Idi"
+msgstr ""
 
 msgid "Short User Manual"
-msgstr "Kratke korisniÄke upute"
+msgstr ""
 
 msgid "Donate to Support Tor"
-msgstr "Donirajte kako biste podrÅ¾ali Tor"
+msgstr ""
 
 msgid "Tor Q Site"
-msgstr "Tor stranica s pitanjima i odgovorima"
+msgstr ""
 
 msgid "Volunteer"
-msgstr "Volontirajte"
+msgstr ""
 
 msgid "JavaScript is enabled."
-msgstr "JavaScript je omoguÄen."
+msgstr ""
 
 msgid "JavaScript is disabled."
-msgstr "JavaScript je onemoguÄen."
+msgstr ""
 
 msgid "However, it does not appear to be Tor Browser."
-msgstr "MeÄutim, Äini se da to nije Tor Preglednik."
+msgstr ""
 
 msgid "Run a Relay"
-msgstr "Pokreni relej"
+msgstr ""
 
 msgid "Stay Anonymous"
-msgstr "Ostani Anoniman"
+msgstr ""

___

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

2016-03-19 Thread translation

commit 886dc725490d139e10eb6c35be3b9139f8049880
Author: Translation commit bot 
Date:   Sat Mar 19 12:15:10 2016 +

Update translations for torcheck
---
 it/torcheck.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/it/torcheck.po b/it/torcheck.po
index d896eaf..c57e57a 100644
--- a/it/torcheck.po
+++ b/it/torcheck.po
@@ -10,6 +10,7 @@
 # ironbishop , 2011
 # Jaggions , 2014
 # Jaggions , 2014
+# Leunam X1 , 2016
 # Mett , 2015
 # Nicholaus , 2014
 # Ruggero Tonelli <>, 2012
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-03-02 02:41+\n"
-"Last-Translator: HostFat \n"
-"Language-Team: Italian 
(http://www.transifex.com/projects/p/torproject/language/it/)\n"
+"PO-Revision-Date: 2016-03-19 11:46+\n"
+"Last-Translator: Leunam X1 \n"
+"Language-Team: Italian 
(http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgid "However, it does not appear to be Tor Browser."
 msgstr "Tuttavia, non sembra essere Tor Browser."
 
 msgid "Run a Relay"
-msgstr "Eseguire un Relay"
+msgstr "Gestisci un Relay"
 
 msgid "Stay Anonymous"
 msgstr "Rimani Anonimo"

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

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

2016-03-19 Thread translation

commit d2964b8b9a8ce92b3d57721f8abb3ed848216786
Author: Translation commit bot 
Date:   Sat Mar 19 12:15:15 2016 +

Update translations for torcheck_completed
---
 it/torcheck.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/it/torcheck.po b/it/torcheck.po
index d896eaf..c57e57a 100644
--- a/it/torcheck.po
+++ b/it/torcheck.po
@@ -10,6 +10,7 @@
 # ironbishop , 2011
 # Jaggions , 2014
 # Jaggions , 2014
+# Leunam X1 , 2016
 # Mett , 2015
 # Nicholaus , 2014
 # Ruggero Tonelli <>, 2012
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-03-02 02:41+\n"
-"Last-Translator: HostFat \n"
-"Language-Team: Italian 
(http://www.transifex.com/projects/p/torproject/language/it/)\n"
+"PO-Revision-Date: 2016-03-19 11:46+\n"
+"Last-Translator: Leunam X1 \n"
+"Language-Team: Italian 
(http://www.transifex.com/otf/torproject/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,7 @@ msgid "However, it does not appear to be Tor Browser."
 msgstr "Tuttavia, non sembra essere Tor Browser."
 
 msgid "Run a Relay"
-msgstr "Eseguire un Relay"
+msgstr "Gestisci un Relay"
 
 msgid "Stay Anonymous"
 msgstr "Rimani Anonimo"

___
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

2016-03-19 Thread translation

commit 70ad50e375f0c61ed4060607b48fe20b647dcf72
Author: Translation commit bot 
Date:   Fri Mar 18 08:46:17 2016 +

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

diff --git a/hr/aboutdialog.dtd b/hr/aboutdialog.dtd
index 5099ad7..ba59803 100644
--- a/hr/aboutdialog.dtd
+++ b/hr/aboutdialog.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-progress_completed] Update translations for tor-launcher-progress_completed

2016-03-19 Thread translation

commit d921d5e10d3f8fc82ce9cca80c2f1a445588c094
Author: Translation commit bot 
Date:   Fri Mar 18 08:45:41 2016 +

Update translations for tor-launcher-progress_completed
---
 hr/progress.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr/progress.dtd b/hr/progress.dtd
index 9c3caaf..da8dda4 100644
--- a/hr/progress.dtd
+++ b/hr/progress.dtd
@@ -1,4 +1,4 @@
 
 
 
-
+

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

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

2016-03-19 Thread translation

commit 84c6ee00ac1ebfd1820f7d8d14722438603d7d71
Author: Translation commit bot 
Date:   Fri Mar 18 21:15:35 2016 +

Update translations for tails-greeter_completed
---
 ja/ja.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index bfcb3a4..4d8c945 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-16 18:12+0100\n"
-"PO-Revision-Date: 2015-12-21 09:22+\n"
+"POT-Creation-Date: 2016-02-29 14:32+0100\n"
+"PO-Revision-Date: 2016-03-18 20:54+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

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

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

2016-03-19 Thread translation

commit 0747b962e405dbf7b7e1a4e6d730641efbb3f620
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:56 2016 +

Update translations for torbirdy
---
 hr_HR/torbirdy.dtd| 74 +++
 hr_HR/torbirdy.properties | 24 +++
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 6c6a6be..3e22539 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -1,63 +1,63 @@
-
-
+
+
 
-
+
 
-
-
-
+
+
+
 
 
-
-
+
+
 
-
-
+
+
 
-
+
 
 
-
+
 
-
-
+
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
-
+
+
 
-
-
-
+
+
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
-
-
+
+
 
 
-
-
-
-
+
+
+
+
 
-
+
diff --git a/hr_HR/torbirdy.properties b/hr_HR/torbirdy.properties
index 56aef8e..fcc69a3 100644
--- a/hr_HR/torbirdy.properties
+++ b/hr_HR/torbirdy.properties
@@ -1,19 +1,19 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy OmoguÄen: Tor
-torbirdy.enabled.jondo=TorBirdy OmoguÄen: JonDo
-torbirdy.enabled.custom=TorBirdy OmoguÄen: PrilagoÄeni Proxy
-torbirdy.enabled.torification=TorBirdy OmoguÄen: Transparentna Torifikacija
-torbirdy.enabled.whonix=TorBirdy OmoguÄen: Whonix
-torbirdy.disabled=TorBirdy: OnemoguÄen!
+torbirdy.enabled.tor=TorBirdy Enabled:Tor
+torbirdy.enabled.jondo=TorBirdy Enabled:JonDo
+torbirdy.enabled.custom=TorBirdy Enabled:Custom Proxy
+torbirdy.enabled.torification=TorBirdy Enabled:Transparent Torification
+torbirdy.enabled.whonix=TorBirdy Enabled:Whonix
+torbirdy.disabled=TorBirdy:Disabled!
 
-torbirdy.email.prompt=TorBirdy je onemoguÄio Thunderbird-ovog Äarobnjaka za 
autokonfiguraciju kako bi zaÅ¡titio VaÅ¡u anonimnost.\n\nPreporuÄene postavke 
sigurnosti za %S su postavljene.\n\nSad moÅ¾ete konfigurirati i ostale postavke.
+torbirdy.email.prompt=TorBirdy has disabled Thunderbird's auto-configuration 
wizard to protect your anonymity.\n\nThe recommended security settings for %S 
have been set.\n\nYou can now configure the other account settings manually.
 
-torbirdy.email.advanced=Imajte na umu da mijenjanje naprednih postavki 
TorBirdy-a NIJE preporuÄeno.\n\nTrebali bi nastaviti samo ako ste sigurni Å¡to 
radite.
-torbirdy.email.advanced.nextwarning=PokaÅ¾i ovo upozorenje iduÄi put
-torbirdy.email.advanced.title=TorBirdy Napredne Postavke
+torbirdy.email.advanced=Please note that changing the advanced settings of 
TorBirdy is NOT recommended.\n\nYou should only continue if you are sure of 
what you are doing.
+torbirdy.email.advanced.nextwarning=Show this warning next time
+torbirdy.email.advanced.title=TorBirdy Advanced Settings
 
-torbirdy.restart=Morate ponovno pokrenuti Thunderbird da bi se Å¾eljena 
vremenska zona primjenila.
+torbirdy.restart=You must restart Thunderbird for the time zone preference to 
take effect.
 
-torbirdy.firstrun=Sad koristite TorBirdy.\n\nDa bi se zaÅ¡titila VaÅ¡a 
anonimnost, TorBirdy Äe provesti Thunderbird postavke koje je postavio, 
sprjeÄavajuÄi njihovo mijenjanje od stane Vas ili bilo kojeg dodatka. Neke 
postavke se mogu promijeniti, i do njih se dolazi preko TorBirdy okvira s 
postavkama. Kad je TorBirdy deinstaliran ili onemoguÄen, sve postavke koje 
mijenja su vraÄene na poÄetne vrijednosti (prije nego Å¡to je TorBirdy 
instaliran).\n\nAko ste novi korisnik, preporuÄeno je proÄitati web stranicu 
TorBirdy-a kako bi razumjeli Å¡to pokuÅ¡avamo postiÄi s TorBirdy-em za naÅ¡e 
korisnike.
+torbirdy.firstrun=You are now running TorBirdy.\n\nTo help protect your 
anonymity, TorBirdy will enforce the Thunderbird settings it has set, 
preventing them from being changed by you or by any add-on. There are some 
settings that can be changed and those are accessed through TorBirdy's 
preferences dialog. When TorBirdy is uninstalled or disabled, all settings that 
it changes are reset to their default values (the values prior to TorBirdy's 
install).\n\nIf you are a new user, it is recommended that you read through the 
TorBirdy website to understand what we are trying to accomplish with TorBirdy 
for our users.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit 60dd4dea7866362f9da35a9d6914a3b4d0e4a845
Author: Translation commit bot 
Date:   Thu Mar 17 05:16:28 2016 +

Update translations for tor-messenger-ircproperties
---
 zh_TW/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_TW/irc.properties b/zh_TW/irc.properties
index 82f0e8d..c22cdb1 100644
--- a/zh_TW/irc.properties
+++ b/zh_TW/irc.properties
@@ -174,7 +174,7 @@ 
error.sendMessageFailed=å³éæ¨çæå¾ä¸æ¢è¨æ¯æåºé¯ãè«å¨é£ç·
 error.channelForward=æ¨å¯è½æªå å¥ %1$Sï¼æåå·²èªåéå®åå° 
%2$Sã
 #%S is the mode that the user tried to set but was not recognized
 #by the server as a valid mode.
-error.unknownMode='%S' is not a valid user mode on this server.
+error.unknownMode='%S' éæ¬ä¼ºæå¨ä¸ææçä½¿ç¨èæ¨¡å¼
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-03-19 Thread translation

commit aa493ee719e0257f779120383712cdc085a2e415
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:30 2016 +

Update translations for abouttor-homepage
---
 hr_HR/aboutTor.dtd | 52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/hr_HR/aboutTor.dtd b/hr_HR/aboutTor.dtd
index 671710a..d44f164 100644
--- a/hr_HR/aboutTor.dtd
+++ b/hr_HR/aboutTor.dtd
@@ -4,46 +4,46 @@
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   -->
 
-
+
 
-
-
-
+
+
+
 
-
+
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 
-
+
 
 https://startpage.com/rth/search;>
 https://duckduckgo.com/html/;>
 https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=USsource=tor;>
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 https://www.torproject.org/download/download.html.en#warning;>
-
-
-
+
+
+
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
-
+
 https://www.torproject.org/getinvolved/volunteer.html.en;>
-
+
 https://www.torproject.org/donate/donate.html.en;>
 
-
-
+
+
 https://www.torproject.org/about/overview.html.en;>

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

[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2016-03-19 Thread translation

commit 6a96207781fd3587caf71754f0ef9e61509fbc31
Author: Translation commit bot 
Date:   Fri Mar 18 21:15:22 2016 +

Update translations for tails-persistence-setup
---
 ja/ja.po | 74 
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/ja/ja.po b/ja/ja.po
index 774d500..1539582 100644
--- a/ja/ja.po
+++ b/ja/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2015-12-16 17:55+0100\n"
-"PO-Revision-Date: 2015-12-19 16:45+\n"
+"POT-Creation-Date: 2016-01-25 17:34+0100\n"
+"PO-Revision-Date: 2016-03-18 20:54+\n"
 "Last-Translator: Tokumei Nanashi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -55,69 +55,69 @@ msgid "Pidgin profiles and OTR keyring"
 msgstr "Pidginã®ãããã¡ã¤ã«ã¨OTRãã¼ãã«ãã¼"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:88
+msgid "Icedove"
+msgstr "Icedove"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+msgid "Icedove profiles and locally stored email"
+msgstr 
"Icedoveã®ãããã¡ã¤ã«ã¨ãã¼ã«ã«ã«ä¿åãããé»åã¡ã¼ã«"
+
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
 msgstr "GNOMEãã¼ãã«ãã¼"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:90
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
 msgstr "GNOMEãã¼ãã«ãã¼ã«ãã£ã¦ä¿åãããç§å¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:98
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
 msgstr "ãããã¯ã¼ã¯æ¥ç¶"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:100
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
 msgid "Configuration of network devices and connections"
 msgstr "ãããã¯ã¼ã¯ããã¤ã¹ã¨æ¥ç¶ã®è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:108
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
 msgstr "ãã©ã¦ã¶ã®ããã¯ãã¼ã¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:110
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
 msgstr "Torãã©ã¦ã¶ã«ä¿åãããããã¯ãã¼ã¯"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:118
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
 msgstr "ããªã³ã¿ã¼"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:120
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
 msgstr "ããªã³ã¿ã¼ã®è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:128
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
 msgstr "Bitcoin ã¯ã©ã¤ã¢ã³ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:130
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
 msgstr "Electrum ã®Bitcoin ã¦ã©ã¬ããã¨è¨å®"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:138
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
 msgstr "APTããã±ã¼ã¸"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:140
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
 msgstr "APTããã¦ã³ãã¼ãããããã±ã¼ã¸"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:148
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"
 msgstr "APTãªã¹ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:150
+#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
 msgid "Lists downloaded by APT"
 msgstr "APTããã¦ã³ãã¼ããããªã¹ã"
 
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:158
-msgid "Icedove"
-msgstr "Icedove"
-
-#: ../lib/Tails/Persistence/Configuration/Presets.pm:160
-msgid "Icedove profiles and locally stored email"
-msgstr 
"Icedoveã®ãããã¡ã¤ã«ã¨ãã¼ã«ã«ã«ä¿åãããé»åã¡ã¼ã«"
-
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:168
 msgid "Dotfiles"
 msgstr "ããããã¡ã¤ã«"
@@ -131,67 +131,67 @@ msgstr 
"`ããããã¡ã¤ã«'ãã£ã¬ã¯ããªã§è¦ã¤ãã£ã$HOMEã®å
 msgid "Setup Tails persistent volume"
 msgstr "Talisã®æ°¸ç¶çããªã¥ã¼ã ãã»ããã¢ãã"
 
-#: ../lib/Tails/Persistence/Setup.pm:311 ../lib/Tails/Persistence/Setup.pm:458
+#: ../lib/Tails/Persistence/Setup.pm:312 ../lib/Tails/Persistence/Setup.pm:459
 msgid "Error"
 msgstr "ã¨ã©ã¼"
 
-#: ../lib/Tails/Persistence/Setup.pm:343
+#: ../lib/Tails/Persistence/Setup.pm:344
 #, perl-format
 msgid "Device %s already has a persistent volume."
 msgstr "ããã¤ã¹ %s ã«ã¯ãã§ã«æ°¸ç¶çããªã¥ã¼ã

[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2016-03-19 Thread translation

commit 68115a5ee5df4510bb3af27b8a335abb652c5a14
Author: Translation commit bot 
Date:   Fri Mar 18 08:46:09 2016 +

Update translations for tor-and-https
---
 hr.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hr.po b/hr.po
index 8446c65..e0cc440 100644
--- a/hr.po
+++ b/hr.po
@@ -1,13 +1,14 @@
 # 
 # Translators:
+# Igor , 2016
 # Vlado V. , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2015-04-28 15:33+\n"
-"Last-Translator: Vlado V. \n"
-"Language-Team: Croatian 
(http://www.transifex.com/projects/p/torproject/language/hr/)\n"
+"PO-Revision-Date: 2016-03-18 08:19+\n"
+"Last-Translator: Igor \n"
+"Language-Team: Croatian 
(http://www.transifex.com/otf/torproject/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,7 +21,7 @@ msgstr ""
 #. languages (e.g. Arabic or Hebrew).
 #: C/tor-and-https.svg:3
 msgid "ltr"
-msgstr ""
+msgstr "s lijeva nadesno"
 
 #. (itstool) path: svg/title
 #: C/tor-and-https.svg:14

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

[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2016-03-19 Thread translation

commit 980d65ece1f8c9bba1293fa14163f3d146b73b91
Author: Translation commit bot 
Date:   Fri Mar 18 20:46:56 2016 +

Update translations for tails-openpgp-applet_completed
---
 ja/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/openpgp-applet.pot b/ja/openpgp-applet.pot
index b98480f..b38d81e 100644
--- a/ja/openpgp-applet.pot
+++ b/ja/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2015-12-19 16:41+\n"
+"PO-Revision-Date: 2016-03-18 20:46+\n"
 "Last-Translator: Tokumei Nanashi\n"
 "Language-Team: Japanese 
(http://www.transifex.com/otf/torproject/language/ja/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-03-19 Thread translation

commit 6f25ba2b5bf681c27abb8cd94ee29d2df4f77a3b
Author: Translation commit bot 
Date:   Thu Mar 17 18:48:46 2016 +

Update translations for tails-openpgp-applet
---
 hr_HR/openpgp-applet.pot | 90 
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/hr_HR/openpgp-applet.pot b/hr_HR/openpgp-applet.pot
index 1696726..d5cc708 100644
--- a/hr_HR/openpgp-applet.pot
+++ b/hr_HR/openpgp-applet.pot
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-03-14 06:48+\n"
-"Last-Translator: Igor \n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,162 +20,162 @@ msgstr ""
 
 #: bin/openpgp-applet:163
 msgid "You are about to exit OpenPGP Applet. Are you sure?"
-msgstr "IzaÄi Äete iz OpenPGP aplikacije. Jeste li sigurni?"
+msgstr ""
 
 #: bin/openpgp-applet:175
 msgid "OpenPGP encryption applet"
-msgstr "OpenPGP aplikacija za enkripciju"
+msgstr ""
 
 #: bin/openpgp-applet:178
 msgid "Exit"
-msgstr "Izlaz"
+msgstr ""
 
 #: bin/openpgp-applet:180
 msgid "About"
-msgstr "O"
+msgstr ""
 
 #: bin/openpgp-applet:235
 msgid "Encrypt Clipboard with _Passphrase"
-msgstr "Enkriptiraj Clipboard s _Lozinkom"
+msgstr ""
 
 #: bin/openpgp-applet:238
 msgid "Sign/Encrypt Clipboard with Public _Keys"
-msgstr "PotpiÅ¡i/Å ifriraj Clipboard s Javnim_KljuÄevima"
+msgstr ""
 
 #: bin/openpgp-applet:243
 msgid "_Decrypt/Verify Clipboard"
-msgstr "_DeÅ¡ifriraj/Potvrdi Clipboard"
+msgstr ""
 
 #: bin/openpgp-applet:247
 msgid "_Manage Keys"
-msgstr "_Upravljaj kljuÄevima"
+msgstr ""
 
 #: bin/openpgp-applet:251
 msgid "_Open Text Editor"
-msgstr "_Otvori ureÄivaÄ teksta"
+msgstr ""
 
 #: bin/openpgp-applet:295
 msgid "The clipboard does not contain valid input data."
-msgstr "Clipboard ne sadrÅ¾i vaÅ¾eÄe ulazne podatke. "
+msgstr ""
 
 #: bin/openpgp-applet:347 bin/openpgp-applet:349 bin/openpgp-applet:351
 msgid "Unknown Trust"
-msgstr "Nepoznato Povjerenje"
+msgstr ""
 
 #: bin/openpgp-applet:353
 msgid "Marginal Trust"
-msgstr "Rubno Povjerenje"
+msgstr ""
 
 #: bin/openpgp-applet:355
 msgid "Full Trust"
-msgstr "Potpuno Povjerenje"
+msgstr ""
 
 #: bin/openpgp-applet:357
 msgid "Ultimate Trust"
-msgstr "Ultimativno Povjerenje"
+msgstr ""
 
 #: bin/openpgp-applet:410
 msgid "Name"
-msgstr "Ime"
+msgstr ""
 
 #: bin/openpgp-applet:411
 msgid "Key ID"
-msgstr "Identifikacija kljuÄa"
+msgstr ""
 
 #: bin/openpgp-applet:412
 msgid "Status"
-msgstr "Status"
+msgstr ""
 
 #: bin/openpgp-applet:444
 msgid "Fingerprint:"
-msgstr "Otisak prsta:"
+msgstr ""
 
 #: bin/openpgp-applet:447
 msgid "User ID:"
 msgid_plural "User IDs:"
-msgstr[0] "KorisniÄki ID:"
-msgstr[1] "KorisniÄki ID-evi:"
-msgstr[2] "KorisniÄki ID-evi:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: bin/openpgp-applet:476
 msgid "None (Don't sign)"
-msgstr "Nijedan (Ne potpisuj)"
+msgstr ""
 
 #: bin/openpgp-applet:539
 msgid "Select recipients:"
-msgstr "Izaberi primatelje:"
+msgstr ""
 
 #: bin/openpgp-applet:547
 msgid "Hide recipients"
-msgstr "Sakrij primatelje"
+msgstr ""
 
 #: bin/openpgp-applet:550
 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 "Sakrij identifikacije svih primatelja enkriptirane poruke. U suprotnom 
svatko tko vidi enkriptiranu poruku moÅ¾e vidjeti tko su primatelji."
+msgstr ""
 
 #: bin/openpgp-applet:556
 msgid "Sign message as:"
-msgstr "PotpiÅ¡i poruku kao:"
+msgstr ""
 
 #: bin/openpgp-applet:560
 msgid "Choose keys"
-msgstr "Izaberi kljuÄeve"
+msgstr ""
 
 #: bin/openpgp-applet:600
 msgid "Do you trust these keys?"
-msgstr "Vjerujete li ovim kljuÄevima?"
+msgstr ""
 
 #: bin/openpgp-applet:603
 msgid "The following selected key is not fully trusted:"
 msgid_plural "The following selected keys are not fully trusted:"
-msgstr[0] "SljedeÄem odabranom kljuÄu se ne vjeruje u potpunosti:"
-msgstr[1] "SljedeÄim odabranim kljuÄevima se ne vjeruje u potpunosti:"
-msgstr[2] "SljedeÄim odabranim kljuÄevima se ne vjeruje u potpunosti:"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: bin/openpgp-applet:621
 msgid "Do you trust this key enough to use it anyway?"
 msgid_plural "Do you trust these keys enough to use them anyway?"
-msgstr[0] "Vjerujete li ovom kljuÄu dovoljno da ga svejedno koristite?"
-msgstr[1] "Vjerujete li ovom kljuÄu da ga svejedno koristite?"
-msgstr[2] "Vjerujete li ovim kljuÄevima dovoljno da ih svejedno koristite?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #: bin/openpgp-applet:634
 msgid "No keys selected"
-msgstr "Nijedan kljuÄ nije izabran "
+msgstr ""

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

2016-03-19 Thread translation

commit e1962925f0766e4af5c53a7ecd49874fd4c58739
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:35 2016 +

Update translations for torbutton-brandproperties
---
 hr_HR/brand.properties | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/hr_HR/brand.properties b/hr_HR/brand.properties
index 5c282b2..732c157 100644
--- a/hr_HR/brand.properties
+++ b/hr_HR/brand.properties
@@ -2,15 +2,15 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor Preglednik
-brandShortName=Tor Preglednik
-brandFullName=Tor Preglednik
-vendorShortName=Tor Projekt
+brandShorterName=Tor Browser
+brandShortName=Tor Browser
+brandFullName=Tor Browser
+vendorShortName=Tor Project
 
-homePageSingleStartMain=Firefox Start, brza poÄetna stranica s ugraÄenim 
pretraÅ¾ivaÄem
-homePageImport=Uvedite svoju poÄetnu stranicu sa %S
+homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageImport=Import your home page from %S
 
-homePageMigrationPageTitle=Odabir PoÄetne Stranice
-homePageMigrationDescription=Molimo odaberite poÄetnu stranicu koju Å¾elite 
koristiti:
+homePageMigrationPageTitle=Home Page Selection
+homePageMigrationDescription=Please select the home page you wish to use:
 
-syncBrandShortName=Sinkronizacija
+syncBrandShortName=Sync

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

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2016-03-19 Thread translation

commit 7f86e703501d8e8113a050ce73ce68866eabe503
Author: Translation commit bot 
Date:   Thu Mar 17 22:16:42 2016 +

Update translations for tor-messenger-ircproperties_completed
---
 de/irc.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/de/irc.properties b/de/irc.properties
index ebf9d19..be936f0 100644
--- a/de/irc.properties
+++ b/de/irc.properties
@@ -172,6 +172,9 @@ error.sendMessageFailed=Beim Versenden Ihrer letzten 
Nachricht ist ein Fehler au
 #%1$S is the channel the user tried to join, %2$S is the channel
 #he was forwarded to.
 error.channelForward=Sie konnten %1$S nicht beitreten, und wurden automatisch 
weitergeleitet zu %2$S.
+#%S is the mode that the user tried to set but was not recognized
+#by the server as a valid mode.
+error.unknownMode='%S' ist kein gÃ¼ltiger Anwendermodus auf diesem Server.
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

___
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

2016-03-19 Thread translation

commit 51548925b40c9f8eefb857f8350c28afc556b658
Author: Translation commit bot 
Date:   Sat Mar 19 09:15:48 2016 +

Update translations for tails-misc_completed
---
 ko.po | 263 +++---
 1 file changed, 140 insertions(+), 123 deletions(-)

diff --git a/ko.po b/ko.po
index 61d7dc2..aa19d7a 100644
--- a/ko.po
+++ b/ko.po
@@ -4,32 +4,34 @@
 # 
 # Translators:
 # ilbe123 , 2014
+# Chris Park , 2016
 # Dr.what , 2014
 # ryush00 , 2014
+# sangmin lee , 2016
 # Sungjin Kang , 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-11 22:08+0100\n"
-"PO-Revision-Date: 2015-02-24 15:42+\n"
-"Last-Translator: Sungjin Kang \n"
-"Language-Team: Korean 
(http://www.transifex.com/projects/p/torproject/language/ko/)\n"
+"POT-Creation-Date: 2016-03-17 15:03+0100\n"
+"PO-Revision-Date: 2016-03-19 09:15+\n"
+"Last-Translator: Chris Park \n"
+"Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\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:39
 msgid "Tor is ready"
-msgstr "Tor ì¤ë¹ë¨"
+msgstr "Torê° ì¤ë¹ëììµëë¤."
 
-#: 
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:40
 msgid "You can now access the Internet."
-msgstr "ì¸í°ë· ì ì ê°ë¥"
+msgstr "ì´ì  ì¸í°ë·ì ì ìíì¤ì ììµëë¤."
 
-#: config/chroot_local-includes/etc/whisperback/config.py:64
+#: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
 msgid ""
 "Help us fix your bug!\n"
@@ -46,28 +48,30 @@ msgid ""
 "\n"
 msgstr "ì°ë¦¬ê° ë²ê·¸ë¥¼ ìì í  ì ìëë¡ ëìì£¼ì¸ì! 
\në²ê·¸ ë¦¬í¬í ì§ì¹¨ìë¥¼ 
ì°¸ì¡°íì¸ì.\níìí ê² ì´ìì ê°ì¸ì ë³´ë¥¼ 
í¬í¨íìì§ ë§ì¸ì!\nì°ë¦¬ê° ì´ë©ì¼ ì£¼ìë¥¼ 
ë°ë ì´ì \n\nì°ë¦¬ê° ì´ë©ì¼ ì£¼ìë¥¼ ë°ë ê²ì ë¬¸ì ë¥¼ 
ëªííê² íê¸° ìí´ ì°ë½ì í  ì ìê¸° ëë¬¸ìëë¤.\nì°ë¦¬ê° 
ë°ë ëë¶ë¶ì ë¦¬í¬íì ì°ë½ì² ì ë³´ê° íìí©ëë¤ë§, 
ê·¸ë°ê²ë¤ì ì¼ë¶ë ì°ë½ì² \nì ë³´ê° ìë ê²½ì°ê° ìê¸° 
ëë¬¸ìëë¤. ë¤ë¥¸ íí¸ì¼ë¡ë ë¹ì ì´ Tailsë¥¼ ì¬ì©íì¬ 
ì´ë©ì¼ì´ë \nì¸í°ë· ì ê³µìì²ë¼ ëì²ììëí íì¸í  ì 
ìë ê¸°íë¥¼ ì ê³µíê¸° ìí¨ìëë¤.\n<./p>\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: config/chroot_local-includes/usr/local/bin/electrum:17
 msgid "Persistence is disabled for Electrum"
 msgstr "ì§ìì±ì Electrumì ë¹íì±ìíµëë¤."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:19
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "Tailsë¥¼ ë¤ì ë¶íí ë, Electrumì ëª¨ë  ë°ì´í°ë ë¹í¸ 
ì½ì¸ ì§ê°ì í¬í¨íì¬ ìì´ì§ëë¤. ì§ìì± ê¸°ë¥ì´ íì±í 
ëì´ììë Electrumë§ ì¤ííë ê²ì ì¶ì²ëë¦½ëë¤."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
-msgid "Do you want to start Electrum any way?"
-msgstr "Electrumì ì´ë¤ ë°©ë²ì¼ë¡ ìì íìê² ìµëê¹?"
+#: config/chroot_local-includes/usr/local/bin/electrum:21
+msgid "Do you want to start Electrum anyway?"
+msgstr "ê·¸ëë Electrumì ì¤ííìê² ìµëê¹?"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:20
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:36
+#: config/chroot_local-includes/usr/local/bin/electrum:23
+#: config/chroot_local-includes/usr/local/bin/icedove:23
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41
 msgid "_Launch"
 msgstr "_Launch"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:21
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:37
+#: config/chroot_local-includes/usr/local/bin/electrum:24
+#: config/chroot_local-includes/usr/local/bin/icedove:24
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42
 msgid "_Exit"
 msgstr "_Exit"
 
@@ -99,135 +103,151 @@ msgstr "_Decrypt/Verify í´ë¦½ë³´ë"
 msgid "_Manage Keys"
 msgstr "_Manage í¤"
 
-#: config/chroot_local-includes/usr/local/bin/gpgApplet:244
+#: config/chroot_local-includes/usr/local/bin/gpgApplet:208

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

2016-03-19 Thread translation

commit eaeb4dc0fc3aba6abaf3685da40658971ac899ef
Author: Translation commit bot 
Date:   Sat Mar 19 09:15:42 2016 +

Update translations for tails-misc
---
 ko.po | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/ko.po b/ko.po
index 6004ec9..aa19d7a 100644
--- a/ko.po
+++ b/ko.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-24 21:38+0100\n"
-"PO-Revision-Date: 2016-03-03 16:50+\n"
+"POT-Creation-Date: 2016-03-17 15:03+0100\n"
+"PO-Revision-Date: 2016-03-19 09:15+\n"
 "Last-Translator: Chris Park \n"
 "Language-Team: Korean 
(http://www.transifex.com/otf/torproject/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
-msgstr "Tor ì¤ë¹ë¨"
+msgstr "Torê° ì¤ë¹ëììµëë¤."
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
-msgstr "ì¸í°ë· ì ì ê°ë¥"
+msgstr "ì´ì  ì¸í°ë·ì ì ìíì¤ì ììµëë¤."
 
 #: config/chroot_local-includes/etc/whisperback/config.py:65
 #, python-format
@@ -127,7 +127,7 @@ msgstr "ì ë¢° ìì¤ - ëì"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:313
 msgid "Ultimate Trust"
-msgstr "ì ë¢° ìì¤ - ì¡´ë ëì"
+msgstr "ì ë¢° ìì¤ - ë§¤ì° ëì"
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:366
 msgid "Name"
@@ -231,14 +231,14 @@ msgstr "GnuPGì ë¤ë¥¸ ìë¦¼"
 
 #: config/chroot_local-includes/usr/local/bin/icedove:19
 msgid "The Claws Mail persistence feature is activated."
-msgstr ""
+msgstr "Claws Mail ì ì§ìì± ê¸°ë¥ì´ íì±íëììµëë¤."
 
 #: config/chroot_local-includes/usr/local/bin/icedove:21
 msgid ""
 "If you have emails saved in Claws Mail, you should migrate"
 " your data before starting Icedove."
-msgstr ""
+msgstr "Claws Mailì ì´ë©ì¼ì´ ì ì¥ë ê²ì´ ìì¼ìë¤ë©´,  
 
ë°ì´í° ì´ëíê¸°ë¥¼  Icedove ì¤í ì ì íìì¼ 
í©ëë¤."
 
 #: 
config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-hel...@tails.boum.org/extension.js:71
 msgid "Restart"
@@ -324,7 +324,7 @@ msgstr "ë¤í¸ìí¬ ì¹´ë ${nic}ê° ìëª»ëììµëë¤"
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}) so it is 
temporarily disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
-msgstr ""
+msgstr "ë¤í¸ìí¬ ì¹´ë ${nic_name} (${nic}) ì MAC ì¤í¸íì´ 
ì¤í¨í´ì ì¼ìì ì¼ë¡ ë¹íì±í ëììµëë¤.\nTailsë¥¼ ë¤ì 
í¤ê³  MAC ìì¥ì ë¹íì±ííì¤ ì ììµëë¤."
 
 #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:62
 msgid "All networking disabled"
@@ -335,7 +335,7 @@ msgstr "ëª¨ë  ë¤í¸ìí¬ ì°ê²°ì´ ë¶ê°ë¥í¨"
 msgid ""
 "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery 
also failed so all networking is disabled.\n"
 "You might prefer to restart Tails and disable MAC spoofing."
-msgstr ""
+msgstr "ë¤í¸ìí¬ ì¹´ë ${nic_name} (${nic}) ì MAC ì¤í¸íì´ 
ì¤í¨íìµëë¤. ì¤ë¥ë³µêµ¬ë ì¤í¨íê¸° ëë¬¸ì ëª¨ë  
ë¤í¸ìí¹ì´ ë¹íì±í ëììµëë¤.\nTailsë¥¼ ë¤ì í¤ê³  MAC 
ìì¥ì ë¹íì±ííì¤ ì ììµëë¤."
 
 #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:24
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27
@@ -411,7 +411,7 @@ msgid ""
 "Network activity within the Unsafe Browser is not anonymous.\\nOnly "
 "use the Unsafe Browser if necessary, for example\\nif you have to login or "
 "register to activate your Internet connection."
-msgstr ""
+msgstr "ìì íì§ ìì ë¸ë¼ì°ì ¸ë¡ íë ë¤í¸ìí¬ ì°ê²°ì 
ìµëªì ë³´ì¥í  ì ììµëë¤. \\nì ë§ íìí ê²½ì°ìë§ 
ì¬ì©íì¸ì. ìë¥¼ ë¤ì´ \\n ì¸í°ë· ì°ê²°ì ìí´ 
ë¡ê·¸ì¸íê±°ë ë±ë¡í  íìê° ìë ê²½ì°ìë§ ì¬ì©íì¸ì"
 
 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:52
 msgid "Starting the Unsafe Browser..."
@@ -497,7 +497,7 @@ msgid ""
 "Eepsite tunnel not built within six minutes. Check the router console in the"
 " I2P Browser or the logs in /var/log/i2p for more information. Reconnect to "
 "the network to try again."
-msgstr ""
+msgstr "Eepsite í°ëì´ 6ë¶ ë´ì ìì±ëì§ ìììµëë¤. ë¼ì°í° 
ì½ìì I2P ë¸ë¼ì°ì ë  /var/log/i2pì ìë ë¡ê·¸ íì¼ìì 
íì¸íììì¤.\në¤ì ì°ê²°íê¸°ë¡ ì¬ìëí  ì ììµëë¤."
 
 #: config/chroot_local-includes/usr/local/sbin/tails-i2p:71
 msgid "I2P is ready"

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-03-19 Thread translation

commit f9aba155bc6b6a40256e53f68b3e7c04e948d14a
Author: Translation commit bot 
Date:   Thu Mar 17 22:16:38 2016 +

Update translations for tor-messenger-ircproperties
---
 de/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de/irc.properties b/de/irc.properties
index 9318e41..be936f0 100644
--- a/de/irc.properties
+++ b/de/irc.properties
@@ -174,7 +174,7 @@ error.sendMessageFailed=Beim Versenden Ihrer letzten 
Nachricht ist ein Fehler au
 error.channelForward=Sie konnten %1$S nicht beitreten, und wurden automatisch 
weitergeleitet zu %2$S.
 #%S is the mode that the user tried to set but was not recognized
 #by the server as a valid mode.
-error.unknownMode='%S' is not a valid user mode on this server.
+error.unknownMode='%S' ist kein gÃ¼ltiger Anwendermodus auf diesem Server.
 
 # LOCALIZATION NOTE (tooltip.*):
 #These are the descriptions given in a tooltip with information received

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

[tor-commits] [metrics-web/master] Ignore votes in most of the modules.

2016-03-19 Thread karsten

commit afd9ccb9212389d7a785d60586bdd35c2185366d
Author: Karsten Loesing 
Date:   Thu Mar 17 20:58:38 2016 +0100

Ignore votes in most of the modules.
---
 .../src/org/torproject/metrics/clients/Main.java   |  8 ++--
 modules/legacy/build.xml   |  2 +-
 modules/legacy/config.template |  6 --
 .../org/torproject/ernie/cron/Configuration.java   | 19 +++
 .../legacy/src/org/torproject/ernie/cron/Main.java |  2 +-
 .../cron/RelayDescriptorDatabaseImporter.java  | 22 ++
 6 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/modules/clients/src/org/torproject/metrics/clients/Main.java 
b/modules/clients/src/org/torproject/metrics/clients/Main.java
index 430cb1e..fcd18a3 100644
--- a/modules/clients/src/org/torproject/metrics/clients/Main.java
+++ b/modules/clients/src/org/torproject/metrics/clients/Main.java
@@ -62,9 +62,13 @@ public class Main {
 descriptorReader.setExcludeFiles(new File(
 "status/relay-descriptors"));
 descriptorReader.addDirectory(new File(
-"../../shared/in/recent/relay-descriptors"));
+"../../shared/in/recent/relay-descriptors/consensuses"));
 descriptorReader.addDirectory(new File(
-"../../shared/in/archive/relay-descriptors"));
+"../../shared/in/recent/relay-descriptors/extra-infos"));
+descriptorReader.addDirectory(new File(
+"../../shared/in/archive/relay-descriptors/consensuses"));
+descriptorReader.addDirectory(new File(
+"../../shared/in/archive/relay-descriptors/extra-infos"));
 Iterator descriptorFiles =
 descriptorReader.readDescriptors();
 while (descriptorFiles.hasNext()) {
diff --git a/modules/legacy/build.xml b/modules/legacy/build.xml
index b0dc32b..3ecf147 100644
--- a/modules/legacy/build.xml
+++ b/modules/legacy/build.xml
@@ -46,7 +46,7 @@
   
   
 
   
 
diff --git a/modules/legacy/config.template b/modules/legacy/config.template
index ce779d9..743fe1e 100644
--- a/modules/legacy/config.template
+++ b/modules/legacy/config.template
@@ -1,8 +1,10 @@
 ## Import directory archives from disk, if available
 #ImportDirectoryArchives 0
 #
-## Relative path to directory to import directory archives from
-#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/
+## Relative paths to directories to import directory archives from
+#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/consensuses/
+#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/server-descriptors/
+#DirectoryArchivesDirectory 
/srv/metrics.torproject.org/metrics/shared/in/recent/relay-descriptors/extra-infos/
 #
 ## Keep a history of imported directory archive files to know which files
 ## have been imported before. This history can be useful when importing
diff --git a/modules/legacy/src/org/torproject/ernie/cron/Configuration.java 
b/modules/legacy/src/org/torproject/ernie/cron/Configuration.java
index 878e882..86d5d10 100644
--- a/modules/legacy/src/org/torproject/ernie/cron/Configuration.java
+++ b/modules/legacy/src/org/torproject/ernie/cron/Configuration.java
@@ -7,6 +7,9 @@ import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -17,7 +20,8 @@ import java.util.logging.Logger;
  */
 public class Configuration {
   private boolean importDirectoryArchives = false;
-  private String directoryArchivesDirectory = "in/relay-descriptors/";
+  private List directoryArchivesDirectories =
+  new ArrayList();
   private boolean keepDirectoryArchiveImportHistory = false;
   private boolean importSanitizedBridges = false;
   private String sanitizedBridgesDirectory = "in/bridge-descriptors/";
@@ -55,7 +59,7 @@ public class Configuration {
   this.importDirectoryArchives = Integer.parseInt(
   line.split(" ")[1]) != 0;
 } else if (line.startsWith("DirectoryArchivesDirectory")) {
-  this.directoryArchivesDirectory = line.split(" ")[1];
+  this.directoryArchivesDirectories.add(line.split(" ")[1]);
 } else if (line.startsWith("KeepDirectoryArchiveImportHistory")) {
   this.keepDirectoryArchiveImportHistory = Integer.parseInt(
   line.split(" ")[1]) != 0;
@@ -117,8 +121,15 @@ public class Configuration {
   public boolean getImportDirectoryArchives() {
 return this.importDirectoryArchives;
   }
-  public String getDirectoryArchivesDirectory() {
-return this.directoryArchivesDirectory;
+  public List getDirectoryArchivesDirectories() {
+if (this.directoryArchivesDirectories.isEmpty()) {
+  String prefix = "../../shared/in/recent/relay-descriptors/";
+

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

2016-03-19 Thread translation

commit c2676d3f68e750f0640cc21ac8bfd0f0d67dd3ec
Author: Translation commit bot 
Date:   Fri Mar 18 09:15:49 2016 +

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

diff --git a/hr/torbutton.properties b/hr/torbutton.properties
index d303488..750e733 100644
--- a/hr/torbutton.properties
+++ b/hr/torbutton.properties
@@ -62,7 +62,7 @@ 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.
 
 # 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?
+canvas.siteprompt=Ova stranica (%S) je pokuÅ¡ala izvuÄi podatke HTML5 slike, 
koji mogu biti koriÅ¡teni kako bi se unikatno identificiralo VaÅ¡e 
raÄunalo.\n\nTreba li Tor Browser dopustiti ovoj stranici izvlaÄenje podataka 
HTML5 slike?
 canvas.notNow=Ne sada
 canvas.notNowAccessKey=N
 canvas.allow=Dozvoli ubuduce

___
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

2016-03-19 Thread translation

commit ad9072abe0f0820ea26bc34d3081c4f33d2866d6
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:46 2016 +

Update translations for torbutton-torbuttonproperties
---
 hr_HR/torbutton.properties | 132 ++---
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/hr_HR/torbutton.properties b/hr_HR/torbutton.properties
index 5d40a0d..2defd9b 100644
--- a/hr_HR/torbutton.properties
+++ b/hr_HR/torbutton.properties
@@ -1,78 +1,78 @@
-torbutton.button.tooltip.disabled = OmoguÄi Tor
-torbutton.button.tooltip.enabled = OnemoguÄi Tor
+torbutton.button.tooltip.disabled = Enable Tor
+torbutton.button.tooltip.enabled = Disable Tor
 torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = Nepoznat IP
-torbutton.circuit_display.onion_site = Onion stranica
-torbutton.circuit_display.this_browser = Ovaj preglednik
-torbutton.circuit_display.relay = relej
-torbutton.circuit_display.tor_bridge = Most
-torbutton.circuit_display.unknown_country = Nepoznata drÅ¾ava
-torbutton.content_sizer.margin_tooltip = Tor Preglednik dodaje ovu marginu 
kako bi uÄinio Å¡irinu i visinu VaÅ¡eg prozora manje uoÄljivom, te time 
smanjio moguÄnost da Vas ljudi prate online.
-torbutton.panel.tooltip.disabled = Klikni za omoguÄenje Tora
-torbutton.panel.tooltip.enabled = Klikni za onemoguÄenje Tora
-torbutton.panel.plugins.disabled = Klik za omoguÄenje prikljuÄaka
-torbutton.panel.plugins.enabled = Klik za onemoguÄenje prikljuÄaka
-torbutton.panel.label.disabled = Tor OnemoguÄen
-torbutton.panel.label.enabled = Tor OmoguÄen
-extensions.torbut...@torproject.org.description = Torbutton omoguÄuje gumb za 
konfiguraciju postavki Tor-a i brzo i lako brisanje privatnih podataka o 
pregledavanju.
-torbutton.popup.history.warning = Torgumb je blokirao aktivnost iz kartice 
koja je uÄitana u drugom Tor stanju.\n\nOvo je zato da bi obiÅ¡li greÅ¡ke 
409737 i 417869 Firefox-a.\n\nAko Vam se Äini da se ovo dogodilo bez razloga, 
jedna od VaÅ¡ih kartica se pokuÅ¡ava ponovno uÄitati u pozadini, i to je 
blokirano.\n\nDa bi ponovno uÄitali karticu u ovom Tor stanju, stisnite 
'enter' u adresnoj traci.\n
-torbutton.popup.plugin.warning = Torbutton je blokirao izravno uÄitavanje 
sadrÅ¾aja prikljuÄka.\n\nKoristite Spremi Kao.\n\n
-torbutton.popup.confirm_ca_certs = Torbutton obavijest: Izgleda kao da nemate 
modificiranih Autoriteta za izdavanje Certifikata. Pregledavanje liste 
Autoriteta za izdavanje Certifikata je spora operacija i usporava Tor promjenu. 
Å½elite li izolaciju certifikata Autoriteta za izdavanje Certifikata? (Ako ne 
razumijete ovo, sigurno je stisnuti OK)
-torbutton.popup.ff3.warning = Upozorenje!\n\nZnano je da Torbutton na Firefox 
3 moÅ¾e procuriti VaÅ¡u vremensku zonu i Å¾ive oznake preko Tor-a.\n\nÅ½elite 
li svejedno nastaviti?
-torbutton.popup.toggle.warning = Morate promjeniti stanje Tor-a ili ga ponovno 
pokrenuti da bi VaÅ¡e promjene imale uÄinka.
-torbutton.popup.test.success = Provjera Tor proxy-a uspjeÅ¡na!
-torbutton.popup.test.failure = Provjera Tor proxy-a NIJE USPJELA! Provjerite 
svoje proxy i Polipo postavke.
-torbutton.popup.test.confirm_toggle = Zadnji Tor proxy test nije uspio 
koristiti Tor.\n\nJeste li sigurni da svejedno Å¾elite osposobiti?\n\nNapomena: 
Ukoliko ste rijeÅ¡ili problem, moÅ¾ete ponovno pokrenuti test u prozoru 
Postavke Torgumb Proxy-a da bi eliminirali ovo upozorenje.
-torbutton.popup.test.ff3_notice = Stisnite OK da bi testirali postavke Tor 
proxya. Ovaj test Äe se dogoditi u pozadini. Molim Vas da budete strpljivi.
-torbutton.panel.label.verified = Tor verificiran
-torbutton.popup.test.auto_failed = Automatska provjera Tor proxy-a nije 
uspjela koristit Tor.\n\nJeste li sigurni da svejedno Å¾elite osposobiti?
-torbutton.prefs.recommended = (preporuÄeno)
-torbutton.prefs.optional = (opcionalno)
-torbutton.prefs.crucial = (vaÅ¾no)
-torbutton.popup.external.title = Preuzeti vanjsku vrstu datoteke?
-torbutton.popup.external.app = Tor preglednik ne moÅ¾e prikazati ovu datoteku. 
Morate ju otvoriti s drugom aplikacijom.\n\n
-torbutton.popup.external.note = Neke vrste datoteka mogu prouzroÄiti spajanje 
aplikacija na Internet bez koriÅ¡tenja Tor-a.\n\n
-torbutton.popup.external.suggest = Da bi bili sigurni, trebali bi otvoriti 
preuzete datoteke samo dok ste offline, ili koristite Å½ivi Tor CD kao Å¡to je 
Tails.\n
-torbutton.popup.launch = Preuzmi datoteku
-torbutton.popup.cancel = Odustani
-torbutton.popup.dontask = Automatski preuzimaj datoteke od sad nadalje
-torbutton.popup.test.no_http_proxy = Test Tor proxy-a: Lokalni HTTP Proxy je 
nedostupan. Radi li Polipo ispravno?
-torbutton.popup.captcha.title = Izbjegavaj Google Captcha?
-torbutton.popup.captcha.ask = Torgumb je otkrio Google Captcha. Å½elite li 
biti preusmjereni na drugu traÅ¾ilicu za ovaj upit?
-torbutton.popup.captcha.always = Uvjek provodi ovu radnju od sad nadalje
-torbutton.popup.redirect =

[tor-commits] [snowflake/master] better checks on receiveOffer (#11)

2016-03-19 Thread arlo

commit 490b8b33b78e318267088d79e362a44d88cc8228
Author: Serene Han 
Date:   Tue Mar 15 20:13:39 2016 -0700

better checks on receiveOffer (#11)
---
 proxy/proxypair.coffee   |  4 +++-
 proxy/snowflake.coffee   | 35 +++
 proxy/spec/snowflake.spec.coffee | 16 
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/proxy/proxypair.coffee b/proxy/proxypair.coffee
index 3a3fb01..3ed6c6c 100644
--- a/proxy/proxypair.coffee
+++ b/proxy/proxypair.coffee
@@ -51,7 +51,9 @@ class ProxyPair
   @client = channel
 
   receiveWebRTCOffer: (offer) ->
-console.assert 'offer' == offer.type
+if 'offer' != offer.type
+  log 'Invalid SDP received -- was not an offer.'
+  return false
 try
   err = @pc.setRemoteDescription offer
 catch e
diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index 7cc01c9..4f38029 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -50,12 +50,11 @@ CONFIRMATION_MESSAGE = "You're currently serving a Tor user 
via Snowflake."
 # Minimum viable snowflake for now - just 1 client.
 class Snowflake
 
-  relayAddr: null
+  relayAddr:  null
   proxyPairs: []
-
-  rateLimit: null
-  state: MODE.INIT
-  retries: 0
+  rateLimit:  null
+  state:  MODE.INIT
+  retries:0
 
   constructor: (@broker, @ui) ->
 rateLimitBytes = undefined
@@ -108,16 +107,8 @@ class Snowflake
 log 'No more available ProxyPair slots.'
 countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000)
 return
-  log 'Polling for ' + pair.id
   recv = @broker.getClientOffer pair.id
-  recv.then (desc) =>
-offer = JSON.parse desc
-dbg 'Received:\n\n' + offer.sdp + '\n'
-console.log desc
-sdp = new RTCSessionDescription offer
-# @receiveOffer offer
-if pair.receiveWebRTCOffer sdp
-  @sendAnswer pair if 'offer' == sdp.type
+  recv.then (desc) => @receiveOffer pair, desc
   , (err) ->
 countdown(err, DEFAULT_BROKER_POLL_INTERVAL / 1000)
   @retries++
@@ -129,12 +120,16 @@ class Snowflake
 return @proxyPairs.find (pp, i, arr) -> return !pp.active
 
   # Receive an SDP offer from some client assigned by the Broker,
-  # TODO: remove
-  receiveOffer: (desc) =>
-sdp = new RTCSessionDescription desc
-pair = @nextAvailableProxyPair()
-if pair.receiveWebRTCOffer sdp
-  @sendAnswer pair if 'offer' == sdp.type
+  # |pair| - an available ProxyPair.
+  receiveOffer: (pair, desc) =>
+console.assert !pair.active
+try
+  offer = JSON.parse desc
+  dbg 'Received:\n\n' + offer.sdp + '\n'
+  sdp = new RTCSessionDescription offer
+  @sendAnswer pair if pair.receiveWebRTCOffer sdp
+catch e
+  log 'ERROR: Unable to receive Offer: ' + e
 
   sendAnswer: (pair) ->
 next = (sdp) ->
diff --git a/proxy/spec/snowflake.spec.coffee b/proxy/spec/snowflake.spec.coffee
index ca7661b..417b6e6 100644
--- a/proxy/spec/snowflake.spec.coffee
+++ b/proxy/spec/snowflake.spec.coffee
@@ -47,14 +47,22 @@ describe 'Snowflake', ->
 expect(s.retries).toBe 1
 expect(s.broker.getClientOffer).toHaveBeenCalled()
 
-  it 'receives SDP offer', ->
+  it 'receives SDP offer and sends answer', ->
 s = new Snowflake(new FakeBroker(), fakeUI)
-s.proxyPairs[0] = { receiveWebRTCOffer: -> }
-spyOn(s.proxyPairs[0], 'receiveWebRTCOffer').and.returnValue true
+pair = { receiveWebRTCOffer: -> }
+spyOn(pair, 'receiveWebRTCOffer').and.returnValue true
 spyOn(s, 'sendAnswer')
-s.receiveOffer { 'type': 'offer', 'sdp': 'foo' }
+s.receiveOffer pair, '{"type":"offer","sdp":"foo"}'
 expect(s.sendAnswer).toHaveBeenCalled()
 
+  it 'does not send answer when receiving invalid offer', ->
+s = new Snowflake(new FakeBroker(), fakeUI)
+pair = { receiveWebRTCOffer: -> }
+spyOn(pair, 'receiveWebRTCOffer').and.returnValue false
+spyOn(s, 'sendAnswer')
+s.receiveOffer pair, '{"type":"not a good offer","sdp":"foo"}'
+expect(s.sendAnswer).not.toHaveBeenCalled()
+
   it 'can make a proxypair', ->
 s = new Snowflake(new FakeBroker(), fakeUI)
 s.makeProxyPair()



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

[tor-commits] [snowflake/master] Close connections before unloading

2016-03-19 Thread arlo

commit cf1b0a49f13f2550cad1b32ef4e4820b4c26bcf1
Author: Arlo Breault 
Date:   Fri Mar 18 14:22:34 2016 -0700

Close connections before unloading

 Noticed a long delay after the window closed before the datachannel
 timed out.

 2016/03/18 13:53:16 Traffic Bytes (in|out): 202576 | 8087
 2016/03/18 13:58:10 WebRTC: DataChannel.OnClose [remotely]
---
 proxy/snowflake.coffee | 4 
 1 file changed, 4 insertions(+)

diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee
index eff96de..7e26481 100644
--- a/proxy/snowflake.coffee
+++ b/proxy/snowflake.coffee
@@ -226,4 +226,8 @@ window.onbeforeunload = ->
 return CONFIRMATION_MESSAGE
   null
 
+window.onunload = ->
+  pair.close() for pair in snowflake.proxyPairs
+  null
+
 window.onload = init if window

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

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

2016-03-19 Thread translation

commit a697a5cba154d6174ec20e730445f4ca070aab37
Author: Translation commit bot 
Date:   Thu Mar 17 18:45:10 2016 +

Update translations for gettor
---
 hr_HR/gettor.po | 150 
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/hr_HR/gettor.po b/hr_HR/gettor.po
index 3ef59cb..13bf4e2 100644
--- a/hr_HR/gettor.po
+++ b/hr_HR/gettor.po
@@ -5,15 +5,15 @@
 # Translators:
 # Ana B, 2013
 # cisterna, 2013
-# skiddiep , 2015
+# Igor , 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-01-19 13:40+0100\n"
-"PO-Revision-Date: 2015-02-06 14:17+\n"
-"Last-Translator: skiddiep \n"
-"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/projects/p/torproject/language/hr_HR/)\n"
+"PO-Revision-Date: 2016-03-17 18:19+\n"
+"Last-Translator: erinm\n"
+"Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,38 +22,38 @@ msgstr ""
 
 #: lib/gettor/i18n.py:27
 msgid "Hello, This is the \"GetTor\" robot."
-msgstr "Pozdrav, ovo je \"DobijTor\" robot."
+msgstr ""
 
 #: lib/gettor/i18n.py:29
 msgid "Thank you for your request."
-msgstr "Hvala Vam na zahtjevu."
+msgstr ""
 
 #: lib/gettor/i18n.py:31
 msgid ""
 "Unfortunately, we won't answer you at this address. You should make\n"
 "an account with GMAIL.COM, YAHOO.COM or YAHOO.CN and send the mail from\n"
 "one of those."
-msgstr "NaÅ¾alost, neÄemo Vam odgovoriti na ovoj adresi. Trebali biste 
napraviti\nraÄun s GMAIL.COM, YAHOO.COM ili YAHOO.CN i poslati nam mail 
s\njednog od njih."
+msgstr ""
 
 #: lib/gettor/i18n.py:35
 msgid ""
 "We only process requests from email services that support \"DKIM\",\n"
 "which is an email feature that lets us verify that the address in the\n"
 "\"From\" line is actually the one who sent the mail."
-msgstr "ObraÄujemo zahtjeve poslane iskljuÄivo putem usluga e-poÅ¡te koje 
podrÅ¾avaju \"DKIM\", Å¡to je znaÄajka e-poÅ¡te koja nam omoguÄuje da 
potvrdimo da je adresa u \"Od\" polju zaista ona s koje je email poslan."
+msgstr ""
 
 #: lib/gettor/i18n.py:39
 msgid ""
 "(We apologize if you didn't ask for this mail. Since your email is from\n"
 "a service that doesn't use DKIM, we're sending a short explanation,\n"
 "and then we'll ignore this email address for the next day or so.)"
-msgstr "(IspriÄavamo se ako niste zatraÅ¾ili ovaj email. S obzirom da je 
email poslan s usluge koja ne koristi DKIM, Å¡aljemo kratko objaÅ¡njenje, a 
zatim Äemo ignorirati ovu adresu e-poÅ¡te otprilike jedan dan.)"
+msgstr ""
 
 #: lib/gettor/i18n.py:43 lib/gettor/i18n.py:135
 msgid ""
 "If you have any questions or it doesn't work, you can contact a\n"
 "human at this support email address: h...@rt.torproject.org"
-msgstr "Ako imate nekih pitanja ili ako ne radi, moÅ¾ete 
kontaktirati\nÄovjeka na email adresi za podrÅ¡ku: h...@rt.torproject.org"
+msgstr ""
 
 #: lib/gettor/i18n.py:46
 msgid ""
@@ -71,19 +71,19 @@ msgid ""
 "obfs-linux-i386\n"
 "obfs-linux-x86_64\n"
 "source"
-msgstr "Poslat Äemo Vam Tor paket, no morate naznaÄiti koji Å¾elite.\nMolimo 
odaberite jedno od navedenih imena 
paketa:\n\nwindows\nmacos-i386\nmacos-ppc\nlinux-i386\nlinux-x86_64\nobfs-windows\nobfs-macos-i386\nobfs-macos-x86_64\nobfs-linux-i386\nobfs-linux-x86_64\nsource"
+msgstr ""
 
 #: lib/gettor/i18n.py:61
 msgid ""
 "Please reply to this mail, and tell me a single package name anywhere \n"
 "in the body of your email."
-msgstr "Molim Vas da odgovorite na ovaj mail, i navedete jedno ime paketa bilo 
gdje\nu sadrÅ¾aju VaÅ¡eg emaila."
+msgstr ""
 
 #: lib/gettor/i18n.py:64
 msgid ""
 "OBTAINING LOCALIZED VERSIONS OF TOR\n"
 "==="
-msgstr "DOBAVLJAM LOKALIZIRANE VERZIJE 
TOR-a\n=="
+msgstr ""
 
 #: lib/gettor/i18n.py:67
 msgid ""
@@ -91,22 +91,22 @@ msgid ""
 "language you want in the address you send the mail to:\n"
 "\n"
 "gettor...@torproject.org"
-msgstr "Da biste dobili verziju Tor-a prevedenu na VaÅ¡ jezik, naznaÄite 
koji\njezik Å¾elite u adresi na koju Å¡aljete mail:\n\ngettor...@torproject.org"
+msgstr ""
 
 #: lib/gettor/i18n.py:72
 msgid ""
 "This example will give you the requested package in a localized\n"
 "version for Farsi (Persian). Check below for a list of supported language\n"
 "codes. "
-msgstr "Ovaj primjer Äe Vam dati traÅ¾eni paket u lokaliziranoj\nverziji za 
Farsi (perzijski). U nastavku provjerite listu podrÅ¾anih jeziÄnih\nkodova."
+msgstr ""
 
 #: lib/gettor/i18n.py:76
 msgid " List of supported locales:"
-msgstr "Popis podrÅ¾anih lokalizacija:"
+msgstr ""
 
 #: lib/gettor/i18n.py:78
 msgid "Here is a list of all available languages:"
-msgstr "Ovdje je popis svih

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

2016-03-19 Thread translation

commit e7bca55ef88b3e434ad299d980cf1d36bf667f43
Author: Translation commit bot 
Date:   Thu Mar 17 10:46:08 2016 +

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

diff --git a/ru/abouttor.properties b/ru/abouttor.properties
index 6795b7c..07d591c 100644
--- a/ru/abouttor.properties
+++ b/ru/abouttor.properties
@@ -2,7 +2,7 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=ÐÑÐ¸ÑÐµ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ ÑÐ¾ Startpage.
+aboutTor.searchSP.privacy=ÐÑÐ¸ÑÐµ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ Ð½Ð° Ð¡ÑÐ°ÑÑÐ¾Ð²Ð¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÐµ.
 # 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.

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-03-19 Thread translation

commit 601c0feca8a61f478372591afe52d15d0766a564
Author: Translation commit bot 
Date:   Thu Mar 17 18:46:18 2016 +

Update translations for tor-launcher-network-settings
---
 hr_HR/network-settings.dtd | 112 ++---
 1 file changed, 55 insertions(+), 57 deletions(-)

diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd
index 038a4ac..75ece3b 100644
--- a/hr_HR/network-settings.dtd
+++ b/hr_HR/network-settings.dtd
@@ -1,77 +1,75 @@
-
+
 
 
-
-
+
+
 
 
 
-
+
 
-
-
+
+
 
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 
-
-
+
+
 
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 
 
 
-
-
-
+
+
+
 
-
-
+
+
 
-
+
 
-
-
-
-
+
+
+
+
 
-
-
+
+
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
-
-
-
-
-
-https://bridges.torproject.org;>
-
-
-https://www.riseup.net, 
https://mail.google.com, ili https://mail.yahoo.com;>
-
-
+
+
+
+
+
+https://bridges.torproject.org;>
+
+
+https://www.riseup.net, 
https://mail.google.com, or https://mail.yahoo.com;>
+
+

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

[tor-commits] [translation/tor-messenger-contactsproperties] Update translations for tor-messenger-contactsproperties

2016-03-19 Thread translation

commit 3707810f78af88730ac1e2611a7c307c424b5567
Author: Translation commit bot 
Date:   Fri Mar 18 21:16:41 2016 +

Update translations for tor-messenger-contactsproperties
---
 ja/contacts.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ja/contacts.properties b/ja/contacts.properties
index 33af79c..37fdff2 100644
--- a/ja/contacts.properties
+++ b/ja/contacts.properties
@@ -5,4 +5,4 @@
 # LOCALIZATION NOTE (defaultGroup):
 # This is the name of the group that will automatically be created when adding 
a
 # buddy without specifying a group.
-defaultGroup=Contacts
+defaultGroup=é£çµ¡å

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

1 2 >

1 - 100 of 116 matches

Mail list logo