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

2013-12-18 Thread translation
commit f7cf2836deeddb8cb39795093289059b7bc531eb
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:15:07 2013 +

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

diff --git a/zh_HK/gettor.po b/zh_HK/gettor.po
index 74e8194..988ed18 100644
--- a/zh_HK/gettor.po
+++ b/zh_HK/gettor.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Jacob Appelbaum ja...@appelbaum.net, 2009
+# CasperLi_HK li_wai...@hotmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
+Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2013-09-16 17:52+\n
-Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
+PO-Revision-Date: 2013-12-18 07:48+\n
+Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -100,7 +101,7 @@ msgstr 
 
 #: lib/gettor/i18n.py:76
 msgid  List of supported locales:
-msgstr 
+msgstr 支持地區列表:
 
 #: lib/gettor/i18n.py:78
 msgid Here is a list of all available languages:

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


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

2013-12-18 Thread translation
commit edfba31562239e8309610527732ab81ce1773cdd
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:15:03 2013 +

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

diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 691d6e2..eaa2fb5 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Translators:
+# CasperLi_HK li_wai...@hotmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-03-27 21:41+\n
-PO-Revision-Date: 2013-09-16 17:52+\n
-Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
+PO-Revision-Date: 2013-12-18 07:49+\n
+Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -21,7 +22,7 @@ msgstr 
 
 #: lib/bridgedb/templates/base.html:33
 msgid What are bridges?
-msgstr 
+msgstr 什麼是橋?
 
 #: lib/bridgedb/templates/base.html:34
 #, python-format
@@ -31,7 +32,7 @@ msgstr 
 
 #: lib/bridgedb/templates/base.html:39
 msgid I need an alternative way of getting bridges!
-msgstr 
+msgstr 我需要得到另一種方式來得到橋!
 
 #: lib/bridgedb/templates/base.html:40
 #, python-format

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


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

2013-12-18 Thread translation
commit fea7044b1d89d7ff0e6e39c2f16a38938721d8e9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:15 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.dtd |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index d37a29c..b6ac04a 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -33,12 +33,12 @@
 !ENTITY torbirdy.prefs.torification.label Transparente Torification (aviso: 
requer transproxy personalizada ou o roteador Tor)
 !ENTITY torbirdy.prefs.torification.key t
 !ENTITY torbirdy.prefs.global Global
-!ENTITY torbirdy.prefs.imap.label Ativar suporte a download de emails via 
IMAP [padrão: desativado]
+!ENTITY torbirdy.prefs.imap.label Ativar o suporte de e-mail para contas de 
IMAP [padrão: desativado]
 !ENTITY torbirdy.prefs.imap.key p
 !ENTITY torbirdy.prefs.startup_folder.label Abrir a última pasta acessada 
ao iniciar [padrão: desativado]
-!ENTITY torbirdy.prefs.startup_folder.key p
-!ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para UTC [padrão: definido para UTC]
-!ENTITY torbirdy.prefs.timezone.key f
+!ENTITY torbirdy.prefs.startup_folder.key I
+!ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para o UTC [padrão: definido para UTC]
+!ENTITY torbirdy.prefs.timezone.key z
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não colocar a ID dos 
destinatários em mensagens criptografadas [padrão: colocar]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
 !ENTITY torbirdy.prefs.confirmemail.label Confirmar antes de enviar e-mail 
se Enigmail estiver ativado [padrão: não confirmar]
@@ -49,8 +49,8 @@
 !ENTITY torbirdy.prefs.automatic.key f
 !ENTITY torbirdy.prefs.renegotiation.label Permitir conexões a servidores 
que não suportam SSL/TLS com negociação segura [padrão: não permitir]
 !ENTITY torbirdy.prefs.renegotiation.key r
-!ENTITY torbirdy.prefs.account_specific Configurações da Conta
-!ENTITY torbirdy.prefs.select_account.key s
+!ENTITY torbirdy.prefs.account_specific Conta-Específica
+!ENTITY torbirdy.prefs.select_account.key C
 !ENTITY torbirdy.prefs.select_account.label Escolher uma conta:
 !ENTITY torbirdy.prefs.enigmail.keyserver.label Servidor de chave(s) a 
usar:
 !ENTITY torbirdy.prefs.enigmail.keyserver.key k

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


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

2013-12-18 Thread translation
commit 68f9926bc722bcc62c4ced9ad5748fdbf90a10ec
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:15:51 2013 +

Update translations for torcheck
---
 zh_HK/torcheck.po |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zh_HK/torcheck.po b/zh_HK/torcheck.po
index e0f1af2..ef3b805 100644
--- a/zh_HK/torcheck.po
+++ b/zh_HK/torcheck.po
@@ -2,12 +2,13 @@
 # Copyright (C) 2008-2012 The Tor Project, Inc
 # 
 # Translators:
+# CasperLi_HK li_wai...@hotmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2013-11-06 08:58+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2013-12-18 07:46+\n
+Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -52,4 +53,4 @@ msgid 
 msgstr 
 
 msgid Your IP address appears to be: 
-msgstr 
+msgstr 您的IP地址顯示為:

___
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

2013-12-18 Thread translation
commit ab028204ccbeb21e807c95298ce7b8df43f21c53
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:20 2013 +

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

diff --git a/zh_HK/torlauncher.properties b/zh_HK/torlauncher.properties
index fcd4d83..97eed01 100644
--- a/zh_HK/torlauncher.properties
+++ b/zh_HK/torlauncher.properties
@@ -24,8 +24,8 @@
 # torlauncher.error_bridges_missing=You must specify one or more bridges.
 
 # torlauncher.connect=Connect
-# torlauncher.quit=Quit
-# torlauncher.quit_win=Exit
+torlauncher.quit=離開
+torlauncher.quit_win=離開
 # torlauncher.done=Done
 
 # torlauncher.forAssistance=For assistance, contact %S

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


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

2013-12-18 Thread translation
commit 1652fe4c21e4951ac66e922bb78804612ef729f3
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:32 2013 +

Update translations for torbutton-brandproperties
---
 zh_HK/brand.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/brand.properties b/zh_HK/brand.properties
index 6598ccd..605ed16 100644
--- a/zh_HK/brand.properties
+++ b/zh_HK/brand.properties
@@ -9,7 +9,7 @@
 # homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 # homePageImport=Import your home page from %S
 
-# homePageMigrationPageTitle=Home Page Selection
+homePageMigrationPageTitle=主頁選擇
 # homePageMigrationDescription=Please select the home page you wish to use:
 
 # syncBrandShortName=Sync

___
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

2013-12-18 Thread translation
commit 007babb43dd83b13c4e4dc7bfbf937d0b25276cd
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:05 2013 +

Update translations for tails-persistence-setup
---
 zh_HK/zh_HK.po |   43 ++-
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 6c89426..a742af1 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# CasperLi_HK li_wai...@hotmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
-POT-Creation-Date: 2013-11-07 16:37+0100\n
-PO-Revision-Date: 2013-11-15 09:19+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2013-11-15 11:30+0100\n
+PO-Revision-Date: 2013-12-18 07:53+\n
+Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -114,71 +115,71 @@ msgid 
 Symlink into $HOME every file or directory found in the `dotfiles' directory
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:227
+#: ../lib/Tails/Persistence/Setup.pm:226
 msgid Setup Tails persistent volume
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:331
+#: ../lib/Tails/Persistence/Setup.pm:330
 #, perl-format
 msgid Device %s already has a persistent volume.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:339
+#: ../lib/Tails/Persistence/Setup.pm:338
 #, perl-format
 msgid Device %s has not enough unallocated space.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361
+#: ../lib/Tails/Persistence/Setup.pm:346 ../lib/Tails/Persistence/Setup.pm:360
 #, perl-format
 msgid Device %s has no persistent volume.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:353
+#: ../lib/Tails/Persistence/Setup.pm:352
 msgid 
 Cannot delete the persistent volume while in use. You should restart Tails 
 without persistence.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:372
+#: ../lib/Tails/Persistence/Setup.pm:371
 msgid Persistence volume is not unlocked.
-msgstr 
+msgstr 持久音量未解鎖。
 
-#: ../lib/Tails/Persistence/Setup.pm:377
+#: ../lib/Tails/Persistence/Setup.pm:376
 msgid Persistence volume is not mounted.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:382
+#: ../lib/Tails/Persistence/Setup.pm:381
 msgid Persistence volume is not readable. Permissions or ownership problems?
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:387
+#: ../lib/Tails/Persistence/Setup.pm:386
 msgid Persistence volume is not writable. Maybe it was mounted read-only?
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:396
+#: ../lib/Tails/Persistence/Setup.pm:395
 #, perl-format
 msgid Tails is running from non-USB / non-SDIO device %s.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:402
+#: ../lib/Tails/Persistence/Setup.pm:401
 #, perl-format
 msgid Device %s is optical.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:409
+#: ../lib/Tails/Persistence/Setup.pm:408
 #, perl-format
 msgid Device %s was not created using Tails USB installer.
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:444
+#: ../lib/Tails/Persistence/Setup.pm:443
 msgid Error
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:680
+#: ../lib/Tails/Persistence/Setup.pm:658
 msgid Persistence wizard - Finished
 msgstr 
 
-#: ../lib/Tails/Persistence/Setup.pm:683
+#: ../lib/Tails/Persistence/Setup.pm:661
 msgid 
 Any changes you have made will only take effect after restarting Tails.\n
 \n
@@ -305,10 +306,10 @@ msgstr 
 msgid Delete
 msgstr 
 
-#: ../lib/Tails/Persistence/Step/Delete.pm:91
+#: ../lib/Tails/Persistence/Step/Delete.pm:100
 msgid Deleting...
 msgstr 
 
-#: ../lib/Tails/Persistence/Step/Delete.pm:94
+#: ../lib/Tails/Persistence/Step/Delete.pm:103
 msgid Deleting the persistent volume...
 msgstr 

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


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

2013-12-18 Thread translation
commit cef74b44b4dea7564ffaeb73595e3f74435a9809
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:15:58 2013 +

Update translations for https_everywhere
---
 zh_HK/https-everywhere.properties |2 +-
 zh_HK/ssl-observatory.dtd |   75 +
 2 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/zh_HK/https-everywhere.properties 
b/zh_HK/https-everywhere.properties
index 21feda9..c5f7cc6 100644
--- a/zh_HK/https-everywhere.properties
+++ b/zh_HK/https-everywhere.properties
@@ -1,6 +1,6 @@
 # https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
 # https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-# https-everywhere.menu.enableDisable = Enable / Disable Rules
+https-everywhere.menu.enableDisable = 啟用 / 禁用規則
 # https-everywhere.menu.noRules = (No Rules for This Page)
 # https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
 # https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can 
toggle it on a site-by-site basis by clicking the icon in the address bar.
diff --git a/zh_HK/ssl-observatory.dtd b/zh_HK/ssl-observatory.dtd
index d832b69..ae52c88 100644
--- a/zh_HK/ssl-observatory.dtd
+++ b/zh_HK/ssl-observatory.dtd
@@ -1,9 +1,11 @@
 !-- Observatory popup window --
-!ENTITY ssl-observatory.popup.details 
-!ENTITY ssl-observatory.popup.later 
-!ENTITY ssl-observatory.popup.no 
+!ENTITY ssl-observatory.popup.details Details and Privacy Information
+!ENTITY ssl-observatory.popup.later Ask Me Later
+!ENTITY ssl-observatory.popup.no 否
 
-!ENTITY ssl-observatory.popup.text 
+!ENTITY ssl-observatory.popup.text HTTPS Everywhere can detect attacks
+against your browser by sending the certificates you receive to the
+Observatory.  Turn this on?
 
 !--!ENTITY ssl-observatory.popup.text 
 EFF's SSL Observatory can detect attacks against HTTPS websites by collecting
@@ -11,40 +13,44 @@ and auditing the certificates being presented to your 
browser. Would you like
 to turn it on?--
 
 !ENTITY ssl-observatory.popup.title 
-
+Should HTTPS Everywhere use the SSL Observatory?
 
-!ENTITY ssl-observatory.popup.yes 
+!ENTITY ssl-observatory.popup.yes 是
 
 !-- Observatory preferences dialog --
 
 !ENTITY ssl-observatory.prefs.adv_priv_opts1
-
+It is safe to enable this, unless you use a very
+intrusive corporate network:
 
 !ENTITY ssl-observatory.prefs.adv_priv_opts2
-
+Safe, unless you use a corporate network with secret intranet server names:
 
 !ENTITY ssl-observatory.prefs.alt_roots 
-
+Submit and check certificates signed by non-standard root CAs
 
 !ENTITY ssl-observatory.prefs.alt_roots_tooltip 
-
+It is safe (and a good idea) to enable this option, unless you use an 
intrusive corporate network or Kaspersky antivirus software that monitors your 
browsing with a TLS proxy and a private root Certificate Authority.  If enabled 
on such a network, this option might publish evidence of which https:// domains 
were being visited through that proxy, because of the unique certificates it 
would produce.  So we leave it off by default.
 
-!ENTITY ssl-observatory.prefs.anonymous 
+!ENTITY ssl-observatory.prefs.anonymous Check certificates using Tor for 
anonymity
 !ENTITY ssl-observatory.prefs.anonymous_unavailable 
-
+Check certificates using Tor for anonymity (requires Tor)
 !ENTITY ssl-observatory.prefs.anonymous_tooltip 
-
+This option requires Tor to be installed and running
 
 !ENTITY ssl-observatory.prefs.asn 
-
+When you see a new certificate, tell the Observatory which ISP you are 
connected to
 
 !ENTITY ssl-observatory.prefs.asn_tooltip
-
+This will fetch and send the quot;Autonomous System numberquot; of your 
network.  This will help us locate attacks against HTTPS, and to determine 
whether we have observations from networks in places like Iran and Syria where 
attacks are comparatively common.
 
-!ENTITY ssl-observatory.prefs.done 
+!ENTITY ssl-observatory.prefs.done Done
 
 !ENTITY ssl-observatory.prefs.explanation 
-
+HTTPS Everywhere can use EFF's SSL Observatory.  This does two things: (1)
+sends copies of HTTPS certificates to the Observatory, to help us
+detect 'man in the middle' attacks and improve the Web's security; and (2)
+lets us warn you about insecure connections or attacks on your browser.
 
 !--!ENTITY ssl-observatory.prefs.explanation2
 When you visit https://www.example.com, the Observatory will learn that
@@ -53,34 +59,37 @@ Mouseover the options for further details:--
 
 !ENTITY ssl-observatory.prefs.explanation2
 
-
+For example, when you visit https://www.something.com, the certificate
+received by the Observatory will indicate that somebody visited
+www.something.com, but not who visited the site, or what specific page they
+looked at.  Mouseover the options for further details:
 
-!ENTITY ssl-observatory.prefs.hide 
+!ENTITY ssl-observatory.prefs.hide Hide advanced options
 
 !ENTITY ssl-observatory.prefs.nonanon 
-
+Check certificates even 

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

2013-12-18 Thread translation
commit ec271c6ba06945e27fd1440e6d2f3073dd716b73
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:12 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.dtd |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index d37a29c..b6ac04a 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -33,12 +33,12 @@
 !ENTITY torbirdy.prefs.torification.label Transparente Torification (aviso: 
requer transproxy personalizada ou o roteador Tor)
 !ENTITY torbirdy.prefs.torification.key t
 !ENTITY torbirdy.prefs.global Global
-!ENTITY torbirdy.prefs.imap.label Ativar suporte a download de emails via 
IMAP [padrão: desativado]
+!ENTITY torbirdy.prefs.imap.label Ativar o suporte de e-mail para contas de 
IMAP [padrão: desativado]
 !ENTITY torbirdy.prefs.imap.key p
 !ENTITY torbirdy.prefs.startup_folder.label Abrir a última pasta acessada 
ao iniciar [padrão: desativado]
-!ENTITY torbirdy.prefs.startup_folder.key p
-!ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para UTC [padrão: definido para UTC]
-!ENTITY torbirdy.prefs.timezone.key f
+!ENTITY torbirdy.prefs.startup_folder.key I
+!ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para o UTC [padrão: definido para UTC]
+!ENTITY torbirdy.prefs.timezone.key z
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não colocar a ID dos 
destinatários em mensagens criptografadas [padrão: colocar]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
 !ENTITY torbirdy.prefs.confirmemail.label Confirmar antes de enviar e-mail 
se Enigmail estiver ativado [padrão: não confirmar]
@@ -49,8 +49,8 @@
 !ENTITY torbirdy.prefs.automatic.key f
 !ENTITY torbirdy.prefs.renegotiation.label Permitir conexões a servidores 
que não suportam SSL/TLS com negociação segura [padrão: não permitir]
 !ENTITY torbirdy.prefs.renegotiation.key r
-!ENTITY torbirdy.prefs.account_specific Configurações da Conta
-!ENTITY torbirdy.prefs.select_account.key s
+!ENTITY torbirdy.prefs.account_specific Conta-Específica
+!ENTITY torbirdy.prefs.select_account.key C
 !ENTITY torbirdy.prefs.select_account.label Escolher uma conta:
 !ENTITY torbirdy.prefs.enigmail.keyserver.label Servidor de chave(s) a 
usar:
 !ENTITY torbirdy.prefs.enigmail.keyserver.key k

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


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

2013-12-18 Thread translation
commit f942c0b736fbccfb20c890985ec507f72579657e
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:37 2013 +

Update translations for torbutton-browserproperties
---
 zh_HK/browser.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_HK/browser.properties b/zh_HK/browser.properties
index fd25b10..40422ec 100644
--- a/zh_HK/browser.properties
+++ b/zh_HK/browser.properties
@@ -2,10 +2,10 @@
 # browser.startup.homepage=about:tor
 
 # Spell checker dictionary
-# spellchecker.dictionary=en_US
+spellchecker.dictionary=en_US
 
 # Default search engine
-# browser.search.defaultenginename=Startpage
+browser.search.defaultenginename=起始頁
 
 # Search engine order (order displayed in the search bar dropdown)
 # browser.search.order.1=Startpage

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


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

2013-12-18 Thread translation
commit 2ea07d271e9ac696656529d42fe7e20fa1a99494
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:23 2013 +

Update translations for tor-launcher-progress
---
 zh_HK/progress.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_HK/progress.dtd b/zh_HK/progress.dtd
index e0dcfcc..ba7830b 100644
--- a/zh_HK/progress.dtd
+++ b/zh_HK/progress.dtd
@@ -1,4 +1,4 @@
-!ENTITY torprogress.dialog.title 
-!ENTITY torprogress.openSettings 
-!ENTITY torprogress.heading 
-!ENTITY torprogress.pleaseWait 
+!ENTITY torprogress.dialog.title Tor Status
+!ENTITY torprogress.openSettings 打開設定
+!ENTITY torprogress.heading Connecting to the Tor network
+!ENTITY torprogress.pleaseWait The Tor Browser will open after a Tor network 
connection is established.

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


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

2013-12-18 Thread translation
commit a637c67fbfb674d560a1a6443a9cbafb23b58ebe
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:16:08 2013 +

Update translations for tails-greeter
---
 zh_HK/zh_HK.po |   25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 1ed9dbf..1456857 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# CasperLi_HK li_wai...@hotmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
-Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
-POT-Creation-Date: 2013-05-12 19:29+0200\n
-PO-Revision-Date: 2013-09-16 17:52+\n
-Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2013-11-22 13:49+0100\n
+PO-Revision-Date: 2013-12-18 07:51+\n
+Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -23,7 +24,7 @@ msgstr 
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid Login
-msgstr 
+msgstr 登入
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid Welcome to Tails
@@ -31,23 +32,23 @@ msgstr 
 
 #: ../glade/persistencewindow.glade.h:4
 msgid Use persistence?
-msgstr 
+msgstr 使用持久性?
 
 #: ../glade/persistencewindow.glade.h:5
 msgid Yes
-msgstr 
+msgstr 是
 
 #: ../glade/persistencewindow.glade.h:6
 msgid No
-msgstr 
+msgstr 否
 
 #: ../glade/persistencewindow.glade.h:7
 msgid Passphrase:
-msgstr 
+msgstr 通關密語 : 
 
 #: ../glade/persistencewindow.glade.h:8
 msgid Read-Only?
-msgstr 
+msgstr 唯讀?
 
 #: ../glade/persistencewindow.glade.h:9
 msgid iWrong passphrase. Please try again./i
@@ -55,7 +56,7 @@ msgstr 
 
 #: ../glade/persistencewindow.glade.h:10
 msgid More options?
-msgstr 
+msgstr 更多選項?
 
 #: ../glade/optionswindow.glade.h:3
 msgid Administration password
@@ -95,7 +96,7 @@ msgstr 
 
 #: ../glade/langpanel.glade.h:1
 msgid  
-msgstr 
+msgstr  
 
 #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42
 msgid Language

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


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

2013-12-18 Thread translation
commit cae009c1ebc57a3e6a1e18e7c2691e6d8cdb5707
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:17 2013 +

Update translations for vidalia
---
 pt_BR/qt_pt_BR.po  |2 +-
 zh_HK/vidalia_zh_HK.po |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pt_BR/qt_pt_BR.po b/pt_BR/qt_pt_BR.po
index 83d97ec..a415366 100644
--- a/pt_BR/qt_pt_BR.po
+++ b/pt_BR/qt_pt_BR.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2008-08-20 03:25+\n
-PO-Revision-Date: 2013-11-12 09:40+\n
+PO-Revision-Date: 2013-12-18 08:40+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index a6c9682..6747ab4 100755
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -5,7 +5,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-03-21 17:52+\n
-PO-Revision-Date: 2013-11-12 09:41+\n
+PO-Revision-Date: 2013-12-18 08:32+\n
 Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -1633,7 +1633,7 @@ msgstr 
 
 msgctxt MainWindow
 msgid Exit
-msgstr 
+msgstr 離開
 
 msgctxt MainWindow
 msgid Bandwidth Graph
@@ -3707,11 +3707,11 @@ msgstr Cancel
 
 msgctxt VMessageBox
 msgid Yes
-msgstr 
+msgstr 是
 
 msgctxt VMessageBox
 msgid No
-msgstr 
+msgstr 否
 
 msgctxt VMessageBox
 msgid Help
@@ -3735,7 +3735,7 @@ msgstr 
 
 msgctxt VMessageBox
 msgid Quit
-msgstr 
+msgstr 離開
 
 msgctxt VMessageBox
 msgid Browse

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


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

2013-12-18 Thread translation
commit 7a47abe6aa86101c68b0f159585ca3f8db24303e
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:10 2013 +

Update translations for orbot
---
 values-zh_HK/strings.xml |1 +
 1 file changed, 1 insertion(+)

diff --git a/values-zh_HK/strings.xml b/values-zh_HK/strings.xml
index 59551d1..c0c4fe1 100644
--- a/values-zh_HK/strings.xml
+++ b/values-zh_HK/strings.xml
@@ -2,6 +2,7 @@
 resources
   string name=menu_infoHelp/string
   string name=button_helpHelp/string
+  string name=menu_exit離開/string
   string name=btn_cancelCancel/string
   !--Welcome Wizard strings (DJH)--
   string name=wizard_proxy_help_infoProxy Settings/string

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


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

2013-12-18 Thread translation
commit 82c547e5a531395dac1ac46ca15ef532cae5cbbe
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:02 2013 +

Update translations for bridgedb
---
 zh_HK/LC_MESSAGES/bridgedb.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index eaa2fb5..6f0264d 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2013-03-27 21:41+\n
-PO-Revision-Date: 2013-12-18 07:49+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit f22b1f4b829e34cc7387d27a405d985f710d3fc6
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:20 2013 +

Update translations for vidalia_completed
---
 pt_BR/qt_pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/qt_pt_BR.po b/pt_BR/qt_pt_BR.po
index 83d97ec..a415366 100644
--- a/pt_BR/qt_pt_BR.po
+++ b/pt_BR/qt_pt_BR.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2008-08-20 03:25+\n
-PO-Revision-Date: 2013-11-12 09:40+\n
+PO-Revision-Date: 2013-12-18 08:40+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit 75cb065a34d684ddac53b3b85111b8456f78060f
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:06 2013 +

Update translations for gettor
---
 zh_HK/gettor.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/gettor.po b/zh_HK/gettor.po
index 988ed18..8ef2ee9 100644
--- a/zh_HK/gettor.po
+++ b/zh_HK/gettor.po
@@ -10,7 +10,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-01-19 13:40+0100\n
-PO-Revision-Date: 2013-12-18 07:48+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit fe49c71a0906188a9b5c438a6e99aeb651f5e6b7
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:57 2013 +

Update translations for torcheck
---
 zh_HK/torcheck.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/torcheck.po b/zh_HK/torcheck.po
index ef3b805..abf4901 100644
--- a/zh_HK/torcheck.po
+++ b/zh_HK/torcheck.po
@@ -7,7 +7,7 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 POT-Creation-Date: 2012-02-16 20:28+PDT\n
-PO-Revision-Date: 2013-12-18 07:46+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit d340056ec2fb54d854a54063a0c755cdd77e76d3
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:45:23 2013 +

Update translations for vidalia_alpha
---
 zh_HK/vidalia_zh_HK.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index 799cea5..1ea3558 100644
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -5,7 +5,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: translati...@vidalia-project.net\n
 POT-Creation-Date: 2012-03-21 17:46+\n
-PO-Revision-Date: 2013-11-12 09:41+\n
+PO-Revision-Date: 2013-12-18 08:32+\n
 Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -1665,7 +1665,7 @@ msgstr 
 
 msgctxt MainWindow
 msgid Exit
-msgstr 
+msgstr 離開
 
 msgctxt MainWindow
 msgid Bandwidth Graph
@@ -3794,11 +3794,11 @@ msgstr Cancel
 
 msgctxt VMessageBox
 msgid Yes
-msgstr 
+msgstr 是
 
 msgctxt VMessageBox
 msgid No
-msgstr 
+msgstr 否
 
 msgctxt VMessageBox
 msgid Help
@@ -3822,7 +3822,7 @@ msgstr 
 
 msgctxt VMessageBox
 msgid Quit
-msgstr 
+msgstr 離開
 
 msgctxt VMessageBox
 msgid Browse

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


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

2013-12-18 Thread translation
commit 27dc2cca87e0058b57f13073ab28ae0731ee46f9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:49 2013 +

Update translations for torbutton-browserproperties
---
 zh_HK/browser.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/browser.properties b/zh_HK/browser.properties
index 40422ec..09634e1 100644
--- a/zh_HK/browser.properties
+++ b/zh_HK/browser.properties
@@ -8,6 +8,6 @@ spellchecker.dictionary=en_US
 browser.search.defaultenginename=起始頁
 
 # Search engine order (order displayed in the search bar dropdown)
-# browser.search.order.1=Startpage
+browser.search.order.1=起始頁
 # browser.search.order.2=DuckDuckGo
 # browser.search.order.3=Google

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


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

2013-12-18 Thread translation
commit d213fde2947ffd785876fa00e9b12ecda70fec7e
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:33 2013 +

Update translations for tor-launcher-network-settings
---
 zh_HK/network-settings.dtd |   84 ++--
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index 723a055..18763c7 100644
--- a/zh_HK/network-settings.dtd
+++ b/zh_HK/network-settings.dtd
@@ -1,55 +1,55 @@
-!ENTITY torsettings.dialog.title 
+!ENTITY torsettings.dialog.title Tor Network Settings
 
 !-- For first run wizard: --
 
-!ENTITY torsettings.prompt 
+!ENTITY torsettings.prompt Before the Tor Browser Bundle tries to connect to 
the Tor network, you need to provide information about this computer's Internet 
connection.
 
-!ENTITY torSettings.yes 
-!ENTITY torSettings.no 
+!ENTITY torSettings.yes 是
+!ENTITY torSettings.no 否
 
-!ENTITY torSettings.firstQuestion 
-!ENTITY torSettings.configurePrompt1 
-!ENTITY torSettings.configurePrompt2 
-!ENTITY torSettings.configure 
-!ENTITY torSettings.connectPrompt1 
-!ENTITY torSettings.connectPrompt2 
-!ENTITY torSettings.connect 
+!ENTITY torSettings.firstQuestion Which of the following best describes your 
situation?
+!ENTITY torSettings.configurePrompt1 This computer's Internet connection is 
censored, filtered, or proxied.
+!ENTITY torSettings.configurePrompt2 I need to configure network settings.
+!ENTITY torSettings.configure Configure
+!ENTITY torSettings.connectPrompt1 This computer's Internet connection is 
clear of obstacles.
+!ENTITY torSettings.connectPrompt2 I would like to connect directly to the 
Tor network.
+!ENTITY torSettings.connect Connect
 
-!ENTITY torSettings.proxyQuestion 
+!ENTITY torSettings.proxyQuestion Does this computer need to use a proxy to 
access the Internet?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp 
-!ENTITY torSettings.enterProxy 
-!ENTITY torSettings.firewallQuestion 
-!ENTITY torSettings.firewallHelp 
-!ENTITY torSettings.enterFirewall 
-!ENTITY torSettings.bridgeQuestion 
+!ENTITY torSettings.proxyHelp If you are not sure how to answer this 
question, look at the Internet settings in another browser to see whether it is 
configured to use a proxy.
+!ENTITY torSettings.enterProxy Enter the proxy settings.
+!ENTITY torSettings.firewallQuestion Does this computer's Internet 
connection go through a firewall that only allows connections to certain 
ports?
+!ENTITY torSettings.firewallHelp If you are not sure how to answer this 
question, choose No. If you encounter problems connecting to the Tor network, 
change this setting.
+!ENTITY torSettings.enterFirewall Enter a comma-separated list of ports that 
are allowed by the firewall.
+!ENTITY torSettings.bridgeQuestion If this computer's Internet connection is 
censored, you will need to obtain and use bridge relays.amp;#160; If not, just 
click Connect.
 
 !-- Other: --
 
-!ENTITY torsettings.startingTor 
-!ENTITY torsettings.restart 
+!ENTITY torsettings.startingTor Waiting for Tor to start…
+!ENTITY torsettings.restart Restart
 
-!ENTITY torsettings.optional 
+!ENTITY torsettings.optional Optional
 
-!ENTITY torsettings.useProxy.checkbox 
-!ENTITY torsettings.useProxy.type 
-!ENTITY torsettings.useProxy.address 
-!ENTITY torsettings.useProxy.address.placeholder 
+!ENTITY torsettings.useProxy.checkbox This computer needs to use a proxy to 
access the Internet
+!ENTITY torsettings.useProxy.type Proxy Type:
+!ENTITY torsettings.useProxy.address Address:
+!ENTITY torsettings.useProxy.address.placeholder IP address or hostname
 !ENTITY torsettings.useProxy.port Port:
-!ENTITY torsettings.useProxy.username 
-!ENTITY torsettings.useProxy.password 
-!ENTITY torsettings.useProxy.type.socks4 
-!ENTITY torsettings.useProxy.type.socks5 
-!ENTITY torsettings.useProxy.type.http 
-!ENTITY torsettings.firewall.checkbox 
-!ENTITY torsettings.firewall.allowedPorts 
-!ENTITY torsettings.useBridges.checkbox 
-!ENTITY torsettings.useBridges.label 
-!ENTITY torsettings.useBridges.placeholder 
-
-!ENTITY torsettings.copyLog 
-!ENTITY torsettings.bridgeHelpTitle 
-!ENTITY torsettings.bridgeHelp1 
-!ENTITY torsettings.bridgeHelp2 
-!ENTITY torsettings.bridgeHelp3 
-!ENTITY torsettings.bridgeHelp4 
+!ENTITY torsettings.useProxy.username Username:
+!ENTITY torsettings.useProxy.password Password:
+!ENTITY torsettings.useProxy.type.socks4 SOCKS 4
+!ENTITY torsettings.useProxy.type.socks5 SOCKS 5
+!ENTITY torsettings.useProxy.type.http HTTP / HTTPS
+!ENTITY torsettings.firewall.checkbox This computer goes through a firewall 
that only allows connections to certain ports
+!ENTITY torsettings.firewall.allowedPorts Allowed Ports:
+!ENTITY torsettings.useBridges.checkbox My Internet Service Provider (ISP) 
blocks connections to the Tor network
+!ENTITY torsettings.useBridges.label Enter one or more bridge relays (one 
per line).
+!ENTITY 

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

2013-12-18 Thread translation
commit 85bb6bbc8dd21678eda1a9489c971119399eefbd
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:13 2013 +

Update translations for tails-persistence-setup
---
 pt_BR/pt_BR.po |2 +-
 zh_HK/zh_HK.po |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 550233f..a0bd2e8 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -18,7 +18,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-15 11:30+0100\n
-PO-Revision-Date: 2013-12-18 01:38+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: ebonsi\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n
diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index a742af1..6b59361 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-15 11:30+0100\n
-PO-Revision-Date: 2013-12-18 07:53+\n
+PO-Revision-Date: 2013-12-18 08:32+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -216,7 +216,7 @@ msgstr 
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144
 msgid Passphrase:
-msgstr 
+msgstr 通關密語 : 
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154
 msgid Verify Passphrase:

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


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

2013-12-18 Thread translation
commit 02950a7b091dfb2363393c189d033e27f949ea60
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:24 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index b6ac04a..b09a67f 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -12,7 +12,7 @@
 !ENTITY torbirdy.prefs.save.button Salvar
 !ENTITY torbirdy.prefs.save.key s
 !ENTITY torbirdy.prefs.cancel.button Cancelar
-!ENTITY torbirdy.prefs.extra2.button Restaurar padrão
+!ENTITY torbirdy.prefs.extra2.button Restaurar os padrões
 !ENTITY torbirdy.prefs.extra2.key d
 !ENTITY torbirdy.prefs.testproxy.button Testar as Configurações do Proxy
 !ENTITY torbirdy.prefs.testproxy.key n
@@ -35,29 +35,29 @@
 !ENTITY torbirdy.prefs.global Global
 !ENTITY torbirdy.prefs.imap.label Ativar o suporte de e-mail para contas de 
IMAP [padrão: desativado]
 !ENTITY torbirdy.prefs.imap.key p
-!ENTITY torbirdy.prefs.startup_folder.label Abrir a última pasta acessada 
ao iniciar [padrão: desativado]
+!ENTITY torbirdy.prefs.startup_folder.label Selecione a última pasta de 
e-mail acessada ao iniciar [padrão: desativado]
 !ENTITY torbirdy.prefs.startup_folder.key I
 !ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para o UTC [padrão: definido para UTC]
 !ENTITY torbirdy.prefs.timezone.key z
-!ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não colocar a ID dos 
destinatários em mensagens criptografadas [padrão: colocar]
+!ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não ponha os IDs chaves 
dos destinatários em mensagens criptografadas [padrão: pôr]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
-!ENTITY torbirdy.prefs.confirmemail.label Confirmar antes de enviar e-mail 
se Enigmail estiver ativado [padrão: não confirmar]
+!ENTITY torbirdy.prefs.confirmemail.label Confirme antes de enviar um e-mail 
e no caso do Enigmail estiver ativado [padrão: não confirmar]
 !ENTITY torbirdy.prefs.confirmemail.key c
 !ENTITY torbirdy.prefs.emailwizard.label Ativar o assistente de 
configuração de email do Thunderbird [padrão: desativar]
 !ENTITY torbirdy.prefs.emailwizard.key w
-!ENTITY torbirdy.prefs.automatic.label Verifica automaticamente novas 
mensagens em todas contas [padrão: desabilitado]
+!ENTITY torbirdy.prefs.automatic.label Verifique as novas mensagens 
automaticamente para todas as contas [padrão: desabilitado]
 !ENTITY torbirdy.prefs.automatic.key f
-!ENTITY torbirdy.prefs.renegotiation.label Permitir conexões a servidores 
que não suportam SSL/TLS com negociação segura [padrão: não permitir]
+!ENTITY torbirdy.prefs.renegotiation.label Permitir conexões à provedores 
que não suportam SSL/TLS com renegociação segura [padrão: não permitir]
 !ENTITY torbirdy.prefs.renegotiation.key r
 !ENTITY torbirdy.prefs.account_specific Conta-Específica
 !ENTITY torbirdy.prefs.select_account.key C
 !ENTITY torbirdy.prefs.select_account.label Escolher uma conta:
-!ENTITY torbirdy.prefs.enigmail.keyserver.label Servidor de chave(s) a 
usar:
+!ENTITY torbirdy.prefs.enigmail.keyserver.label Provedores chave(s) para 
usar:
 !ENTITY torbirdy.prefs.enigmail.keyserver.key k
 
 !ENTITY torbirdy.panel.usetor.label Usar o Roteador Tor Onion
-!ENTITY torbirdy.panel.usejondo.label Usar o JonDo (Usuário Premium)
-!ENTITY torbirdy.panel.usewhonix.label Usar Whonix
-!ENTITY torbirdy.panel.preferences.label Abrir Preferências do TorBirdy
+!ENTITY torbirdy.panel.usejondo.label Use o JonDo (Premium)
+!ENTITY torbirdy.panel.usewhonix.label Use o Whonix
+!ENTITY torbirdy.panel.preferences.label Abra o Preferências do TorBirdy
 
 !ENTITY torbirdy.firstrun.title Primeira execução do TorBirdy

___
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

2013-12-18 Thread translation
commit d9317394f5fa452fd5d9d0fbfbfeebe5ecc173f9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:40 2013 +

Update translations for abouttor-homepage
---
 zh_HK/aboutTor.dtd |  102 ++--
 1 file changed, 51 insertions(+), 51 deletions(-)

diff --git a/zh_HK/aboutTor.dtd b/zh_HK/aboutTor.dtd
index da2703e..5c9293e 100644
--- a/zh_HK/aboutTor.dtd
+++ b/zh_HK/aboutTor.dtd
@@ -4,24 +4,24 @@
- vim: set sw=2 sts=2 ts=8 et syntax=xml:
   --
 
-!ENTITY aboutTor.title 
+!ENTITY aboutTor.title About Tor
 
-!ENTITY aboutTor.outOfDateTorOn.label 
-!ENTITY aboutTor.outOfDateTorOff.label 
-!ENTITY aboutTor.outOfDate2.label 
+!ENTITY aboutTor.outOfDateTorOn.label HOWEVER, this browser is out of date.
+!ENTITY aboutTor.outOfDateTorOff.label ALSO, this browser is out of date.
+!ENTITY aboutTor.outOfDate2.label Click on the onion and then choose 
Download Tor Browser Bundle Update.
 
-!ENTITY aboutTor.check.label 
+!ENTITY aboutTor.check.label Test Tor Network Settings
 
-!ENTITY aboutTor.success.label 
-!ENTITY aboutTor.success2.label 
-!ENTITY aboutTor.success3.label 
-!ENTITY aboutTor.failure.label 
-!ENTITY aboutTor.failure2.label 
-!ENTITY aboutTor.failure3prefix.label 
-!ENTITY aboutTor.failure3Link 
-!ENTITY aboutTor.failure3suffix.label 
+!ENTITY aboutTor.success.label Congratulations!
+!ENTITY aboutTor.success2.label This browser is configured to use Tor.
+!ENTITY aboutTor.success3.label You are now free to browse the Internet 
anonymously.
+!ENTITY aboutTor.failure.label Something Went Wrong!
+!ENTITY aboutTor.failure2.label Tor is not working in this browser.
+!ENTITY aboutTor.failure3prefix.label For assistance, please contact 
+!ENTITY aboutTor.failure3Link h...@rt.torproject.org
+!ENTITY aboutTor.failure3suffix.label .
 
-!ENTITY aboutTor.search.label 
+!ENTITY aboutTor.search.label Search
 
 !-- Note to translators: the following 18 entities are used to construct a
- sentence (either the SP or DDG entities are used, but not both at the
@@ -32,42 +32,42 @@
- The sentence contains two embedded links for securely and
- the search engine (Startpage or DuckDuckGo).
   --
-!ENTITY aboutTor.searchSPPost.link 
-!ENTITY aboutTor.searchDDGPost.link 
-!ENTITY aboutTor.searchSP.privacy.beforeLink.label 
-!ENTITY aboutTor.searchDDG.privacy.beforeLink.label 
-!ENTITY aboutTor.searchSP.privacy.label 
-!ENTITY aboutTor.searchDDG.privacy.label 
-!ENTITY aboutTor.searchSP.privacy.link 
-!ENTITY aboutTor.searchDDG.privacy.link 
-!ENTITY aboutTor.searchSP.privacy.afterLink.label 
-!ENTITY aboutTor.searchDDG.privacy.afterLink.label 
-!ENTITY aboutTor.searchSP.search.beforeLink.label 
-!ENTITY aboutTor.searchDDG.search.beforeLink.label 
-!ENTITY aboutTor.searchSP.search.label 
-!ENTITY aboutTor.searchDDG.search.label 
-!ENTITY aboutTor.searchSP.search.link 
-!ENTITY aboutTor.searchDDG.search.link 
-!ENTITY aboutTor.searchSP.search.afterLink.label 
-!ENTITY aboutTor.searchDDG.search.afterLink.label 
+!ENTITY aboutTor.searchSPPost.link https://startpage.com/rth/search;
+!ENTITY aboutTor.searchDDGPost.link https://duckduckgo.com/html/;
+!ENTITY aboutTor.searchSP.privacy.beforeLink.label Search 
+!ENTITY aboutTor.searchDDG.privacy.beforeLink.label Search 
+!ENTITY aboutTor.searchSP.privacy.label securely
+!ENTITY aboutTor.searchDDG.privacy.label securely
+!ENTITY aboutTor.searchSP.privacy.link 
https://startpage.com/eng/protect-privacy.html;
+!ENTITY aboutTor.searchDDG.privacy.link https://duckduckgo.com/privacy.html;
+!ENTITY aboutTor.searchSP.privacy.afterLink.label amp;nbsp;
+!ENTITY aboutTor.searchDDG.privacy.afterLink.label amp;nbsp;
+!ENTITY aboutTor.searchSP.search.beforeLink.label with 
+!ENTITY aboutTor.searchDDG.search.beforeLink.label with 
+!ENTITY aboutTor.searchSP.search.label 起始頁
+!ENTITY aboutTor.searchDDG.search.label DuckDuckGo
+!ENTITY aboutTor.searchSP.search.link https://startpage.com/;
+!ENTITY aboutTor.searchDDG.search.link https://duckduckgo.com/;
+!ENTITY aboutTor.searchSP.search.afterLink.label .
+!ENTITY aboutTor.searchDDG.search.afterLink.label .
 
-!ENTITY aboutTor.torInfo1.label 
-!ENTITY aboutTor.torInfo2.label 
-!ENTITY aboutTor.torInfo3.label 
-!ENTITY aboutTor.torInfo4.label 
-!ENTITY aboutTor.whatnextQuestion.label 
-!ENTITY aboutTor.whatnextAnswer.label 
-!ENTITY aboutTor.whatnext.label 
-!ENTITY aboutTor.whatnext.link 
-!ENTITY aboutTor.helpInfo1.label 
-!ENTITY aboutTor.helpInfo2.label 
-!ENTITY aboutTor.helpInfo3.label 
-!ENTITY aboutTor.helpInfo3.link 
-!ENTITY aboutTor.helpInfo4.label 
-!ENTITY aboutTor.helpInfo4.link 
-!ENTITY aboutTor.helpInfo5.label 
-!ENTITY aboutTor.helpInfo5.link 
+!ENTITY aboutTor.torInfo1.label Additional Info:
+!ENTITY aboutTor.torInfo2.label Country amp; IP Address:
+!ENTITY aboutTor.torInfo3.label Exit Node:
+!ENTITY aboutTor.torInfo4.label This server does not log any information 
about visitors.
+!ENTITY aboutTor.whatnextQuestion.label What Next?
+!ENTITY 

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

2013-12-18 Thread translation
commit 4830e232ee1d0288b8176cb275b743f6c93027c6
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:37 2013 +

Update translations for tails-misc
---
 zh_HK.po |   52 ++--
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/zh_HK.po b/zh_HK.po
index 10711b8..d79cc7f 100644
--- a/zh_HK.po
+++ b/zh_HK.po
@@ -7,8 +7,8 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-10-26 23:41+0200\n
-PO-Revision-Date: 2013-11-06 09:01+\n
+POT-Creation-Date: 2013-12-09 22:49+0100\n
+PO-Revision-Date: 2013-12-18 08:33+\n
 Last-Translator: runasand runa.sand...@gmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -41,7 +41,7 @@ msgstr 
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:139
 msgid Exit
-msgstr 
+msgstr 離開
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:141
 msgid About
@@ -221,21 +221,21 @@ msgstr 
 msgid About Tails
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:114
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:120
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
 msgid Your additional software
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126
 msgid 
 The upgrade failed. This might be due to a network problem. Please check 
 your network connection, try to restart Tails, or read the system log to 
 understand better the problem.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121
+#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122
 msgid The upgrade was successful.
 msgstr 
 
@@ -312,79 +312,79 @@ msgid 
  more.../a
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:59
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57
 msgid error:
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:60
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58
 msgid Error
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:69
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:67
 msgid warning:
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:70
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:68
 msgid Warning
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:77
 msgid Do you really want to launch the Unsafe Browser?
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:79
 msgid 
 Network activity within the Unsafe Browser is bnot anonymous/b. Only use
  the Unsafe Browser if necessary, for example if you have to login or 
 register to activate your Internet connection.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:82
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:80
 msgid _Launch
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:83
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:81
 msgid _Exit
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:93
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:91
 msgid Starting the Unsafe Browser...
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:94
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:92
 msgid This may take a while, so please be patient.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:112
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:110
 msgid Failed to setup chroot.
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:181
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182
 #: 
../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1
 msgid Unsafe Browser
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:221
+#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222
 msgid Shutting down the Unsafe Browser...
 msgstr 
 
-#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:222
+#: 

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

2013-12-18 Thread translation
commit 501c5189426272fad852a239ecbba30a358420d5
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:15 2013 +

Update translations for tails-persistence-setup_completed
---
 pt_BR/pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po
index 550233f..a0bd2e8 100644
--- a/pt_BR/pt_BR.po
+++ b/pt_BR/pt_BR.po
@@ -18,7 +18,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: Tails developers ta...@boum.org\n
 POT-Creation-Date: 2013-11-15 11:30+0100\n
-PO-Revision-Date: 2013-12-18 01:38+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: ebonsi\n
 Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n
 MIME-Version: 1.0\n

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


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-12-18 Thread translation
commit 284832a8ef0e15b57d7074c79f84136dcb191192
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:08 2013 +

Update translations for liveusb-creator
---
 zh_HK/zh_HK.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 0683c94..a557801 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-12-09 15:17+0100\n
-PO-Revision-Date: 2013-12-18 07:45+\n
+PO-Revision-Date: 2013-12-18 08:25+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit eab9c62a417b4504a8997aac6428f10b68dcfb9b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:18 2013 +

Update translations for tails-greeter
---
 zh_HK/zh_HK.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 1456857..7b38cb1 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-11-22 13:49+0100\n
-PO-Revision-Date: 2013-12-18 07:51+\n
+PO-Revision-Date: 2013-12-18 08:32+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n

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


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

2013-12-18 Thread translation
commit 718bbf236a6780ef14e7382f1ef9135bd615f0e3
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 08:46:22 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.dtd |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index b6ac04a..b09a67f 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -12,7 +12,7 @@
 !ENTITY torbirdy.prefs.save.button Salvar
 !ENTITY torbirdy.prefs.save.key s
 !ENTITY torbirdy.prefs.cancel.button Cancelar
-!ENTITY torbirdy.prefs.extra2.button Restaurar padrão
+!ENTITY torbirdy.prefs.extra2.button Restaurar os padrões
 !ENTITY torbirdy.prefs.extra2.key d
 !ENTITY torbirdy.prefs.testproxy.button Testar as Configurações do Proxy
 !ENTITY torbirdy.prefs.testproxy.key n
@@ -35,29 +35,29 @@
 !ENTITY torbirdy.prefs.global Global
 !ENTITY torbirdy.prefs.imap.label Ativar o suporte de e-mail para contas de 
IMAP [padrão: desativado]
 !ENTITY torbirdy.prefs.imap.key p
-!ENTITY torbirdy.prefs.startup_folder.label Abrir a última pasta acessada 
ao iniciar [padrão: desativado]
+!ENTITY torbirdy.prefs.startup_folder.label Selecione a última pasta de 
e-mail acessada ao iniciar [padrão: desativado]
 !ENTITY torbirdy.prefs.startup_folder.key I
 !ENTITY torbirdy.prefs.timezone.label Não defina o fuso horário do 
Thunderbird para o UTC [padrão: definido para UTC]
 !ENTITY torbirdy.prefs.timezone.key z
-!ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não colocar a ID dos 
destinatários em mensagens criptografadas [padrão: colocar]
+!ENTITY torbirdy.prefs.enigmail_throwkeyid.label Não ponha os IDs chaves 
dos destinatários em mensagens criptografadas [padrão: pôr]
 !ENTITY torbirdy.prefs.enigmail_throwkeyid.key r
-!ENTITY torbirdy.prefs.confirmemail.label Confirmar antes de enviar e-mail 
se Enigmail estiver ativado [padrão: não confirmar]
+!ENTITY torbirdy.prefs.confirmemail.label Confirme antes de enviar um e-mail 
e no caso do Enigmail estiver ativado [padrão: não confirmar]
 !ENTITY torbirdy.prefs.confirmemail.key c
 !ENTITY torbirdy.prefs.emailwizard.label Ativar o assistente de 
configuração de email do Thunderbird [padrão: desativar]
 !ENTITY torbirdy.prefs.emailwizard.key w
-!ENTITY torbirdy.prefs.automatic.label Verifica automaticamente novas 
mensagens em todas contas [padrão: desabilitado]
+!ENTITY torbirdy.prefs.automatic.label Verifique as novas mensagens 
automaticamente para todas as contas [padrão: desabilitado]
 !ENTITY torbirdy.prefs.automatic.key f
-!ENTITY torbirdy.prefs.renegotiation.label Permitir conexões a servidores 
que não suportam SSL/TLS com negociação segura [padrão: não permitir]
+!ENTITY torbirdy.prefs.renegotiation.label Permitir conexões à provedores 
que não suportam SSL/TLS com renegociação segura [padrão: não permitir]
 !ENTITY torbirdy.prefs.renegotiation.key r
 !ENTITY torbirdy.prefs.account_specific Conta-Específica
 !ENTITY torbirdy.prefs.select_account.key C
 !ENTITY torbirdy.prefs.select_account.label Escolher uma conta:
-!ENTITY torbirdy.prefs.enigmail.keyserver.label Servidor de chave(s) a 
usar:
+!ENTITY torbirdy.prefs.enigmail.keyserver.label Provedores chave(s) para 
usar:
 !ENTITY torbirdy.prefs.enigmail.keyserver.key k
 
 !ENTITY torbirdy.panel.usetor.label Usar o Roteador Tor Onion
-!ENTITY torbirdy.panel.usejondo.label Usar o JonDo (Usuário Premium)
-!ENTITY torbirdy.panel.usewhonix.label Usar Whonix
-!ENTITY torbirdy.panel.preferences.label Abrir Preferências do TorBirdy
+!ENTITY torbirdy.panel.usejondo.label Use o JonDo (Premium)
+!ENTITY torbirdy.panel.usewhonix.label Use o Whonix
+!ENTITY torbirdy.panel.preferences.label Abra o Preferências do TorBirdy
 
 !ENTITY torbirdy.firstrun.title Primeira execução do TorBirdy

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


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

2013-12-18 Thread translation
commit 9a9fa14f79394871024f9c93dd034106204a1a91
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 14:16:05 2013 +

Update translations for tails-greeter
---
 zh_HK/zh_HK.po |   26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/zh_HK/zh_HK.po b/zh_HK/zh_HK.po
index 7b38cb1..071921b 100644
--- a/zh_HK/zh_HK.po
+++ b/zh_HK/zh_HK.po
@@ -9,7 +9,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
 POT-Creation-Date: 2013-11-22 13:49+0100\n
-PO-Revision-Date: 2013-12-18 08:32+\n
+PO-Revision-Date: 2013-12-18 14:10+\n
 Last-Translator: CasperLi_HK li_wai...@hotmail.com\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -20,7 +20,7 @@ msgstr 
 
 #: ../glade/persistencewindow.glade.h:1
 msgid Forward
-msgstr 
+msgstr 下一步
 
 #: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
 msgid Login
@@ -28,7 +28,7 @@ msgstr 登入
 
 #: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
 msgid Welcome to Tails
-msgstr 
+msgstr 歡迎光臨 Tails
 
 #: ../glade/persistencewindow.glade.h:4
 msgid Use persistence?
@@ -52,7 +52,7 @@ msgstr 唯讀?
 
 #: ../glade/persistencewindow.glade.h:9
 msgid iWrong passphrase. Please try again./i
-msgstr 
+msgstr i密碼錯誤。請再試一次。/i
 
 #: ../glade/persistencewindow.glade.h:10
 msgid More options?
@@ -60,29 +60,29 @@ msgstr 更多選項?
 
 #: ../glade/optionswindow.glade.h:3
 msgid Administration password
-msgstr 
+msgstr 管理員密碼
 
 #: ../glade/optionswindow.glade.h:4
 msgid 
 Enter an administration password in case you need to perform administration 
tasks.\n
 Otherwise it will be disabled for better security.
-msgstr 
+msgstr 如果你需要執行管理任務就輸å…
¥ç®¡ç†å“¡å¯†ç¢¼ã€‚\n否則,在日常情
況下最好禁用管理員權限,以獲取更好的安全性。
 
 #: ../glade/optionswindow.glade.h:6
 msgid Password:
-msgstr 
+msgstr 密碼:
 
 #: ../glade/optionswindow.glade.h:7
 msgid Verify Password:
-msgstr 
+msgstr 確認密碼:
 
 #: ../glade/optionswindow.glade.h:8
 msgid iPasswords do not match/i
-msgstr 
+msgstr i密碼不相符/i
 
 #: ../glade/optionswindow.glade.h:9
 msgid Windows Camouflage
-msgstr 
+msgstr 窗口迷彩
 
 #: ../glade/optionswindow.glade.h:10
 msgid 
@@ -100,7 +100,7 @@ msgstr  
 
 #: ../glade/langpanel.glade.h:2 ../GdmGreeter/langpanel.py:42
 msgid Language
-msgstr 
+msgstr 語言
 
 #: ../glade/langpanel.glade.h:3
 msgid Locale
@@ -108,7 +108,7 @@ msgstr 
 
 #: ../glade/langpanel.glade.h:4
 msgid Layout
-msgstr 
+msgstr 佈局
 
 #: ../GdmGreeter/persistence.py:59
 #, python-format
@@ -136,4 +136,4 @@ msgstr 
 #: ../GdmGreeter/langpanel.py:124 ../GdmGreeter/langpanel.py:148
 #: ../GdmGreeter/langpanel.py:181
 msgid Other...
-msgstr 
+msgstr 其它...

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


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

2013-12-18 Thread translation
commit 5387171b0cf4fde2b90b11b7561f6129f7c94f9d
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 14:15:12 2013 +

Update translations for vidalia
---
 zh_HK/qt_zh_HK.po  |4 ++--
 zh_HK/vidalia_zh_HK.po |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/zh_HK/qt_zh_HK.po b/zh_HK/qt_zh_HK.po
index 2752c67..828d61f 100644
--- a/zh_HK/qt_zh_HK.po
+++ b/zh_HK/qt_zh_HK.po
@@ -6,7 +6,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2008-08-20 03:25+\n
-PO-Revision-Date: 2013-11-12 09:40+\n
+PO-Revision-Date: 2013-12-18 14:10+\n
 Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -324,7 +324,7 @@ msgstr 
 #: ui_qfiledialog.h:269
 msgctxt QFileDialog
 msgid Forward
-msgstr 
+msgstr 下一步
 
 #: qfiledialog.cpp:2137
 msgctxt QFileDialog
diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index 6747ab4..2ce1f2f 100755
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -5,7 +5,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n;
 POT-Creation-Date: 2012-03-21 17:52+\n
-PO-Revision-Date: 2013-12-18 08:32+\n
+PO-Revision-Date: 2013-12-18 14:10+\n
 Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -212,7 +212,7 @@ msgstr 
 
 msgctxt AppearancePage
 msgid Language
-msgstr 
+msgstr 語言
 
 msgctxt AppearancePage
 msgid Choose the language used in Vidalia
@@ -1448,7 +1448,7 @@ msgstr 
 
 msgctxt HelpBrowser
 msgid Forward
-msgstr 
+msgstr 下一步
 
 msgctxt HelpBrowser
 msgid Move to next page (Shift+Backspace)
@@ -2588,7 +2588,7 @@ msgstr 
 
 msgctxt NetworkPage
 msgid Password:
-msgstr 
+msgstr 密碼:
 
 msgctxt NetworkPage
 msgid Port:

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


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

2013-12-18 Thread translation
commit 584e57bd9ec56fe14b905efb6bc6ecaf7c7da8ab
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 14:15:19 2013 +

Update translations for vidalia_alpha
---
 zh_HK/vidalia_zh_HK.po |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_HK/vidalia_zh_HK.po b/zh_HK/vidalia_zh_HK.po
index 1ea3558..a0aa5c5 100644
--- a/zh_HK/vidalia_zh_HK.po
+++ b/zh_HK/vidalia_zh_HK.po
@@ -5,7 +5,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: translati...@vidalia-project.net\n
 POT-Creation-Date: 2012-03-21 17:46+\n
-PO-Revision-Date: 2013-12-18 08:32+\n
+PO-Revision-Date: 2013-12-18 14:10+\n
 Last-Translator: Tor Project support-team-priv...@lists.torproject.org\n
 Language-Team: Chinese (Hong Kong) 
(http://www.transifex.com/projects/p/torproject/language/zh_HK/)\n
 MIME-Version: 1.0\n
@@ -239,7 +239,7 @@ msgstr 
 
 msgctxt AppearancePage
 msgid Language
-msgstr 
+msgstr 語言
 
 msgctxt AppearancePage
 msgid Choose the language used in Vidalia
@@ -1480,7 +1480,7 @@ msgstr 
 
 msgctxt HelpBrowser
 msgid Forward
-msgstr 
+msgstr 下一步
 
 msgctxt HelpBrowser
 msgid Move to next page (Shift+Backspace)
@@ -2573,7 +2573,7 @@ msgstr 
 
 msgctxt NetworkPage
 msgid Password:
-msgstr 
+msgstr 密碼:
 
 msgctxt NetworkPage
 msgid Port:

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


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

2013-12-18 Thread translation
commit 979e1a6955fc0e79a1fb8a08d746a7d7c08ecb0a
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 14:16:17 2013 +

Update translations for tor-launcher-network-settings
---
 zh_HK/network-settings.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_HK/network-settings.dtd b/zh_HK/network-settings.dtd
index 18763c7..7b5c819 100644
--- a/zh_HK/network-settings.dtd
+++ b/zh_HK/network-settings.dtd
@@ -37,7 +37,7 @@
 !ENTITY torsettings.useProxy.address.placeholder IP address or hostname
 !ENTITY torsettings.useProxy.port Port:
 !ENTITY torsettings.useProxy.username Username:
-!ENTITY torsettings.useProxy.password Password:
+!ENTITY torsettings.useProxy.password 密碼:
 !ENTITY torsettings.useProxy.type.socks4 SOCKS 4
 !ENTITY torsettings.useProxy.type.socks5 SOCKS 5
 !ENTITY torsettings.useProxy.type.http HTTP / HTTPS

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


[tor-commits] [stem/master] Adding torirc to our examples

2013-12-18 Thread atagar
commit d865784767b4446c4068d7f70985789fb4f4f010
Author: Damian Johnson ata...@torproject.org
Date:   Wed Dec 18 08:07:53 2013 -0800

Adding torirc to our examples
---
 docs/tutorials/double_double_toil_and_trouble.rst |1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/tutorials/double_double_toil_and_trouble.rst 
b/docs/tutorials/double_double_toil_and_trouble.rst
index 005c247..f2de969 100644
--- a/docs/tutorials/double_double_toil_and_trouble.rst
+++ b/docs/tutorials/double_double_toil_and_trouble.rst
@@ -43,6 +43,7 @@ something you would like to have included on this page then 
`let me know
 `Metrics Tasks https://gitweb.torproject.org/metrics-tasks.git/tree`_
 One-off tasks related to Tor metrics. These mostly 
involve using descriptor information to answer a particular question. Tasks 
that involve stem are: `1854 
https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-1854/pylinf.py`_,
 `6232 
https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-6232/pyentropy.py`_,
 and `7241 
https://gitweb.torproject.org/metrics-tasks.git/blob/HEAD:/task-7241/first_pass.py`_.
 `check_tor 
http://anonscm.debian.org/gitweb/?p=users/lunar/check_tor.git;a=blob;f=check_tor.py;hb=HEAD`_
  Nagios check to verify that a relay is participating in the Tor network.
 `tbbscraper 
https://github.com/zackw/tbbscraper/blob/master/controller/controller.py`_
Automated website scraper over Tor.
+`torirc https://github.com/alfred-gw/torirc`_
 IRC-like chat client using Tor hidden services.
 `ExitMap https://github.com/NullHypothesis/exitmap`_ 
 Scanner for malicious or misconfigured tor exits.
 
===
 ==
 

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


[tor-commits] r26485: {website} Fixed an anchor (website/trunk/docs/en)

2013-12-18 Thread Matt Pagan
Author: mttp
Date: 2013-12-18 17:16:52 + (Wed, 18 Dec 2013)
New Revision: 26485

Modified:
   website/trunk/docs/en/faq.wml
Log:
Fixed an anchor



Modified: website/trunk/docs/en/faq.wml
===
--- website/trunk/docs/en/faq.wml   2013-12-18 02:44:32 UTC (rev 26484)
+++ website/trunk/docs/en/faq.wml   2013-12-18 17:16:52 UTC (rev 26485)
@@ -2860,8 +2860,8 @@
 
 hr
 
-a id=UseTorInJava/a
-h3a class=anchor href=UseTorInJavaHow can I make my Java 
+a id=UseTorWithJava/a
+h3a class=anchor href=#UseTorWithJavaHow can I make my Java 
 program use the Tor Network?/a/h3
 
 p

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


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

2013-12-18 Thread translation
commit 93addf2017073f615c870a5b063ce08b789822d3
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 18:16:06 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index b09a67f..1d0d97c 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -22,7 +22,7 @@
 !ENTITY torbirdy.prefs.security.label Segurança
 !ENTITY torbirdy.prefs.recommended.text Use as configurações de proxy 
recomendadas para o TorBirdy (Tor)
 !ENTITY torbirdy.prefs.recommended.key r
-!ENTITY torbirdy.prefs.anonservice.text Escolher um serviço de anonimato
+!ENTITY torbirdy.prefs.anonservice.text Escolha um serviço de anonimato
 !ENTITY torbirdy.prefs.anonservice.key a
 !ENTITY torbirdy.prefs.customsettings.text Use as configurações de proxy 
personalizadas
 !ENTITY torbirdy.prefs.customsettings.key c

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


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

2013-12-18 Thread translation
commit da1afc7b44a5f9ccc95f8d0062aeee1c20ae630d
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 18:16:02 2013 +

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

diff --git a/pt_BR/torbirdy.dtd b/pt_BR/torbirdy.dtd
index b09a67f..1d0d97c 100644
--- a/pt_BR/torbirdy.dtd
+++ b/pt_BR/torbirdy.dtd
@@ -22,7 +22,7 @@
 !ENTITY torbirdy.prefs.security.label Segurança
 !ENTITY torbirdy.prefs.recommended.text Use as configurações de proxy 
recomendadas para o TorBirdy (Tor)
 !ENTITY torbirdy.prefs.recommended.key r
-!ENTITY torbirdy.prefs.anonservice.text Escolher um serviço de anonimato
+!ENTITY torbirdy.prefs.anonservice.text Escolha um serviço de anonimato
 !ENTITY torbirdy.prefs.anonservice.key a
 !ENTITY torbirdy.prefs.customsettings.text Use as configurações de proxy 
personalizadas
 !ENTITY torbirdy.prefs.customsettings.key c

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


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

2013-12-18 Thread translation
commit 39655454f55be11409fa4e33c3035974002edf07
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 18:46:03 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index f9cf4ed..2608301 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -3,7 +3,7 @@ torbirdy.name=TorBirdy
 torbirdy.enabled.tor=TorBirdy Ativado: Tor
 torbirdy.enabled.jondo=TorBirdy Ativado: JonDo
 torbirdy.enabled.custom=TorBirdy Ativado: Proxy Personalizado
-torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparent
+torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparente
 torbirdy.enabled.whonix=TorBirdy Habilitado:  Whonix
 torbirdy.disabled=TorBirdy: Desativado!
 

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


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

2013-12-18 Thread translation
commit 7bef6fec8871351ff7f7d5750d695c733ba0cde9
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 18:46:07 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index f9cf4ed..2608301 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -3,7 +3,7 @@ torbirdy.name=TorBirdy
 torbirdy.enabled.tor=TorBirdy Ativado: Tor
 torbirdy.enabled.jondo=TorBirdy Ativado: JonDo
 torbirdy.enabled.custom=TorBirdy Ativado: Proxy Personalizado
-torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparent
+torbirdy.enabled.torification=TorBirdy Ativado: Torificação Transparente
 torbirdy.enabled.whonix=TorBirdy Habilitado:  Whonix
 torbirdy.disabled=TorBirdy: Desativado!
 

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


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

2013-12-18 Thread translation
commit 4475f939336e0c32e40cda06044a2b65af4b2652
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 19:46:04 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 2608301..9f27a70 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -7,7 +7,7 @@ torbirdy.enabled.torification=TorBirdy Ativado: Torificação 
Transparente
 torbirdy.enabled.whonix=TorBirdy Habilitado:  Whonix
 torbirdy.disabled=TorBirdy: Desativado!
 
-torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger sua anonimidade.\nAs configurações 
de segurança recomendadas para %S foram definidas.\nVocê pode configurar as 
configurações de outras contas manualmente.
+torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger seu anonimato.\nAs configurações de 
segurança recomendadas para %S foram definidas.\nAgora você pode configurar 
as definições de uma outra conta manualmente.
 
 torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações 
avançadas do TorBirdy NÃO É recomendado.\nVocê só deve continuar se souber 
o que está fazendo.
 torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro

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


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

2013-12-18 Thread translation
commit 09bec77f774c7159cc8cb99ac2a33c771cc3fbd2
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 19:46:01 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.properties |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 2608301..9f27a70 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -7,7 +7,7 @@ torbirdy.enabled.torification=TorBirdy Ativado: Torificação 
Transparente
 torbirdy.enabled.whonix=TorBirdy Habilitado:  Whonix
 torbirdy.disabled=TorBirdy: Desativado!
 
-torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger sua anonimidade.\nAs configurações 
de segurança recomendadas para %S foram definidas.\nVocê pode configurar as 
configurações de outras contas manualmente.
+torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger seu anonimato.\nAs configurações de 
segurança recomendadas para %S foram definidas.\nAgora você pode configurar 
as definições de uma outra conta manualmente.
 
 torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações 
avançadas do TorBirdy NÃO É recomendado.\nVocê só deve continuar se souber 
o que está fazendo.
 torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro

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


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

2013-12-18 Thread translation
commit f2b1514de73f26cbc7634feb0ec84b0b6d4498eb
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 20:16:03 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 9f27a70..9a26077 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -9,8 +9,8 @@ torbirdy.disabled=TorBirdy: Desativado!
 
 torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger seu anonimato.\nAs configurações de 
segurança recomendadas para %S foram definidas.\nAgora você pode configurar 
as definições de uma outra conta manualmente.
 
-torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações 
avançadas do TorBirdy NÃO É recomendado.\nVocê só deve continuar se souber 
o que está fazendo.
-torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro
+torbirdy.email.advanced=Por favor, note que alterar as configurações 
avançadas do TorBirdy NÃO é recomendado.\nVocê só deve continuar se você 
tiver certeza do que está fazendo.
+torbirdy.email.advanced.nextwarning=Mostrar esse aviso na próxima vez
 torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
 torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso 
horário seja ativada.

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


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

2013-12-18 Thread translation
commit 3e40a6579d16ec233bb3443c80a1d5689e007ef8
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 20:16:06 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 9f27a70..9a26077 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -9,8 +9,8 @@ torbirdy.disabled=TorBirdy: Desativado!
 
 torbirdy.email.prompt=O TorBirdy desativou o assistente de configuração 
automática do Thunderbird para proteger seu anonimato.\nAs configurações de 
segurança recomendadas para %S foram definidas.\nAgora você pode configurar 
as definições de uma outra conta manualmente.
 
-torbirdy.email.advanced=Por favor, tenha em mente que mudar as configurações 
avançadas do TorBirdy NÃO É recomendado.\nVocê só deve continuar se souber 
o que está fazendo.
-torbirdy.email.advanced.nextwarning=Mostrar esse aviso no futuro
+torbirdy.email.advanced=Por favor, note que alterar as configurações 
avançadas do TorBirdy NÃO é recomendado.\nVocê só deve continuar se você 
tiver certeza do que está fazendo.
+torbirdy.email.advanced.nextwarning=Mostrar esse aviso na próxima vez
 torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
 torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso 
horário seja ativada.

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


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

2013-12-18 Thread translation
commit 2f11c81c953da11fb660b75e783b3fc1c446226b
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 20:46:17 2013 +

Update translations for torbirdy_completed
---
 pt_BR/torbirdy.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 9a26077..52dbf24 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, note que alterar as 
configurações avançada
 torbirdy.email.advanced.nextwarning=Mostrar esse aviso na próxima vez
 torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
-torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso 
horário seja ativada.
+torbirdy.restart=Você deve reiniciar o Thunderbind para que a opção do fuso 
horário de zona seja ativada.
 
-torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a 
sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que 
ele criou, prevenindo que ela seja modificada por você ou por um acessório.  
Há algumas configurações que podem ser modificadas através das 
preferências do TorBirdy.  Quando o TorBirdy for removido ou desativado, todas 
suas configurações são restauradas a seus valores padrões (os valores 
anteriores ao TorBirdy ser instalado)\n\nSe você for um novo usuário, 
recomenda-se que leia a página do TorBirdy para entender o que estamos 
almejando para nossos usuários com o TorBirdy.
+torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara ajudar a 
proteger o seu anonimato, o TorBirdy irá impor as configurações do 
Thunderbird que ele criou, impedindo-os de ser mudado por você ou por qualquer 
add-on. Há algumas configurações que podem ser alteradas e estas poderão 
ser acessadas ​​por meio do diálogo de preferências do TorBirdy. Quando o 
TorBirdy for desinstalado ou desativado, todas as configurações definidas 
anteriormente irão retornar para os seus valores padrão (os valores 
anteriores à instalação do TorBirdy).\n\nSe você for um novo usuário, nós 
recomendamos que você leia o site do TorBirdy para entender o que nós estamos 
tentando elaborar com o TorBirdy para os nossos usuários.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

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


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

2013-12-18 Thread translation
commit fa59ddfc699faf9ae8fa884c4a1bfb4fbecdf939
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 20:46:13 2013 +

Update translations for torbirdy
---
 pt_BR/torbirdy.properties |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pt_BR/torbirdy.properties b/pt_BR/torbirdy.properties
index 9a26077..52dbf24 100644
--- a/pt_BR/torbirdy.properties
+++ b/pt_BR/torbirdy.properties
@@ -13,7 +13,7 @@ torbirdy.email.advanced=Por favor, note que alterar as 
configurações avançada
 torbirdy.email.advanced.nextwarning=Mostrar esse aviso na próxima vez
 torbirdy.email.advanced.title=Configurações Avançadas do TorBirdy
 
-torbirdy.restart=Reinicie o Thunderbind para que a opção de zona do fuso 
horário seja ativada.
+torbirdy.restart=Você deve reiniciar o Thunderbind para que a opção do fuso 
horário de zona seja ativada.
 
-torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara melhorar a 
sua anonimidade o TorBirdy irá forçar as configurações do Thunderbird que 
ele criou, prevenindo que ela seja modificada por você ou por um acessório.  
Há algumas configurações que podem ser modificadas através das 
preferências do TorBirdy.  Quando o TorBirdy for removido ou desativado, todas 
suas configurações são restauradas a seus valores padrões (os valores 
anteriores ao TorBirdy ser instalado)\n\nSe você for um novo usuário, 
recomenda-se que leia a página do TorBirdy para entender o que estamos 
almejando para nossos usuários com o TorBirdy.
+torbirdy.firstrun=Você agora está executando o TorBirdy.\n\nPara ajudar a 
proteger o seu anonimato, o TorBirdy irá impor as configurações do 
Thunderbird que ele criou, impedindo-os de ser mudado por você ou por qualquer 
add-on. Há algumas configurações que podem ser alteradas e estas poderão 
ser acessadas ​​por meio do diálogo de preferências do TorBirdy. Quando o 
TorBirdy for desinstalado ou desativado, todas as configurações definidas 
anteriormente irão retornar para os seus valores padrão (os valores 
anteriores à instalação do TorBirdy).\n\nSe você for um novo usuário, nós 
recomendamos que você leia o site do TorBirdy para entender o que nós estamos 
tentando elaborar com o TorBirdy para os nossos usuários.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

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


[tor-commits] r26486: {website} Add 1 FAQ entry and cleaned up some links. (website/trunk/docs/en)

2013-12-18 Thread Matt Pagan
Author: mttp
Date: 2013-12-18 21:10:36 + (Wed, 18 Dec 2013)
New Revision: 26486

Modified:
   website/trunk/docs/en/faq.wml
Log:
Add 1 FAQ entry and cleaned up some links. 



Modified: website/trunk/docs/en/faq.wml
===
--- website/trunk/docs/en/faq.wml   2013-12-18 17:16:52 UTC (rev 26485)
+++ website/trunk/docs/en/faq.wml   2013-12-18 21:10:36 UTC (rev 26486)
@@ -88,6 +88,8 @@
 languages?/li/a
 lia href=#GmailWarningGmail warns me that my account may have
 been compromised./a/li
+lia href=#NeedToUseAProxyMy internet connection requires an HTTP 
+or SOCKS Proxy/a/li
 /ul
 
 pAdvanced Tor usage:/p
@@ -107,7 +109,7 @@
 are used for entry/exit?/a/li
 lia href=#FirewallPortsMy firewall only allows a few outgoing
 ports./a/li
-lia href=#ExitPortsIs there a list of default exit ports?/a/li
+lia href=#DefaultExitPortsIs there a list of default exit 
ports?/a/li
 lia href=#SocksAndDNSHow do I check if my application that uses 
 SOCKS is leaking DNS requests?/a/li
 lia href=#DifferentComputerI want to run my Tor client on a 
@@ -837,7 +839,7 @@
 /p
 p
 If you really need to connect to only a small set of ports, see the FAQ 
-entry on firewalled ports.
+entry on a href=#FirewallPortsfirewalled ports/a.
 /p
 p
 Note that if you're running Tor as a relay, you must allow outgoing 
@@ -1399,6 +1401,36 @@
 
 hr
 
+a id=NeedToUseAProxy/a
+h3a class=anchor href=#NeedToUseAProxyMy internet connection requires 
an HTTP 
+or SOCKS Proxy/a/h3
+
+p
+You can set Proxy IP address, port, and authentication information in 
+Tor Browser's Network Settings. If you're using Tor another way, check 
+out the HTTPProxy and HTTPSProxy config options in the a 
+href=https://www.torproject.org/docs/tor-manual.html.en;man page/a, 
+and modify your torrc file accordingly. You will need an HTTP proxy for 
+doing GET requests to fetch the Tor directory, and you will need an 
+HTTPS proxy for doing CONNECT requests to get to Tor relays. (It's fine 
+if they're the same proxy.) Tor also recognizes the torrc options 
+Socks4Proxy and Socks5Proxy. 
+/p
+p
+Also check out HTTPProxyAuthenticator and HTTPSProxyAuthenticator if your 
+proxy requires auth. We only support basic auth currently, but if you need 
+NTLM authentication, you find a 
+href=http://archives.seul.org/or/talk/Jun-2005/msg00223.html;this post 
+in the archives/a useful. 
+/p
+p
+If your proxies only allow you to connect to certain ports, look at the 
+entry on a href=#FirewallPortsFirewalled clients/a for how 
+to restrict what ports your Tor will try to access. 
+/p
+
+hr
+
 a id=torrc/a
 h3a class=anchor href=#torrcI'm supposed to edit my torrc.
 What does that mean?/a/h3
@@ -1607,7 +1639,7 @@
 zone is correct./li
 liIs your Internet connection a href=#FirewallPortsfirewalled
 by port/a, or do you normally need to use a a
-href=wikifaq#MyInternetconnectionrequiresanHTTPorSOCKSproxy.proxy/a?
+href=#NeedToUseAProxyproxy/a?
 /li
 liAre you running programs like Norton Internet Security or SELinux
 that
@@ -1862,8 +1894,8 @@
 
 hr
 
-a id=ExitPorts/a
-h3a class=anchor href=#ExitPortsIs there a list of default exit 
+a id=DefaultExitPorts/a
+h3a class=anchor href=#DefaultExitPortsIs there a list of default 
exit 
 ports?/a/h3
 p
 The default open ports are listed below but keep in mind that, any port or 
@@ -2017,7 +2049,7 @@
 liIf your relay is behind a NAT and it doesn't know its public
 IP (e.g. it has an IP of 192.168.x.y), you'll need to set up port
 forwarding. Forwarding TCP connections is system dependent but
-a href=wikifaq#ImbehindaNATFirewallthis FAQ entry/a
+a href=#BehindANATthis FAQ entry/a
 offers some examples on how to do this.
 /li
 liYour relay will passively estimate and advertise its recent
@@ -2058,7 +2090,7 @@
 p
 The default exit policy allows access to many popular services
 (e.g. web browsing), but a
-href=wikifaq#Istherealistofdefaultexitportsrestricts/a
+href=#DefaultExitPortsrestricts/a
 some due to abuse potential (e.g. mail) and some since
 the Tor network can't handle the load (e.g. default
 file-sharing ports). You can change your exit policy
@@ -2589,12 +2621,14 @@
 use
 this feature./li
 
+!-- Nickm says he's not sure this is still accurate
+
 liIf you're running on Solaris, OpenBSD, NetBSD, or
 old FreeBSD, Tor is probably forking separate processes
 rather than using threads. Consider switching to a a
 href=wikifaq#WhydoesntmyWindowsorotherOSTorrelayrunwellbetter
 operating system/a./li
-
+--
 liIf you still can't handle the memory load, consider reducing the
 amount of bandwidth your relay advertises. Advertising less
 bandwidth
@@ -3481,7 +3515,7 @@
 p
 Requiring every Tor user to be a relay would help with scaling the
 network to handle all our users, 

[tor-commits] [torbrowser/maint-2.4] Linux: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit 1833f26206df7541c5f14ba5d6cbdc9a7567143a
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 14:49:17 2013 -0200

Linux: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-linux |8 ++
 build-scripts/linux-alpha.mk   |   27 
 src/RelativeLink/vidalia/start-vidalia.sh  |4 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-linux 
b/build-scripts/config/vidalia.conf.standalone-linux
new file mode 100644
index 000..5a7414c
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-linux
@@ -0,0 +1,8 @@
+[General]
+InterfaceStyle=Cleanlooks
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../Data/Tor/torrc
+DataDirectory=../Data/Tor
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 72d4b0a..3c11f32 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -148,6 +148,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-gnu-linux-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -205,6 +206,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -385,6 +402,9 @@ bundle_%:
LANGCODE=$* make -f linux-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f linux-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
make -f linux-alpha.mk copy-files_$* install-extensions 
\
@@ -400,6 +420,13 @@ compressed-bundle-localized: 
bundle-localized_$(LANGCODE).stamp
tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna 
wheel |gzip -c9 $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz
rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized:
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone-linux 
$(BUNDLE)/Data/Vidalia/vidalia.conf
+   cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE)
+   ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf 
$(LANGCODE) -e
+   cd $(BUNDLE)  tar -cvzf 
../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz 
start-vidalia.sh App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* 
Lib/libpng*
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia.sh 
b/src/RelativeLink/vidalia/start-vidalia.sh
new file mode 100755
index 000..3880e76
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+LD_LIBRARY_PATH=./Lib
+./App/vidalia  --datadir Data/Vidalia/ -style Cleanlooks



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


[tor-commits] [torbrowser/master] Windows: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit 525d46b359e9def47b6caf1a7fcda84d541e8a99
Author: Erinn Clark er...@torproject.org
Date:   Tue Dec 17 01:09:50 2013 -0200

Windows: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone |7 +++
 build-scripts/windows-alpha.mk   |   29 ++
 2 files changed, 36 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone 
b/build-scripts/config/vidalia.conf.standalone
new file mode 100644
index 000..eed1095
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=..\\Data\\Tor\\torrc
+DataDirectory=..\\Data\\Tor
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index d087ac2..a0109b7 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -159,6 +159,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-win32
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -215,6 +216,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -388,6 +405,9 @@ bundle_%:
LANGCODE=$* make -f windows-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f windows-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
make -f windows-alpha.mk copy-files_$* install-extensions   
\
@@ -402,6 +422,15 @@ compressed-bundle-localized: $(SEVENZIP) 
bundle-localized_$(LANGCODE).stamp
rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe
cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx 
../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)
 
+vidalia-standalone-bundle-localized: $(SEVENZIP) 
bundle-localized_$(LANGCODE).stamp
+   rm -f $(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe
+   rm -rf vidalia-standalone
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf
+   ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf 
$(LANGCODE)
+   cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe
+   cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx 
../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe 
../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia 
Docs/Qt
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
mkdir $(NAME)_$*



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


[tor-commits] [torbrowser/master] Merge branch 'maint-2.4'

2013-12-18 Thread erinn
commit b5d81d038b5935a205be91e5314c997561188367
Merge: 6100d4c cde9241
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 20:54:32 2013 -0200

Merge branch 'maint-2.4'

 build-scripts/config/vidalia.conf.standalone   |7 +
 build-scripts/config/vidalia.conf.standalone-linux |8 +
 build-scripts/config/vidalia.conf.standalone-osx   |7 +
 build-scripts/linux-alpha.mk   |   31 --
 build-scripts/linux.mk |4 +--
 build-scripts/osx-alpha.mk |   33 ++--
 build-scripts/osx.mk   |4 +--
 build-scripts/recommended-versions |5 ++-
 build-scripts/windows-alpha.mk |   33 ++--
 build-scripts/windows.mk   |4 +--
 src/RelativeLink/vidalia/start-vidalia-osx.sh  |3 ++
 src/RelativeLink/vidalia/start-vidalia.sh  |4 +++
 12 files changed, 130 insertions(+), 13 deletions(-)

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


[tor-commits] [torbrowser/maint-2.4] Windows: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit 525d46b359e9def47b6caf1a7fcda84d541e8a99
Author: Erinn Clark er...@torproject.org
Date:   Tue Dec 17 01:09:50 2013 -0200

Windows: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone |7 +++
 build-scripts/windows-alpha.mk   |   29 ++
 2 files changed, 36 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone 
b/build-scripts/config/vidalia.conf.standalone
new file mode 100644
index 000..eed1095
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=..\\Data\\Tor\\torrc
+DataDirectory=..\\Data\\Tor
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index d087ac2..a0109b7 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -159,6 +159,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION)
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-win32
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -215,6 +216,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -388,6 +405,9 @@ bundle_%:
LANGCODE=$* make -f windows-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f windows-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f windows-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
make -f windows-alpha.mk copy-files_$* install-extensions   
\
@@ -402,6 +422,15 @@ compressed-bundle-localized: $(SEVENZIP) 
bundle-localized_$(LANGCODE).stamp
rm -f $(COMPRESSED_NAME)_$(LANGCODE).exe
cd $(NAME)_$(LANGCODE); $(SEVENZIP) a -mx9 -sfx7z.sfx 
../$(COMPRESSED_NAME)_$(LANGCODE).exe $(NAME)
 
+vidalia-standalone-bundle-localized: $(SEVENZIP) 
bundle-localized_$(LANGCODE).stamp
+   rm -f $(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe
+   rm -rf vidalia-standalone
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone $(BUNDLE)/Data/Vidalia/vidalia.conf
+   ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf 
$(LANGCODE)
+   cp ../src/RelativeLink/StartTorBrowserBundle.exe Start\ Vidalia.exe
+   cd $(NAME)_$(LANGCODE)/$(NAME); $(SEVENZIP) a -mx9 -sfx7z.sfx 
../../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)_$(LANGCODE).exe 
../../Start\ Vidalia.exe App/vidalia.exe App/Qt* Data/Vidalia Docs/Vidalia 
Docs/Qt
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
mkdir $(NAME)_$*



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


[tor-commits] [torbrowser/master] Linux: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit 1833f26206df7541c5f14ba5d6cbdc9a7567143a
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 14:49:17 2013 -0200

Linux: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-linux |8 ++
 build-scripts/linux-alpha.mk   |   27 
 src/RelativeLink/vidalia/start-vidalia.sh  |4 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-linux 
b/build-scripts/config/vidalia.conf.standalone-linux
new file mode 100644
index 000..5a7414c
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-linux
@@ -0,0 +1,8 @@
+[General]
+InterfaceStyle=Cleanlooks
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../Data/Tor/torrc
+DataDirectory=../Data/Tor
diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 72d4b0a..3c11f32 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -148,6 +148,7 @@ IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)-
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-gnu-linux-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -205,6 +206,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -385,6 +402,9 @@ bundle_%:
LANGCODE=$* make -f linux-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f linux-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f linux-alpha.mk vidalia-standalone-bundle-localized
+
 
 bundle-localized_%.stamp:
make -f linux-alpha.mk copy-files_$* install-extensions 
\
@@ -400,6 +420,13 @@ compressed-bundle-localized: 
bundle-localized_$(LANGCODE).stamp
tar -cvf - $(NAME)_$(LANGCODE) |tardy -unu 0 -una root -gnu 0 -gna 
wheel |gzip -c9 $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).tar.gz
rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized:
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone-linux 
$(BUNDLE)/Data/Vidalia/vidalia.conf
+   cp ../src/RelativeLink/vidalia/start-vidalia.sh $(BUNDLE)
+   ./patch-vidalia-language.sh $(BUNDLE)/Data/Vidalia/vidalia.conf 
$(LANGCODE) -e
+   cd $(BUNDLE)  tar -cvzf 
../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).tar.gz 
start-vidalia.sh App/vidalia Data/Vidalia Docs/Qt Docs/Vidalia Lib/libQt* 
Lib/libpng*
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia.sh 
b/src/RelativeLink/vidalia/start-vidalia.sh
new file mode 100755
index 000..3880e76
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+LD_LIBRARY_PATH=./Lib
+./App/vidalia  --datadir Data/Vidalia/ -style Cleanlooks



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


[tor-commits] [torbrowser/maint-2.4] OSX: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit f6780158f0f151735d85d11ef45a07cb1292d5e5
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 14:50:02 2013 -0200

OSX: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-osx |7 ++
 build-scripts/osx-alpha.mk   |   29 ++
 src/RelativeLink/vidalia/start-vidalia-osx.sh|3 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-osx 
b/build-scripts/config/vidalia.conf.standalone-osx
new file mode 100644
index 000..7e687c4
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-osx
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../../../../../Library/Vidalia/torrc
+DataDirectory=../../../../Resources/Data/Tor/
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index b9d2cce..ac770b2 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -182,6 +182,7 @@ IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-osx-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -242,6 +243,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -390,6 +407,9 @@ bundle_%:
LANGCODE=$* make -f osx-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f osx-alpha.mk vidalia-standalone-bundle-localized
+
 bundle-localized_%.stamp:
make -f osx-alpha.mk copy-files_$* install-torbutton
\
install-httpseverywhere install-noscript \
@@ -406,6 +426,15 @@ compressed-bundle-localized: 
bundle-localized_$(LANGCODE).stamp
zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip 
$(NAME)_$(LANGCODE).app
-rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized: bundle-localized_$(LANGCODE).stamp
+   rm -rf vidalia-standalone
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone-osx 
$(BUNDLE).app/Library/Vidalia/vidalia.conf
+   cp ../src/RelativeLink/vidalia/start-vidalia-osx.sh 
$(BUNDLE).app/start-vidalia.sh
+   ./patch-vidalia-language.sh $(BUNDLE).app/Library/Vidalia/vidalia.conf 
$(LANGCODE) -e
+   cd $(BUNDLE).app  zip -r 
../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).zip 
start-vidalia.sh Contents/MacOS/Vidalia.app Library/Vidalia/vidalia.conf 
Contents/Resources/vidalia.icns Contents/Resources/Docs/Qt 
Contents/Resources/Docs/Vidalia
+
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia-osx.sh 
b/src/RelativeLink/vidalia/start-vidalia-osx.sh
new file mode 100755
index 000..a06af38
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia-osx.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+open Contents/MacOS/Vidalia.app



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


[tor-commits] [torbrowser/maint-2.4] bump recommended-versions for TBB 3.5

2013-12-18 Thread erinn
commit cde9241d471e70adb7f06cc07eb69c72b06f3200
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 20:54:16 2013 -0200

bump recommended-versions for TBB 3.5
---
 build-scripts/recommended-versions |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index 2ae83cd..aac31f3 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -12,5 +12,8 @@
 2.4.18-rc-2-Linux,
 3.5-rc-1-Linux,
 3.5-rc-1-MacOS,
-3.5-rc-1-Windows
+3.5-Windows,
+3.5-Linux,
+3.5-MacOS,
+3.5-Windows
 ]

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


[tor-commits] [torbrowser/master] fix changelog and README versions in build scripts

2013-12-18 Thread erinn
commit 92c2a816caa72ae4e3cdc09abcef43f3fc085e84
Author: Erinn Clark er...@torproject.org
Date:   Sat Dec 14 17:46:26 2013 -0200

fix changelog and README versions in build scripts
---
 build-scripts/linux-alpha.mk   |4 ++--
 build-scripts/linux.mk |4 ++--
 build-scripts/osx-alpha.mk |4 ++--
 build-scripts/osx.mk   |4 ++--
 build-scripts/windows-alpha.mk |4 ++--
 build-scripts/windows.mk   |4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk
index 3f831dd..72d4b0a 100644
--- a/build-scripts/linux-alpha.mk
+++ b/build-scripts/linux-alpha.mk
@@ -289,9 +289,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
-   cp ../changelog.linux-2.4 $(DOCSDIR)/changelog
+   cp ../changelog.linux-2.5 $(DOCSDIR)/changelog
# This should be updated to be more generic (version-wise) and more 
Linux specific
-   cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle
+   cp ../README.LINUX-2.5 $(DOCSDIR)/README-TorBrowserBundle
 ifeq ($(USE_OBFSPROXY),1)
mkdir -p $(DOCSDIR)/Obfsproxy
cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 300357f..d5e82b0 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -268,9 +268,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
-   cp ../changelog.linux-2.3 $(DOCSDIR)/changelog
+   cp ../changelog.linux-2.4 $(DOCSDIR)/changelog
# This should be updated to be more generic (version-wise) and more 
Linux specific
-   cp ../README.LINUX-2.3 $(DOCSDIR)/README-TorBrowserBundle
+   cp ../README.LINUX-2.4 $(DOCSDIR)/README-TorBrowserBundle
 
 ## Copy over Firefox
 install-firefox:
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index 00bc7aa..b9d2cce 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -310,9 +310,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
-   cp ../changelog.osx-2.4 $(DOCSDIR)/changelog
+   cp ../changelog.osx-2.5 $(DOCSDIR)/changelog
cp ../LICENSE $(DEST)
-   cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle
+   cp ../README.OSX-2.5 $(DEST)/README-TorBrowserBundle
 
 ## Copy over Firefox
 install-firefox:
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index 4246dc3..36120ae 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -264,9 +264,9 @@ install-docs:
cp $(VIDALIA_DIR)/LICENSE* $(VIDALIA_DIR)/CREDITS $(DOCSDIR)/Vidalia
cp $(TOR_DIR)/LICENSE $(TOR_DIR)/README $(DOCSDIR)/Tor
cp $(QT_DIR)/LICENSE.GPL* $(QT_DIR)/LICENSE.LGPL $(DOCSDIR)/Qt
-   cp ../changelog.osx-2.3 $(DOCSDIR)/changelog
+   cp ../changelog.osx-2.4 $(DOCSDIR)/changelog
cp ../LICENSE $(DEST)
-   cp ../README.OSX-2.3 $(DEST)/README-TorBrowserBundle
+   cp ../README.OSX-2.4 $(DEST)/README-TorBrowserBundle
 
 ## Copy over Firefox
 install-firefox:
diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk
index da4af92..d087ac2 100644
--- a/build-scripts/windows-alpha.mk
+++ b/build-scripts/windows-alpha.mk
@@ -294,8 +294,8 @@ install-docs:
cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor
cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt
cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW
-   cp ../changelog.windows-2.4 $(DOCSDIR)/changelog
-   cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle
+   cp ../changelog.windows-2.5 $(DOCSDIR)/changelog
+   cp ../README.WIN-2.5 $(DOCSDIR)/README-TorBrowserBundle
 ifeq ($(USE_OBFSPROXY),1)
mkdir -p $(DOCSDIR)/Obfsproxy
cp $(OBFSPROXY_DIR)/LICENSE $(DOCSDIR)/Obfsproxy
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index 9b4a557..d7ff4d3 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -265,8 +265,8 @@ install-docs:
cp $(TOR)/LICENSE $(TOR)/README $(DOCSDIR)/Tor
cp $(QT_LIB)/../LICENSE.GPL* $(QT_LIB)/../LICENSE.LGPL $(DOCSDIR)/Qt
cp $(MING)/../msys/1.0/share/doc/MSYS/COPYING $(DOCSDIR)/MinGW
-   cp ../changelog.windows-2.3 $(DOCSDIR)/changelog
-   cp ../README.WIN-2.3 $(DOCSDIR)/README-TorBrowserBundle
+   cp ../changelog.windows-2.4 $(DOCSDIR)/changelog
+   cp ../README.WIN-2.4 $(DOCSDIR)/README-TorBrowserBundle
 
 ## Copy over FirefoxPortable
 

[tor-commits] [torbrowser/master] OSX: add logic to build standalone Vidalia bundles for TBB

2013-12-18 Thread erinn
commit f6780158f0f151735d85d11ef45a07cb1292d5e5
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 14:50:02 2013 -0200

OSX: add logic to build standalone Vidalia bundles for TBB
---
 build-scripts/config/vidalia.conf.standalone-osx |7 ++
 build-scripts/osx-alpha.mk   |   29 ++
 src/RelativeLink/vidalia/start-vidalia-osx.sh|3 +++
 3 files changed, 39 insertions(+)

diff --git a/build-scripts/config/vidalia.conf.standalone-osx 
b/build-scripts/config/vidalia.conf.standalone-osx
new file mode 100644
index 000..7e687c4
--- /dev/null
+++ b/build-scripts/config/vidalia.conf.standalone-osx
@@ -0,0 +1,7 @@
+[General]
+LanguageCode=en
+
+[Tor]
+ControlPort=9151
+Torrc=../../../../../Library/Vidalia/torrc
+DataDirectory=../../../../Resources/Data/Tor/
diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk
index b9d2cce..ac770b2 100644
--- a/build-scripts/osx-alpha.mk
+++ b/build-scripts/osx-alpha.mk
@@ -182,6 +182,7 @@ IM_COMPRESSED_BASENAME=TorBrowser-IM-$(VERSION)-
 OBFS_COMPRESSED_NAME=$(OBFS_COMPRESSED_BASENAME)
 DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)
 IM_COMPRESSED_NAME=$(IM_COMPRESSED_BASENAME)$(VERSION)
+VIDALIA_COMPRESSED_BASENAME=vidalia-standalone-$(VIDALIA_VER)-osx-$(ARCH_TYPE)-
 
 ifeq ($(USE_PIDGIN),1)
 COMPRESSED_NAME=$(IM_COMPRESSED_NAME)
@@ -242,6 +243,22 @@ all-compressed-bundles: compressed-bundle_ar \
compressed-bundle_vi \
compressed-bundle_zh-CN
 
+vidalia-standalone-bundles: vidalia-standalone-bundle_ar \
+   vidalia-standalone-bundle_de \
+   vidalia-standalone-bundle_en-US \
+   vidalia-standalone-bundle_es-ES \
+   vidalia-standalone-bundle_fa \
+   vidalia-standalone-bundle_fr \
+   vidalia-standalone-bundle_it \
+   vidalia-standalone-bundle_ko \
+   vidalia-standalone-bundle_nl \
+   vidalia-standalone-bundle_pl \
+   vidalia-standalone-bundle_pt-PT \
+   vidalia-standalone-bundle_ru \
+   vidalia-standalone-bundle_vi \
+   vidalia-standalone-bundle_zh-CN
+
+
 ##
 ## Cleanup
 ##
@@ -390,6 +407,9 @@ bundle_%:
LANGCODE=$* make -f osx-alpha.mk bundle-localized
 compressed-bundle_%:
LANGCODE=$* make -f osx-alpha.mk compressed-bundle-localized
+vidalia-standalone-bundle_%:
+   LANGCODE=$* make -f osx-alpha.mk vidalia-standalone-bundle-localized
+
 bundle-localized_%.stamp:
make -f osx-alpha.mk copy-files_$* install-torbutton
\
install-httpseverywhere install-noscript \
@@ -406,6 +426,15 @@ compressed-bundle-localized: 
bundle-localized_$(LANGCODE).stamp
zip -r $(DISTDIR)/$(COMPRESSED_NAME)$(LANGCODE).zip 
$(NAME)_$(LANGCODE).app
-rm -f *.zip *.xpi
 
+vidalia-standalone-bundle-localized: bundle-localized_$(LANGCODE).stamp
+   rm -rf vidalia-standalone
+   mkdir -p vidalia-standalone
+   cp config/vidalia.conf.standalone-osx 
$(BUNDLE).app/Library/Vidalia/vidalia.conf
+   cp ../src/RelativeLink/vidalia/start-vidalia-osx.sh 
$(BUNDLE).app/start-vidalia.sh
+   ./patch-vidalia-language.sh $(BUNDLE).app/Library/Vidalia/vidalia.conf 
$(LANGCODE) -e
+   cd $(BUNDLE).app  zip -r 
../vidalia-standalone/$(VIDALIA_COMPRESSED_BASENAME)$(LANGCODE).zip 
start-vidalia.sh Contents/MacOS/Vidalia.app Library/Vidalia/vidalia.conf 
Contents/Resources/vidalia.icns Contents/Resources/Docs/Qt 
Contents/Resources/Docs/Vidalia
+
+
 copy-files_%: generic-bundle.stamp
rm -fr $(NAME)_$*
#mkdir $(NAME)_$*
diff --git a/src/RelativeLink/vidalia/start-vidalia-osx.sh 
b/src/RelativeLink/vidalia/start-vidalia-osx.sh
new file mode 100755
index 000..a06af38
--- /dev/null
+++ b/src/RelativeLink/vidalia/start-vidalia-osx.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+open Contents/MacOS/Vidalia.app



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


[tor-commits] [torbrowser/master] bump recommended-versions for TBB 3.5

2013-12-18 Thread erinn
commit cde9241d471e70adb7f06cc07eb69c72b06f3200
Author: Erinn Clark er...@torproject.org
Date:   Wed Dec 18 20:54:16 2013 -0200

bump recommended-versions for TBB 3.5
---
 build-scripts/recommended-versions |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build-scripts/recommended-versions 
b/build-scripts/recommended-versions
index 2ae83cd..aac31f3 100644
--- a/build-scripts/recommended-versions
+++ b/build-scripts/recommended-versions
@@ -12,5 +12,8 @@
 2.4.18-rc-2-Linux,
 3.5-rc-1-Linux,
 3.5-rc-1-MacOS,
-3.5-rc-1-Windows
+3.5-Windows,
+3.5-Linux,
+3.5-MacOS,
+3.5-Windows
 ]



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


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2013-12-18 Thread translation
commit b68b5b5d30e1ee29c05388acfe765098178f8de7
Author: Translation commit bot translat...@torproject.org
Date:   Wed Dec 18 23:45:56 2013 +

Update translations for liveusb-creator
---
 de/de.po |   57 +
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/de/de.po b/de/de.po
index 5c93db2..1fefec5 100644
--- a/de/de.po
+++ b/de/de.po
@@ -18,13 +18,14 @@
 # Sacro sc...@t-online.de, 2013
 # Sacro sc...@t-online.de, 2012
 # to_ba, 2013
+# to_ba, 2013
 # Victor1975 vkerle...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2013-11-30 15:23+0100\n
-PO-Revision-Date: 2013-12-05 19:40+\n
+POT-Creation-Date: 2013-12-09 15:17+0100\n
+PO-Revision-Date: 2013-12-18 23:30+\n
 Last-Translator: to_ba\n
 Language-Team: German 
(http://www.transifex.com/projects/p/torproject/language/de/)\n
 MIME-Version: 1.0\n
@@ -38,17 +39,17 @@ msgstr 
 msgid %(distribution)s installer
 msgstr %(distribution)s Installationsprogramm
 
-#: ../liveusb/gui.py:807
+#: ../liveusb/gui.py:809
 #, python-format
 msgid %(filename)s selected
 msgstr %(filename)s ausgewählt
 
-#: ../liveusb/gui.py:437
+#: ../liveusb/gui.py:439
 #, python-format
 msgid %(size)s %(label)s
 msgstr %(size)s %(label)s
 
-#: ../liveusb/gui.py:443
+#: ../liveusb/gui.py:445
 #, python-format
 msgid %(vendor)s %(model)s (%(details)s) - %(device)s
 msgstr %(vendor)s %(model)s (%(details)s) - %(device)s
@@ -143,7 +144,7 @@ msgstr Klonen\n\nAktualisieren
 msgid Creating %sMB persistent overlay
 msgstr Erzeuge %s MB persistentes Overlay
 
-#: ../liveusb/gui.py:565
+#: ../liveusb/gui.py:567
 msgid 
 Device is not yet mounted, so we cannot determine the amount of free space.
 msgstr Das Gerät ist momentan nicht eingehängt, sodass wir den freien 
Speicherplatz nicht bestimmen können.
@@ -153,11 +154,11 @@ msgstr Das Gerät ist momentan nicht eingehängt, sodass 
wir den freien Speiche
 msgid Download %(distribution)s
 msgstr %(distribution)s herunterladen
 
-#: ../liveusb/gui.py:781
+#: ../liveusb/gui.py:783
 msgid Download complete!
 msgstr Herunterladen abgeschlossen!
 
-#: ../liveusb/gui.py:785
+#: ../liveusb/gui.py:787
 msgid Download failed: 
 msgstr Herunterladen fehlgeschlagen:
 
@@ -218,7 +219,7 @@ msgstr Wenn Sie kein existierendes Live-ISO auswählen, 
wird die gewählte Ver
 msgid Install Tails
 msgstr Tails installieren
 
-#: ../liveusb/gui.py:628
+#: ../liveusb/gui.py:630
 msgid Installation complete!
 msgstr Installation abgeschlossen!
 
@@ -227,7 +228,7 @@ msgstr Installation abgeschlossen!
 msgid Installation complete! (%s)
 msgstr Installation abgeschlossen! (%s) 
 
-#: ../liveusb/gui.py:629
+#: ../liveusb/gui.py:631
 msgid Installation was completed. Press OK to close this program.
 msgstr Installation abgeschlossen. OK drücken um das Programm zu schließen.
 
@@ -255,7 +256,7 @@ msgstr Stellen Sie sicher, dass Ihr USB-Stick eingesteckt 
und mit einem FAT-Dat
 msgid Mount %s exists after unmounting
 msgstr Mount %s existiert noch nach dem unmounten
 
-#: ../liveusb/gui.py:571
+#: ../liveusb/gui.py:573
 #, python-format
 msgid No free space on device %(device)s
 msgstr Kein freier Speicher auf dem Gerät %(device)s 
@@ -271,11 +272,11 @@ msgid 
 %dMB ISO + %dMB overlay  %dMB free space
 msgstr Nicht genug Speicherplatz auf Gerät.⏎\n%dMB ISO + %dMB overlay  
%dMB free space
 
-#: ../liveusb/gui.py:552
+#: ../liveusb/gui.py:554
 msgid Partition is FAT16; Restricting overlay size to 2G
 msgstr Partition ist FAT16. Beschränkung der max. Datei-Grösse auf 2 GB
 
-#: ../liveusb/gui.py:548
+#: ../liveusb/gui.py:550
 msgid Partition is FAT32; Restricting overlay size to 4G
 msgstr Die Partition ist FAT32; max. Datei-Größe wird auf 4G beschränkt
 
@@ -284,7 +285,7 @@ msgstr Die Partition ist FAT32; max. Datei-Größe wird 
auf 4G beschränkt
 msgid Partitioning device %(device)s
 msgstr Partitioniere Gerät %(device)s
 
-#: ../liveusb/gui.py:619
+#: ../liveusb/gui.py:621
 msgid Persistent Storage
 msgstr Persistenter Speicher
 
@@ -292,15 +293,15 @@ msgstr Persistenter Speicher
 msgid Persistent Storage (0 MB)
 msgstr Persistenter Speicher (0 MB)
 
-#: ../liveusb/gui.py:700 ../liveusb/gui.py:730
+#: ../liveusb/gui.py:702 ../liveusb/gui.py:732
 msgid Please confirm your device selection
 msgstr Bitte bestätige deine Geräteauswahl
 
-#: ../liveusb/gui.py:465
+#: ../liveusb/gui.py:467
 msgid Refreshing releases...
 msgstr Veröffentlichungen werden aktualisiert …
 
-#: ../liveusb/gui.py:470
+#: ../liveusb/gui.py:472
 msgid Releases updated!
 msgstr Veröffentlichungen wurden aktualisiert!
 
@@ -318,7 +319,7 @@ msgstr Entferne bestehendes Live OS
 msgid Resetting Master Boot Record of %s
 msgstr Setze Master Boot Record von %s zurück
 
-#: ../liveusb/gui.py:792
+#: ../liveusb/gui.py:794
 msgid Select Live ISO
 msgstr Live ISO-Abbild wählen
 
@@ -346,13 +347,13 @@ msgstr Daten auf dem Datenträger werden 

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

2013-12-18 Thread translation
commit 621aabf0e1adc761e3c52ff8480b47497787d7db
Author: Translation commit bot translat...@torproject.org
Date:   Thu Dec 19 00:15:53 2013 +

Update translations for https_everywhere
---
 nb/https-everywhere.dtd |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd
index 8f3a5f9..1f4c664 100644
--- a/nb/https-everywhere.dtd
+++ b/nb/https-everywhere.dtd
@@ -36,11 +36,11 @@
 
 !ENTITY https-everywhere.popup.title HTTPS Everywhere 4.0development.11 
notification
 !ENTITY https-everywhere.popup.paragraph1 Oops. You were using the stable 
version of HTTPS Everywhere, but we might have accidentally upgraded you to the 
development version in our last release.
-!ENTITY https-everywhere.popup.paragraph2 Would you like to go back to 
stable?
+!ENTITY https-everywhere.popup.paragraph2 Vil du gå tilbake til den 
stabile?
 !ENTITY https-everywhere.popup.paragraph3 We'd love it if you continued 
using our development release and helped us make HTTPS Everywhere better! You 
might find there are a few more bugs here and there, which you can report to 
https-everywh...@eff.org. Sorry about the inconvenience, and thank you for 
using HTTPS Everywhere.
-!ENTITY https-everywhere.popup.keep Keep me on the development version
-!ENTITY https-everywhere.popup.revert Download the latest stable version
+!ENTITY https-everywhere.popup.keep Hold meg på utvikler versjonen
+!ENTITY https-everywhere.popup.revert Last ned den siste stabile versjonen
 
-!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere Ruleset 
Tests
+!ENTITY https-everywhere.ruleset-tests.status_title HTTPS Everywhere 
Regelsett Test
 !ENTITY https-everywhere.ruleset-tests.status_cancel_button Avbryt
 !ENTITY https-everywhere.ruleset-tests.status_start_button Start

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


[tor-commits] r26488: {website} fix the download-easy page so the donation box is in the rig (website/trunk/download/en)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 00:32:47 + (Thu, 19 Dec 2013)
New Revision: 26488

Modified:
   website/trunk/download/en/download-easy.wml
Log:
fix the download-easy page so the donation box is in the right place

Modified: website/trunk/download/en/download-easy.wml
===
--- website/trunk/download/en/download-easy.wml 2013-12-19 00:10:44 UTC (rev 
26487)
+++ website/trunk/download/en/download-easy.wml 2013-12-19 00:32:47 UTC (rev 
26488)
@@ -13,7 +13,6 @@
 define-tag button-win-tbb32Tor Browser Bundle/define-tag
 define-tag button-win-tbb64Currently Unused/define-tag
 define-tag button-osx-tbb32Tor Browser Bundle/define-tag
-#!-- Commented out until further notice. -EC define-tag button-osx-tbb64Mac 
64-bit/define-tag --
 define-tag button-lin-tbb32Tor Browser Bundle/define-tag
 define-tag button-lin-tbb64GNU/Linux 64-bit/define-tag
 
@@ -72,31 +71,8 @@
pEverything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run. a href=page 
projects/torbrowserLearn more raquo;/a/p
  /div
  p class=alt-dlNot Using Mac? Download for a 
href=#windowsWindows/a or a href=#linuxGNU/Linux/a/p
-   /div
+/div
   /div
-!-- START MAC 64 --
-!-- Comment out MAC 64 until it exists. -EC
-  div class=easy mac
-   div class=package style=padding-top: 13px; border-top: 0px;
- form class=downloads
-   a class=button osx-tbb64 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-lang.zipspan
 class=strongDownload/spanspan 
class=normalbutton-osx-tbb64/span/a
-   select name=language id=osx-tbb64 class=lang
-#include lang.wmi
-   /select
-   div class=sig style=margin-bottom: 5px;
- a class=lang-alt href=page 
projects/torbrowser#Download-torbrowserbundleosxOther Languages/a
- (a class=osx-tbb64-sig 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-lang.zip.ascsig/a)
 a class=siginfo href=page docs/verifying-signaturesWhat's This?/a
-   /div
- /form
- div class=desc
-   h2Tor Browser Bundle for 64-Bit Mac/h2
-   emVersion version-torbrowserbundleosx64 - OS X (64-Bit) 
(10.6+)/em
-   pEverything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run. a href=page 
projects/torbrowserLearn more raquo;/a/p
- /div
---
- p class=alt-dlNot Using Mac? Download for a 
href=#windowsWindows/a or a href=#linuxGNU/Linux/a/p
-   /div
-  /div
 !-- START LINUX --
   div id=linux class=easy linux
div class=package style=padding-top: 13px; border-top: 0px;

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


[tor-commits] [tor/maint-0.2.4] Merge branch 'bug10402_redux_024' into maint-0.2.4

2013-12-18 Thread nickm
commit dabdc339fe5abc5949f087621996672c122101b6
Merge: 561d988 7b87003
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 18 21:55:06 2013 -0500

Merge branch 'bug10402_redux_024' into maint-0.2.4

 changes/bug10402|   11 +++
 src/common/crypto.c |   13 ++---
 2 files changed, 21 insertions(+), 3 deletions(-)

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


[tor-commits] [tor/maint-0.2.4] Never allow OpenSSL engines to replace the RAND_SSLeay method

2013-12-18 Thread nickm
commit 7b87003957530427eadce36ed03b4645b481a335
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 18 11:49:44 2013 -0500

Never allow OpenSSL engines to replace the RAND_SSLeay method

This fixes bug 10402, where the rdrand engine would use the rdrand
instruction, not as an additional entropy source, but as a replacement
for the entire userspace PRNG.  That's obviously stupid: even if you
don't think that RDRAND is a likely security risk, the right response
to an alleged new alleged entropy source is never to throw away all
previously used entropy sources.

Thanks to coderman and rl1987 for diagnosing and tracking this down.
---
 changes/bug10402|   11 +++
 src/common/crypto.c |   13 ++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug10402 b/changes/bug10402
new file mode 100644
index 000..eac00bd
--- /dev/null
+++ b/changes/bug10402
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+- Do not allow OpenSSL engines to replace the PRNG, even when
+  HardwareAccel is set. The only default builtin PRNG engine uses
+  the Intel RDRAND instruction to replace the entire PRNG, and
+  ignores all attempts to seed it with more entropy. That's
+  cryptographically stupid: the right response to a new alleged
+  entropy source is never to discard all previously used entropy
+  sources. Fixes bug 10402; works around behavior introduced in
+  OpenSSL 1.0.0. Diagnosis and investigation thanks to coderman
+  and rl1987.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 0ababea..940a756 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -169,8 +169,8 @@ log_engine(const char *fn, ENGINE *e)
 const char *name, *id;
 name = ENGINE_get_name(e);
 id = ENGINE_get_id(e);
-log_notice(LD_CRYPTO, Using OpenSSL engine %s [%s] for %s,
-name?name:?, id?id:?, fn);
+log_notice(LD_CRYPTO, Default OpenSSL engine for %s is %s [%s],
+   fn, name?name:?, id?id:?);
   } else {
 log_info(LD_CRYPTO, Using default implementation for %s, fn);
   }
@@ -288,7 +288,7 @@ crypto_global_init(int useAccel, const char *accelName, 
const char *accelDir)
   }
   log_engine(RSA, ENGINE_get_default_RSA());
   log_engine(DH, ENGINE_get_default_DH());
-  log_engine(RAND, ENGINE_get_default_RAND());
+  log_engine(RAND (which we will not use), ENGINE_get_default_RAND());
   log_engine(SHA1, ENGINE_get_digest_engine(NID_sha1));
   log_engine(3DES, ENGINE_get_cipher_engine(NID_des_ede3_ecb));
   log_engine(AES, ENGINE_get_cipher_engine(NID_aes_128_ecb));
@@ -297,6 +297,13 @@ crypto_global_init(int useAccel, const char *accelName, 
const char *accelDir)
   log_info(LD_CRYPTO, NOT using OpenSSL engine support.);
 }
 
+if (RAND_get_rand_method() != RAND_SSLeay()) {
+  log_notice(LD_CRYPTO, It appears that one of our engines has provided 
+ a replacement the OpenSSL RNG. Resetting it to the default 
+ implementation.);
+  RAND_set_rand_method(RAND_SSLeay());
+}
+
 evaluate_evp_for_aes(-1);
 evaluate_ctr_for_aes();
 



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


[tor-commits] r26489: {website} update osx tbb link on download-easy page (website/trunk/download/en)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 03:01:32 + (Thu, 19 Dec 2013)
New Revision: 26489

Modified:
   website/trunk/download/en/download-easy.wml
Log:
update osx tbb link on download-easy page

Modified: website/trunk/download/en/download-easy.wml
===
--- website/trunk/download/en/download-easy.wml 2013-12-19 00:32:47 UTC (rev 
26488)
+++ website/trunk/download/en/download-easy.wml 2013-12-19 03:01:32 UTC (rev 
26489)
@@ -56,13 +56,13 @@
   div id=mac class=easy mac
div class=package style=padding-top: 13px; border-top: 0px;
  form class=downloads
-   a class=button osx-tbb 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx32-osx-i386-lang.zipspan
 class=strongDownload/spanspan 
class=normalbutton-osx-tbb32/span/a
+   a class=button osx-tbb 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_lang.zipspan
 class=strongDownload/spanspan 
class=normalbutton-osx-tbb32/span/a
select name=language id=osx-tbb class=lang
 #include lang.wmi
/select
div class=sig style=margin-bottom: 5px;
  a class=lang-alt href=page 
projects/torbrowser#Download-torbrowserbundleosxOther Languages/a
- (a class=osx-tbb-sig 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx32-osx-i386-lang.zip.ascsig/a)
 a class=siginfo href=page docs/verifying-signaturesWhat's This?/a
+ (a class=osx-tbb-sig 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_lang.zip.ascsig/a)
 a class=siginfo href=page docs/verifying-signaturesWhat's This?/a
/div
  /form
  div class=desc

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


[tor-commits] [tor/master] Merge branch 'bug10402_redux_024' into maint-0.2.4

2013-12-18 Thread nickm
commit dabdc339fe5abc5949f087621996672c122101b6
Merge: 561d988 7b87003
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 18 21:55:06 2013 -0500

Merge branch 'bug10402_redux_024' into maint-0.2.4

 changes/bug10402|   11 +++
 src/common/crypto.c |   13 ++---
 2 files changed, 21 insertions(+), 3 deletions(-)



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


[tor-commits] [tor/master] Never allow OpenSSL engines to replace the RAND_SSLeay method

2013-12-18 Thread nickm
commit 7b87003957530427eadce36ed03b4645b481a335
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 18 11:49:44 2013 -0500

Never allow OpenSSL engines to replace the RAND_SSLeay method

This fixes bug 10402, where the rdrand engine would use the rdrand
instruction, not as an additional entropy source, but as a replacement
for the entire userspace PRNG.  That's obviously stupid: even if you
don't think that RDRAND is a likely security risk, the right response
to an alleged new alleged entropy source is never to throw away all
previously used entropy sources.

Thanks to coderman and rl1987 for diagnosing and tracking this down.
---
 changes/bug10402|   11 +++
 src/common/crypto.c |   13 ++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug10402 b/changes/bug10402
new file mode 100644
index 000..eac00bd
--- /dev/null
+++ b/changes/bug10402
@@ -0,0 +1,11 @@
+  o Major bugfixes:
+- Do not allow OpenSSL engines to replace the PRNG, even when
+  HardwareAccel is set. The only default builtin PRNG engine uses
+  the Intel RDRAND instruction to replace the entire PRNG, and
+  ignores all attempts to seed it with more entropy. That's
+  cryptographically stupid: the right response to a new alleged
+  entropy source is never to discard all previously used entropy
+  sources. Fixes bug 10402; works around behavior introduced in
+  OpenSSL 1.0.0. Diagnosis and investigation thanks to coderman
+  and rl1987.
+
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 0ababea..940a756 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -169,8 +169,8 @@ log_engine(const char *fn, ENGINE *e)
 const char *name, *id;
 name = ENGINE_get_name(e);
 id = ENGINE_get_id(e);
-log_notice(LD_CRYPTO, Using OpenSSL engine %s [%s] for %s,
-name?name:?, id?id:?, fn);
+log_notice(LD_CRYPTO, Default OpenSSL engine for %s is %s [%s],
+   fn, name?name:?, id?id:?);
   } else {
 log_info(LD_CRYPTO, Using default implementation for %s, fn);
   }
@@ -288,7 +288,7 @@ crypto_global_init(int useAccel, const char *accelName, 
const char *accelDir)
   }
   log_engine(RSA, ENGINE_get_default_RSA());
   log_engine(DH, ENGINE_get_default_DH());
-  log_engine(RAND, ENGINE_get_default_RAND());
+  log_engine(RAND (which we will not use), ENGINE_get_default_RAND());
   log_engine(SHA1, ENGINE_get_digest_engine(NID_sha1));
   log_engine(3DES, ENGINE_get_cipher_engine(NID_des_ede3_ecb));
   log_engine(AES, ENGINE_get_cipher_engine(NID_aes_128_ecb));
@@ -297,6 +297,13 @@ crypto_global_init(int useAccel, const char *accelName, 
const char *accelDir)
   log_info(LD_CRYPTO, NOT using OpenSSL engine support.);
 }
 
+if (RAND_get_rand_method() != RAND_SSLeay()) {
+  log_notice(LD_CRYPTO, It appears that one of our engines has provided 
+ a replacement the OpenSSL RNG. Resetting it to the default 
+ implementation.);
+  RAND_set_rand_method(RAND_SSLeay());
+}
+
 evaluate_evp_for_aes(-1);
 evaluate_ctr_for_aes();
 



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


[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

2013-12-18 Thread nickm
commit 85284c33d1952711703087eb64149ef55ea775cf
Merge: f12d3fe dabdc33
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 18 22:04:21 2013 -0500

Merge remote-tracking branch 'origin/maint-0.2.4'

Conflicts:
src/common/crypto.c

 changes/bug10402|   11 +++
 src/common/crypto.c |   12 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --cc src/common/crypto.c
index 5afb98e,940a756..347f27e
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@@ -307,28 -286,12 +307,29 @@@ crypto_global_init(int useAccel, const 
setting default ciphers.);
  ENGINE_set_default(e, ENGINE_METHOD_ALL);
}
 +  /* Log, if available, the intersection of the set of algorithms
 + used by Tor and the set of algorithms available in the engine */
log_engine(RSA, ENGINE_get_default_RSA());
log_engine(DH, ENGINE_get_default_DH());
 +  log_engine(ECDH, ENGINE_get_default_ECDH());
 +  log_engine(ECDSA, ENGINE_get_default_ECDSA());
 +  log_engine(RAND, ENGINE_get_default_RAND());
+   log_engine(RAND (which we will not use), ENGINE_get_default_RAND());
log_engine(SHA1, ENGINE_get_digest_engine(NID_sha1));
 -  log_engine(3DES, ENGINE_get_cipher_engine(NID_des_ede3_ecb));
 -  log_engine(AES, ENGINE_get_cipher_engine(NID_aes_128_ecb));
 +  log_engine(3DES-CBC, ENGINE_get_cipher_engine(NID_des_ede3_cbc));
 +  log_engine(AES-128-ECB, ENGINE_get_cipher_engine(NID_aes_128_ecb));
 +  log_engine(AES-128-CBC, ENGINE_get_cipher_engine(NID_aes_128_cbc));
 +#ifdef NID_aes_128_ctr
 +  log_engine(AES-128-CTR, ENGINE_get_cipher_engine(NID_aes_128_ctr));
 +#endif
 +#ifdef NID_aes_128_gcm
 +  log_engine(AES-128-GCM, ENGINE_get_cipher_engine(NID_aes_128_gcm));
 +#endif
 +  log_engine(AES-256-CBC, ENGINE_get_cipher_engine(NID_aes_256_cbc));
 +#ifdef NID_aes_256_gcm
 +  log_engine(AES-256-GCM, ENGINE_get_cipher_engine(NID_aes_256_gcm));
 +#endif
 +
  #endif
  } else {
log_info(LD_CRYPTO, NOT using OpenSSL engine support.);

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


[tor-commits] r26490: {website} fix windows links on torbrowser page (website/trunk/projects/en)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 04:30:11 + (Thu, 19 Dec 2013)
New Revision: 26490

Modified:
   website/trunk/projects/en/torbrowser.wml
Log:
fix windows links on torbrowser page

Modified: website/trunk/projects/en/torbrowser.wml
===
--- website/trunk/projects/en/torbrowser.wml2013-12-19 03:01:32 UTC (rev 
26489)
+++ website/trunk/projects/en/torbrowser.wml2013-12-19 04:30:11 UTC (rev 
26490)
@@ -96,8 +96,8 @@
  tbody
tr
  tdEnglish (en-US)/td
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_en-US.exe32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_en-US.exe.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_en-US.exe32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_en-US.exe.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_en-US.zip32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_en-US.zip.ascsig/a)/em
 
  !-- ECbull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-en-US.zip64-bit/a
 
@@ -109,8 +109,8 @@
/tr
tr class=alt
  td#x0627;#x0644;#x0639;#x0631;#x0628;#x064a;#x0629; 
(ar)/td
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_ar.exe32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_ar.exe.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_ar.exe32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_ar.exe.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_ar.zip32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_ar.zip.ascsig/a)/em
 
  !-- ECbull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-ar.zip64-bit/a
 
@@ -122,8 +122,8 @@
/tr
tr
  tdDeutsch (de)/td
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_de.exe32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_de.exe.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_de.exe32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_de.exe.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_de.zip32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_de.zip.ascsig/a)/em
 
  !-- EC bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-de.zip64-bit/a
 
@@ -135,8 +135,8 @@
/tr
tr class=alt
  td#x0045;#x0073;#x0070;#x0061;#x00f1;#x006f;#x006c; 
(es-ES)/td
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_es-ES.exe32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundle_es-ES.exe.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_es-ES.exe32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_es-ES.exe.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_es-ES.zip32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_es-ES.zip.ascsig/a)/em
 
  !-- ECbull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-es-ES.zip64-bit/a
 
@@ -148,8 +148,8 

[tor-commits] r26491: {website} fix hanging comment arrow on torbrowser page (website/trunk/projects/en)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 04:35:17 + (Thu, 19 Dec 2013)
New Revision: 26491

Modified:
   website/trunk/projects/en/torbrowser.wml
Log:
fix hanging comment arrow on torbrowser page

Modified: website/trunk/projects/en/torbrowser.wml
===
--- website/trunk/projects/en/torbrowser.wml2013-12-19 04:30:11 UTC (rev 
26490)
+++ website/trunk/projects/en/torbrowser.wml2013-12-19 04:35:17 UTC (rev 
26491)
@@ -297,8 +297,8 @@
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-version-torbrowserbundlealpha_en-US.exe.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx32alpha-osx-i386-en-US.zip32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx32alpha-osx-i386-en-US.zip.ascsig/a)/em
 
- !-- EC bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64alpha-osx-x86_64-en-US.zip64-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64alpha-osx-x86_64-en-US.zip.ascsig/a)/em/td
 --
+ bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64alpha-osx-x86_64-en-US.zip64-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64alpha-osx-x86_64-en-US.zip.ascsig/a)/em/td
  tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-gnu-linux-i686-version-torbrowserbundlelinux32alpha-dev-en-US.tar.gz32-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-gnu-linux-i686-version-torbrowserbundlelinux32alpha-dev-en-US.tar.gz.ascsig/a)/em
 
  bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-gnu-linux-x86_64-version-torbrowserbundlelinux64alpha-dev-en-US.tar.gz64-bit/a
 

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


[tor-commits] r26492: {website} linux bundles are .xz now, not .gz (website/trunk/projects/en)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 04:46:30 + (Thu, 19 Dec 2013)
New Revision: 26492

Modified:
   website/trunk/projects/en/torbrowser.wml
Log:
linux bundles are .xz now, not .gz

Modified: website/trunk/projects/en/torbrowser.wml
===
--- website/trunk/projects/en/torbrowser.wml2013-12-19 04:35:17 UTC (rev 
26491)
+++ website/trunk/projects/en/torbrowser.wml2013-12-19 04:46:30 UTC (rev 
26492)
@@ -102,10 +102,10 @@
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_en-US.zip.ascsig/a)/em
 
  !-- ECbull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-en-US.zip64-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-en-US.zip.ascsig/a)/em/td
 --
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_en-US.tar.gz32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_en-US.tar.gz.ascsig/a)/em
 
- bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_en-US.tar.gz64-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_en-US.tar.gz.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_en-US.tar.xz32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_en-US.tar.xz.ascsig/a)/em
 
+ bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_en-US.tar.xz64-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_en-US.tar.xz.ascsig/a)/em/td
/tr
tr class=alt
  td#x0627;#x0644;#x0639;#x0631;#x0628;#x064a;#x0629; 
(ar)/td
@@ -115,10 +115,10 @@
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_ar.zip.ascsig/a)/em
 
  !-- ECbull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-ar.zip64-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-ar.zip.ascsig/a)/em/td
 --
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_ar.tar.gz32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_ar.tar.gz.ascsig/a)/em
 
- bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_ar.tar.gz64-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_ar.tar.gz.ascsig/a)/em/td
+ tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_ar.tar.xz32-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_ar.tar.xz.ascsig/a)/em
 
+ bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_ar.tar.xz64-bit/a
 
+ em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_ar.tar.xz.ascsig/a)/em/td
/tr
tr
  tdDeutsch (de)/td
@@ -128,10 +128,10 @@
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_de.zip.ascsig/a)/em
 
  !-- EC bull; a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-de.zip64-bit/a
 
  em(a 
href=../dist/torbrowser/version-torbrowserbundledir/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-de.zip.ascsig/a)/em/td
 --
- tda 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_de.tar.gz32-bit/a
 
- em(a 
href=../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_de.tar.gz.ascsig/a)/em
 
- bull; a 

[tor-commits] r26493: {website} fix the easy download page javascript to point at the right (website/trunk/include)

2013-12-18 Thread Erinn Clark
Author: erinn
Date: 2013-12-19 04:56:21 + (Thu, 19 Dec 2013)
New Revision: 26493

Modified:
   website/trunk/include/dlhead.wmi
Log:
fix the easy download page javascript to point at the right tbbs in the right 
directory

Modified: website/trunk/include/dlhead.wmi
===
--- website/trunk/include/dlhead.wmi2013-12-19 04:46:30 UTC (rev 26492)
+++ website/trunk/include/dlhead.wmi2013-12-19 04:56:21 UTC (rev 26493)
@@ -60,11 +60,11 @@
 var caller = $( this );
 var pkg = caller.attr('id');
 var lang = caller.val();
-var wintbb = 
'../dist/torbrowser/tor-browser-version-torbrowserbundle_'+lang+'.exe';
-var osxtbb = 
'../dist/torbrowser/osx/TorBrowser-version-torbrowserbundleosx32-osx-i386-'+lang+'.zip';
-var osxtbb64 = 
'../dist/torbrowser/osx/TorBrowser-version-torbrowserbundleosx64-osx-x86_64-'+lang+'.zip';
-var lintbb32 = 
'../dist/torbrowser/linux/tor-browser-gnu-linux-i686-version-torbrowserbundlelinux32-dev-'+lang+'.tar.gz';
-var lintbb64 = 
'../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-version-torbrowserbundlelinux64-dev-'+lang+'.tar.gz';
+var wintbb = 
'../dist/torbrowser/version-torbrowserbundledir/torbrowser-install-version-torbrowserbundle_'+lang+'.exe';
+var osxtbb = 
'../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx32_'+lang+'.zip';
+var osxtbb64 = 
'../dist/torbrowser/version-torbrowserbundledir/TorBrowserBundle-version-torbrowserbundleosx32-osx64_'+lang+'.zip';
+var lintbb32 = 
'../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux32-version-torbrowserbundlelinux32_'+lang+'.tar.gz';
+var lintbb64 = 
'../dist/torbrowser/version-torbrowserbundledir/tor-browser-linux64-version-torbrowserbundlelinux64_'+lang+'.tar.gz';
 if(pkg == 'win-tbb'){
   $('.'+pkg).replaceWith('a class=button win-tbb 
href='+wintbb+'span class=strongDownload/spanspan 
class=normalbutton-win-tbb32/span/a');
   $('.'+pkg+'-sig').replaceWith('a class=win-tbb-sig 
href='+wintbb+'.ascsig/a');

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