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

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

29 Sep '13

commit 73810678ad2b4f2033f75f019fe5e364ac322e3a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 18:46:07 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index 50e11df..d1e12ae 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.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: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-29 18:15+0000\n" +"PO-Revision-Date: 2013-09-29 18:46+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: ../liveusb/dialog.py:150 ../liveusb/launcher_ui.py:149 #, python-format msgid "%(distribution)s LiveUSB Creator" -msgstr "" +msgstr "%(distribution)s Creador de LiveUSB" #: ../liveusb/gui.py:776 #, python-format @@ -40,7 +40,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 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 "" +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>" #: ../liveusb/launcher_ui.py:151 msgid "" @@ -49,7 +49,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. 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 Tails en un USB. Toda la información de la unidad se perderá.</span></p></body></html>" #: ../liveusb/launcher_ui.py:153 msgid "" @@ -58,7 +58,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 USB stick. 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 Tails en un USB que contiene otra versión instalada de Tails. Las otras particiones encontradas en el dispositivo serán conservadas.</span></p></body></html>" #: ../liveusb/launcher_ui.py:155 msgid "" @@ -67,11 +67,11 @@ 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 USB stick 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 una versión ya instalada de Tails en un USB desde una nueva imagen ISO.</span></p></body></html>" #: ../liveusb/dialog.py:154 msgid "Alt+B" -msgstr "" +msgstr "Alt+B" #: ../liveusb/dialog.py:153 msgid "Browse" @@ -83,7 +83,7 @@ msgid "" "will be able to store data and make permanent modifications to your live " "operating system. Without it, you will not be able to save data that will " "persist after a reboot." -msgstr "" +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 esto, no será capaz de guardar datos después de un reinicio." #: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format @@ -104,18 +104,18 @@ msgid "" "Clone\n" "&&\n" "Install" -msgstr "" +msgstr "Clonar\n&&\nInstalar" #: ../liveusb/launcher_ui.py:152 msgid "" "Clone\n" "&&\n" "Upgrade" -msgstr "" +msgstr "Clonar\n&&\nActualizar" #: ../liveusb/dialog.py:165 msgid "Create Live USB" -msgstr "" +msgstr "Crear Live USB" #: ../liveusb/creator.py:400 #, python-format @@ -130,7 +130,7 @@ msgstr "" #: ../liveusb/dialog.py:157 #, python-format msgid "Download %(distribution)s" -msgstr "" +msgstr "Descargar %(distribution)s" #: ../liveusb/gui.py:750 msgid "Download complete!" @@ -191,7 +191,7 @@ msgstr "La verificación de MD5 checksum falló" msgid "" "If you do not select an existing Live ISO, the selected release will be " "downloaded for you." -msgstr "" +msgstr "Si no selecciona una Live ISO existente, la versión seleccionada sera descargada." #: ../liveusb/gui.py:619 msgid "Installation complete!" @@ -269,7 +269,7 @@ msgstr "Almacenamiento persistente" #: ../liveusb/dialog.py:161 msgid "Persistent Storage (0 MB)" -msgstr "" +msgstr "Datos almacenados (0 MB)" #: ../liveusb/gui.py:679 ../liveusb/gui.py:696 msgid "Press 'Next' if you wish to continue." @@ -277,11 +277,11 @@ msgstr "Presione 'Siguiente' si desea continuar." #: ../liveusb/gui.py:456 msgid "Refreshing releases..." -msgstr "" +msgstr "Actualizando distribuciones..." #: ../liveusb/gui.py:461 msgid "Releases updated!" -msgstr "" +msgstr "¡Distribuciones actualizadas!" #: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 #, python-format @@ -323,7 +323,7 @@ msgstr "Sincronizando datos en disco..." #: ../liveusb/dialog.py:159 msgid "Target Device" -msgstr "" +msgstr "Dispositivo destino" #: ../liveusb/gui.py:643 msgid "" @@ -335,7 +335,7 @@ msgstr "El Master Boot Record en su dispositivo esta vacío. Presionando 'Crear msgid "" "The selected file is unreadable. Please fix its permissions or select " "another file." -msgstr "" +msgstr "Los archivos seleccionados no tienen permiso de lectura. Por favor cambie los permisos o seleccione otro archivo" #: ../liveusb/creator.py:337 #, python-format @@ -349,7 +349,7 @@ 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 "" +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 msgid "" @@ -357,7 +357,7 @@ msgid "" "optionally downloading a release (if an existing one wasn't selected), " "extracting the ISO to the USB device, creating the persistent overlay, and " "installing the bootloader." -msgstr "" +msgstr "Este botón iniciará los procesos de creación del LiveUSB. Esto conlleva descargar la versión (si no hay una seleccionada), crear una partición, extraer la ISO en el dispositivo USB, e instalar el gestor de arranque." #: ../liveusb/dialog.py:158 msgid "" @@ -495,7 +495,7 @@ msgstr "" #: ../liveusb/dialog.py:152 msgid "Use existing Live system ISO" -msgstr "" +msgstr "Usar ISO existente" #: ../liveusb/creator.py:133 msgid "Verifying ISO MD5 checksum" @@ -563,4 +563,4 @@ msgstr "Su dispositivo ya contiene un LiveOS.\nSi continua, será sobreescrito." #: ../liveusb/dialog.py:155 msgid "or" -msgstr "" +msgstr "o"

1 0

[tor/master] test-network.sh: tools dir in PATH, parameterization
by nickm＠torproject.org 29 Sep '13

29 Sep '13

commit 8bc5b9f3d0cd35ebf3d6eca428adc5d27e12e9dc Author: Jim Pannacciulli <jpnc(a)member.fsf.org> Date: Sun Sep 29 01:24:14 2013 -0400 test-network.sh: tools dir in PATH, parameterization --- src/test/test-network.sh | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 9146ae3..7b59864 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,9 +1,30 @@ #! /bin/sh -# NOTE: Requires Chutney in $CHUTNEY_PATH. +until [ -z $1 ] +do + case $1 in + --chutney-path) + export CHUTNEY_PATH="$2" + shift + ;; + --tor-path) + export TOR_DIR="$2" + shift + ;; + --flavo?r|--network-flavo?r) + export NETWORK_FLAVOUR="$2" + shift + ;; + *) + echo "Sorry, I don't know what to do with '$1'." + exit 2 + ;; + esac + shift +done -TOR_DIR=$(pwd)/src/or -NETWORK_FLAVOUR=basic +TOR_DIR="${TOR_DIR:-$PWD}" +NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-basic} CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR myname=$(basename $0) @@ -12,7 +33,8 @@ myname=$(basename $0) exit 1 } cd "$CHUTNEY_PATH" -PATH=$TOR_DIR:$PATH # For picking up the right tor binary. +# For picking up the right tor binaries. +PATH="$TOR_DIR/src/or:$TOR_DIR/src/tools:$PATH" ./tools/bootstrap-network.sh $NETWORK_FLAVOUR || exit 2 # Sleep some, waiting for the network to bootstrap.

1 0

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

29 Sep '13

commit b0fd232a6315edc6694222bce9ce42cc8c3257c6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 18:16:05 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index ad21c1e..50e11df 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.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: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-29 15:01+0000\n" +"PO-Revision-Date: 2013-09-29 18:15+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "%(filename)s seleccionado" #: ../liveusb/creator.py:1004 #, python-format msgid "%s already bootable" -msgstr "" +msgstr "%s es arrancable" #: ../liveusb/launcher_ui.py:156 msgid "" @@ -88,11 +88,11 @@ msgstr "" #: ../liveusb/creator.py:1106 ../liveusb/creator.py:1369 #, python-format msgid "Calculating the SHA1 of %s" -msgstr "" +msgstr "Calculando el SHA1 de %s" #: ../liveusb/creator.py:1317 msgid "Cannot find" -msgstr "" +msgstr "No se encontró" #: ../liveusb/creator.py:545 #, python-format @@ -147,7 +147,7 @@ msgstr "Descargando %s..." #: ../liveusb/creator.py:1102 msgid "Drive is a loopback, skipping MBR reset" -msgstr "" +msgstr "La unidad es virtual, omitiendo el restablecimiento del MBR" #: ../liveusb/creator.py:808 #, python-format @@ -156,7 +156,7 @@ msgstr "" #: ../liveusb/creator.py:1182 msgid "Error probing device" -msgstr "" +msgstr "Error al probar el dispositivo" #: ../liveusb/gui.py:227 msgid "" @@ -177,7 +177,7 @@ msgstr "Extrayendo archivos en el dispositivo USB..." #: ../liveusb/creator.py:1047 #, python-format msgid "Formatting %(device)s as FAT32" -msgstr "" +msgstr "Formateando %(device)s como FAT32" #: ../liveusb/creator.py:140 msgid "ISO MD5 checksum passed" @@ -208,7 +208,7 @@ msgstr "La instalación se ha completado. Presione Aceptar para cerrar este prog #: ../liveusb/creator.py:900 ../liveusb/creator.py:1223 msgid "Installing bootloader..." -msgstr "" +msgstr "Instalando el gestor de arranque..." #: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" @@ -218,17 +218,17 @@ msgstr "¡Falló la creación del LiveUSB!" msgid "" "Make sure to extract the entire liveusb-creator zip file before running this" " program." -msgstr "" +msgstr "Asegúrese de extraer el archivo zip liveusb-creator antes de ejecutar este programa." #: ../liveusb/creator.py:1194 msgid "" "Make sure your USB key is plugged in and formatted with the FAT filesystem" -msgstr "" +msgstr "Asegurese de que su dispositivo USB está conectado y esta formateado con un sistema de archivos FAT" #: ../liveusb/creator.py:830 #, python-format msgid "Mount %s exists after unmounting" -msgstr "" +msgstr "El punto de montaje %s sigue existiendo despues del desmontado" #: ../liveusb/gui.py:681 ../liveusb/gui.py:698 msgid "Next" @@ -241,7 +241,7 @@ msgstr "No hay espacio libre en el dispositivo %(device)s" #: ../liveusb/creator.py:797 msgid "No mount points found" -msgstr "" +msgstr "No se encontraron puntos de montaje" #: ../liveusb/creator.py:393 #, python-format @@ -286,7 +286,7 @@ msgstr "" #: ../liveusb/creator.py:923 ../liveusb/creator.py:1241 #, python-format msgid "Removing %(file)s" -msgstr "" +msgstr "Removiendo %(file)s" #: ../liveusb/creator.py:469 msgid "Removing existing Live OS" @@ -295,7 +295,7 @@ msgstr "Eliminando Live OS existente" #: ../liveusb/creator.py:1096 #, python-format msgid "Resetting Master Boot Record of %s" -msgstr "" +msgstr "Restableciendo Master Boot Record de %s" #: ../liveusb/gui.py:761 msgid "Select Live ISO" @@ -310,7 +310,7 @@ msgstr "Estableciendo los archivos de arranque OLPC..." msgid "" "Some partitions of USB device %(device)s are mounted. They will be unmounted" " before starting the installation process." -msgstr "" +msgstr "Algunas particiones del dispositivo USB %(device)s estan montadas. Serán desmontadas antes de empezar el proceso de instalación." #: ../liveusb/creator.py:131 msgid "" @@ -319,7 +319,7 @@ msgstr "La fuente no soporta la verificación MD5 checksum, omitiendo..." #: ../liveusb/creator.py:1130 msgid "Synchronizing data on disk..." -msgstr "" +msgstr "Sincronizando datos en disco..." #: ../liveusb/dialog.py:159 msgid "Target Device" @@ -378,7 +378,7 @@ msgstr "" #: ../liveusb/creator.py:895 #, python-format msgid "Unable to change volume label: %(message)s" -msgstr "" +msgstr "No se pudo cambiar la etiqueta de la volumen: %(message)s" #: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format @@ -396,16 +396,16 @@ msgstr "No se encontró ningun dispositivo USB" #: ../liveusb/creator.py:1184 msgid "Unable to find any removable device" -msgstr "" +msgstr "No se encontró ningún dispositivo removible" #: ../liveusb/creator.py:1024 msgid "Unable to find partition" -msgstr "" +msgstr "No se encontraron particiones" #: ../liveusb/creator.py:1264 msgid "" "Unable to get Win32_LogicalDisk; win32com query did not return any results" -msgstr "" +msgstr "No se pudo obtener Win32_LogicalDisk; la consulta de win32com no retornó ningún resultado" #: ../liveusb/gui.py:671 msgid "Unable to mount device" @@ -414,7 +414,7 @@ msgstr "No se pudo montar el dispositivo" #: ../liveusb/creator.py:785 #, python-format msgid "Unable to mount device: %(message)s" -msgstr "" +msgstr "No se pudo montar el dispositivo: %(message)s" #: ../liveusb/creator.py:494 #, python-format @@ -429,7 +429,7 @@ msgstr "No se pudiero borrar archivos del anterior LiveOS: %(message)s" #: ../liveusb/creator.py:1099 msgid "" "Unable to reset MBR. You may not have the `syslinux` package installed." -msgstr "" +msgstr "No se pudo establecer el MBR. Tal vez no tenga el paquete`syslinux` instalado." #: ../liveusb/gui.py:770 msgid "" @@ -440,7 +440,7 @@ msgstr "Imposible usar el archivo seleccionado. Puede probar que tenga más suer #: ../liveusb/creator.py:692 #, python-format msgid "Unable to write on %(device)s, skipping." -msgstr "" +msgstr "No se puede escribir la unidad %(device)s, omitiendo..." #: ../liveusb/creator.py:382 msgid "Unknown ISO, skipping checksum verification" @@ -449,11 +449,11 @@ msgstr "ISO desconosida, omitiendo verificación de checksum..." #: ../liveusb/creator.py:781 #, python-format msgid "Unknown dbus exception while trying to mount device: %(message)s" -msgstr "" +msgstr "Excepción de dbus desconosida al intentar montar el dispositivo: %(message)s" #: ../liveusb/creator.py:760 ../liveusb/creator.py:874 msgid "Unknown filesystem. Your device may need to be reformatted." -msgstr "" +msgstr "Sistema de archivos desconocido. Su dispositivo puede necesitar ser formateado." #: ../liveusb/gui.py:84 #, python-format @@ -473,7 +473,7 @@ msgstr "" #: ../liveusb/creator.py:765 ../liveusb/creator.py:877 #, python-format msgid "Unsupported filesystem: %s" -msgstr "" +msgstr "Sistema de archivos no soportado: %s" #: ../liveusb/creator.py:763 #, python-format @@ -487,7 +487,7 @@ msgstr "" msgid "" "Unsupported filesystem: %s\n" "Please backup and format your USB key with the FAT filesystem." -msgstr "" +msgstr "Sistema de archivos no soportado: %s\nHaga un respaldo de los datos y formatee su dispositivo USB con un sistema de archivos FAT." #: ../liveusb/launcher_ui.py:154 msgid "Upgrade from ISO" @@ -511,7 +511,7 @@ msgstr "Verificando SHA256 checksum de la imagen del LiveCD..." #: ../liveusb/creator.py:871 ../liveusb/creator.py:1190 msgid "Verifying filesystem..." -msgstr "" +msgstr "Verificando el sistema de archivos..." #: ../liveusb/gui.py:677 msgid "Warning: All data on the selected drive will be lost."

1 0

[tor/master] Changes file for 5505
by nickm＠torproject.org 29 Sep '13

29 Sep '13

commit 09e850dc3657b8e83016d43d237dd00272957765 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Sep 29 13:59:02 2013 -0400 Changes file for 5505 --- changes/bug5505 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug5505 b/changes/bug5505 new file mode 100644 index 0000000..fab1d1a --- /dev/null +++ b/changes/bug5505 @@ -0,0 +1,5 @@ + o Minor fixes (build): + - Stop preprocessing the "torify" script with autoconf, since + it no longer refers to LOCALSTATEDIR. Fixes bug 5505; patch + from Guilhem. +

1 0

[tor/master] Don't preprocess torify
by nickm＠torproject.org 29 Sep '13

29 Sep '13

commit f8c45339f72525c6826d6db6a5e2acc4d7475952 Author: guilhem <tor(a)guilhem.org> Date: Sat Sep 28 16:08:15 2013 -0400 Don't preprocess torify Since torify has been removed from tsocks, it doesn't need to be preprocessed. Closes #5505. --- .gitignore | 2 -- configure.ac | 1 - contrib/torify | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ contrib/torify.in | 61 ----------------------------------------------------- doc/include.am | 10 ++++----- 5 files changed, 65 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 201d04d..65f4d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -110,9 +110,7 @@ /doc/tor-resolve.html.in /doc/tor-resolve.1.xml /doc/torify.1 -/doc/torify.1.in /doc/torify.html -/doc/torify.html.in /doc/torify.1.xml # /doc/spec/ diff --git a/configure.ac b/configure.ac index 7259d88..2dd3a1e 100644 --- a/configure.ac +++ b/configure.ac @@ -1488,7 +1488,6 @@ AC_CONFIG_FILES([ contrib/tor.logrotate contrib/tor.sh contrib/torctl - contrib/torify src/config/torrc.sample ]) diff --git a/contrib/torify b/contrib/torify new file mode 100755 index 0000000..54acfed --- /dev/null +++ b/contrib/torify @@ -0,0 +1,61 @@ +#! /bin/sh + +# This script used to call (the now deprecated) tsocks as a fallback in case +# torsocks wasn't installed. +# Now, it's just a backwards compatible shim around torsocks with reasonable +# behavior if -v/--verbose or -h/--help arguments are passed. +# +# Copyright (c) 2004, 2006, 2009 Peter Palfrader +# Modified by Jacob Appelbaum <jacob(a)appelbaum.net> April 16th 2006 +# Stripped of all the tsocks cruft by ugh on February 22nd 2012 +# May be distributed under the same terms as Tor itself + + +compat() { + echo "torify is now just a wrapper around torsocks(1) for backwards compatibility." +} + +usage() { + compat + echo "Usage: $0 [-hv] <command> [<options>...]" +} + +case $# in 0) + usage >&2 + exit 1 +esac + +case $# in 1) + case $1 in -h|--help) + usage + exit 0 + esac +esac + +case $1 in -v|--verbose) + compat >&2 + shift +esac + +# taken from Debian's Developer's Reference, 6.4 +pathfind() { + OLDIFS="$IFS" + IFS=: + for p in $PATH; do + if [ -x "$p/$*" ]; then + IFS="$OLDIFS" + return 0 + fi + done + IFS="$OLDIFS" + return 1 +} + +if pathfind torsocks; then + exec torsocks "$@" + echo "$0: Failed to exec torsocks $@" >&2 + exit 1 +else + echo "$0: torsocks not found in your PATH. Perhaps it isn't installed? (tsocks is no longer supported, for security reasons.)" >&2 +fi + diff --git a/contrib/torify.in b/contrib/torify.in deleted file mode 100755 index 54acfed..0000000 --- a/contrib/torify.in +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh - -# This script used to call (the now deprecated) tsocks as a fallback in case -# torsocks wasn't installed. -# Now, it's just a backwards compatible shim around torsocks with reasonable -# behavior if -v/--verbose or -h/--help arguments are passed. -# -# Copyright (c) 2004, 2006, 2009 Peter Palfrader -# Modified by Jacob Appelbaum <jacob(a)appelbaum.net> April 16th 2006 -# Stripped of all the tsocks cruft by ugh on February 22nd 2012 -# May be distributed under the same terms as Tor itself - - -compat() { - echo "torify is now just a wrapper around torsocks(1) for backwards compatibility." -} - -usage() { - compat - echo "Usage: $0 [-hv] <command> [<options>...]" -} - -case $# in 0) - usage >&2 - exit 1 -esac - -case $# in 1) - case $1 in -h|--help) - usage - exit 0 - esac -esac - -case $1 in -v|--verbose) - compat >&2 - shift -esac - -# taken from Debian's Developer's Reference, 6.4 -pathfind() { - OLDIFS="$IFS" - IFS=: - for p in $PATH; do - if [ -x "$p/$*" ]; then - IFS="$OLDIFS" - return 0 - fi - done - IFS="$OLDIFS" - return 1 -} - -if pathfind torsocks; then - exec torsocks "$@" - echo "$0: Failed to exec torsocks $@" >&2 - exit 1 -else - echo "$0: torsocks not found in your PATH. Perhaps it isn't installed? (tsocks is no longer supported, for security reasons.)" >&2 -fi - diff --git a/doc/include.am b/doc/include.am index 9695292..37c0237 100644 --- a/doc/include.am +++ b/doc/include.am @@ -12,8 +12,8 @@ # part of the source distribution, so that people without asciidoc can # just use the .1 and .html files. -regular_mans = doc/tor doc/tor-gencert doc/tor-resolve doc/torify -all_mans = $(regular_mans) doc/tor-fw-helper +regular_mans = doc/tor doc/tor-gencert doc/tor-resolve +all_mans = $(regular_mans) doc/torify doc/tor-fw-helper if USE_ASCIIDOC if USE_FW_HELPER @@ -55,13 +55,11 @@ $(man_in) : doc/tor.1.in: doc/tor.1.txt doc/tor-gencert.1.in: doc/tor-gencert.1.txt doc/tor-resolve.1.in: doc/tor-resolve.1.txt -doc/torify.1.in: doc/torify.1.txt doc/tor-fw-helper.1.in: doc/tor-fw-helper.1.txt doc/tor.html.in: doc/tor.1.txt doc/tor-gencert.html.in: doc/tor-gencert.1.txt doc/tor-resolve.html.in: doc/tor-resolve.1.txt -doc/torify.html.in: doc/torify.1.txt doc/tor-fw-helper.html.in: doc/tor-fw-helper.1.txt # use ../config.status to swap all machine-specific magic strings @@ -76,13 +74,13 @@ $(asciidoc_product) : doc/tor.html: doc/tor.html.in doc/tor-gencert.html: doc/tor-gencert.html.in doc/tor-resolve.html: doc/tor-resolve.html.in -doc/torify.html: doc/torify.html.in +doc/torify.html: doc/torify.1.txt doc/tor-fw-helper.html: doc/tor-fw-helper.html.in doc/tor.1: doc/tor.1.in doc/tor-gencert.1: doc/tor-gencert.1.in doc/tor-resolve.1: doc/tor-resolve.1.in -doc/torify.1: doc/torify.1.in +doc/torify.1: doc/torify.1.txt doc/tor-fw-helper.1: doc/tor-fw-helper.1.in CLEANFILES+= $(asciidoc_product) config.log

1 0

[torbirdy/master] Enhance preferences and Thunderbird chat support
by sukhbir＠torproject.org 29 Sep '13

29 Sep '13

commit 49afc614c30e7570173bffdb9c3af4b6e9796516 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Sep 29 13:23:32 2013 -0400 Enhance preferences and Thunderbird chat support --- ChangeLog | 1 + components/torbirdy.js | 28 ++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fea99bf..82c29ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ `--throw-keyids' is now disabled by default We are no longer forcing Thunderbird updates (closes #8341) Add support for Thunderbird 24 (Gecko 17+) + Enhance support for Thunderbird chat We have a new TorBirdy logo. Thanks to Nima Fatemi! Add Persian translation (thanks to Nima) Add Czech translation (thanks to dope) diff --git a/components/torbirdy.js b/components/torbirdy.js index babb09d..6d5214f 100644 --- a/components/torbirdy.js +++ b/components/torbirdy.js @@ -179,6 +179,13 @@ const TorBirdyPrefs = { "mail.server.default.use_idle": false, /* + Browser + */ + // Disable caching. + "browser.cache.disk.enable": false, + "browser.cache.memory.enable": false, + + /* Enigmail */ @@ -195,8 +202,7 @@ const TorBirdyPrefs = { "extensions.enigmail.addHeaders": false, // Use GnuPG's default comment for signed messages. "extensions.enigmail.useDefaultComment": true, - // XXX: TODO --hidden-recipient should be used for each person but perhaps - // --throw-keyids will be an OK stopgap? + // We need to pass some more parameters to GPG. "extensions.enigmail.agentAdditionalParam": // Don't disclose the version "--no-emit-version " + @@ -238,10 +244,11 @@ const TorBirdyPrefs = { // Disable changing of images via JavaScript. "dom.disable_image_src_set": true, - // Disable media files (WebM, WAV, Ogg). + // Disable WebM, WAV, Ogg, PeerConnection. "media.webm.enabled": false, "media.wave.enabled": false, "media.ogg.enabled": false, + "media.peerconnection.enabled": false, // Disable CSS :visited selector. "layout.css.visited_links_enabled": false, @@ -259,10 +266,23 @@ const TorBirdyPrefs = { "purple.conversations.im.send_typing": false, // Messenger related preferences. + // Do not report idle. "messenger.status.reportIdle": false, + "messenger.status.awayWhenIdle": false, + // Set the following preferences to empty strings. "messenger.status.defaultIdleAwayMessage": "", "messenger.status.userDisplayName": "", + // Do not connect automatically. "messenger.startup.action": 0, + // Ignore invitations; do not automatically accept them. + "messenger.conversations.autoAcceptChatInvitations": 0, + // Do not format incoming messages. + "messenger.options.filterMode": 0, + // On copying the content in the chat window, remove the time information. + // See `comm-central/chat/locales/conversations.properties' for more information. + "messenger.conversations.selections.systemMessagesTemplate": "%message%", + "messenger.conversations.selections.contentMessagesTemplate": "%sender%: %message%", + "messenger.conversations.selections.actionMessagesTemplate": "%sender% %message%", // Mozilla Lightning. "calendar.useragent.extra": "", @@ -460,7 +480,7 @@ TorBirdy.prototype = { this.prefs.setIntPref("network.proxy.ssl_port", 0); // Disable all plugins. - for(var i = 0; i < this.plugins.length; i++) { + for (var i = 0; i < this.plugins.length; i++) { this.plugins[i].disabled = true; }

1 0

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

29 Sep '13

commit 83594d2fda0e667707545a7654ce189ee03d3249 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 15:16:04 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index be9db5a..ad21c1e 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.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: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-29 14:43+0000\n" +"PO-Revision-Date: 2013-09-29 15:01+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ msgstr "" #: ../liveusb/creator.py:545 #, python-format msgid "Cannot find device %s" -msgstr "" +msgstr "No se encontro el dispositivo %s" #: ../liveusb/launcher_ui.py:150 msgid "" @@ -383,7 +383,7 @@ msgstr "" #: ../liveusb/creator.py:478 ../liveusb/creator.py:489 #, python-format msgid "Unable to chmod %(file)s: %(message)s" -msgstr "" +msgstr "No se pudo cambiar los permisos de acceso a %(file)s: %(message)s" #: ../liveusb/creator.py:459 #, python-format @@ -419,12 +419,12 @@ msgstr "" #: ../liveusb/creator.py:494 #, python-format msgid "Unable to remove directory from previous LiveOS: %(message)s" -msgstr "" +msgstr "No se pudieron remover directorios del anterior LiveOS: %(message)s" #: ../liveusb/creator.py:482 #, python-format msgid "Unable to remove file from previous LiveOS: %(message)s" -msgstr "" +msgstr "No se pudiero borrar archivos del anterior LiveOS: %(message)s" #: ../liveusb/creator.py:1099 msgid "" @@ -545,7 +545,7 @@ msgstr "Copiando archivos a %(speed)d MB/sec" msgid "" "You are using an old version of syslinux-extlinux that does not support the " "ext4 filesystem" -msgstr "" +msgstr "Estas usando una versión vieja de syslinux-extlinux que no soporta el sistema de archivos ext4" #: ../liveusb/gui.py:755 msgid "You can try again to resume your download"

1 0

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

29 Sep '13

commit 1ff8b3fa14ea0a8a2fe9b53257e28a820c4f8ded Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 29 14:46:04 2013 +0000 Update translations for liveusb-creator --- es_AR/es_AR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po index eaf4107..be9db5a 100644 --- a/es_AR/es_AR.po +++ b/es_AR/es_AR.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: 2013-09-09 11:21+0200\n" -"PO-Revision-Date: 2013-09-29 08:26+0000\n" +"PO-Revision-Date: 2013-09-29 14:43+0000\n" "Last-Translator: Malows <cruz.jm.stafe(a)gmail.com>\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -120,7 +120,7 @@ msgstr "" #: ../liveusb/creator.py:400 #, python-format msgid "Creating %sMB persistent overlay" -msgstr "" +msgstr "Creando partición de datos de %sMB" #: ../liveusb/gui.py:556 msgid "" @@ -290,7 +290,7 @@ msgstr "" #: ../liveusb/creator.py:469 msgid "Removing existing Live OS" -msgstr "" +msgstr "Eliminando Live OS existente" #: ../liveusb/creator.py:1096 #, python-format @@ -388,7 +388,7 @@ msgstr "" #: ../liveusb/creator.py:459 #, python-format msgid "Unable to copy %(infile)s to %(outfile)s: %(message)s" -msgstr "" +msgstr "No se pudo copiar %(infile)s a %(outfile)s: %(message)s" #: ../liveusb/gui.py:418 msgid "Unable to find any USB drive"

1 0

[tor/master] fix whitespace in log message
by arma＠torproject.org 29 Sep '13

29 Sep '13

commit 1b6ea92a5751f2388bacd7c234bea1063ecd586d Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 29 06:15:00 2013 -0400 fix whitespace in log message --- src/or/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/directory.c b/src/or/directory.c index 815e0ab..45992e8 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -747,7 +747,7 @@ connection_dir_request_failed(dir_connection_t *conn) conn->base_.address); } else if (conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC) { log_info(LD_DIR, "Giving up on downloading microdescriptors from " - " directory server at '%s'; will retry", conn->base_.address); + "directory server at '%s'; will retry", conn->base_.address); connection_dir_download_routerdesc_failed(conn); } }

1 0

[tor/master] fix two cases where we were printing unsigned int as %d
by arma＠torproject.org 29 Sep '13

29 Sep '13

commit c902b4981b189d7d5f14b4ba77b02cc0825f9a57 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Sep 29 06:13:59 2013 -0400 fix two cases where we were printing unsigned int as %d --- src/or/circuituse.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 00dbc7e..e347cdf 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -745,7 +745,7 @@ circuit_expire_building(void) if (victim->n_chan) log_info(LD_CIRC, - "Abandoning circ %u %s:%d (state %d,%d:%s, purpose %d, " + "Abandoning circ %u %s:%u (state %d,%d:%s, purpose %d, " "len %d)", TO_ORIGIN_CIRCUIT(victim)->global_identifier, channel_get_canonical_remote_descr(victim->n_chan), (unsigned)victim->n_circ_id, @@ -755,7 +755,7 @@ circuit_expire_building(void) TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len); else log_info(LD_CIRC, - "Abandoning circ %u %d (state %d,%d:%s, purpose %d, len %d)", + "Abandoning circ %u %u (state %d,%d:%s, purpose %d, len %d)", TO_ORIGIN_CIRCUIT(victim)->global_identifier, (unsigned)victim->n_circ_id, TO_ORIGIN_CIRCUIT(victim)->has_opened,

1 0