date:20160714

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

2016-07-14 Thread translation

commit 5967360ee9a6c24604d2b1c72ba682988bf4a96a
Author: Translation commit bot 
Date:   Thu Jul 14 21:18:22 2016 +

Update translations for tor-messenger-prefsdtd
---
 sk_SK/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/prefs.dtd b/sk_SK/prefs.dtd
index 3b39e59..822a186 100644
--- a/sk_SK/prefs.dtd
+++ b/sk_SK/prefs.dtd
@@ -5,7 +5,7 @@
 
 
 
-
+
 
 
 

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

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

2016-07-14 Thread translation

commit 37e7ace8a19caadb3e2ae8e5842ead483d38919b
Author: Translation commit bot 
Date:   Thu Jul 14 21:17:59 2016 +

Update translations for tor-messenger-imtooltipproperties
---
 sk_SK/imtooltip.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sk_SK/imtooltip.properties b/sk_SK/imtooltip.properties
index 0dd51fe..06a689c 100644
--- a/sk_SK/imtooltip.properties
+++ b/sk_SK/imtooltip.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/.
 
-buddy.username=Username
-buddy.account=Account
-contact.tags=Tags
+buddy.username=PouÅ¾ÃvateÄ¾skÃ© meno
+buddy.account=ÃÄet
+contact.tags=Tagy

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

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

2016-07-14 Thread translation

commit 92586f80840b188e3d9c4a982ece98e69c6bf7ed
Author: Translation commit bot 
Date:   Thu Jul 14 21:18:02 2016 +

Update translations for tor-messenger-imtooltipproperties_completed
---
 sk_SK/imtooltip.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sk_SK/imtooltip.properties b/sk_SK/imtooltip.properties
new file mode 100644
index 000..06a689c
--- /dev/null
+++ b/sk_SK/imtooltip.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+buddy.username=PouÅ¾ÃvateÄ¾skÃ© meno
+buddy.account=ÃÄet
+contact.tags=Tagy

___
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-07-14 Thread translation

commit e6fdf9af97e7a13d5d896ae7e74ea562bc1b634e
Author: Translation commit bot 
Date:   Thu Jul 14 21:18:06 2016 +

Update translations for tor-messenger-ircproperties
---
 sk_SK/irc.properties | 36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/sk_SK/irc.properties b/sk_SK/irc.properties
index 6219de3..610ad24 100644
--- a/sk_SK/irc.properties
+++ b/sk_SK/irc.properties
@@ -6,49 +6,49 @@
 #  This is displayed inside the accountUsernameInfoWithDescription
 #  string defined in imAccounts.properties when the user is
 #  configuring an IRC account.
-irc.usernameHint=nick
+irc.usernameHint=PrezÃ½vka
 
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
-connection.error.lost=Lost connection with server
-connection.error.timeOut=Connection timed out
-connection.error.invalidUsername=%S is not an allowed username
-connection.error.invalidPassword=Invalid server password
-connection.error.passwordRequired=Password required
+connection.error.lost=Spojenie so serverom bolo preruÅ¡enÃ©
+connection.error.timeOut=Spojenie vyprÅ¡alo
+connection.error.invalidUsername=%S nie je povolenÃ© pouÅ¾ÃvateÄ¾skÃ© meno
+connection.error.invalidPassword=NeplatnÃ© heslo k serveru
+connection.error.passwordRequired=PoÅ¾adovanÃ© heslo
 
 # LOCALIZATION NOTE (joinChat.*):
 #   These show up on the join chat menu. An underscore is for the access key.
-joinChat.channel=_Channel
-joinChat.password=_Password
+joinChat.channel=_KanÃ¡l
+joinChat.password=_Heslo
 
 # LOCALIZATION NOTE (options.*):
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.server=Server
 options.port=Port
-options.ssl=Use SSL
-options.encoding=Character Set
-options.quitMessage=Quit message
-options.partMessage=Part message
-options.showServerTab=Show messages from the server
-options.alternateNicks=Alternate nicks
+options.ssl=PouÅ¾iÅ¥ SSL
+options.encoding=Set znakov
+options.quitMessage=UkonÄiÅ¥ sprÃ¡vu
+options.partMessage=ÄasÅ¥ sprÃ¡vy
+options.showServerTab=UkÃ¡Å¾ sprÃ¡vy zo servera
+options.alternateNicks=AlternatÃvne prezÃ½vky
 
 # LOCALIZATION NOTE (ctcp.version):
 #   %1$S is the nickname of the user whose version was requested.
 #   %2$S is the version response from the client.
-ctcp.version=%1$S is using "%2$S".
+ctcp.version=%1$S pouÅ¾Ãva "%2$S".
 # LOCALIZATION NOTE (ctcp.time):
 #   %1$S is the nickname of the user whose time was requested.
 #   %2$S is the time response.
-ctcp.time=The time for %1$S is %2$S.
+ctcp.time=Äas pre %1$S je %2$S.
 
 # LOCALZIATION NOTE (command.*):
 #   These are the help messages for each command, the %S is the command name
 #   Each command first gives the parameter it accepts and then a description of
 #   the command.
-command.action=%S action to perform: Perform an action.
-command.ctcp=%S nick msg: Sends a CTCP message to the nick.
+command.action=%S action to perform: Vykonaj akciu.
+command.ctcp=%S nick msg: PoÅ¡li CTCP sprÃ¡vu prezÃ½vke.
 command.chanserv=%S command: Send a command to ChanServ.
 command.deop=%S nick1[,nick2]*: Remove channel operator status 
from someone. You must be a channel operator to do this.
 command.devoice=%S nick1[,nick2]*: Remove channel voice status 
from someone, preventing them from speaking if the channel is moderated (+m). 
You must be a channel operator to do this.

___
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-07-14 Thread translation

commit 8f1e251ac278b9f5ef1883bff9ac22dd1a08e7f0
Author: Translation commit bot 
Date:   Thu Jul 14 21:17:50 2016 +

Update translations for tor-messenger-fingerdtd
---
 sk_SK/finger.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sk_SK/finger.dtd b/sk_SK/finger.dtd
index 21b7473..5049a2f 100644
--- a/sk_SK/finger.dtd
+++ b/sk_SK/finger.dtd
@@ -1,15 +1,15 @@
 
 
 
-
-
-
-
+
+
+
+
 
-
-
-
-
+
+
+
+
 
-
-
\ 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-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed

2016-07-14 Thread translation

commit 4ffc30cb0c5e476905ef5952734e1e2069e78790
Author: Translation commit bot 
Date:   Thu Jul 14 21:17:55 2016 +

Update translations for tor-messenger-fingerdtd_completed
---
 sk_SK/finger.dtd | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/sk_SK/finger.dtd b/sk_SK/finger.dtd
new file mode 100644
index 000..5049a2f
--- /dev/null
+++ b/sk_SK/finger.dtd
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-07-14 Thread translation

commit abdf28a06cf9c4c3332d356361640ee5d28f90db
Author: Translation commit bot 
Date:   Thu Jul 14 20:48:22 2016 +

Update translations for tor-messenger-prefsdtd
---
 sk_SK/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/prefs.dtd b/sk_SK/prefs.dtd
index c1427fd..3b39e59 100644
--- a/sk_SK/prefs.dtd
+++ b/sk_SK/prefs.dtd
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
 

___
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-07-14 Thread translation

commit bdda7083a8556a9739219ba4cd3f2d9ae47b295c
Author: Translation commit bot 
Date:   Thu Jul 14 20:47:56 2016 +

Update translations for tor-messenger-fingerdtd
---
 sk_SK/finger.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/finger.dtd b/sk_SK/finger.dtd
index a489f2f..21b7473 100644
--- a/sk_SK/finger.dtd
+++ b/sk_SK/finger.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-facebookproperties_completed] Update translations for tor-messenger-facebookproperties_completed

2016-07-14 Thread translation

commit 600cd259c4442ddc888e681ba189bf285a0c6ba9
Author: Translation commit bot 
Date:   Thu Jul 14 20:47:53 2016 +

Update translations for tor-messenger-facebookproperties_completed
---
 sk_SK/facebook.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sk_SK/facebook.properties b/sk_SK/facebook.properties
new file mode 100644
index 000..f242e50
--- /dev/null
+++ b/sk_SK/facebook.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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=ProsÃm pouÅ¾ite vaÅ¡e 
pouÅ¾ÃvateÄ¾skÃ© meno na Facebooku, nie emailovÃº adresu.
+
+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] [translation/tor-messenger-facebookproperties] Update translations for tor-messenger-facebookproperties

2016-07-14 Thread translation

commit da7890957c026c070439a1a5d6784aafb4cdcc32
Author: Translation commit bot 
Date:   Thu Jul 14 20:47:49 2016 +

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

diff --git a/sk_SK/facebook.properties b/sk_SK/facebook.properties
index aaf7cdc..f242e50 100644
--- a/sk_SK/facebook.properties
+++ b/sk_SK/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=Please use your Facebook username, 
not an email address
+connection.error.useUsernameNotEmailAddress=ProsÃm pouÅ¾ite vaÅ¡e 
pouÅ¾ÃvateÄ¾skÃ© meno na Facebooku, nie emailovÃº adresu.
 
 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] [translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties

2016-07-14 Thread translation

commit f7ac0ea08289156631cdbbda8e2ad7233583a8ce
Author: Translation commit bot 
Date:   Thu Jul 14 20:47:42 2016 +

Update translations for tor-messenger-conversationsproperties
---
 sk_SK/conversations.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK/conversations.properties b/sk_SK/conversations.properties
index 5aaf43a..63b4cf4 100644
--- a/sk_SK/conversations.properties
+++ b/sk_SK/conversations.properties
@@ -61,11 +61,11 @@ topicCleared=%1$S zmazala tÃ©mu.
 #   nickname in a conversation.
 #   %1$S is the old nick.
 #   %2$S is the new nick.
-nickSet=%1$S is now known as %2$S.
+nickSet=%1$S je teraz znÃ¡my/a ako %2$S.
 # LOCALIZATION NOTE (nickSet.you):
 #   This is displayed as a system message when your nickname is changed.
 #   %S is your new nick.
-nickSet.you=You are now known as %S.
+nickSet.you=Teraz ste znÃ¡mi ako %S.
 
 # LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
 #  ellipsis is used when copying a part of a message to show that the message 
was cut

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

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

2016-07-14 Thread translation

commit 36c8184fb9b5d67cbaf44466c4b26ce216264d6e
Author: Translation commit bot 
Date:   Thu Jul 14 20:47:46 2016 +

Update translations for tor-messenger-conversationsproperties_completed
---
 sk_SK/conversations.properties | 80 ++
 1 file changed, 80 insertions(+)

diff --git a/sk_SK/conversations.properties b/sk_SK/conversations.properties
new file mode 100644
index 000..63b4cf4
--- /dev/null
+++ b/sk_SK/conversations.properties
@@ -0,0 +1,80 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=KonverzÃ¡cia bude pokraÄovaÅ¥ s %1$S, pouÅ¾itÃm %2$S.
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S je teraz %2$S.
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S je teraz %2$S: %3$S.
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S je %2$S.
+statusChangedFromUnknownWithStatusText=%1$S je %2$S: %3$S.
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½ (%1$S je %2$S).
+statusKnownWithStatusText=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½ (%1$S je %2$S: 
%3$S).
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=VÃ¡Å¡ ÃºÄet bol odpojenÃ½ (status %S nie je znÃ¡my).
+
+accountDisconnected=VÃ¡Å¡ ÃºÄet bol odpojenÃ½.
+accountReconnected=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½.
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=AutomatickÃ¡ odpoveÄ - %S
+
+# LOCALIZATION NOTE (noTopic):
+# Displayed instead of the topic when no topic is set.
+noTopic=TÃ¡to miestnosÅ¥ nemÃ¡ nastavenÃ© tÃ©mu.
+
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=TÃ©ma pre %1$S je: %2$S.
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=Pre %S neexistuje tÃ©ma.
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S zmenila tÃ©mu na: %2$S.
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S zmazala tÃ©mu.
+
+# LOCALIZATION NOTE (nickSet):
+#   This is displayed as a system message when a participant changes his/her
+#   nickname in a conversation.
+#   %1$S is the old nick.
+#   %2$S is the new nick.
+nickSet=%1$S je teraz znÃ¡my/a ako %2$S.
+# LOCALIZATION NOTE (nickSet.you):
+#   This is displayed as a system message when your nickname is changed.
+#   %S is your new nick.
+nickSet.you=Teraz ste znÃ¡mi ako %S.
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message 
was cut
+messenger.conversations.selections.ellipsis=[â¦]
+
+# LOCALIZATION NOTE 
(messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: 
%message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% 
%message%

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

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

2016-07-14 Thread translation

commit 56e7881a765998a740ca45be302c56d273aec82c
Author: Translation commit bot 
Date:   Thu Jul 14 20:17:44 2016 +

Update translations for tor-messenger-conversationsproperties
---
 sk_SK/conversations.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sk_SK/conversations.properties b/sk_SK/conversations.properties
index ed78f5a..5aaf43a 100644
--- a/sk_SK/conversations.properties
+++ b/sk_SK/conversations.properties
@@ -33,28 +33,28 @@ statusKnownWithStatusText=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½ 
(%1$S je %2$S: %3$S)
 statusUnknown=VÃ¡Å¡ ÃºÄet bol odpojenÃ½ (status %S nie je znÃ¡my).
 
 accountDisconnected=VÃ¡Å¡ ÃºÄet bol odpojenÃ½.
-accountReconnected=Your account has been reconnected.
+accountReconnected=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½.
 
 # LOCALIZATION NOTE (autoReply):
 #  %S is replaced by the text of a message that was sent as an automatic reply.
-autoReply=Auto-reply - %S
+autoReply=AutomatickÃ¡ odpoveÄ - %S
 
 # LOCALIZATION NOTE (noTopic):
 # Displayed instead of the topic when no topic is set.
-noTopic=No topic message for this room.
+noTopic=TÃ¡to miestnosÅ¥ nemÃ¡ nastavenÃ© tÃ©mu.
 
 # LOCALIZATION NOTE (topicSet):
 #  %1$S is the conversation name, %2$S is the topic.
-topicSet=The topic for %1$S is: %2$S.
+topicSet=TÃ©ma pre %1$S je: %2$S.
 # LOCALIZATION NOTE (topicNotSet):
 #  %S is the conversation name.
-topicNotSet=There is no topic for %S.
+topicNotSet=Pre %S neexistuje tÃ©ma.
 # LOCALIZATION NOTE (topicChanged):
 #  %1$S is the user who changed the topic, %2$S is the new topic.
-topicChanged=%1$S has changed the topic to: %2$S.
+topicChanged=%1$S zmenila tÃ©mu na: %2$S.
 # LOCALIZATION NOTE (topicCleared):
 #  %1$S is the user who cleared the topic.
-topicCleared=%1$S has cleared the topic.
+topicCleared=%1$S zmazala tÃ©mu.
 
 # LOCALIZATION NOTE (nickSet):
 #   This is displayed as a system message when a participant changes his/her

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

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

2016-07-14 Thread translation

commit a5a52a61c6035206561b26afe4b97b1730c93501
Author: Translation commit bot 
Date:   Thu Jul 14 19:47:45 2016 +

Update translations for tor-messenger-conversationsproperties
---
 sk_SK/conversations.properties | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sk_SK/conversations.properties b/sk_SK/conversations.properties
index 1a5564a..ed78f5a 100644
--- a/sk_SK/conversations.properties
+++ b/sk_SK/conversations.properties
@@ -5,34 +5,34 @@
 # LOCALIZATION NOTE (targetChanged):
 #  %1$S is the new conversation title (display name of the new target),
 #  %2$S is the protocol name used for the new target.
-targetChanged=The conversation will continue with %1$S, using %2$S.
+targetChanged=KonverzÃ¡cia bude pokraÄovaÅ¥ s %1$S, pouÅ¾itÃm %2$S.
 
 # LOCALIZATION NOTE (statusChanged):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
-statusChanged=%1$S is now %2$S.
+statusChanged=%1$S je teraz %2$S.
 # LOCALIZATION NOTE (statusChangedWithStatusText):
 #  %1$S is the display name of the contact.
 #  %2$S is the new status type (a value from status.properties).
 #  %3$S is the status text (eg. "I'm currently away from the computer").
-statusChangedWithStatusText=%1$S is now %2$S: %3$S.
+statusChangedWithStatusText=%1$S je teraz %2$S: %3$S.
 # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
 #  special case of the previous 2 strings for when the status was
 #  previously unknown. These 2 strings should not mislead the user
 #  into thinking the person's status has just changed.
-statusChangedFromUnknown=%1$S is %2$S.
-statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S.
+statusChangedFromUnknown=%1$S je %2$S.
+statusChangedFromUnknownWithStatusText=%1$S je %2$S: %3$S.
 # LOCALIZATION NOTE (statusKnown[WithStatusText]):
 # special case of the previous 2 strings for when an account has just
 # been reconnected, so the status is now known. These 2 strings should not
 # mislead the user into thinking the person's status has just changed.
-statusKnown=Your account has been reconnected (%1$S is %2$S).
-statusKnownWithStatusText=Your account has been reconnected (%1$S is %2$S: 
%3$S).
+statusKnown=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½ (%1$S je %2$S).
+statusKnownWithStatusText=VÃ¡Å¡ ÃºÄet bol znovu pripojenÃ½ (%1$S je %2$S: 
%3$S).
 # LOCALIZATION NOTE (statusUnknown):
 #  %S is the display name of the contact.
-statusUnknown=Your account is disconnected (the status of %S is no longer 
known).
+statusUnknown=VÃ¡Å¡ ÃºÄet bol odpojenÃ½ (status %S nie je znÃ¡my).
 
-accountDisconnected=Your account is disconnected.
+accountDisconnected=VÃ¡Å¡ ÃºÄet bol odpojenÃ½.
 accountReconnected=Your account has been reconnected.
 
 # LOCALIZATION NOTE (autoReply):

___
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-07-14 Thread translation

commit f00d23546e9a83c1d2a4c52de2e731358accde27
Author: Translation commit bot 
Date:   Thu Jul 14 19:47:31 2016 +

Update translations for tor-messenger-commandsproperties
---
 sk_SK/commands.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sk_SK/commands.properties b/sk_SK/commands.properties
index b06b2df..21403f6 100644
--- a/sk_SK/commands.properties
+++ b/sk_SK/commands.properties
@@ -11,17 +11,17 @@ noCommand=Å½iaden prÃkaz '%S'.
 noHelp=Å½iadna nÃ¡poveda pre prÃkaz '%S', prepÃ¡Äte!
 
 sayHelpString=say message: poslaÅ¥ sprÃ¡vu bez vykonania prÃkazov.
-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.
+rawHelpString=raw message: poslaÅ¥ sprÃ¡vu bez odstrÃ¡nenia HTML entÃt
+helpHelpString=help name: ukÃ¡Å¾ nÃ¡povedu pre prÃkaz name, 
alebo zoznam pouÅ¾iteÄ¾nÃ½ch prÃkazov, pokiaÄ¾ sÃº pouÅ¾itÃ© bez parametra.
 
 # 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 status message: set the status to %2$S with an 
optional status message.
-back=available
-away=away
-busy=unavailable
-dnd=unavailable
+statusCommand=%1$S status message: nastav status na %2$S s moÅ¾nosÅ¥ou 
sprÃ¡vy.
+back=dostupnÃ©
+away=preÄ
+busy=nedostupnÃ©
+dnd=nedostupnÃ©
 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-commandsproperties_completed] Update translations for tor-messenger-commandsproperties_completed

2016-07-14 Thread translation

commit 63e34668fedfe9eabef4a3fb7f1c330691d3d493
Author: Translation commit bot 
Date:   Thu Jul 14 19:47:35 2016 +

Update translations for tor-messenger-commandsproperties_completed
---
 sk_SK/commands.properties | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/sk_SK/commands.properties b/sk_SK/commands.properties
new file mode 100644
index 000..21403f6
--- /dev/null
+++ b/sk_SK/commands.properties
@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=PrÃkazy: %S.\nPouÅ¾ite /help command pre viac informÃ¡ciÃ.
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=Å½iaden prÃkaz '%S'.
+noHelp=Å½iadna nÃ¡poveda pre prÃkaz '%S', prepÃ¡Äte!
+
+sayHelpString=say message: poslaÅ¥ sprÃ¡vu bez vykonania prÃkazov.
+rawHelpString=raw message: poslaÅ¥ sprÃ¡vu bez odstrÃ¡nenia HTML entÃt
+helpHelpString=help name: ukÃ¡Å¾ nÃ¡povedu pre prÃkaz name, 
alebo zoznam pouÅ¾iteÄ¾nÃ½ch prÃkazov, pokiaÄ¾ sÃº pouÅ¾itÃ© bez parametra.
+
+# 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 status message: nastav status na %2$S s moÅ¾nosÅ¥ou 
sprÃ¡vy.
+back=dostupnÃ©
+away=preÄ
+busy=nedostupnÃ©
+dnd=nedostupnÃ©
+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-contactsproperties] Update translations for tor-messenger-contactsproperties

2016-07-14 Thread translation

commit 55d12262250994aea2781a088befcc433c3eee80
Author: Translation commit bot 
Date:   Thu Jul 14 19:47:38 2016 +

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

diff --git a/sk_SK/contacts.properties b/sk_SK/contacts.properties
index 33af79c..8a2cc29 100644
--- a/sk_SK/contacts.properties
+++ b/sk_SK/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=Kontakty

___
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_completed] Update translations for tor-messenger-contactsproperties_completed

2016-07-14 Thread translation

commit a6227eb39887bfbdd29d605cb12e68600f309f7d
Author: Translation commit bot 
Date:   Thu Jul 14 19:47:42 2016 +

Update translations for tor-messenger-contactsproperties_completed
---
 sk_SK/contacts.properties | 8 
 1 file changed, 8 insertions(+)

diff --git a/sk_SK/contacts.properties b/sk_SK/contacts.properties
new file mode 100644
index 000..8a2cc29
--- /dev/null
+++ b/sk_SK/contacts.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding 
a
+# buddy without specifying a group.
+defaultGroup=Kontakty

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

[tor-commits] [webwml/master] more link fixing

2016-07-14 Thread sebastian

commit c21cddf4bc79fe33d9be80d1df97d3643606488a
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:45:02 2016 +0200

more link fixing
---
 docs/en/faq.wml  | 10 +-
 docs/en/tor-doc-relay.wml|  3 ++-
 en/index.wml |  2 +-
 getinvolved/en/volunteer.wml | 11 ---
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index f98bc11..c238ca6 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1482,14 +1482,6 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79;>proposed
 Exitpolicy reject *:*
 BridgeRelay 1  # only add this line if you want to be a bridge
 
-
-If you've installed Obfsproxy,
-you'll need to add one more line:
-
-
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-
 
 
 
@@ -2581,7 +2573,7 @@ short)
 
 Several countries, including China and Iran, have found ways to
 detect and block connections to Tor bridges.
-Obfsproxy bridges address
+Obfsproxy bridges address
 this by adding another layer of obfuscation.
 
 
diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml
index c932c33..7f897d3 100644
--- a/docs/en/tor-doc-relay.wml
+++ b/docs/en/tor-doc-relay.wml
@@ -55,9 +55,10 @@
 ContactInfo human@...
 
 
+# TODO: Update link to PT setup docs
 If you want to be a bridge, read about the BridgeRelay and
 ServerTransportPlugin values on
+href="">on
 this page.
 
 Tor will use all your bandwidth if you don't set limits for it. Some
diff --git a/en/index.wml b/en/index.wml
index fededd4..836d3b0 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -118,7 +118,7 @@
 -->
   
 
-
 Pluggable 
Transports
 Pluggable transports help you circumvent censorship.
diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 8d9335d..20f7190 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -518,17 +518,6 @@ meetings around the world.
 TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients.
 
 
-
-Obfsproxy (https://gitweb.torproject.org/pluggable-transports/obfsproxy.git;>code,
-https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_review=new=reopened=Obfuscation%2FObfsproxy=priority;>bug
-tracker)
-
-
-A proxy that shapes Tor traffic, making it harder for censors to detect and
-block Tor. This has both a C and python implementation.
-
-
 
 https://crypto.stanford.edu/flashproxy/;>Flash Proxy (https://gitweb.torproject.org/flashproxy.git;>code, https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Fix up rewrite rules

2016-07-14 Thread sebastian

commit 9ed889a61c97033442504e96f4525b40b4e0b63b
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:32:23 2016 +0200

Fix up rewrite rules
---
 .htaccess | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index d6d7dc4..407b61f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,9 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
-RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy-debian-instructions(.*) 
/docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
 
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]

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

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

2016-07-14 Thread translation

commit 3ac4d52dfafc9108f863c0461dea2335bf4b5f11
Author: Translation commit bot 
Date:   Thu Jul 14 19:17:26 2016 +

Update translations for tor-messenger-authproperties
---
 sk_SK/auth.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk_SK/auth.properties b/sk_SK/auth.properties
index db95874..5e2915e 100644
--- a/sk_SK/auth.properties
+++ b/sk_SK/auth.properties
@@ -1,7 +1,7 @@
 auth.title=OveriÅ¥ identitu %S
-auth.yourFingerprint=Fingerprint for you, %S:\n%S
-auth.theirFingerprint=Purported fingerprint for %S:\n%S
-auth.help=Verifying a contact's identity helps ensure that the person you are 
talking to is who they claim to be.
-auth.helpTitle=Verification help
-auth.question=This is the question asked by your contact:\n\n%S\n\nEnter 
secret answer here (case sensitive):
+auth.yourFingerprint=OdtlaÄok pre vÃ¡s, %S\n%S
+auth.theirFingerprint=ÃdajnÃ½ odtlaÄok pre %S:\n%S
+auth.help=Overenie totoÅ¾nosti kontaktu pomÃ¡ha urÄiÅ¥, Äi je osoba s ktorou 
sa rozprÃ¡vate tÃ½m, za koho sa vydÃ¡va.
+auth.helpTitle=Pomoc s overenÃm
+auth.question=Toto je otÃ¡zka poloÅ¾enÃ¡ vaÅ¡im kontaktom:\n\n%S\n\nVloÅ¾te 
tajnÃº odpoveÄ (zÃ¡leÅ¾Ã na veÄ¾kosti pÃsmen):
 auth.secret=VloÅ¾te tajomstvo:

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

[tor-commits] [webwml/master] replace obfsproxy with PT in projects page and navbar

2016-07-14 Thread sebastian

commit 8eaa93901ce09178ba260883c0d107820bb306a6
Author: Nima Fatemi 
Date:   Wed Jul 6 22:43:17 2016 +

replace obfsproxy with PT in projects page and navbar
---
 projects/en/projects.wml | 10 ++
 projects/en/sidenav.wmi  | 10 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/projects/en/projects.wml b/projects/en/projects.wml
index b5c844b..985b050 100644
--- a/projects/en/projects.wml
+++ b/projects/en/projects.wml
@@ -52,12 +52,14 @@ default and sends all of its traffic over Tor.
 
 
 
-
 Obfsproxy
-Obfsproxy is a pluggable transports proxy. It shapes Tor traffic,
-making it harder for censors to detect and block the Tor protocol.
+href="">Pluggable Transports
+Pluggable Transports (PT) transform the Tor traffic flow between the client
+and the bridge. This way, censors who monitor traffic between the
+client and the bridge will see innocent-looking transformed traffic
+instead of the actual Tor traffic.
 
 
 
diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi
index 160d20c..4be3c78 100644
--- a/projects/en/sidenav.wmi
+++ b/projects/en/sidenav.wmi
@@ -15,11 +15,11 @@
 #
 # url - the path to the wml page, as used the the  tag. This tag ensures
 # that links will point to the current language if supported, and alternately
-# the english version 
+# the english version
 #
 # txt - the link text to be displayed. Different translations will
-# need to supply alternate txt 
- 
+# need to supply alternate txt
+
 <:
   my $sidenav;
   $sidenav = [
@@ -47,8 +47,8 @@
   {'url'  => 'https://metrics.torproject.org/',
'txt'  => 'Metrics Portal',
   },
-  {'url'  => 'projects/obfsproxy',
-   'txt'  => 'Obfsproxy',
+  {'url'  => 'docs/pluggable-transports',
+   'txt'  => 'Pluggable Transports',
   },
   {'url' => 'https://shadow.cs.umn.edu/',
'txt' => 'Shadow',



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

[tor-commits] [webwml/master] redirect old obfsproxy pages to PT page

2016-07-14 Thread sebastian

commit ff7363907c0a9ec1b4b7d12115ee8a2604ce6f38
Author: Nima Fatemi 
Date:   Wed Jul 6 22:03:52 2016 +

redirect old obfsproxy pages to PT page
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index b85f8ee..c896fe6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,6 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
 
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]



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

[tor-commits] [webwml/master] add graphic instructions on how to use PTs

2016-07-14 Thread sebastian

commit f2c6c8aef5dcc41b1fee3afb6037182c7aae873e
Author: Nima Fatemi 
Date:   Tue Jul 12 20:37:02 2016 +

add graphic instructions on how to use PTs
---
 docs/en/pluggable-transports.wml|  12 +++-
 images/PT/2016-07-how-to-use-PT.png | Bin 0 -> 494386 bytes
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 8c55572..482538f 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -32,13 +32,23 @@ 
href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt;>pluggable
 transport API, to make it easier to build interoperable programs.
 
 
+How to use PTs to bypass censorship
+
+  If connections to Tor network are being blocked by your ISP or country,
+  follow this instructions:
+
+
+
+
+
 
 
 Currently deployed PTs
 
   These Pluggable Transports are currently deployed in Tor Browser, and 
you can start using them by downloading 
and using Tor Browser.
 
-
 
   
 
diff --git a/images/PT/2016-07-how-to-use-PT.png 
b/images/PT/2016-07-how-to-use-PT.png
new file mode 100644
index 000..0994f04
Binary files /dev/null and b/images/PT/2016-07-how-to-use-PT.png differ



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

[tor-commits] [webwml/master] add link to obfs4 instructions

2016-07-14 Thread sebastian

commit d50ef37e46483fcde8e8d24f81ee864b004521fb
Author: Nima Fatemi 
Date:   Thu Jul 14 18:51:37 2016 +

add link to obfs4 instructions
---
 docs/en/pluggable-transports.wml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 482538f..65cbe45 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -43,6 +43,12 @@ transport API, to make it easier to build interoperable 
programs.
 4-select obfs4 5-press connect" />
 
 
+How to run PTs to help censored users
+
+  obfs4 is currently the most effective transport to bypass censorship.
+  To learn how to run this transport, please visit https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy;>obfs4proxy
 wiki page.
+
+
 
 
 Currently deployed PTs



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

[tor-commits] [webwml/master] Fix up PT changes

2016-07-14 Thread sebastian

commit 44c667ecd025ecb10a332551c4051b0533db6a7a
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:20:36 2016 +0200

Fix up PT changes
---
 .htaccess |   2 +-
 docs/en/pluggable-transports.wml  |   6 +-
 projects/en/obfsproxy-debian-instructions.wml | 150 ---
 projects/en/obfsproxy-instructions.wml| 164 --
 projects/en/obfsproxy.wml | 102 
 5 files changed, 4 insertions(+), 420 deletions(-)

diff --git a/.htaccess b/.htaccess
index c896fe6..d6d7dc4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,7 +32,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
 RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
 RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
 
diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 65cbe45..99d3c3b 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -34,8 +34,8 @@ transport API, to make it easier to build interoperable 
programs.
 
 How to use PTs to bypass censorship
 
-  If connections to Tor network are being blocked by your ISP or country,
-  follow this instructions:
+  If connections to the Tor network are being blocked by your ISP or
+  country, follow these instructions:
 
 
 , to make it easier to build interoperable 
programs.
 How to run PTs to help censored users
 
   obfs4 is currently the most effective transport to bypass censorship.
-  To learn how to run this transport, please visit https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy;>obfs4proxy
 wiki page.
+  To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy;>obfs4proxy
 wiki page.
 
 
 
diff --git a/projects/en/obfsproxy-debian-instructions.wml 
b/projects/en/obfsproxy-debian-instructions.wml
deleted file mode 100644
index 4911bc5..000
--- a/projects/en/obfsproxy-debian-instructions.wml
+++ /dev/null
@@ -1,150 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 4-optional
-
-#include "head.wmi" TITLE="obfsproxy: Setting up an Obfsproxy Bridge on 
Debian/Ubuntu" CHARSET="UTF-8"
-
-
-  
-Home  
-Projects  
-obfsproxy
-  
-  
-
-
-
-Setting up an Obfsproxy Bridge on Debian/Ubuntu
-
-
-
-
-
- Hey! 
-If you are not using Debian or Ubuntu, you better look
-at this other guide
-which sets up Obfsproxy from source.
-
-
-
-
-
-  This is a Debian/Ubuntu guide for installing the Python
-  version of obfsproxy. If you are still using the C version, we
-  recommend you to upgrade to the Python version!
-
-
-Step 0: Install a recent version of Tor (>= 0.2.4.1)
-
-
-
-Add the official Tor
-APT repository and run the specified commands to install 
tor
-and deb.torproject.org-keyring. You need Tor 0.2.4.x 
because
-it knows how to automatically report your obfsproxy address to https://bridges.torproject.org/?transport=obfs3;>BridgeDB.
-
-
-Step 1: Install obfsproxy
-
-
-
-Since you installed the Tor APT repository, installing obfsproxy is now a 
matter of running a command:
-
-
-
-\# apt-get install obfsproxy
-
-
-Step 2: Configure Tor
-
-
-
-Edit your /etc/tor/torrc to add:
-
-
-
-SocksPort 0
-ORPort auto
-BridgeRelay 1
-Exitpolicy reject *:*
-
-\## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like
-\#Nickname CHANGEME_1
-\## CHANGEME_2 -> provide some email address so we can contact you if there's 
a problem
-\#ContactInfo CHANGEME_2
-
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-
-
-
-Don't forget to uncomment and edit the CHANGEME fields!
-
-
-Step 3: Launch Tor and verify that it bootstraps
-
-
-
-Restart Tor to use the new configuration file.
-(Preface with sudo if needed.)
-
-
-
-\# service tor restart
-
-
-
-Now check /var/log/tor/log and you should see something
-like this:
-
-
-
-Nov 05 16:40:45.000 [notice] We now have enough directory information to build 
circuits.
-Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.
-Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first 
hop.
-Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.
-Nov 05 16:40:48.000 [notice] Tor has successfully opened a circuit. Looks like 
client functionality is working.
-Nov

[tor-commits] [webwml/master] Remove link to same page via redirects

2016-07-14 Thread sebastian

commit f1819af6f6be1c09cbd31eab8525359356673a0c
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:22:39 2016 +0200

Remove link to same page via redirects
---
 docs/en/pluggable-transports.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 99d3c3b..3cd7033 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -110,7 +110,7 @@ transport API, to make it easier to build interoperable 
programs.
   
   
 
-Obfsproxy is a 
Python framework for implementing new
+Obfsproxy is a Python framework for implementing new
 pluggable transports. It uses Twisted for its networking needs, and
 https://gitweb.torproject.org/pluggable-transports/pyptlib.git/tree/README.rst;>pyptlib
 for some pluggable transport-related features. It supports the

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

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

2016-07-14 Thread translation

commit 0c70fd3c76ce5729368ea0f68f97caede6394816
Author: Translation commit bot 
Date:   Thu Jul 14 19:17:32 2016 +

Update translations for tor-messenger-authproperties_completed
---
 sk_SK/auth.properties | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sk_SK/auth.properties b/sk_SK/auth.properties
new file mode 100644
index 000..5e2915e
--- /dev/null
+++ b/sk_SK/auth.properties
@@ -0,0 +1,7 @@
+auth.title=OveriÅ¥ identitu %S
+auth.yourFingerprint=OdtlaÄok pre vÃ¡s, %S\n%S
+auth.theirFingerprint=ÃdajnÃ½ odtlaÄok pre %S:\n%S
+auth.help=Overenie totoÅ¾nosti kontaktu pomÃ¡ha urÄiÅ¥, Äi je osoba s ktorou 
sa rozprÃ¡vate tÃ½m, za koho sa vydÃ¡va.
+auth.helpTitle=Pomoc s overenÃm
+auth.question=Toto je otÃ¡zka poloÅ¾enÃ¡ vaÅ¡im kontaktom:\n\n%S\n\nVloÅ¾te 
tajnÃº odpoveÄ (zÃ¡leÅ¾Ã na veÄ¾kosti pÃsmen):
+auth.secret=VloÅ¾te tajomstvo:

___
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-07-14 Thread translation

commit 3a054719348727133a104ee664d755ac5cd9
Author: Translation commit bot 
Date:   Thu Jul 14 19:17:36 2016 +

Update translations for tor-messenger-commandsproperties
---
 sk_SK/commands.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk_SK/commands.properties b/sk_SK/commands.properties
index d4e3a91..b06b2df 100644
--- a/sk_SK/commands.properties
+++ b/sk_SK/commands.properties
@@ -4,13 +4,13 @@
 
 # LOCALIZATION NOTE (commands):
 #  %S is a comma separated list of command names.
-commands=Commands: %S.\nUse /help command for more information.
+commands=PrÃkazy: %S.\nPouÅ¾ite /help command pre viac informÃ¡ciÃ.
 # LOCALIZATION NOTE (noCommand, noHelp):
 #  %S is the command name the user typed.
-noCommand=No '%S' command.
-noHelp=No help message for the '%S' command, sorry!
+noCommand=Å½iaden prÃkaz '%S'.
+noHelp=Å½iadna nÃ¡poveda pre prÃkaz '%S', prepÃ¡Äte!
 
-sayHelpString=say message: send a message without processing commands.
+sayHelpString=say message: poslaÅ¥ sprÃ¡vu bez vykonania prÃkazov.
 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.
 

___
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-07-14 Thread translation

commit 64d25f08f00776827afafe634742d7e158ece135
Author: Translation commit bot 
Date:   Thu Jul 14 18:47:20 2016 +

Update translations for tor-messenger-authdtd
---
 sk_SK/auth.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd
index ec74493..1ae4620 100644
--- a/sk_SK/auth.dtd
+++ b/sk_SK/auth.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -10,12 +10,12 @@
 
 
 
-
-
-
-
-
-
-
-
-
\ 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-authproperties] Update translations for tor-messenger-authproperties

2016-07-14 Thread translation

commit b51415fc93d7d8f17a98f53847d706fafa12cf8a
Author: Translation commit bot 
Date:   Thu Jul 14 18:47:29 2016 +

Update translations for tor-messenger-authproperties
---
 sk_SK/auth.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK/auth.properties b/sk_SK/auth.properties
index 17410b1..db95874 100644
--- a/sk_SK/auth.properties
+++ b/sk_SK/auth.properties
@@ -1,7 +1,7 @@
-auth.title=Verify %S's identity
+auth.title=OveriÅ¥ identitu %S
 auth.yourFingerprint=Fingerprint for you, %S:\n%S
 auth.theirFingerprint=Purported fingerprint for %S:\n%S
 auth.help=Verifying a contact's identity helps ensure that the person you are 
talking to is who they claim to be.
 auth.helpTitle=Verification help
 auth.question=This is the question asked by your contact:\n\n%S\n\nEnter 
secret answer here (case sensitive):
-auth.secret=Enter secret here:
+auth.secret=VloÅ¾te tajomstvo:

___
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-07-14 Thread translation

commit 95586e058c10b107a44789b7131e8f35d8933a27
Author: Translation commit bot 
Date:   Thu Jul 14 18:47:26 2016 +

Update translations for tor-messenger-authdtd_completed
---
 sk_SK/auth.dtd | 21 +
 1 file changed, 21 insertions(+)

diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd
new file mode 100644
index 000..1ae4620
--- /dev/null
+++ b/sk_SK/auth.dtd
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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-accountsproperties_completed] Update translations for tor-messenger-accountsproperties_completed

2016-07-14 Thread translation

commit f9487580661196ce937d9b640af95b04cf9f19ad
Author: Translation commit bot 
Date:   Thu Jul 14 18:17:19 2016 +

Update translations for tor-messenger-accountsproperties_completed
---
 sk_SK/accounts.properties | 9 +
 1 file changed, 9 insertions(+)

diff --git a/sk_SK/accounts.properties b/sk_SK/accounts.properties
new file mode 100644
index 000..4f2562d
--- /dev/null
+++ b/sk_SK/accounts.properties
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=Heslo pre %S
+passwordPromptText=Pre prihlÃ¡senie zadajte prosÃm vaÅ¡e heslo pre %S.
+passwordPromptSaveCheckbox=PouÅ¾ite Password Manager na zapamÃ¤tanie tohto 
hesla.

___
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-07-14 Thread translation

commit fac6aa4b044c95b94ffc450afb713634852103f4
Author: Translation commit bot 
Date:   Thu Jul 14 18:17:23 2016 +

Update translations for tor-messenger-authdtd
---
 sk_SK/auth.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sk_SK/auth.dtd b/sk_SK/auth.dtd
index 5c3d019..ec74493 100644
--- a/sk_SK/auth.dtd
+++ b/sk_SK/auth.dtd
@@ -1,15 +1,15 @@
-
+
 
 
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
 

___
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-07-14 Thread translation

commit 6c5547e7d6ea81c5b9244a6079c5ee5ba7aa3a74
Author: Translation commit bot 
Date:   Thu Jul 14 18:17:15 2016 +

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

diff --git a/sk_SK/accounts.properties b/sk_SK/accounts.properties
index 051ba0d..4f2562d 100644
--- a/sk_SK/accounts.properties
+++ b/sk_SK/accounts.properties
@@ -4,6 +4,6 @@
 
 # LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
 # %S is replaced with the name of the account
-passwordPromptTitle=Password for %S
-passwordPromptText=Please enter your password for %S in order to connect it.
-passwordPromptSaveCheckbox=Use Password Manager to remember this password.
+passwordPromptTitle=Heslo pre %S
+passwordPromptText=Pre prihlÃ¡senie zadajte prosÃm vaÅ¡e heslo pre %S.
+passwordPromptSaveCheckbox=PouÅ¾ite Password Manager na zapamÃ¤tanie tohto 
hesla.

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

[tor-commits] [stem/master] Add OnionLauncher and TorNova to examples

2016-07-14 Thread atagar

commit 2a869fc4987caeaf006673f6686e64ee3374ad22
Author: Damian Johnson 
Date:   Thu Jul 14 09:35:34 2016 -0700

Add OnionLauncher and TorNova to examples

Neat Qt and GTK launchers by Neel...

  https://lists.torproject.org/pipermail/tor-talk/2016-July/041770.html
---
 docs/tutorials/double_double_toil_and_trouble.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/tutorials/double_double_toil_and_trouble.rst 
b/docs/tutorials/double_double_toil_and_trouble.rst
index 8dfbf4b..d5f7e79 100644
--- a/docs/tutorials/double_double_toil_and_trouble.rst
+++ b/docs/tutorials/double_double_toil_and_trouble.rst
@@ -57,6 +57,8 @@ Applications
research paper.
 
 
===
 ==
+`OnionLauncher `_
 Qt interface for launching tor.
+`TorNova `_
 GTK interface for launching tor.
 `BeagleBone for Secret Agents 
`_  
Bridge with a `bandwidth monitor 
`_
 on a BeagleBoard.
 `NavigaTor `_
 Measures round-trip times for Tor circuits.
 `TorPS 
`_  
 Tor path simulator.

___
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-45.2.0esr-6.5-1] Bug 18923: Add a script to run all Tor Browser specific tests

2016-07-14 Thread gk

commit 1198d77c4ef82db7878e04920523b13ab0e678e6
Author: Nicolas Vigier 
Date:   Thu Jul 14 17:09:12 2016 +0200

Bug 18923: Add a script to run all Tor Browser specific tests
---
 run-tbb-tests| 60 
 tbb-tests-ignore.txt |  4 
 2 files changed, 64 insertions(+)

diff --git a/run-tbb-tests b/run-tbb-tests
new file mode 100755
index 000..5e266f9
--- /dev/null
+++ b/run-tbb-tests
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# This script runs all the Mochitest tests that have been added or
+# modified since the last ffxbld commit.
+#
+# It does not currently run XPCShell tests. We should change this if we
+# start using this type or other types of tests.
+#
+# The logs of the tests are stored in the tbb-tests.log file.
+# Ignored tests are listed in the tbb-tests-ignore.txt file.
+#
+# https://trac.torproject.org/projects/tor/ticket/18923
+
+IFS=$'\n'
+
+if [ -n "$USE_TESTS_LIST" ] && [ -f tbb-tests-list.txt ]
+then
+echo "Using tests list from file tbb-tests-list.txt"
+tests=($(cat tbb-tests-list.txt))
+else
+ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \
+| head -1 | cut -d ' ' -f 2)
+
+tests=($(git diff --name-status "$ffxbld_commit" HEAD | \
+grep -e '^[AM].*/test_[^/]\+\.\(html\|xul\)$' \
+ -e '^[AM].*/browser_[^/]\+\.js$' \
+ | sed 's/^[AM]\s\+//'))
+fi
+
+echo 'The following tests will be run:'
+for i in "${!tests[@]}"
+do
+if [ -z "$USE_TESTS_LIST" ] \
+&& grep -q "^${tests[$i]}$" tbb-tests-ignore.txt
+then
+unset "tests[$i]"
+continue
+fi
+echo "- ${tests[$i]}"
+done
+
+if [ -n "$WRITE_TESTS_LIST" ]
+then
+rm -f tbb-tests-list.txt
+for i in "${!tests[@]}"
+do
+echo "${tests[$i]}" >> tbb-tests-list.txt
+done
+exit 0
+fi
+
+rm -f tbb-tests.log
+echo $'\n''Starting tests'
+./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \
+ "${tests[@]}"
+
+echo "*"
+echo "*"
+echo "Summary of failed tests:"
+grep --color=never TEST-UNEXPECTED-FAIL tbb-tests.log
diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt
new file mode 100644
index 000..00978df
--- /dev/null
+++ b/tbb-tests-ignore.txt
@@ -0,0 +1,4 @@
+# This file contains the list of tests ignored by the run-tbb-tests script
+
+#19575: Test for privacy.thirdparty.isolate fails with a timeout
+dom/tests/mochitest/localstorage/test_localStorageByFirstParty.html

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

[tor-commits] [collector/master] Checkstyle warnings down to zero.

2016-07-14 Thread karsten

commit ae4be6f06be911b5e6607fcc2c698d3c2b7b463c
Author: iwakeh 
Date:   Wed Jul 13 17:55:39 2016 +0200

Checkstyle warnings down to zero.
---
 .../bridgedescs/BridgeDescriptorParser.java|  2 +
 .../bridgedescs/BridgeSnapshotReader.java  |  7 ++-
 .../bridgedescs/SanitizedBridgesWriter.java| 54 
 .../java/org/torproject/collector/conf/Key.java|  2 +-
 .../collector/exitlists/ExitListDownloader.java|  8 ++-
 .../collector/index/CreateIndexJson.java   | 11 ++--
 .../org/torproject/collector/main/LockFile.java|  2 +
 .../collector/relaydescs/ArchiveReader.java|  2 +
 .../collector/relaydescs/ArchiveWriter.java| 18 +-
 .../relaydescs/CachedRelayDescriptorReader.java|  2 +
 .../collector/relaydescs/ReferenceChecker.java |  2 +
 .../relaydescs/RelayDescriptorDownloader.java  | 71 +++---
 .../relaydescs/RelayDescriptorParser.java  |  2 +
 .../collector/torperf/TorperfDownloader.java   | 67 +++-
 src/main/resources/collector.properties|  2 +-
 .../collector/conf/ConfigurationTest.java  |  4 +-
 16 files changed, 147 insertions(+), 109 deletions(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
index 94d554f..337c2a3 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
@@ -16,12 +16,14 @@ public class BridgeDescriptorParser {
 
   private Logger logger;
 
+  @SuppressWarnings("checkstyle:javadocmethod")
   public BridgeDescriptorParser(SanitizedBridgesWriter sbw) {
 this.sbw = sbw;
 this.logger =
 LoggerFactory.getLogger(BridgeDescriptorParser.class);
   }
 
+  @SuppressWarnings("checkstyle:javadocmethod")
   public void parse(byte[] allData, String dateTime) {
 try {
   BufferedReader br = new BufferedReader(new StringReader(
diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
index b1aacec..169731b 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
@@ -27,10 +27,11 @@ import java.util.SortedSet;
 import java.util.Stack;
 import java.util.TreeSet;
 
-/**
- * Reads the half-hourly snapshots of bridge descriptors from Tonga.
- */
 public class BridgeSnapshotReader {
+
+  /**
+   * Reads the half-hourly snapshots of bridge descriptors from Tonga.
+   */
   public BridgeSnapshotReader(BridgeDescriptorParser bdp,
   File bridgeDirectoriesDir, File statsDirectory) {
 
diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index e483353..1f48fb7 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -54,6 +54,7 @@ public class SanitizedBridgesWriter extends Thread {
 
   private static Logger logger = 
LoggerFactory.getLogger(SanitizedBridgesWriter.class);
 
+  @SuppressWarnings("checkstyle:javadocmethod")
   public static void main(Configuration config) throws ConfigurationException {
 
 logger.info("Starting bridge-descriptors module of CollecTor.");
@@ -89,11 +90,11 @@ public class SanitizedBridgesWriter extends Thread {
*/
   private File sanitizedBridgesDirectory;
 
-  private boolean replaceIPAddressesWithHashes;
+  private boolean replaceIpAddressesWithHashes;
 
   private boolean persistenceProblemWithSecrets;
 
-  private SortedMap secretsForHashingIPAddresses;
+  private SortedMap secretsForHashingIpAddresses;
 
   private String bridgeSanitizingCutOffTimestamp;
 
@@ -119,10 +120,6 @@ public class SanitizedBridgesWriter extends Thread {
 config.getPath(Key.BridgeSnapshotsDirectory).toFile();
 File sanitizedBridgesDirectory =
 config.getPath(Key.SanitizedBridgesWriteDirectory).toFile();
-boolean replaceIPAddressesWithHashes =
-config.getBool(Key.ReplaceIPAddressesWithHashes);
-long limitBridgeSanitizingInterval =
-config.getInt(Key.BridgeDescriptorMappingsLimit);
 File statsDirectory = new File("stats");
 
 if (bridgeDirectoriesDirectory == null
@@ -133,8 +130,8 @@ public class SanitizedBridgesWriter extends Thread {
 /* Memorize argument values. */
 this.bridgeDirectoriesDirectory = bridgeDirectoriesDirectory;
 this.sanitizedBridgesDirectory = sanitizedBridgesDirectory;
-this.replaceIPAddressesWithHashes = replaceIPAddressesWithHashes;
-
+

[tor-commits] [collector/master] Enable suppression annotations for checkstyle.

2016-07-14 Thread karsten

commit 4383ae9386a0cc41d48885266313eb94253301a8
Author: iwakeh 
Date:   Wed Jul 13 17:54:58 2016 +0200

Enable suppression annotations for checkstyle.
---
 src/test/resources/metrics_checks.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/test/resources/metrics_checks.xml 
b/src/test/resources/metrics_checks.xml
index 0777894..2df2f2a 100644
--- a/src/test/resources/metrics_checks.xml
+++ b/src/test/resources/metrics_checks.xml
@@ -14,6 +14,8 @@
  - Relaxed requirement that catch parameters must be at least two
characters long [CatchParameterName].
 
+ - Enabled suppression of warnings using annotations.
+
 Checkstyle is very configurable. Be sure to read the documentation at
 http://checkstyle.sf.net (or in your downloaded distribution).
 
@@ -34,6 +36,7 @@
 
 
 
+
 
 
 
@@ -213,5 +216,6 @@
 
 
 
+
 
 



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

[tor-commits] [collector/master] Let Eclipse organize imports.

2016-07-14 Thread karsten

commit 7cc1d9d9704f9efbf28e2f83d9dee959ceae82ce
Author: Karsten Loesing 
Date:   Thu Jul 14 14:08:34 2016 +0200

Let Eclipse organize imports.
---
 src/main/java/org/torproject/collector/Main.java  |  1 -
 .../collector/bridgedescs/BridgeSnapshotReader.java   |  1 -
 .../collector/bridgedescs/SanitizedBridgesWriter.java |  1 -
 .../org/torproject/collector/conf/Configuration.java  |  5 -
 .../torproject/collector/index/CreateIndexJson.java   |  3 ---
 .../collector/relaydescs/ArchiveReader.java   |  1 -
 .../collector/relaydescs/ArchiveWriter.java   |  1 -
 .../relaydescs/CachedRelayDescriptorReader.java   |  2 --
 .../relaydescs/RelayDescriptorDownloader.java |  1 -
 .../collector/relaydescs/RelayDescriptorParser.java   |  1 -
 .../collector/torperf/TorperfDownloader.java  |  1 -
 src/test/java/org/torproject/collector/MainTest.java  | 19 ---
 .../torproject/collector/conf/ConfigurationTest.java  | 11 +++
 13 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/src/main/java/org/torproject/collector/Main.java 
b/src/main/java/org/torproject/collector/Main.java
index 34bb95b..81234c3 100644
--- a/src/main/java/org/torproject/collector/Main.java
+++ b/src/main/java/org/torproject/collector/Main.java
@@ -18,7 +18,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.Map;
diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
index 169731b..3df5242 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeSnapshotReader.java
@@ -7,7 +7,6 @@ import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index b1b9589..9d5828c 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -12,7 +12,6 @@ import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.codec.digest.DigestUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java 
b/src/main/java/org/torproject/collector/conf/Configuration.java
index 2166402..4e05ad4 100644
--- a/src/main/java/org/torproject/collector/conf/Configuration.java
+++ b/src/main/java/org/torproject/collector/conf/Configuration.java
@@ -3,13 +3,8 @@
 
 package org.torproject.collector.conf;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Properties;
 
 /**
diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java 
b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
index a39ef67..821be59 100644
--- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java
+++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
@@ -13,9 +13,6 @@ import com.google.gson.GsonBuilder;
 import 
org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
 import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileOutputStream;
diff --git 
a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java 
b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java
index 25f5859..9ceb2a0 100644
--- a/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java
+++ b/src/main/java/org/torproject/collector/relaydescs/ArchiveReader.java
@@ -6,7 +6,6 @@ package org.torproject.collector.relaydescs;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
 import 
org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git 
a/src/main/java/org/torproject/collector/relaydescs/ArchiveWriter.java

[tor-commits] [collector/master] Write Javadocs to appease checkstyle.

2016-07-14 Thread karsten

commit 74bae5b448fd8684fcbfe06a409df459d1f539d3
Author: Karsten Loesing 
Date:   Thu Jul 14 14:04:20 2016 +0200

Write Javadocs to appease checkstyle.
---
 .../bridgedescs/BridgeDescriptorParser.java|  6 +++--
 .../bridgedescs/SanitizedBridgesWriter.java|  3 ++-
 .../collector/exitlists/ExitListDownloader.java|  2 +-
 .../collector/index/CreateIndexJson.java   |  3 ++-
 .../org/torproject/collector/main/LockFile.java|  6 +++--
 .../collector/relaydescs/ArchiveReader.java|  9 ++--
 .../collector/relaydescs/ArchiveWriter.java| 26 +-
 .../relaydescs/CachedRelayDescriptorReader.java|  3 ++-
 .../collector/relaydescs/ReferenceChecker.java |  5 +++--
 .../relaydescs/RelayDescriptorParser.java  |  9 ++--
 .../collector/torperf/TorperfDownloader.java   |  2 +-
 11 files changed, 49 insertions(+), 25 deletions(-)

diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
index 337c2a3..6dc05b6 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/BridgeDescriptorParser.java
@@ -16,14 +16,16 @@ public class BridgeDescriptorParser {
 
   private Logger logger;
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Initializes a new bridge descriptor parser and links it to a
+   * sanitized bridges writer to sanitize and store bridge descriptors. */
   public BridgeDescriptorParser(SanitizedBridgesWriter sbw) {
 this.sbw = sbw;
 this.logger =
 LoggerFactory.getLogger(BridgeDescriptorParser.class);
   }
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Parses the first line of the given descriptor data to determine the
+   * descriptor type and passes it to the sanitized bridges writer. */
   public void parse(byte[] allData, String dateTime) {
 try {
   BufferedReader br = new BufferedReader(new StringReader(
diff --git 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
index 1f48fb7..b1b9589 100644
--- 
a/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
+++ 
b/src/main/java/org/torproject/collector/bridgedescs/SanitizedBridgesWriter.java
@@ -54,7 +54,8 @@ public class SanitizedBridgesWriter extends Thread {
 
   private static Logger logger = 
LoggerFactory.getLogger(SanitizedBridgesWriter.class);
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Executes the bridge-descriptors module using the given
+   * configuration. */
   public static void main(Configuration config) throws ConfigurationException {
 
 logger.info("Starting bridge-descriptors module of CollecTor.");
diff --git 
a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java 
b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java
index f54a427..5e17971 100644
--- a/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java
+++ b/src/main/java/org/torproject/collector/exitlists/ExitListDownloader.java
@@ -36,7 +36,7 @@ public class ExitListDownloader extends Thread {
 
   private static Logger logger = 
LoggerFactory.getLogger(ExitListDownloader.class);
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Execute the exit-lists module using the given configuration. */
   public static void main(Configuration config) throws ConfigurationException {
 logger.info("Starting exit-lists module of CollecTor.");
 
diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java 
b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
index 70886bc..a39ef67 100644
--- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java
+++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
@@ -52,7 +52,8 @@ public class CreateIndexJson {
 
   static final TimeZone dateTimezone = TimeZone.getTimeZone("UTC");
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Creates indexes of directories containing archived and recent
+   * descriptors and write index files to disk. */
   public static void main(Configuration config)
   throws ConfigurationException, IOException {
 indexJsonFile =  new File(config.getPath(Key.IndexPath).toFile(), 
"index.json");
diff --git a/src/main/java/org/torproject/collector/main/LockFile.java 
b/src/main/java/org/torproject/collector/main/LockFile.java
index 83cb603..977b0b9 100644
--- a/src/main/java/org/torproject/collector/main/LockFile.java
+++ b/src/main/java/org/torproject/collector/main/LockFile.java
@@ -28,7 +28,9 @@ public class LockFile {
 this.moduleName = moduleName;
   }
 
-  @SuppressWarnings("checkstyle:javadocmethod")
+  /** Acquires the lock by checking whether a lock file already

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

2016-07-14 Thread translation

commit cbccc9d6e7a53464d66cbf2c04f0e0ed57e47f2a
Author: Translation commit bot 
Date:   Thu Jul 14 12:18:09 2016 +

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

diff --git a/ta/irc.properties b/ta/irc.properties
index 3f8804d..7ce640b 100644
--- a/ta/irc.properties
+++ b/ta/irc.properties
@@ -25,7 +25,7 @@ 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=à®à®°à¯à®µà®°à¯\n
 options.port=à®ªà¯à®°à¯à®à¯
 options.ssl=Use SSL
 options.encoding=Character Set

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

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

2016-07-14 Thread translation

commit c0902214b1286b3803745ff1558e21b4154ecf43
Author: Translation commit bot 
Date:   Thu Jul 14 12:18:26 2016 +

Update translations for tor-messenger-prefsdtd
---
 ta/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/prefs.dtd b/ta/prefs.dtd
index 2dc91f1..a45ded2 100644
--- a/ta/prefs.dtd
+++ b/ta/prefs.dtd
@@ -4,7 +4,7 @@
 
 
 
-
+
 
 
 

___
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-07-14 Thread translation

commit 498869e857cb3bd45235bed1865d581cafe47bfe
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:58 2016 +

Update translations for tor-messenger-fingerdtd
---
 ta/finger.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/finger.dtd b/ta/finger.dtd
index 389e856..863e887 100644
--- a/ta/finger.dtd
+++ b/ta/finger.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-contactsproperties_completed] Update translations for tor-messenger-contactsproperties_completed

2016-07-14 Thread translation

commit 7ba22c98559661caca5c8a49fc7a4a18fbe2d074
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:44 2016 +

Update translations for tor-messenger-contactsproperties_completed
---
 ta/contacts.properties | 8 
 1 file changed, 8 insertions(+)

diff --git a/ta/contacts.properties b/ta/contacts.properties
new file mode 100644
index 000..2b57b0e
--- /dev/null
+++ b/ta/contacts.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding 
a
+# buddy without specifying a group.
+defaultGroup=à®¤à¯à®¾à®à®°à¯à®ªà¯à®à®³à¯

___
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-07-14 Thread translation

commit f3a8d2875c70c116c3106ca75b6782d72590f931
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:34 2016 +

Update translations for tor-messenger-commandsproperties
---
 ta/commands.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/commands.properties b/ta/commands.properties
index d4e3a91..809df71 100644
--- a/ta/commands.properties
+++ b/ta/commands.properties
@@ -24,4 +24,4 @@ back=available
 away=away
 busy=unavailable
 dnd=unavailable
-offline=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-contactsproperties] Update translations for tor-messenger-contactsproperties

2016-07-14 Thread translation

commit c3c9d765d2d84c7554e8032118713966c0ca2556
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:41 2016 +

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

diff --git a/ta/contacts.properties b/ta/contacts.properties
index 33af79c..2b57b0e 100644
--- a/ta/contacts.properties
+++ b/ta/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

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

2016-07-14 Thread translation

commit a5f918e657bc4730fdb1206065df274a51a49fd6
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:23 2016 +

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

diff --git a/ta/auth.dtd b/ta/auth.dtd
index 35bd531..8671ecc 100644
--- a/ta/auth.dtd
+++ b/ta/auth.dtd
@@ -15,7 +15,7 @@
 
 
 
-
+
 
 
 
\ 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/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2016-07-14 Thread translation

commit 55bd867dccbf07ef3b87a1917a84d947648ab82f
Author: Translation commit bot 
Date:   Thu Jul 14 12:17:07 2016 +

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

diff --git a/ta/aboutdialog.dtd b/ta/aboutdialog.dtd
index 5099ad7..36e023f 100644
--- a/ta/aboutdialog.dtd
+++ b/ta/aboutdialog.dtd
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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-07-14 Thread translation

commit f0b56fa782e0e8cdde15ce6693ff8098116db810
Author: Translation commit bot 
Date:   Thu Jul 14 12:16:41 2016 +

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

diff --git a/ta/torbutton.properties b/ta/torbutton.properties
index 0027eae..8033827 100644
--- a/ta/torbutton.properties
+++ b/ta/torbutton.properties
@@ -21,7 +21,7 @@ torbutton.popup.external.note = Some types of files can cause 
applications to co
 torbutton.popup.external.suggest = To be safe, you should only open downloaded 
files while offline, or use a Tor Live CD such as Tails.\n
 torbutton.popup.launch = Download file
 torbutton.popup.cancel = à®°à®¤à¯à®¤à¯à®à¯à®¯à¯
-torbutton.popup.dontask = Automatically download files from now on
+torbutton.popup.dontask = à®à®ªà¯à®ªà¯à®¾à®¤à¯ à®à®°à¯à®¨à¯à®¤à¯ 
à®à¯à®¾à®ªà¯à®ªà¯à®à®³à¯ 
 torbutton.popup.test.no_http_proxy = Tor proxy test: Local HTTP Proxy is 
unreachable. Is Polipo running properly?
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can 
request the English language version of web pages. This may cause web pages 
that you prefer to read in your native language to display in English 
instead.\n\nWould you like to request English language web pages for better 
privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. 
It does not have access to the Tor Control Port.\n\nAre you running Tor Browser 
Bundle?

___
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-07-14 Thread translation

commit fcc3401f11327615634183c1b1e132b29e48c4df
Author: Translation commit bot 
Date:   Thu Jul 14 12:16:19 2016 +

Update translations for tails-misc
---
 ta.po | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ta.po b/ta.po
index c8de11e..9de886d 100644
--- a/ta.po
+++ b/ta.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ephraim Raj , 2016
 # Khaleel Jageer , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-25 20:25+0200\n"
-"PO-Revision-Date: 2016-05-27 10:12+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2016-06-06 14:26+0200\n"
+"PO-Revision-Date: 2016-07-14 12:02+\n"
+"Last-Translator: Ephraim Raj \n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
-msgstr ""
+msgstr "Tor à®à®ªà¯à®ªà¯à®¾à®¤à¯ à®¤à®¯à®¾à®°à®¾à® à®à®³à¯à®³à®¤à¯"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
@@ -522,7 +523,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2
 msgid "Learn how to use Tails"
-msgstr ""
+msgstr "Tails à®à®ªà¯à®ªà®à®¿ "
 
 #: 
../config/chroot_local-includes/usr/share/applications/i2p-browser.desktop.in.h:1
 msgid "Anonymous overlay network browser"

___
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-07-14 Thread translation

commit 634cbbfde7491ad713240af243909f389c1a4ef2
Author: Translation commit bot 
Date:   Thu Jul 14 12:15:40 2016 +

Update translations for tails-persistence-setup
---
 ta/ta.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ta/ta.po b/ta/ta.po
index 7a2d612..4d5dd75 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Ephraim Raj , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-07-14 11:54+\n"
+"Last-Translator: Ephraim Raj \n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:48
 msgid "Personal Data"
-msgstr ""
+msgstr "à®¤à®©à®¿à®ªà¯à®ªà®à¯à® à®¤à®à®µà®²à¯à®à®³à¯"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:50
 msgid "Keep files stored in the `Persistent' directory"

___
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-07-14 Thread translation

commit 4b7c7868e3991ae608554234fe817eba7a48aad4
Author: Translation commit bot 
Date:   Thu Jul 14 11:47:54 2016 +

Update translations for tor-messenger-fingerdtd
---
 ta/finger.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ta/finger.dtd b/ta/finger.dtd
index b52e0fe..389e856 100644
--- a/ta/finger.dtd
+++ b/ta/finger.dtd
@@ -5,7 +5,7 @@
 
 
 
-
+
 
 
 

___
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-07-14 Thread translation

commit 11ec5fce2c1189b1d8235620c80dcb9c263886bb
Author: Translation commit bot 
Date:   Thu Jul 14 11:47:20 2016 +

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

diff --git a/ta/auth.dtd b/ta/auth.dtd
index 965bc4f..35bd531 100644
--- a/ta/auth.dtd
+++ b/ta/auth.dtd
@@ -1,5 +1,5 @@
 
-
+
 
 
 

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

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

2016-07-14 Thread translation

commit c88e51367bcb70736af2f90611096abd02b4ab18
Author: Translation commit bot 
Date:   Thu Jul 14 11:16:03 2016 +

Update translations for tor-launcher-properties
---
 sk_SK/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index db522f7..f0e48e5 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -3,7 +3,7 @@
 
 torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be 
due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
+torlauncher.tor_exited_during_startup=Tor bol ukonÄenÃ½ poÄas spÃºÅ¡Å¥ania. 
Mohla to spÃ´sibiÅ¥ chyba vo VaÅ¡om torrc sÃºbore, chyba v Tor alebo inom 
programe vo VaÅ¡om systÃ©me, alebo chybnÃ½ hardvÃ©r. KÃ½m nevyrieÅ¡ite tento 
problÃ©m a nereÅ¡tartujete Tor, nebude moÅ¾nÃ© spustiÅ¥ prehliadaÄ Tor.
 torlauncher.tor_exited=Tor bol neÄakane ukonÄenÃ½. Mohla nastaÅ¥ chyba v 
prehliadaÄi Tor, alebo to mohlo byÅ¥ spÃ´sobenÃ© inÃ½m programom vo VaÅ¡om 
systÃ©me alebo chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, prehliadaÄ Tor 
nebude schopnÃ½ naÄÃtaÅ¥ Å¾iadne webovÃ© strÃ¡nky. Ak sa tÃ½m problÃ©m 
nevyrieÅ¡i, poÅ¡lite kÃ³piu zÃ¡znamu Tor Log tÃmu technickej podpory.
 torlauncher.tor_exited2=ReÅ¡tartovanie Tor spojenia nezavrie zÃ¡loÅ¾ky
 torlauncher.tor_controlconn_failed=Pripojenie ku kontrolnÃ©mu portu Tor bolo 
neÃºspeÅ¡nÃ©.

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

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

2016-07-14 Thread translation

commit fba7ac58b625fe9dc54d29261abb78c004ca14f2
Author: Translation commit bot 
Date:   Thu Jul 14 11:16:07 2016 +

Update translations for tor-launcher-properties_completed
---
 sk_SK/torlauncher.properties | 63 
 1 file changed, 63 insertions(+)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
new file mode 100644
index 000..f0e48e5
--- /dev/null
+++ b/sk_SK/torlauncher.properties
@@ -0,0 +1,63 @@
+### Copyright (c) 2016, The Tor Project, Inc.
+### See LICENSE for licensing information.
+
+torlauncher.error_title=Tor Launcher
+
+torlauncher.tor_exited_during_startup=Tor bol ukonÄenÃ½ poÄas spÃºÅ¡Å¥ania. 
Mohla to spÃ´sibiÅ¥ chyba vo VaÅ¡om torrc sÃºbore, chyba v Tor alebo inom 
programe vo VaÅ¡om systÃ©me, alebo chybnÃ½ hardvÃ©r. KÃ½m nevyrieÅ¡ite tento 
problÃ©m a nereÅ¡tartujete Tor, nebude moÅ¾nÃ© spustiÅ¥ prehliadaÄ Tor.
+torlauncher.tor_exited=Tor bol neÄakane ukonÄenÃ½. Mohla nastaÅ¥ chyba v 
prehliadaÄi Tor, alebo to mohlo byÅ¥ spÃ´sobenÃ© inÃ½m programom vo VaÅ¡om 
systÃ©me alebo chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, prehliadaÄ Tor 
nebude schopnÃ½ naÄÃtaÅ¥ Å¾iadne webovÃ© strÃ¡nky. Ak sa tÃ½m problÃ©m 
nevyrieÅ¡i, poÅ¡lite kÃ³piu zÃ¡znamu Tor Log tÃmu technickej podpory.
+torlauncher.tor_exited2=ReÅ¡tartovanie Tor spojenia nezavrie zÃ¡loÅ¾ky
+torlauncher.tor_controlconn_failed=Pripojenie ku kontrolnÃ©mu portu Tor bolo 
neÃºspeÅ¡nÃ©.
+torlauncher.tor_failed_to_start=Nepodarilo sa spustiÅ¥ Tor.
+torlauncher.tor_control_failed=Nepodarilo sa zÃskaÅ¥ kontrolu nad Tor-om
+torlauncher.tor_bootstrap_failed=Tor nedokÃ¡zal nadviazaÅ¥ spojenie do siete 
Tor.
+torlauncher.tor_bootstrap_failed_details=%1$S zlyhanÃ½ch (%2$S).
+
+torlauncher.unable_to_start_tor=Nie je moÅ¾nÃ© spustiÅ¥ Tor.\n\n%S
+torlauncher.tor_missing=ChÃ½bjÃº dÃ¡ta pre spustenie Tor.
+torlauncher.torrc_missing=ChÃ½ba sÃºbor torrc a nemohol byÅ¥ vytvorenÃ½. 
+torlauncher.datadir_missing=PrieÄinok pre dÃ¡ta Tor neexistuje a nemohol byÅ¥ 
vytvorenÃ½.
+torlauncher.password_hash_missing=Nebolo moÅ¾nÃ© prevziaÅ¥ zaÅ¡ifrovanÃ© heslo.
+
+torlauncher.failed_to_get_settings=Nepodarilo sa zÃskaÅ¥ Tor nastavenia.\n\n%S
+torlauncher.failed_to_save_settings=Nepodarilo sa uloÅ¾iÅ¥ Tor 
nastavenia.\n\n%S
+torlauncher.ensure_tor_is_running=ProsÃm, uistite sa Å¾e Tor beÅ¾Ã.
+
+torlauncher.error_proxy_addr_missing=MusÃte Å¡pecifikovaÅ¥ tak IP adresu 
alebo host, ako aj port, aby Tor pouÅ¾Ãval proxy na pripÃ¡janie sa do 
internetu.
+torlauncher.error_proxy_type_missing=MusÃte si vybraÅ¥ proxy typ.
+torlauncher.error_bridges_missing=MusÃte Å¡pecifikovaÅ¥ jedno alebo viac 
premostenÃ
+torlauncher.error_default_bridges_type_missing=MusÃte vybraÅ¥ typ transportu 
pre zÃskanie premostenÃ.
+torlauncher.error_bridge_bad_default_type=Nie sÃº k dispozÃcii Å¾iadne 
premostenia s typom transportu %S. ProsÃm upravte nastavenia.
+
+torlauncher.recommended_bridge=(odporÃºÄanÃ©)
+
+torlauncher.connect=PripojiÅ¥
+torlauncher.restart_tor=ReÅ¡tartovaÅ¥ Tor
+torlauncher.quit=UkonÄiÅ¥
+torlauncher.quit_win=UkonÄiÅ¥
+torlauncher.done=Hotovo
+
+torlauncher.forAssistance=Pre pomoc konaktujte %S
+torlauncher.forAssistance2=Pre pomoc navÅ¡tÃvte %S
+
+torlauncher.copiedNLogMessages=KopÃrovanie kompletnÃ©. %S zÃ¡znamov je 
pripravenÃ½ch na vloÅ¾enie do textovÃ©ho editora alebo emailu.
+
+torlauncher.bootstrapStatus.conn_dir=PripÃ¡jam sa do prieÄinka relÃ©
+torlauncher.bootstrapStatus.handshake_dir=VytvÃ¡ram spojenie so zaÅ¡ifrovanÃ½m 
prieÄinkom
+torlauncher.bootstrapStatus.requesting_status=ZÃskavam stav siete
+torlauncher.bootstrapStatus.loading_status=NaÄÃtavam stav siete
+torlauncher.bootstrapStatus.loading_keys=NaÄÃtavam certifikÃ¡ty autority
+torlauncher.bootstrapStatus.requesting_descriptors=VyÅ¾iadavam informÃ¡cie o 
relÃ©
+torlauncher.bootstrapStatus.loading_descriptors=NaÄÃtavam informÃ¡cie o relÃ©
+torlauncher.bootstrapStatus.conn_or=PripÃ¡janie do siete Tor 
+torlauncher.bootstrapStatus.handshake_or=VytvÃ¡ram obvod Tor
+torlauncher.bootstrapStatus.done=PripojenÃ© do siete Tor!
+
+torlauncher.bootstrapWarning.done=hotovo
+torlauncher.bootstrapWarning.connectrefused=spojenie odmietnutÃ©
+torlauncher.bootstrapWarning.misc=rÃ´zne
+torlauncher.bootstrapWarning.resourcelimit=nedostatoÄnÃ© zdroje
+torlauncher.bootstrapWarning.identity=nezhoda v identite
+torlauncher.bootstrapWarning.timeout=timeout spojenia
+torlauncher.bootstrapWarning.noroute=Å½iadna cesta ku hostiteÄ¾ovi
+torlauncher.bootstrapWarning.ioerror=chyba ÄÃtania, alebo zÃ¡pisu
+torlauncher.bootstrapWarning.pt_missing=chÃ½ba zÃ¡suvnÃ½ - pluggable transport

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

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

2016-07-14 Thread translation

commit da94c305813bb28b47bdc66aaa817dbd84ae99ed
Author: Translation commit bot 
Date:   Thu Jul 14 10:46:02 2016 +

Update translations for tor-launcher-properties
---
 sk_SK/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index 433c56a..db522f7 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -37,9 +37,9 @@ torlauncher.quit_win=UkonÄiÅ¥
 torlauncher.done=Hotovo
 
 torlauncher.forAssistance=Pre pomoc konaktujte %S
-torlauncher.forAssistance2=For assistance, visit %S
+torlauncher.forAssistance2=Pre pomoc navÅ¡tÃvte %S
 
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to 
be pasted into a text editor or an email message.
+torlauncher.copiedNLogMessages=KopÃrovanie kompletnÃ©. %S zÃ¡znamov je 
pripravenÃ½ch na vloÅ¾enie do textovÃ©ho editora alebo emailu.
 
 torlauncher.bootstrapStatus.conn_dir=PripÃ¡jam sa do prieÄinka relÃ©
 torlauncher.bootstrapStatus.handshake_dir=VytvÃ¡ram spojenie so zaÅ¡ifrovanÃ½m 
prieÄinkom

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

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

2016-07-14 Thread translation

commit 9d12c619edeccb4c9eb116e1bdafe982ee7d3d08
Author: Translation commit bot 
Date:   Thu Jul 14 09:46:02 2016 +

Update translations for tor-launcher-properties
---
 sk_SK/torlauncher.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index b71eade..433c56a 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -25,8 +25,8 @@ torlauncher.ensure_tor_is_running=ProsÃm, uistite sa Å¾e Tor 
beÅ¾Ã.
 torlauncher.error_proxy_addr_missing=MusÃte Å¡pecifikovaÅ¥ tak IP adresu 
alebo host, ako aj port, aby Tor pouÅ¾Ãval proxy na pripÃ¡janie sa do 
internetu.
 torlauncher.error_proxy_type_missing=MusÃte si vybraÅ¥ proxy typ.
 torlauncher.error_bridges_missing=MusÃte Å¡pecifikovaÅ¥ jedno alebo viac 
premostenÃ
-torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
+torlauncher.error_default_bridges_type_missing=MusÃte vybraÅ¥ typ transportu 
pre zÃskanie premostenÃ.
+torlauncher.error_bridge_bad_default_type=Nie sÃº k dispozÃcii Å¾iadne 
premostenia s typom transportu %S. ProsÃm upravte nastavenia.
 
 torlauncher.recommended_bridge=(odporÃºÄanÃ©)
 
@@ -58,6 +58,6 @@ torlauncher.bootstrapWarning.misc=rÃ´zne
 torlauncher.bootstrapWarning.resourcelimit=nedostatoÄnÃ© zdroje
 torlauncher.bootstrapWarning.identity=nezhoda v identite
 torlauncher.bootstrapWarning.timeout=timeout spojenia
-torlauncher.bootstrapWarning.noroute=no route to host
+torlauncher.bootstrapWarning.noroute=Å½iadna cesta ku hostiteÄ¾ovi
 torlauncher.bootstrapWarning.ioerror=chyba ÄÃtania, alebo zÃ¡pisu
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+torlauncher.bootstrapWarning.pt_missing=chÃ½ba zÃ¡suvnÃ½ - pluggable transport

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

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

2016-07-14 Thread translation

commit ae6ca263e32dc7d49c53a1c1955a0328fe7a2f3a
Author: Translation commit bot 
Date:   Thu Jul 14 09:16:04 2016 +

Update translations for tor-launcher-properties
---
 sk_SK/torlauncher.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index 340412d..b71eade 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -41,15 +41,15 @@ torlauncher.forAssistance2=For assistance, visit %S
 
 torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to 
be pasted into a text editor or an email message.
 
-torlauncher.bootstrapStatus.conn_dir=Connecting to a relay directory
+torlauncher.bootstrapStatus.conn_dir=PripÃ¡jam sa do prieÄinka relÃ©
 torlauncher.bootstrapStatus.handshake_dir=VytvÃ¡ram spojenie so zaÅ¡ifrovanÃ½m 
prieÄinkom
 torlauncher.bootstrapStatus.requesting_status=ZÃskavam stav siete
 torlauncher.bootstrapStatus.loading_status=NaÄÃtavam stav siete
 torlauncher.bootstrapStatus.loading_keys=NaÄÃtavam certifikÃ¡ty autority
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
+torlauncher.bootstrapStatus.requesting_descriptors=VyÅ¾iadavam informÃ¡cie o 
relÃ©
+torlauncher.bootstrapStatus.loading_descriptors=NaÄÃtavam informÃ¡cie o relÃ©
 torlauncher.bootstrapStatus.conn_or=PripÃ¡janie do siete Tor 
-torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
+torlauncher.bootstrapStatus.handshake_or=VytvÃ¡ram obvod Tor
 torlauncher.bootstrapStatus.done=PripojenÃ© do siete Tor!
 
 torlauncher.bootstrapWarning.done=hotovo

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

[tor-commits] [collector/master] Added symlink update steps.

2016-07-14 Thread karsten

commit 94278aa92fbb99f1c7c4f048bbd981b47bc5981f
Author: iwakeh 
Date:   Wed Jul 13 14:50:53 2016 +0200

Added symlink update steps.
---
 src/main/resources/create-tarballs.sh | 44 +--
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/create-tarballs.sh 
b/src/main/resources/create-tarballs.sh
index 6b3785d..cc75219 100755
--- a/src/main/resources/create-tarballs.sh
+++ b/src/main/resources/create-tarballs.sh
@@ -3,12 +3,14 @@
 # Copyright 2016 The Tor Project
 # See LICENSE for licensing information.
 #
-# Script for creating descriptor tarballs on a CollecTor instance.
+# Script for creating descriptor tarballs on a CollecTor instance,
+# and creating/touching the symlinks for the web-app.
 #
 
 # Configuration section:
 # The following path should be adjusted, if the CollecTor server layout 
differs.
 # OUTDIR and TARBALLTARGETDIR have to be given absolute or relative to WORKDIR.
+ARCHIVEDIR="archive"
 WORKDIR="tarballs"
 OUTDIR="../out"
 TARBALLTARGETDIR="../data"
@@ -104,5 +106,43 @@ echo `date` "Moving tarballs into place"
 mv *.tar.xz $TARBALLTARGETDIR
 
 cd $CURRENTPATH
-echo `date` "Finished."
 
+echo `date` "Finished tarball creation.  Starting symlink-update ..."
+
+mkdir -p $ARCHIVEDIR/bridge-descriptors/
+ln -f -s -t $ARCHIVEDIR/bridge-descriptors/ 
$TARBALLTARGETDIR/bridge-descriptors-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/bridge-pool-assignments/
+ln -f -s -t $ARCHIVEDIR/bridge-pool-assignments/ 
$TARBALLTARGETDIR/bridge-pool-assignments-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/exit-lists/
+ln -f -s -t $ARCHIVEDIR/exit-lists/ $TARBALLTARGETDIR/exit-list-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/ $TARBALLTARGETDIR/certs.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/consensuses/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/consensuses/ 
$TARBALLTARGETDIR/consensuses-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/extra-infos/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/extra-infos/ 
$TARBALLTARGETDIR/extra-infos-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/microdescs/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/microdescs/ 
$TARBALLTARGETDIR/microdescs-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/server-descriptors/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/server-descriptors/ 
$TARBALLTARGETDIR/server-descriptors-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/statuses/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/statuses/ 
$TARBALLTARGETDIR/statuses-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/tor/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/tor/ 
$TARBALLTARGETDIR/tor-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/relay-descriptors/votes/
+ln -f -s -t $ARCHIVEDIR/relay-descriptors/votes/ 
$TARBALLTARGETDIR/votes-20??-??.tar.xz
+
+mkdir -p $ARCHIVEDIR/torperf/
+ln -f -s -t $ARCHIVEDIR/torperf/ $TARBALLTARGETDIR/torperf-20??-??.tar.xz
+
+echo `date` "Finished."

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

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

2016-07-14 Thread translation

commit 70c1a021959af9f767e9f49e3872e718af884721
Author: Translation commit bot 
Date:   Thu Jul 14 08:46:02 2016 +

Update translations for tor-launcher-properties
---
 sk_SK/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk_SK/torlauncher.properties b/sk_SK/torlauncher.properties
index 8f479ab..340412d 100644
--- a/sk_SK/torlauncher.properties
+++ b/sk_SK/torlauncher.properties
@@ -4,18 +4,18 @@
 torlauncher.error_title=Tor Launcher
 
 torlauncher.tor_exited_during_startup=Tor exited during startup. This might be 
due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in 
Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
+torlauncher.tor_exited=Tor bol neÄakane ukonÄenÃ½. Mohla nastaÅ¥ chyba v 
prehliadaÄi Tor, alebo to mohlo byÅ¥ spÃ´sobenÃ© inÃ½m programom vo VaÅ¡om 
systÃ©me alebo chybnÃ½m hardvÃ©rom. KÃ½m nereÅ¡tartujete Tor, prehliadaÄ Tor 
nebude schopnÃ½ naÄÃtaÅ¥ Å¾iadne webovÃ© strÃ¡nky. Ak sa tÃ½m problÃ©m 
nevyrieÅ¡i, poÅ¡lite kÃ³piu zÃ¡znamu Tor Log tÃmu technickej podpory.
 torlauncher.tor_exited2=ReÅ¡tartovanie Tor spojenia nezavrie zÃ¡loÅ¾ky
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
+torlauncher.tor_controlconn_failed=Pripojenie ku kontrolnÃ©mu portu Tor bolo 
neÃºspeÅ¡nÃ©.
 torlauncher.tor_failed_to_start=Nepodarilo sa spustiÅ¥ Tor.
 torlauncher.tor_control_failed=Nepodarilo sa zÃskaÅ¥ kontrolu nad Tor-om
 torlauncher.tor_bootstrap_failed=Tor nedokÃ¡zal nadviazaÅ¥ spojenie do siete 
Tor.
 torlauncher.tor_bootstrap_failed_details=%1$S zlyhanÃ½ch (%2$S).
 
 torlauncher.unable_to_start_tor=Nie je moÅ¾nÃ© spustiÅ¥ Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-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.tor_missing=ChÃ½bjÃº dÃ¡ta pre spustenie Tor.
+torlauncher.torrc_missing=ChÃ½ba sÃºbor torrc a nemohol byÅ¥ vytvorenÃ½. 
+torlauncher.datadir_missing=PrieÄinok pre dÃ¡ta Tor neexistuje a nemohol byÅ¥ 
vytvorenÃ½.
 torlauncher.password_hash_missing=Nebolo moÅ¾nÃ© prevziaÅ¥ zaÅ¡ifrovanÃ© heslo.
 
 torlauncher.failed_to_get_settings=Nepodarilo sa zÃskaÅ¥ Tor nastavenia.\n\n%S

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

[tor-commits] [tor-browser-bundle/maint-6.0] Bug 19269: Icon doesn't appear in Applications folder or Dock

2016-07-14 Thread gk

commit a444e50be76078eead724908f9154d9217ec3f91
Author: Kathy Brade 
Date:   Wed Jul 13 15:30:49 2016 -0400

Bug 19269: Icon doesn't appear in Applications folder or Dock

On OSX, when building with DATA_OUTSIDE_APP_DIR = 1, set the
mode on all files and directories properly so that standard
(unprivileged) users can access all files in the app bundle.
---
 gitian/build-helpers/ddmg.sh | 16 ++--
 gitian/descriptors/mac/gitian-bundle.yml |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh
index cb513e8..a58e774 100755
--- a/gitian/build-helpers/ddmg.sh
+++ b/gitian/build-helpers/ddmg.sh
@@ -5,17 +5,21 @@ export LC_ALL=C
 DMGFILE=$1
 shift
 
-# We need group readability for some Macs to be able to handle /Applications
-# installation. Still unclear exactly why this is -- it is not dependent on
-# OSX version...
-find $@ -executable -exec chmod 750 {} \;
-find $@ ! -executable -exec chmod 640 {} \;
+if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
+  EXE_MODE=0755
+  OTHER_MODE=0644
+else
+  EXE_MODE=0750
+  OTHER_MODE=0640
+fi
+find $@ -executable -exec chmod $EXE_MODE {} \;
+find $@ ! -executable -exec chmod $OTHER_MODE {} \;
 
 cd $@
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
~/build/filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
~/build/filelist.txt
 
-genisoimage -D -V "Tor Browser" -no-pad -R -apple -o 
~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+genisoimage -D -V "Tor Browser" -no-pad -R -apple -o 
~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 
20 -dir-mode $EXE_MODE -new-dir-mode $EXE_MODE
 
 cd ~/build
 
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index a1a4ed8..d644a56 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -71,6 +71,9 @@ script: |
   export TORBROWSER_APP="TorBrowser"
   export TORBROWSER_NAME="TorBrowserBundle"
 
+  # ddmg.sh needs DATA_OUTSIDE_APP_DIR
+  export DATA_OUTSIDE_APP_DIR
+
   if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
 DOCSPATH=Contents/Resources/TorBrowser/Docs
 EXTSPATH=Contents/Resources/distribution/extensions

___
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 19269: Icon doesn't appear in Applications folder or Dock

2016-07-14 Thread gk

commit 3c39bce72160b9dbbf1196deea613ad8e2116eaa
Author: Kathy Brade 
Date:   Wed Jul 13 15:30:49 2016 -0400

Bug 19269: Icon doesn't appear in Applications folder or Dock

On OSX, when building with DATA_OUTSIDE_APP_DIR = 1, set the
mode on all files and directories properly so that standard
(unprivileged) users can access all files in the app bundle.
---
 gitian/build-helpers/ddmg.sh | 16 ++--
 gitian/descriptors/mac/gitian-bundle.yml |  3 +++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh
index e36fca9..dc76b6f 100755
--- a/gitian/build-helpers/ddmg.sh
+++ b/gitian/build-helpers/ddmg.sh
@@ -5,11 +5,15 @@ export LC_ALL=C
 DMGFILE=$1
 shift
 
-# We need group readability for some Macs to be able to handle /Applications
-# installation. Still unclear exactly why this is -- it is not dependent on
-# OSX version...
-find $@ -executable -exec chmod 750 {} \;
-find $@ ! -executable -exec chmod 640 {} \;
+if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
+  EXE_MODE=0755
+  OTHER_MODE=0644
+else
+  EXE_MODE=0750
+  OTHER_MODE=0640
+fi
+find $@ -executable -exec chmod $EXE_MODE {} \;
+find $@ ! -executable -exec chmod $OTHER_MODE {} \;
 
 [ -n "$REFERENCE_DATETIME" ] && \
 find $@ -exec touch --date="$REFERENCE_DATETIME" {} \;
@@ -18,7 +22,7 @@ cd $@
 find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > 
~/build/filelist.txt
 find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> 
~/build/filelist.txt
 
-genisoimage -D -V "Tor Browser" -no-pad -R -apple -o 
~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 
20 -dir-mode 0750 -new-dir-mode 0750
+genisoimage -D -V "Tor Browser" -no-pad -R -apple -o 
~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 
20 -dir-mode $EXE_MODE -new-dir-mode $EXE_MODE
 
 cd ~/build
 
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index a1a4ed8..d644a56 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -71,6 +71,9 @@ script: |
   export TORBROWSER_APP="TorBrowser"
   export TORBROWSER_NAME="TorBrowserBundle"
 
+  # ddmg.sh needs DATA_OUTSIDE_APP_DIR
+  export DATA_OUTSIDE_APP_DIR
+
   if [ "z$DATA_OUTSIDE_APP_DIR" = "z1" ]; then
 DOCSPATH=Contents/Resources/TorBrowser/Docs
 EXTSPATH=Contents/Resources/distribution/extensions

___
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-07-14 Thread translation

commit 41527044e48369b5a18f41f665806e70d7f63269
Author: Translation commit bot 
Date:   Thu Jul 14 08:16:23 2016 +

Update translations for abouttor-homepage
---
 hi/aboutTor.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd
index 2157390..1c02e35 100644
--- a/hi/aboutTor.dtd
+++ b/hi/aboutTor.dtd
@@ -29,11 +29,11 @@
 
 
 
-
-
+
+
 
 
-
+
 https://www.torproject.org/download/download.html.en#warning;>
 
 
@@ -41,9 +41,9 @@
 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/abouttor-homepage] Update translations for abouttor-homepage

2016-07-14 Thread translation

commit 2e88cceda5f65a0714a8cd8ab34f274ac86bf67a
Author: Translation commit bot 
Date:   Thu Jul 14 07:46:24 2016 +

Update translations for abouttor-homepage
---
 hi/aboutTor.dtd | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/hi/aboutTor.dtd b/hi/aboutTor.dtd
index 83b77f6..2157390 100644
--- a/hi/aboutTor.dtd
+++ b/hi/aboutTor.dtd
@@ -6,22 +6,22 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
-
+
 
 https://startpage.com/rth/search;>
 https://duckduckgo.com/html/;>
@@ -31,11 +31,11 @@
 
 
 
-
+
 
 
 https://www.torproject.org/download/download.html.en#warning;>
-
+
 
 
 https://www.torproject.org/docs/tor-doc-relay.html.en;>

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

65 matches

Mail list logo