November 2013 - tor-commits - lists.torproject.org

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 567d6f0cb5805908b0e9570f56881cd4bd4a96d1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 16:16:16 2013 +0000 Update translations for tails-misc_completed --- pt_BR.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index 4a72b3b..d46544f 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -5,13 +5,14 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 # eduardolvt, 2013 +# Matheus_Martins <m.vmartins(a)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-09-09 12:35+0200\n" -"PO-Revision-Date: 2013-10-04 02:00+0000\n" -"Last-Translator: Communia <ameaneantie(a)riseup.net>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-26 23:41+0200\n" +"PO-Revision-Date: 2013-11-07 16:10+0000\n" +"Last-Translator: Matheus_Martins <m.vmartins(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,21 +227,21 @@ msgstr "Construir informações:⏎\n%s" msgid "About Tails" msgstr "Sobre o Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: 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:128 msgid "Your additional software" msgstr "Seu software adicional" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 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 "A atualização falhou. Isto pode ser devido a um problema de rede. Por favor, verifique a sua conexão de rede, tente reiniciat Tails ou leia o log do sistema para compreender melhor o problema." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 msgid "The upgrade was successful." msgstr "A atualização foi bem sucedida." @@ -405,9 +406,9 @@ msgid "" "concerns." msgstr "TrueCript será removido em breve do Tails devido a preocupações com licença e desenvolvimento." -#: ../config/chroot_local-includes/etc/skel/Desktop/Report_a_Bug.desktop.in.h:1 -msgid "Report a Bug" -msgstr "Reportar um Erro" +#: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 +msgid "Report an error" +msgstr "Reporte um erro" #: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 msgid "Tails documentation"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 7f9a73b3e9d47266b1378171d931cfbfb4af8a14 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 16:16:14 2013 +0000 Update translations for tails-misc --- pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR.po b/pt_BR.po index eedfa56..d46544f 100644 --- a/pt_BR.po +++ b/pt_BR.po @@ -5,13 +5,14 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 # eduardolvt, 2013 +# Matheus_Martins <m.vmartins(a)hotmail.com>, 2013 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+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-07 16:10+0000\n" +"Last-Translator: Matheus_Martins <m.vmartins(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -407,7 +408,7 @@ msgstr "TrueCript será removido em breve do Tails devido a preocupações com l #: ../config/chroot_local-includes/etc/skel/Desktop/Report_an_error.desktop.in.h:1 msgid "Report an error" -msgstr "" +msgstr "Reporte um erro" #: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 msgid "Tails documentation"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 5dcc8e8266ac37734f1e106e8bf151a808f1e03a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 16:15:54 2013 +0000 Update translations for liveusb-creator --- pt_BR/pt_BR.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index cf4f8f0..c8a883f 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -9,6 +9,7 @@ # Augustine <evandro(a)geocities.com>, 2013 # gv1974 <g.lucio(a)ig.com.br>, 2013 # Igor Pires Soares <igor(a)projetofedora.org>, 2008 +# Matheus_Martins <m.vmartins(a)hotmail.com>, 2013 # Rafael Gomes <rafaelgomes(a)projetofedora.org>, 2009 # NICEcookie <rafaelmartinsrm(a)gmail.com>, 2012 # Wilson Campos <wcampos5(a)gmail.com>, 2008 @@ -17,8 +18,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 09:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-07 16:15+0000\n" +"Last-Translator: Matheus_Martins <m.vmartins(a)hotmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "" #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format msgid "%(distribution)s installer" -msgstr "" +msgstr "%(distribution)s instalador" #: ../liveusb/gui.py:803 #, python-format @@ -39,7 +40,7 @@ msgstr "%(filename)s selecionado" #: ../liveusb/gui.py:440 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -282,7 +283,7 @@ msgstr "Armazenamento permanente (0 MB)" #: ../liveusb/gui.py:697 ../liveusb/gui.py:726 msgid "Please confirm your device selection" -msgstr "" +msgstr "Por favor confirme a seleção do seu dispositivo" #: ../liveusb/gui.py:462 msgid "Refreshing releases..." @@ -319,7 +320,7 @@ msgstr "Configurando o arquivo de inicialização do OLPC..." msgid "" "Some partitions of the target device %(device)s are mounted. They will be " "unmounted before starting the installation process." -msgstr "" +msgstr "Algumas partições do dispositivo %(device)s estão montadas. Elas serão desmontadas antes do processo de instalação iniciar." #: ../liveusb/creator.py:131 msgid "" @@ -386,7 +387,7 @@ msgstr "Este é o console de informação onde todas mensagens são mostradas." #: ../liveusb/creator.py:879 msgid "Trying to continue anyway." -msgstr "" +msgstr "Tentando continuar de qualquer maneira." #: ../liveusb/creator.py:911 #, python-format

1 0

r26413: {website} change the phone number. (in website/trunk: about/en press/en)
by Andrew Lewman 07 Nov '13

07 Nov '13

Author: phobos Date: 2013-11-07 16:13:47 +0000 (Thu, 07 Nov 2013) New Revision: 26413 Modified: website/trunk/about/en/contact.wml website/trunk/about/en/corepeople.wml website/trunk/press/en/info.wmi Log: change the phone number. Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-11-06 17:11:31 UTC (rev 26412) +++ website/trunk/about/en/contact.wml 2013-11-07 16:13:47 UTC (rev 26413) @@ -17,7 +17,6 @@ <li><a href="#email">Email</a></li> <li><a href="#identica">Identi.ca</a></li> <li><a href="#irc">IRC</a></li> - <li><a href="#sms">SMS/Text Messaging</a></li> <li><a href="#phone">Telephone</a></li> </ul> @@ -86,16 +85,9 @@ stuff that is not related to Tor.</li> </ul> - <a id="sms"></a> - <h3><a class="anchor" href="#sms">SMS/Text Messaging</a></h3> - <p>We've started an experimental SMS/Text Messaging contact - system. The following number can receive SMS/Text Messages from - anywhere: +15088010746. Please be aware that your phone company and - ours (and everyone in between) could see the messages.</p> - <a id="phone"></a> <h3><a class="anchor" href="#phone">Telephone</a></h3> - <p>If none of the above appeal to you, calling +1-508-801-0746 + <p>If none of the above appeal to you, calling +1-781-948-1982 will reach the Tor office. Should there be no answer, please leave a message with a way to reach you. Please be aware that your phone company and ours (and everyone in between) could listen to Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2013-11-06 17:11:31 UTC (rev 26412) +++ website/trunk/about/en/corepeople.wml 2013-11-07 16:13:47 UTC (rev 26413) @@ -110,7 +110,7 @@ <a href="<page press/press>">press contact</a></dt> <dd>Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, - press, and general support. He can be contacted via OpenPGP 0x6B4D6475 or 508-801-0746.</dd> + press, and general support. He can be contacted via OpenPGP 0x6B4D6475 or +1-781-948-1982.</dd> <dt>Dr. Karsten Loesing, Metrics Researcher and Developer, Project Manager</dt> <dd>Primary researcher and developer into Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2013-11-06 17:11:31 UTC (rev 26412) +++ website/trunk/press/en/info.wmi 2013-11-07 16:13:47 UTC (rev 26413) @@ -8,7 +8,7 @@ <p> <b>Tor Press Team</b><br> execdir(a)torproject.org<br> - +1-508-801-0746<br> + +1-781-948-1982<br> </p> </div>

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 1483a3b34ce9496f55e59ffaccecd88e855624d8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 15:15:58 2013 +0000 Update translations for liveusb-creator_completed --- es/es.po | 247 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 132 insertions(+), 115 deletions(-) diff --git a/es/es.po b/es/es.po index ad47e66..f2fd7c0 100644 --- a/es/es.po +++ b/es/es.po @@ -5,15 +5,17 @@ # Translators: # Adrián Sandí <asandi.sagot(a)gmail.com>, 2013 # Carlos Capote <carloscapote(a)masticable.org>, 2012 -# strel <strelnic(a)gmail.com>, 2013 -# strel <strelnic(a)gmail.com>, 2012-2013 +# dpatricio <dani(a)dominiosvm.es>, 2013 +# mm2herr <ma_herrer(a)yahoo.com.mx>, 2013 +# strel, 2013 +# strel, 2012-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-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-09 11:00+0000\n" -"Last-Translator: strel <strelnic(a)gmail.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-10-17 13:19+0200\n" +"PO-Revision-Date: 2013-11-07 14:50+0000\n" +"Last-Translator: dpatricio <dani(a)dominiosvm.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,66 +23,71 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 +#: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format -msgid "%(distribution)s LiveUSB Creator" -msgstr "Creador de USB autoarrancable de %(distribution)s" +msgid "%(distribution)s installer" +msgstr "instalador %(distribution)s" -#: ../liveusb/gui.py:776 +#: ../liveusb/gui.py:803 #, python-format msgid "%(filename)s selected" msgstr "%(filename)s seleccionado(s)" -#: ../liveusb/creator.py:1004 +#: ../liveusb/gui.py:440 +#, python-format +msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" + +#: ../liveusb/creator.py:1020 #, python-format msgid "%s already bootable" msgstr "%s ya es arrancable" -#: ../liveusb/launcher_ui.py:156 +#: ../liveusb/launcher_ui.py:165 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">¿Necesita ayuda? Lea la </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/usb_installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentación</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Need help? Read the </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentation</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">⏎\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">⏎\np, li { white-space: pre-wrap; }⏎\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">⏎\n<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Necesita ayuda? Lea la siguiente </span><a href=\"file:///usr/share/doc/tails/website/doc/first_steps/installation.en.html\"><span style=\" text-decoration: underline; color:#0000ff;\">documentacion</span></a><span style=\" font-size:10pt;\">.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:151 +#: ../liveusb/launcher_ui.py:160 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick. All data on the target drive will be lost.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar el sistema Tails en ejecución a una memoria USB. Todos los datos en la unidad destino se perderán.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar en una memoria USB o tarjeta SD el Tails que se está ejecutando. Se perderán todos los datos de la unidad de destino.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:153 +#: ../liveusb/launcher_ui.py:162 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails USB stick. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar el sistema Tails en ejecución a una memoria USB con Tails ya instalado. Otras particiones que se encuentren en la memoria serán preservadas.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar el Tails que se está ejecutando en un dispositivo que ya cuenta con Tails instalado. Se conservará cualquier otra partición encontrada.</span></p></body></html>" -#: ../liveusb/launcher_ui.py:155 +#: ../liveusb/launcher_ui.py:164 msgid "" "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" -"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails USB stick from a new ISO image.</span></p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Actualizar una memoria USB con Tails ya instalado, desde una nueva imagen ISO.</span></p></body></html>" +"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Actualizar un dispositivo con Tails instalado desde una imagen ISO nueva.</span></p></body></html>" -#: ../liveusb/dialog.py:154 +#: ../liveusb/dialog.py:163 msgid "Alt+B" msgstr "Alt+S" -#: ../liveusb/dialog.py:153 +#: ../liveusb/dialog.py:162 msgid "Browse" msgstr "Seleccionar" -#: ../liveusb/dialog.py:160 +#: ../liveusb/dialog.py:169 msgid "" "By allocating extra space on your USB stick for a persistent overlay, you " "will be able to store data and make permanent modifications to your live " @@ -88,12 +95,12 @@ msgid "" "persist after a reboot." msgstr "Con la asignación de espacio extra para un área persistente en su memoria USB, será capaz de almacenar datos y hacer modificaciones persistentes a su sistema operativo autoarrancable. Sin ello, no será capaz de guardar datos que persistan después de un reinicio." -#: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 +#: ../liveusb/creator.py:1122 ../liveusb/creator.py:1385 #, python-format msgid "Calculating the SHA1 of %s" msgstr "Calculando el identificador criptográfico ('checksum') SHA1 de %s " -#: ../liveusb/creator.py:1317 +#: ../liveusb/creator.py:1333 msgid "Cannot find" msgstr "No se pudo encontrar" @@ -102,21 +109,21 @@ msgstr "No se pudo encontrar" msgid "Cannot find device %s" msgstr "No se pudo encontrar el dispositivo %s" -#: ../liveusb/launcher_ui.py:150 +#: ../liveusb/launcher_ui.py:159 msgid "" "Clone\n" "&&\n" "Install" msgstr "Clonar\n&&\ninstalar" -#: ../liveusb/launcher_ui.py:152 +#: ../liveusb/launcher_ui.py:161 msgid "" "Clone\n" "&&\n" "Upgrade" msgstr "Clonar\n&&\nactualizar" -#: ../liveusb/dialog.py:165 +#: ../liveusb/dialog.py:174 msgid "Create Live USB" msgstr "Crear USB autoarrancable" @@ -125,21 +132,21 @@ msgstr "Crear USB autoarrancable" msgid "Creating %sMB persistent overlay" msgstr "Creando partición de datos persistentes ('overlay') de %s MB" -#: ../liveusb/gui.py:556 +#: ../liveusb/gui.py:562 msgid "" "Device is not yet mounted, so we cannot determine the amount of free space." msgstr "El dispositivo no está montado aún, por lo que no se pudo determinar la cantidad de espacio libre." -#: ../liveusb/dialog.py:157 +#: ../liveusb/dialog.py:166 #, python-format msgid "Download %(distribution)s" msgstr "Descargar %(distribution)s" -#: ../liveusb/gui.py:750 +#: ../liveusb/gui.py:777 msgid "Download complete!" msgstr "¡Descarga completa!" -#: ../liveusb/gui.py:754 +#: ../liveusb/gui.py:781 msgid "Download failed: " msgstr "Fallo de la descarga: " @@ -148,16 +155,16 @@ msgstr "Fallo de la descarga: " msgid "Downloading %s..." msgstr "Descargando %s..." -#: ../liveusb/creator.py:1102 +#: ../liveusb/creator.py:1118 msgid "Drive is a loopback, skipping MBR reset" msgstr "La unidad es de tipo loopback (virtual, de bucle), omitiendo el restablecimiento del MBR..." -#: ../liveusb/creator.py:808 +#: ../liveusb/creator.py:813 #, python-format msgid "Entering unmount_device for '%(device)s'" msgstr "Ejecutando unmount_device para '%(device)s'" -#: ../liveusb/creator.py:1182 +#: ../liveusb/creator.py:1198 msgid "Error probing device" msgstr "Error probando el dispositivo " @@ -174,10 +181,10 @@ msgid "" msgstr "Error: El identificador criptográfico ('checksum') SHA1 de su CD autoarrancable (Live CD) no es válido. Puede ejecutar este programa con el modificador --noverify para evitar este chequeo de verificación." #: ../liveusb/creator.py:145 -msgid "Extracting live image to USB device..." -msgstr "Extrayendo la imagen autoarrancable (live image) del dispositivo USB..." +msgid "Extracting live image to the target device..." +msgstr "Extrayendo la imagen al dispositivo de destino..." -#: ../liveusb/creator.py:1047 +#: ../liveusb/creator.py:1063 #, python-format msgid "Formatting %(device)s as FAT32" msgstr "Formateando %(device)s como FAT32" @@ -190,13 +197,13 @@ msgstr "El identificador criptográfico ('checksum') MD5 de la ISO es correcto" msgid "ISO MD5 checksum verification failed" msgstr "Error en la verificación del identificador criptográfico ('checksum') MD5 de la ISO" -#: ../liveusb/dialog.py:156 +#: ../liveusb/dialog.py:165 msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." msgstr "Si no selecciona una imagen ISO autoarrancable existente, la versión seleccionada se descargará para usted." -#: ../liveusb/gui.py:619 +#: ../liveusb/gui.py:625 msgid "Installation complete!" msgstr "¡Instalación completa!" @@ -205,11 +212,11 @@ msgstr "¡Instalación completa!" msgid "Installation complete! (%s)" msgstr "¡Instalación completa! (%s)" -#: ../liveusb/gui.py:620 +#: ../liveusb/gui.py:626 msgid "Installation was completed. Press OK to close this program." msgstr "Instalación completa. Pulse Aceptar para cerrar este programa." -#: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 +#: ../liveusb/creator.py:916 ../liveusb/creator.py:1239 msgid "Installing bootloader..." msgstr "Instalando gestor de arranque (bootloader)... " @@ -217,32 +224,28 @@ msgstr "Instalando gestor de arranque (bootloader)... " msgid "LiveUSB creation failed!" msgstr "¡La creación del USB autoarrancable (LiveUSB) falló!" -#: ../liveusb/creator.py:1318 +#: ../liveusb/creator.py:1334 msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." msgstr "Asegúrese de extraer el fichero zip liveusb-creator completamente antes de ejecutar este programa." -#: ../liveusb/creator.py:1194 +#: ../liveusb/creator.py:1210 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" msgstr "Asegúrese de que su memoria USB está conectada, y formateada con el sistema de ficheros FAT" -#: ../liveusb/creator.py:830 +#: ../liveusb/creator.py:835 #, python-format msgid "Mount %s exists after unmounting" msgstr "El punto de montaje %s sigue existiendo tras desmontar " -#: ../liveusb/gui.py:681 ../liveusb/gui.py:698 -msgid "Next" -msgstr "Siguiente" - -#: ../liveusb/gui.py:562 +#: ../liveusb/gui.py:568 #, python-format msgid "No free space on device %(device)s" msgstr "No hay espacio libre en el dispositivo %(device)s" -#: ../liveusb/creator.py:797 +#: ../liveusb/creator.py:802 msgid "No mount points found" msgstr "No se encontraron puntos de montaje" @@ -253,40 +256,40 @@ msgid "" "%dMB ISO + %dMB overlay > %dMB free space" msgstr "No hay suficiente espacio libre en el dispositivo.\n%dMB ISO + %dMB partición de datos persistentes ('overlay') > %dMB espacio libre" -#: ../liveusb/gui.py:543 +#: ../liveusb/gui.py:549 msgid "Partition is FAT16; Restricting overlay size to 2G" msgstr "La partición es FAT16; Restringiendo el tamaño de la partición de datos persistentes ('overlay') a 2G" -#: ../liveusb/gui.py:539 +#: ../liveusb/gui.py:545 msgid "Partition is FAT32; Restricting overlay size to 4G" msgstr "La partición es FAT32; restringiendo el tamaño de la partición de datos persistentes (overlay) a 4G" -#: ../liveusb/creator.py:226 ../liveusb/creator.py:837 +#: ../liveusb/creator.py:226 ../liveusb/creator.py:842 #, python-format msgid "Partitioning device %(device)s" msgstr "Particionando el dispositivo %(device)s" -#: ../liveusb/gui.py:610 +#: ../liveusb/gui.py:616 msgid "Persistent Storage" msgstr "Almacenamiento persistente" -#: ../liveusb/dialog.py:161 +#: ../liveusb/dialog.py:170 msgid "Persistent Storage (0 MB)" msgstr "Almacenamiento persistente (0 MB)" -#: ../liveusb/gui.py:679 ../liveusb/gui.py:696 -msgid "Press 'Next' if you wish to continue." -msgstr "Pulse 'Siguiente' si quiere continuar." +#: ../liveusb/gui.py:697 ../liveusb/gui.py:726 +msgid "Please confirm your device selection" +msgstr "Por favor confirme su dispositivo" -#: ../liveusb/gui.py:456 +#: ../liveusb/gui.py:462 msgid "Refreshing releases..." msgstr "Comprobando nuevas versiones..." -#: ../liveusb/gui.py:461 +#: ../liveusb/gui.py:467 msgid "Releases updated!" msgstr "¡Nuevas versiones actualizadas!" -#: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 +#: ../liveusb/creator.py:939 ../liveusb/creator.py:1257 #, python-format msgid "Removing %(file)s" msgstr "Eliminando %(file)s" @@ -295,12 +298,12 @@ msgstr "Eliminando %(file)s" msgid "Removing existing Live OS" msgstr "Eliminando el sistema operativo autoarrancable (Live OS) existente" -#: ../liveusb/creator.py:1096 +#: ../liveusb/creator.py:1112 #, python-format msgid "Resetting Master Boot Record of %s" msgstr "Restableciendo Master Boot Record de %s" -#: ../liveusb/gui.py:761 +#: ../liveusb/gui.py:788 msgid "Select Live ISO" msgstr "Seleccione una ISO autoarrancable (Live ISO)" @@ -308,33 +311,33 @@ msgstr "Seleccione una ISO autoarrancable (Live ISO)" msgid "Setting up OLPC boot file..." msgstr "Configurando un fichero de arranque OLPC (One Laptop Per Child)..." -#: ../liveusb/creator.py:711 +#: ../liveusb/creator.py:716 #, python-format msgid "" -"Some partitions of USB device %(device)s are mounted. They will be unmounted" -" before starting the installation process." -msgstr "Algunas particiones del dispositivo USB %(device)s están montadas. Serán desmontadas antes de comenzar el proceso de instalación." +"Some partitions of the target device %(device)s are mounted. They will be " +"unmounted before starting the installation process." +msgstr "Algunas particiones de su dispositivo %(device)s se han montado. Serán desmontadas antes de iniciar con el proceso de instalación." #: ../liveusb/creator.py:131 msgid "" "Source type does not support verification of ISO MD5 checksum, skipping" msgstr "La fuente no soporta la verificación del identificador criptográfico ('checksum') MD5 de la ISO, omitiendo..." -#: ../liveusb/creator.py:1130 +#: ../liveusb/creator.py:1146 msgid "Synchronizing data on disk..." msgstr "Sincronizando datos en el disco... " -#: ../liveusb/dialog.py:159 +#: ../liveusb/dialog.py:168 msgid "Target Device" msgstr "Dispositivo destino" -#: ../liveusb/gui.py:643 +#: ../liveusb/gui.py:662 msgid "" "The Master Boot Record on your device is blank. Pressing 'Create Live USB' " "again will reset the MBR on this device." msgstr "El Master Boot Record (registro de arranque maestro) de su dispositivo está en blanco. Al pulsar 'Crear Live USB' de nuevo, se restablecerá el MBR de este dispositivo." -#: ../liveusb/gui.py:764 +#: ../liveusb/gui.py:791 msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." @@ -347,14 +350,14 @@ msgid "" "A more detailed error log has been written to '%(filename)s'." msgstr "Hubo un problema ejecutando el siguiente comando: '%(command)s'. \nSe ha escrito un registro de errores (log) más detallado en '%(filename)s'." -#: ../liveusb/dialog.py:151 +#: ../liveusb/dialog.py:160 msgid "" "This button allows you to browse for an existing Live system ISO that you " "have previously downloaded. If you do not select one, a release will be " "downloaded for you automatically." msgstr "Este botón le permite desplazarse para seleccionar una ISO de sistema autoarrancable existente que haya descargado previamente. Si no selecciona una se descargará una versión automáticamente para usted." -#: ../liveusb/dialog.py:164 +#: ../liveusb/dialog.py:173 msgid "" "This button will begin the LiveUSB creation process. This entails " "optionally downloading a release (if an existing one wasn't selected), " @@ -362,23 +365,27 @@ msgid "" "installing the bootloader." msgstr "Este botón comenzará el proceso de creación del USB autoarrancable (LiveUSB). Opcionalmente esto conlleva descargar una versión (si no fue seleccionada una existente), extraer la ISO al dispositivo USB, crear el área persistente, e instalar el gestor de arranque." -#: ../liveusb/dialog.py:158 +#: ../liveusb/dialog.py:167 msgid "" "This is the USB stick that you want to install your Live system on. This " "device must be formatted with the FAT filesystem." msgstr "Esta es la memoria USB sobre la que quiere instalar su sistema autoarrancable ('Live'). Este dispositivo debe ser formateado con el sistema de ficheros FAT." -#: ../liveusb/dialog.py:163 +#: ../liveusb/dialog.py:172 msgid "" "This is the progress bar that will indicate how far along in the LiveUSB " "creation process you are" msgstr "Esta es la barra de progreso que indicará en qué punto, a lo largo del proceso de creación de USB autoarrancable ('LiveUSB'), se está." -#: ../liveusb/dialog.py:162 +#: ../liveusb/dialog.py:171 msgid "This is the status console, where all messages get written to." msgstr "Esta es la consola de estado, donde salen escritos todos los mensajes." -#: ../liveusb/creator.py:895 +#: ../liveusb/creator.py:879 +msgid "Trying to continue anyway." +msgstr "Tratando de continuar de cualquier manera." + +#: ../liveusb/creator.py:911 #, python-format msgid "Unable to change volume label: %(message)s" msgstr "No se pudo cambiar la etiqueta del volumen: %(message)s" @@ -397,24 +404,24 @@ msgstr "No se pudo copiar %(infile)s en %(outfile)s: %(message)s" msgid "Unable to find any USB drive" msgstr "No fue posible encontrar alguna unidad USB" -#: ../liveusb/creator.py:1184 -msgid "Unable to find any removable device" -msgstr "No se pudo encontrar dispositivo extraíble alguno" +#: ../liveusb/creator.py:1200 +msgid "Unable to find any supported device" +msgstr "No es posible localizar un dispositivo válido." -#: ../liveusb/creator.py:1024 +#: ../liveusb/creator.py:1040 msgid "Unable to find partition" msgstr "No se pudo encontrar la partición" -#: ../liveusb/creator.py:1264 +#: ../liveusb/creator.py:1280 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" msgstr "No fue posible obtener Win32_LogicalDisk; la petición win32com no devolvió resultados" -#: ../liveusb/gui.py:671 +#: ../liveusb/gui.py:690 msgid "Unable to mount device" msgstr "No se pudo montar el dispositivo" -#: ../liveusb/creator.py:785 +#: ../liveusb/creator.py:790 #, python-format msgid "Unable to mount device: %(message)s" msgstr "No se pudo montar el dispositivo: %(message)s" @@ -429,18 +436,18 @@ msgstr "No se pudo eliminar la carpeta del anterior sistema operativo autoarraca msgid "Unable to remove file from previous LiveOS: %(message)s" msgstr "No se pudo eliminar el fichero del anterior sistema operativo autoarrancable (LiveOS): %(message)s" -#: ../liveusb/creator.py:1099 +#: ../liveusb/creator.py:1115 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." msgstr "No se pudo restablecer el MBR. Podría no tener instalado el paquete `syslinux`" -#: ../liveusb/gui.py:770 +#: ../liveusb/gui.py:797 msgid "" "Unable to use the selected file. You may have better luck if you move your " "ISO to the root of your drive (ie: C:\\)" msgstr "No se pudo utilizar el fichero seleccionado. Puede que tenga más suerte si mueve su ISO a la carpeta raíz de su unidad (ej. C:\\)" -#: ../liveusb/creator.py:692 +#: ../liveusb/creator.py:697 #, python-format msgid "Unable to write on %(device)s, skipping." msgstr "No se pudo escribir en %(device)s, omitiendo... " @@ -449,12 +456,12 @@ msgstr "No se pudo escribir en %(device)s, omitiendo... " msgid "Unknown ISO, skipping checksum verification" msgstr "ISO desconocida, omitiendo la verificación del identificador criptográfico ('checksum')" -#: ../liveusb/creator.py:781 +#: ../liveusb/creator.py:786 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" msgstr "Excepción dbus desconocida al intentar montar el dispositivo: %(message)s" -#: ../liveusb/creator.py:760 ../liveusb/creator.py:874 +#: ../liveusb/creator.py:765 ../liveusb/creator.py:890 msgid "Unknown filesystem. Your device may need to be reformatted." msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser formateado." @@ -463,40 +470,45 @@ msgstr "Sistema de ficheros desconocido. Su dispositivo podría tener que ser fo msgid "Unknown release: %s" msgstr "Versión desconocida: %s" -#: ../liveusb/creator.py:822 +#: ../liveusb/creator.py:827 #, python-format msgid "Unmounting '%(udi)s' on '%(device)s'" msgstr "Desmontando '%(udi)s' en '%(device)s'" -#: ../liveusb/creator.py:818 +#: ../liveusb/creator.py:823 #, python-format msgid "Unmounting mounted filesystems on '%(device)s'" msgstr "Desmontando los sistemas de ficheros montados sobre '%(device)s'" -#: ../liveusb/creator.py:765 ../liveusb/creator.py:877 +#: ../liveusb/creator.py:876 +#, python-format +msgid "Unsupported device '%(device)s', please report a bug." +msgstr "Dispositivo '%(device)s' no válido, por favor reporte un fallo." + +#: ../liveusb/creator.py:770 ../liveusb/creator.py:893 #, python-format msgid "Unsupported filesystem: %s" msgstr "Sistema de ficheros no soportado: %s" -#: ../liveusb/creator.py:763 +#: ../liveusb/creator.py:768 #, python-format msgid "" "Unsupported filesystem: %s\n" "In case you are trying to upgrade a manually installed Tails system (that is, if it was installed without this installer), this option is not supported: you need to install it anew to start with, e.g. by choosing the \"Clone & Install\" action instead." msgstr "Sistema de ficheros no soportado: %s\nEn caso de que esté intentando actualizar un sistema Tails instalado manualmente (esto es, si fue instalado sin este instalador), esta opción no está soportada: necesita instalarlo de nuevo para comenzar con ello, ej.: escogiendo la acción \"Clonar e instalar\" en su lugar." -#: ../liveusb/creator.py:1197 +#: ../liveusb/creator.py:1213 #, python-format msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." msgstr "Sistema de ficheros no soportado: %s\nPor favor, haga copia de respaldo y dé formato a su memoria USB con el sistema de ficheros FAT." -#: ../liveusb/launcher_ui.py:154 +#: ../liveusb/launcher_ui.py:163 msgid "Upgrade from ISO" msgstr "Actualizar desde ISO" -#: ../liveusb/dialog.py:152 +#: ../liveusb/dialog.py:161 msgid "Use existing Live system ISO" msgstr "Usar una ISO de sistema autoarrancable ('Live') existente" @@ -512,20 +524,16 @@ msgstr "Verificando el identificador criptográfico ('checksum') SHA1 de la imag msgid "Verifying SHA256 checksum of LiveCD image..." msgstr "Verificando el identificador criptográfico ('checksum') SHA256 de la imagen del CD autoarrancable (LiveCD)... " -#: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 +#: ../liveusb/creator.py:887 ../liveusb/creator.py:1206 msgid "Verifying filesystem..." msgstr "Verificando el sistema de ficheros... " -#: ../liveusb/gui.py:677 -msgid "Warning: All data on the selected drive will be lost." -msgstr "Advertencia: Se perderán todos los datos de la unidad seleccionada." - -#: ../liveusb/gui.py:694 +#: ../liveusb/gui.py:724 msgid "" "Warning: Creating a new persistent overlay will delete your existing one." msgstr "Advertencia: La creación de una nueva partición de datos persistentes ('overlay') borrará la suya existente." -#: ../liveusb/gui.py:657 +#: ../liveusb/gui.py:676 msgid "" "Warning: The Master Boot Record on your device does not match your system's " "syslinux MBR. If you have trouble booting this stick, try running the " @@ -544,13 +552,28 @@ msgstr "Advertencia: Esta herramienta debe ser ejecutada como un Administrador. msgid "Wrote to device at %(speed)d MB/sec" msgstr "Escrito al dispositivo a %(speed)d MB/sec" +#: ../liveusb/gui.py:698 +#, python-format +msgid "" +"You are going to install Tails on the %(size)s %(vendor)s %(model)s device " +"(%(device)s). All data on the selected drive will be lost. Continue?" +msgstr "Está a punto de instalar Tails en un dispositivo (%(device)s) %(vendor)s %(model)s %(size)s. Toda la información en el volumen seleccionado se perderá. Desea continuar?" + +#: ../liveusb/gui.py:715 +#, python-format +msgid "" +"You are going to upgrade Tails on the %(vendor)s %(model)s device " +"(%(device)s). Any persistent volume on this device will remain unchanged. " +"Continue?" +msgstr "Está a punto de actualizar Tails en el dispositivo (%(device)s) de %(vendor)s %(model)s. Cualquier volumen persistente en este dispositivo se mantendrá sin cambios. ¿Continuar?" + #: ../liveusb/creator.py:607 msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" msgstr "Está usando una versión antigua de syslinux-extlinux que no soporta el sistema de ficheros ext4." -#: ../liveusb/gui.py:755 +#: ../liveusb/gui.py:782 msgid "You can try again to resume your download" msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" @@ -558,12 +581,6 @@ msgstr "Puede intentar continuar con la descarga de nuevo donde la dejó" msgid "You must run this application as root" msgstr "Debe ejecutar esta aplicación como root (superusuario)" -#: ../liveusb/gui.py:691 -msgid "" -"Your device already contains a LiveOS.\n" -"If you continue, this will be overwritten." -msgstr "Su dispositivo ya contiene un sistema operativo autoarrancable (LiveOS).\nSi continúa, lo sobreescribirá." - -#: ../liveusb/dialog.py:155 +#: ../liveusb/dialog.py:164 msgid "or" msgstr "o"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 73d725de0f5ac0aa4f784648f4ffe8e3347bb202 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 15:15:55 2013 +0000 Update translations for liveusb-creator --- es/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es/es.po b/es/es.po index ccdfebe..f2fd7c0 100644 --- a/es/es.po +++ b/es/es.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-07 14:40+0000\n" +"PO-Revision-Date: 2013-11-07 14:50+0000\n" "Last-Translator: dpatricio <dani(a)dominiosvm.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -182,7 +182,7 @@ msgstr "Error: El identificador criptográfico ('checksum') SHA1 de su CD autoar #: ../liveusb/creator.py:145 msgid "Extracting live image to the target device..." -msgstr "" +msgstr "Extrayendo la imagen al dispositivo de destino..." #: ../liveusb/creator.py:1063 #, python-format

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Nov '13

07 Nov '13

commit 70d4bde4462cfe1d01b94f2c13b5d58ff68765dc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 7 14:45:55 2013 +0000 Update translations for liveusb-creator --- es/es.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/es/es.po b/es/es.po index dadf0c6..ccdfebe 100644 --- a/es/es.po +++ b/es/es.po @@ -5,6 +5,7 @@ # Translators: # Adrián Sandí <asandi.sagot(a)gmail.com>, 2013 # Carlos Capote <carloscapote(a)masticable.org>, 2012 +# dpatricio <dani(a)dominiosvm.es>, 2013 # mm2herr <ma_herrer(a)yahoo.com.mx>, 2013 # strel, 2013 # strel, 2012-2013 @@ -13,8 +14,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 15:50+0000\n" -"Last-Translator: mm2herr <ma_herrer(a)yahoo.com.mx>\n" +"PO-Revision-Date: 2013-11-07 14:40+0000\n" +"Last-Translator: dpatricio <dani(a)dominiosvm.es>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: ../liveusb/dialog.py:159 ../liveusb/launcher_ui.py:158 #, python-format msgid "%(distribution)s installer" -msgstr "" +msgstr "instalador %(distribution)s" #: ../liveusb/gui.py:803 #, python-format @@ -35,7 +36,7 @@ msgstr "%(filename)s seleccionado(s)" #: ../liveusb/gui.py:440 #, python-format msgid "%(vendor)s %(model)s (%(details)s) - %(device)s" -msgstr "" +msgstr "%(vendor)s %(model)s (%(details)s) - %(device)s" #: ../liveusb/creator.py:1020 #, python-format @@ -58,7 +59,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto a USB stick or SD card. All data on the target drive will be lost.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar en una memoria USB o tarjeta SD el Tails que se está ejecutando. Se perderán todos los datos de la unidad de destino.</span></p></body></html>" #: ../liveusb/launcher_ui.py:162 msgid "" @@ -67,7 +68,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copy the running Tails onto an already installed Tails device. Other partitions found on the stick are preserved.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Copiar el Tails que se está ejecutando en un dispositivo que ya cuenta con Tails instalado. Se conservará cualquier otra partición encontrada.</span></p></body></html>" #: ../liveusb/launcher_ui.py:164 msgid "" @@ -76,7 +77,7 @@ msgid "" "p, li { white-space: pre-wrap; }\n" "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Upgrade an already installed Tails device from a new ISO image.</span></p></body></html>" -msgstr "" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:10pt;\">Actualizar un dispositivo con Tails instalado desde una imagen ISO nueva.</span></p></body></html>" #: ../liveusb/dialog.py:163 msgid "Alt+B" @@ -564,7 +565,7 @@ msgid "" "You are going to upgrade Tails on the %(vendor)s %(model)s device " "(%(device)s). Any persistent volume on this device will remain unchanged. " "Continue?" -msgstr "" +msgstr "Está a punto de actualizar Tails en el dispositivo (%(device)s) de %(vendor)s %(model)s. Cualquier volumen persistente en este dispositivo se mantendrá sin cambios. ¿Continuar?" #: ../liveusb/creator.py:607 msgid ""

1 0

[tor-browser-bundle/master] Fix issues with tag verification for alternate versions file.
by mikeperry＠torproject.org 07 Nov '13

07 Nov '13

commit 0a15d499588ad25187e64d851bb1bacb5a436b6f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 6 20:33:55 2013 -0800 Fix issues with tag verification for alternate versions file. --- gitian/fetch-inputs.sh | 13 ++++++++++--- gitian/mkbundle-linux.sh | 13 ++++++++++--- gitian/mkbundle-mac.sh | 13 ++++++++++--- gitian/mkbundle-windows.sh | 14 +++++++++++--- gitian/verify-tags.sh | 26 ++++++++++++++------------ 5 files changed, 55 insertions(+), 24 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7320c74..7c71772 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -18,15 +18,22 @@ WRAPPER_DIR=$(readlink -f "$WRAPPER_DIR") if [ "$#" = 1 ]; then INPUTS_DIR="$1" - . ./versions + VERSIONS_FILE=./versions elif [ "$#" = 2 ]; then - INPUTS_DIR="$PWD/../../gitian-builder/inputs" - . $2 + INPUTS_DIR="$1" + VERSIONS_FILE=$2 else echo >&2 "Usage: $0 [<inputsdir> <versions>]" exit 1 fi +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + mkdir -p "$INPUTS_DIR" cd "$INPUTS_DIR" diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 09cbdd4..dc73f96 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -5,11 +5,18 @@ if [ -z "$1" ]; then - . ./versions + VERSIONS_FILE=./versions else - . $1 + VERSIONS_FILE=$1 fi +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder DESCRIPTOR_DIR=$PWD/descriptors/ @@ -51,7 +58,7 @@ cd $WRAPPER_DIR if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 97d9535..42eb9ef 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -5,11 +5,18 @@ if [ -z "$1" ]; then - . ./versions + VERSIONS_FILE=./versions else - . $1 + VERSIONS_FILE=$1 fi +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder DESCRIPTOR_DIR=$PWD/descriptors/ @@ -51,7 +58,7 @@ cd $WRAPPER_DIR if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index a542099..16a1454 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -5,11 +5,19 @@ if [ -z "$1" ]; then - . ./versions + VERSIONS_FILE=./versions else - . $1 + VERSIONS_FILE=$1 fi +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + + WRAPPER_DIR=$PWD GITIAN_DIR=$PWD/../../gitian-builder DESCRIPTOR_DIR=$PWD/descriptors/ @@ -51,7 +59,7 @@ cd $WRAPPER_DIR if [ "z$VERIFY_TAGS" = "z1" ]; then - ./verify-tags.sh $GITIAN_DIR/inputs || exit 1 + ./verify-tags.sh $GITIAN_DIR/inputs $VERSIONS_FILE || exit 1 # If we're verifying tags, be explicit to gitian that we # want to build from tags. NSIS_TAG=refs/tags/$NSIS_TAG diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 9621065..055cac5 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -4,25 +4,27 @@ set -e set -u -if ! [ -e ./versions ]; then - echo >&2 "Error: ./versions file does not exist" - exit 1 -fi - -. ./versions - WRAPPER_DIR=$(dirname "$0") WRAPPER_DIR=$(readlink -f "$WRAPPER_DIR") -if [ "$#" -gt 1 ]; then - echo >&2 "Usage: $0 [<inputsdir>]" - exit 1 -elif [ "$#" = 1 ]; then +if [ "$#" = 1 ]; then + INPUTS_DIR="$1" + VERSIONS_FILE=./versions +elif [ "$#" = 2 ]; then INPUTS_DIR="$1" + VERSIONS_FILE=$2 else - INPUTS_DIR="$PWD/../../gitian-builder/inputs" + echo >&2 "Usage: $0 [<inputsdir> <versions>]" + exit 1 fi +if ! [ -e $VERSIONS_FILE ]; then + echo >&2 "Error: $VERSIONS_FILE file does not exist" + exit 1 +fi + +. $VERSIONS_FILE + cd "$INPUTS_DIR" CLEANUP=$(tempfile)

1 0

[tor-browser-bundle/master] Bug #7277: Switch to using Nick's OpenSSL branch w/ timestamp fix.
by mikeperry＠torproject.org 07 Nov '13

07 Nov '13

commit c9ad5b5d63738d9bfe601ed2c8c91501aa59fb99 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 6 21:22:12 2013 -0800 Bug #7277: Switch to using Nick's OpenSSL branch w/ timestamp fix. TBB's Tor client will now omit its timestamp in the TLS handshake. --- gitian/descriptors/linux/gitian-tor.yml | 6 ++--- gitian/descriptors/mac/gitian-tor.yml | 6 ++--- gitian/descriptors/windows/gitian-tor.yml | 6 ++--- gitian/fetch-inputs.sh | 34 ++++++++++++++--------------- gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- gitian/verify-tags.sh | 1 + gitian/versions | 9 ++++---- gitian/versions.alpha | 9 ++++---- 10 files changed, 43 insertions(+), 37 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index dd17184..15437e2 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -23,8 +23,9 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" +- "url": "https://github.com/nmathewson/openssl.git" + "dir": "openssl" files: -- "openssl.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -63,8 +64,7 @@ script: | cp $INSTDIR/libevent/lib/libevent-2.0.so.5 $INSTDIR/Tor/ cd .. # - tar xzf openssl.tar.gz - cd openssl-* + cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" #./Configure -shared --prefix=$INSTDIR/openssl linux-elf ./config -shared --prefix=$INSTDIR/openssl diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 7707555..c0b483b 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -22,8 +22,9 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" +- "url": "https://github.com/nmathewson/openssl.git" + "dir": "openssl" files: -- "openssl.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -64,8 +65,7 @@ script: | #cp $INSTDIR/zlib/lib/*.dylib $INSTDIR/Tor/ #cd .. # - tar xzf openssl.tar.gz - cd openssl-* + cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure --cross-compile-prefix=i686-apple-darwin11- $CFLAGS darwin-i386-cc --prefix=$INSTDIR/openssl make # SHARED_LDFLAGS="-shared -dynamiclib -L/usr/lib/apple/SDKs/MacOSX10.6.sdk/usr/lib/" diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index ff32c2e..c1af6a8 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -22,8 +22,9 @@ remotes: "dir": "libevent" - "url": "https://github.com/madler/zlib.git" "dir": "zlib" +- "url": "https://github.com/nmathewson/openssl.git" + "dir": "openssl" files: -- "openssl.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -60,8 +61,7 @@ script: | cp $INSTDIR/libevent/bin/*.dll $INSTDIR/Tor/ cd .. # - tar xzf openssl.tar.gz - cd openssl-* + cd openssl find -type f | xargs touch --date="$REFERENCE_DATETIME" ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw --prefix=$INSTDIR/openssl make diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 7c71772..9295a1f 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -103,20 +103,20 @@ update_git() { # Get package files from mirror # Get+verify sigs that exist -for i in OPENSSL # OBFSPROXY -do - PACKAGE="${i}_PACKAGE" - URL="${MIRROR_URL}${!PACKAGE}" - SUFFIX="asc" - get "${!PACKAGE}" "$URL" - get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" - - if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then - echo "$i: GPG signature is broken for ${URL}" - mv "${!PACKAGE}" "${!PACKAGE}.badgpg" - exit 1 - fi -done +#for i in OPENSSL # OBFSPROXY +#do +# PACKAGE="${i}_PACKAGE" +# URL="${MIRROR_URL}${!PACKAGE}" +# SUFFIX="asc" +# get "${!PACKAGE}" "$URL" +# get "${!PACKAGE}.$SUFFIX" "$URL.$SUFFIX" +# +# if ! verify "${!PACKAGE}" "$WRAPPER_DIR/gpg/$i.gpg" $SUFFIX; then +# echo "$i: GPG signature is broken for ${URL}" +# mv "${!PACKAGE}" "${!PACKAGE}.badgpg" +# exit 1 +# fi +#done for i in BINUTILS GCC do @@ -147,7 +147,7 @@ done # TOOLCHAIN4 each time. Rely only on SHA256 for now.. mkdir -p verify cd verify -for i in OPENSSL OSXSDK +for i in OSXSDK #OPENSSL do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -177,7 +177,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OPENSSL OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100 +for i in OSXSDK TOOLCHAIN4 NOSCRIPT PDFJS MINGW MSVCR100 # OPENSSL do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -214,7 +214,6 @@ cd .. ln -sf "$NOSCRIPT_PACKAGE" noscript(a)noscript.net.xpi ln -sf "$PDFJS_PACKAGE" uriloader(a)pdf.js.xpi -ln -sf "$OPENSSL_PACKAGE" openssl.tar.gz ln -sf "$BINUTILS_PACKAGE" binutils.tar.bz2 ln -sf "$GCC_PACKAGE" gcc.tar.bz2 @@ -233,6 +232,7 @@ while read dir url tag; do update_git "$dir" "$url" "$tag" done << EOF tbb-windows-installer https://github.com/moba/tbb-windows-installer.git +openssl https://github.com/nmathewson/openssl.git zlib https://github.com/madler/zlib.git libevent https://github.com/libevent/libevent.git tor-launcher https://git.torproject.org/tor-launcher.git diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index dc73f96..7db7316 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -65,6 +65,7 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG + OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -80,7 +81,7 @@ then echo "****** Starting Tor Component of Linux Bundle (1/3 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/linux/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 42eb9ef..6ddcf24 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -65,6 +65,7 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG + OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -80,7 +81,7 @@ then echo "****** Starting Tor Component of Mac Bundle (1/3 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/mac/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 16a1454..5241722 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -66,6 +66,7 @@ then GITIAN_TAG=refs/tags/$GITIAN_TAG TORLAUNCHER_TAG=refs/tags/$TORLAUNCHER_TAG TORBROWSER_TAG=refs/tags/$TORBROWSER_TAG + OPENSSL_TAG=refs/tags/$OPENSSL_TAG TORBUTTON_TAG=refs/tags/$TORBUTTON_TAG TOR_TAG=refs/tags/$TOR_TAG HTTPSE_TAG=refs/tags/$HTTPSE_TAG @@ -81,7 +82,7 @@ then echo "****** Starting Tor Component of Windows Bundle (1/3 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS --commit zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml + ./bin/gbuild -j $NUM_PROCS --commit openssl=$OPENSSL_TAG,zlib=$ZLIB_TAG,libevent=$LIBEVENT_TAG,tor=$TOR_TAG $DESCRIPTOR_DIR/windows/gitian-tor.yml if [ $? -ne 0 ]; then #mv var/build.log ./tor-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 055cac5..73016a8 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -60,6 +60,7 @@ zlib zlib.gpg $ZLIB_TAG libevent libevent.gpg $LIBEVENT_TAG tor tor.gpg $TOR_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG +openssl tor.gpg $OPENSSL_TAG EOF cd "$INPUTS_DIR" diff --git a/gitian/versions b/gitian/versions index 02afa2b..f2b712a 100755 --- a/gitian/versions +++ b/gitian/versions @@ -5,6 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-17.0.10esr-3.0beta1-build2 TOR_TAG=tor-0.2.4.17-rc +OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.3.1-beta TORBUTTON_TAG=1.6.4 HTTPSE_TAG=3.4.2 @@ -15,13 +16,13 @@ MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-4 -OPENSSL_VER=1.0.1e +# OPENSSL_VER=1.0.1e FIREFOX_LANG_VER=17.0.10esr BINUTILS_VER=2.22 GCC_VER=4.6.3 ## File names for the source packages -OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -32,7 +33,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f @@ -41,7 +42,7 @@ MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACK… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 83d6b5d..07c1d8e 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,6 +5,7 @@ VERIFY_TAGS=0 TORBROWSER_TAG=tor-browser-24.1.0esr-1 TOR_TAG=tor-0.2.4.17-rc +OPENSSL_TAG=openssl-101e-no-gmt-time-v1 TORLAUNCHER_TAG=0.2.3.1-beta TORBUTTON_TAG=1.6.4 HTTPSE_TAG=3.4.2 @@ -15,13 +16,13 @@ MINGW_REV=5830 GITIAN_TAG=tor-browser-builder-3.0-4 -OPENSSL_VER=1.0.1e +# OPENSSL_VER=1.0.1e FIREFOX_LANG_VER=24.1.0esr BINUTILS_VER=2.22 GCC_VER=4.6.3 ## File names for the source packages -OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz +# OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.2-fx+fn+sm.xpi PDFJS_PACKAGE=pdf_viewer-0.8.1-sm+fx+an.xpi TOOLCHAIN4_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -32,7 +33,7 @@ BINUTILS_PACKAGE=binutils-${BINUTILS_VER}.tar.bz2 GCC_PACKAGE=gcc-${GCC_VER}.tar.bz2 # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 +# OPENSSL_HASH=f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=52b309f2e5ca1bee4d0f97cbb342fdac3be6a447c35f744a90348df55eea635f @@ -41,7 +42,7 @@ MINGW_HASH=457f11d29f6e95425d190711a73955fa54a98a2113ce2c2bfd76291be71e3e2b MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 ## Non-git package URLs -OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} +# OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} TOOLCHAIN4_URL=https://mingw-and-ndk.googlecode.com/files/${TOOLCHAIN4_PACK… OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 07 Nov '13

07 Nov '13

commit 9ce786988a0710b1f563eb97ec9acf534b2e6dcd Merge: b76cac4 fb560d7 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Nov 6 19:13:31 2013 -0800 Merge branch 'maint-2.4' build-scripts/recommended-versions | 3 --- 1 file changed, 3 deletions(-)

1 0