tor-commits September 2014

tor-commits@lists.torproject.org

22 participants
980 discussions

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 01 Sep '14

01 Sep '14

commit 37597533505b2f0dbfd54f871d40ab5c0e214c83 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 1 13:45:49 2014 +0000 Update translations for tails-iuk_completed --- es.po | 76 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 36 deletions(-) diff --git a/es.po b/es.po index 54d69c8..592ced3 100644 --- a/es.po +++ b/es.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "… [View More]Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-06-24 11:44+0200\n" -"PO-Revision-Date: 2014-08-21 10:01+0000\n" -"Last-Translator: Emma Peel\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-01 13:41+0000\n" +"Last-Translator: strel\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" @@ -19,8 +19,8 @@ msgstr "" "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "Para información de depuración, vea ~/.xsession-errors ." @@ -62,39 +62,43 @@ msgstr "no hay suficiente memoria libre en este sistema" msgid "No explanation available for reason '%{reason}s'." msgstr "No hay una explicación disponible por motivo de '%{reason}s'." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "El sistema está actualizado" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Esta versión de Tails está desfasada, y puede tener problemas de seguridad." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "La actualización incremental disponible requiere %{space_needed}s de espacio libre en la partición de sistema de Tails, pero sólo hay %{free_space}s disponible(s)." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "La actualización incremental disponible requiere %{memory_needed}s de memoria libre, pero sólo hay %{memory_needed}s disponible(s)." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Está disponible una actualización incremental, pero no está disponible ninguna actualización completa.\nEsto no debería ocurrir. Por favor informe del fallo." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Error al comprobar si hay actualizaciones" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -110,19 +114,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Debe actualizar a %{name}s %{version}s.\n\nPara más información acerca de esta nueva versión, vaya a %{details_url}s\n\nDurante la actualización se recomienda cerrar todas las aplicaciones abiertas.\nDescargar la actualización podría llevar mucho tiempo, desde varios minutos a unas pocas horas.\nLa red será deshabilitada después de descargar la actualización.\n\nTamaño de la descarga: %{size}s\n\n¿Quiere actualizar ahora?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Actualización disponible" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Actualizar ahora" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Actualizar más tarde" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -134,20 +138,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Debe hacer una actualización manual a %{name}s %{version}s.\n\nPara más información acerca de esta nueva versión, vaya a %{details_url}s\n\nNo es posible actualizar automáticamente su dispositivo a esta nueva versión: %{explanation}s.\n\nPara aprender cómo hacer una actualización manual, vaya a https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "Nueva versión disponible" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Descargando actualización" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Descargar la actualización a %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -155,26 +159,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "La actualización no se pudo descargar.\\n\\nCompruebe su conexión a la red, y reinicie Tails para intentar actualizar de nuevo.\\n\\nSi el problema persiste, vaya al fichero file:///usr/share/doc/tails/website/doc/upgrade/error/download.es.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Error al descargar la actualización" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "El fichero de salida '%{output_file}s' no existe, pero tails-iuk-get-target-file (tails-kit_de_actualización_incremental-obtener-fichero-objetivo) no se quejó. Por favor informe del fallo." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Error al crear directorio de descarga temporal" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Fallo al crear directorio de descarga temporal" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -184,46 +188,46 @@ msgid "" "Do you want to restart now?" msgstr "Su dispositivo Tails fue actualizado con éxito.\n\nAlgunas funciones de seguridad fueron deshabilitadas temporalmente.\nDebería reiniciar Tails con la nueva versión tan pronto como sea posible.\n\n¿Quiere reiniciar ahora?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Reiniciar Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Reiniciar ahora" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Reiniciar más tarde" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Error al reiniciar el sistema" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Fallo al reiniciar el sistema" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Error al cerrar la red" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Fallo al cerrar la red" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Actualizando el sistema" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Su dispotitivo Tails está siendo actualizado...\n\nPor motivos de seguridad, las conexiones de red ahora están deshabilitadas." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -231,6 +235,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Ha ocurrido un error al instalar la actualización.\\n\\nSu dispositivo Tails precisa ser reparado y podría no ser posible reiniciarlo.\\n\\nPor favor, siga las instrucciones en file:///usr/share/doc/tails/website/doc/upgrade/error/install.es.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Error al instalar la actualización" [View Less]

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 01 Sep '14

01 Sep '14

commit 932dcdaac5f0cbfeaa705f6be34b758821dcb126 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 1 13:45:47 2014 +0000 Update translations for tails-iuk --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index 4ea597f..592ced3 100644 --- a/es.po +++ b/es.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-… [View More]

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 01 Sep '14

01 Sep '14

commit a1c79aa50feab12be367ddf1a812b89f0baaa662 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 1 12:45:49 2014 +0000 Update translations for tails-iuk_completed --- fr_CA.po | 78 +++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 37 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index df760b3..6677b8c 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -5,14 +5,14 @@ # Translators: # bassmax, 2013 # Towatowa441, … [View More]2013 -# Alain-Olivier Breysse, 2014 +# yahoe.001, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 12:50+0000\n" -"Last-Translator: Alain-Olivier Breysse\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-01 12:40+0000\n" +"Last-Translator: yahoe.001\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,8 +20,8 @@ msgstr "" "Language: fr_CA\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:523 -#: ../lib/Tails/IUK/Frontend.pm:667 +#: ../lib/Tails/IUK/Frontend.pm:146 ../lib/Tails/IUK/Frontend.pm:527 +#: ../lib/Tails/IUK/Frontend.pm:671 msgid "For debugging information, see /home/amnesia/.xsession-errors" msgstr "Pour les informations de débogage, voir /home/amnesia/.xsession-errors" @@ -63,39 +63,43 @@ msgstr "il n'y a pas assez de mémoire disponible sur ce système" msgid "No explanation available for reason '%{reason}s'." msgstr "Aucune explication disponible pour la raison « %{reason}s »." -#: ../lib/Tails/IUK/Frontend.pm:281 +#: ../lib/Tails/IUK/Frontend.pm:279 +msgid "XXX HEJ XXX" +msgstr "XXX HEJ XXX" + +#: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date" msgstr "Le système est à jour" -#: ../lib/Tails/IUK/Frontend.pm:286 +#: ../lib/Tails/IUK/Frontend.pm:290 msgid "This version of Tails is outdated, and may have security issues." msgstr "Cette version de Tails est obsolète et peut avoir des problèmes de sécurité." -#: ../lib/Tails/IUK/Frontend.pm:318 +#: ../lib/Tails/IUK/Frontend.pm:322 #, perl-brace-format msgid "" "The available incremental upgrade requires %{space_needed}s of free space on" " Tails system partition, but only %{free_space}s is available." msgstr "La mise à niveau incrémentale disponible exige %{space_needed}s d'espace libre sur la partition système de Tails, mais seulement %{free_space}s est libre." -#: ../lib/Tails/IUK/Frontend.pm:334 +#: ../lib/Tails/IUK/Frontend.pm:338 #, perl-brace-format msgid "" "The available incremental upgrade requires %{memory_needed}s of free memory," " but only %{free_memory}s is available." msgstr "La mise à niveau incrémentale disponible nécessite %{memory_needed}s de mémoire libre mais seulement %{free_memory}s est libre." -#: ../lib/Tails/IUK/Frontend.pm:356 +#: ../lib/Tails/IUK/Frontend.pm:360 msgid "" "An incremental upgrade is available, but no full upgrade is.\n" "This should not happen. Please report a bug." msgstr "Une mise à niveau incrémentale est disponible, mais aucune mise à niveau complète.\nCela ne devrait pas arriver. Veuillez rapporter un bogue." -#: ../lib/Tails/IUK/Frontend.pm:360 +#: ../lib/Tails/IUK/Frontend.pm:364 msgid "Error while detecting available upgrades" msgstr "Erreur lors de la vérification de mises à niveau disponibles" -#: ../lib/Tails/IUK/Frontend.pm:370 +#: ../lib/Tails/IUK/Frontend.pm:374 #, perl-brace-format msgid "" "You should upgrade to %{name}s %{version}s.\n" @@ -111,19 +115,19 @@ msgid "" "Do you want to upgrade now?" msgstr "Vous devriez mettre à niveau vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, aller à %{details_url}s\n\nIl est recommandé de fermer toutes les applications durant la mise à niveau.\nLe téléchargement de la mise à niveau peut prendre longtemps, de plusieurs minutes à quelques heures.\nLe réseau sera désactivé après le téléchargement de la mise à niveau.\n\nTaille du téléchargements : %{size}s\n\nVoulez-vous mettre à niveau maintenant?" -#: ../lib/Tails/IUK/Frontend.pm:385 +#: ../lib/Tails/IUK/Frontend.pm:389 msgid "Upgrade available" msgstr "Mise à niveau disponible" -#: ../lib/Tails/IUK/Frontend.pm:386 +#: ../lib/Tails/IUK/Frontend.pm:390 msgid "Upgrade now" msgstr "Mettre à niveau maintenant" -#: ../lib/Tails/IUK/Frontend.pm:387 +#: ../lib/Tails/IUK/Frontend.pm:391 msgid "Upgrade later" msgstr "Mettre à niveau plus tard" -#: ../lib/Tails/IUK/Frontend.pm:395 +#: ../lib/Tails/IUK/Frontend.pm:399 #, perl-brace-format msgid "" "You should do a manual upgrade to %{name}s %{version}s.\n" @@ -135,20 +139,20 @@ msgid "" "To learn how to do a manual upgrade, go to https://tails.boum.org/doc/first_steps/upgrade/#manual" msgstr "Vous devriez mettre à niveau manuellement vers %{name}s %{version}s.\n\nPour plus d'informations sur cette nouvelle version, aller sur %{details_url}s.\n\nIl n'est pas possible de mettre automatiquement à niveau votre dispositif vers cette nouvelle version : %{explanation}s.\n\nPour apprendre comment faire une mise à niveau manuelle, aller à https://tails.boum.org/doc/first_steps/upgrade/#manual" -#: ../lib/Tails/IUK/Frontend.pm:411 +#: ../lib/Tails/IUK/Frontend.pm:415 msgid "New version available" msgstr "Nouvelle version disponible" -#: ../lib/Tails/IUK/Frontend.pm:468 +#: ../lib/Tails/IUK/Frontend.pm:472 msgid "Downloading upgrade" msgstr "Téléchargement de la mise à niveau" -#: ../lib/Tails/IUK/Frontend.pm:471 +#: ../lib/Tails/IUK/Frontend.pm:475 #, perl-brace-format msgid "Downloading the upgrade to %{name}s %{version}s..." msgstr "Téléchargement de la mise à niveau vers %{name}s %{version}s..." -#: ../lib/Tails/IUK/Frontend.pm:512 +#: ../lib/Tails/IUK/Frontend.pm:516 msgid "" "The upgrade could not be downloaded.\\n\\nCheck your network " "connection, and restart Tails to try upgrading again.\\n\\nIf the problem " @@ -156,26 +160,26 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.html" msgstr "La mise à niveau n'a pas pu être téléchargée.\\n\\nVérifier votre connexion réseau et redémarrer Tails pour ressayer de mettre à niveau.\\n\\nSi le problème persiste, aller sur file:///usr/share/doc/tails/website/doc/upgrade/error/download.fr.html" -#: ../lib/Tails/IUK/Frontend.pm:528 ../lib/Tails/IUK/Frontend.pm:547 +#: ../lib/Tails/IUK/Frontend.pm:532 ../lib/Tails/IUK/Frontend.pm:551 msgid "Error while downloading the upgrade" msgstr "Échec lors du téléchargement de la mise à niveau" -#: ../lib/Tails/IUK/Frontend.pm:540 +#: ../lib/Tails/IUK/Frontend.pm:544 #, perl-brace-format msgid "" "Output file '%{output_file}s' does not exist, but tails-iuk-get-target-file " "did not complain. Please report a bug." msgstr "Le fichier de sortie '%{output_file}s' n'existe pas, mais tails-iuk-get-target-file ne s'en est pas plaint. Veuillez rapporter un bogue." -#: ../lib/Tails/IUK/Frontend.pm:559 +#: ../lib/Tails/IUK/Frontend.pm:563 msgid "Error while creating temporary downloading directory" msgstr "Échec lors de la création du répertoire de téléchargement temporaire" -#: ../lib/Tails/IUK/Frontend.pm:562 +#: ../lib/Tails/IUK/Frontend.pm:566 msgid "Failed to create temporary download directory" msgstr "Échec lors de la création du répertoire de téléchargement temporaire" -#: ../lib/Tails/IUK/Frontend.pm:574 +#: ../lib/Tails/IUK/Frontend.pm:578 msgid "" "Your Tails device was successfully upgraded.\n" "\n" @@ -185,46 +189,46 @@ msgid "" "Do you want to restart now?" msgstr "Votre dispositif Tails a été mis à niveau avec succès.\n\nQuelques fonctions de sécurité ont été temporairement mises hors service.\nVous devriez redémarrer Tails sur la nouvelle version dès que possible.\n\nVoulez-vous redémarrer maintenant?" -#: ../lib/Tails/IUK/Frontend.pm:579 +#: ../lib/Tails/IUK/Frontend.pm:583 msgid "Restart Tails" msgstr "Redémarrer Tails" -#: ../lib/Tails/IUK/Frontend.pm:580 +#: ../lib/Tails/IUK/Frontend.pm:584 msgid "Restart now" msgstr "Redémarrer maintenant" -#: ../lib/Tails/IUK/Frontend.pm:581 +#: ../lib/Tails/IUK/Frontend.pm:585 msgid "Restart later" msgstr "Redémarrer plus tard" -#: ../lib/Tails/IUK/Frontend.pm:592 +#: ../lib/Tails/IUK/Frontend.pm:596 msgid "Error while restarting the system" msgstr "Échec lors du redémarrage du système" -#: ../lib/Tails/IUK/Frontend.pm:595 +#: ../lib/Tails/IUK/Frontend.pm:599 msgid "Failed to restart the system" msgstr "Échec lors du redémarrage du système" -#: ../lib/Tails/IUK/Frontend.pm:610 +#: ../lib/Tails/IUK/Frontend.pm:614 msgid "Error while shutting down the network" msgstr "Échec lors de l'arrêt du réseau" -#: ../lib/Tails/IUK/Frontend.pm:613 +#: ../lib/Tails/IUK/Frontend.pm:617 msgid "Failed to shutdown network" msgstr "Échec lors de l'arrêt du réseau" -#: ../lib/Tails/IUK/Frontend.pm:623 +#: ../lib/Tails/IUK/Frontend.pm:627 msgid "Upgrading the system" msgstr "Mise à niveau du système" -#: ../lib/Tails/IUK/Frontend.pm:625 +#: ../lib/Tails/IUK/Frontend.pm:629 msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the networking is now disabled." msgstr "Votre dispositif Tails est en cours de mise à niveau...\n\nPour des raisons de sécurité, le réseau est actuellement désactivé." -#: ../lib/Tails/IUK/Frontend.pm:662 +#: ../lib/Tails/IUK/Frontend.pm:666 msgid "" "An error occured while installing the upgrade.\\n\\nYour Tails device" " needs to be repaired and might be unable to restart.\\n\\nPlease follow the" @@ -232,6 +236,6 @@ msgid "" "file:///usr/share/doc/tails/website/doc/upgrade/error/install.en.html" msgstr "Une erreur est survenue durant l'installation de la mise à niveau.\\n\\nVotre dispositif Tails doit être réparé et pourrait être incapable de redémarrer.\\n\\nVeuillez suivre les instructions sur file:///usr/share/doc/tails/website/doc/upgrade/error/install.fr.html" -#: ../lib/Tails/IUK/Frontend.pm:672 +#: ../lib/Tails/IUK/Frontend.pm:676 msgid "Error while installing the upgrade" msgstr "Erreur lors de l'installation de la mise à niveau" [View Less]

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 01 Sep '14

01 Sep '14

commit ccb1f8804ed593f525300144eb59c98439c3af97 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 1 12:45:45 2014 +0000 Update translations for tails-iuk --- fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 36f3ae4..6677b8c 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\… [View More]

1 0

[ooni-probe/master] Implement policy aware bouncing support in the client
by art＠torproject.org 01 Sep '14

01 Sep '14

commit 9220c796dafcc850af42bcba6906ae49afa19edc Author: kudrom <kudrom(a)riseup.net> Date: Sun Aug 24 23:15:18 2014 +0200 Implement policy aware bouncing support in the client --- ooni/deck.py | 86 ++++++++++++++++++++++++++++++++++++++++++++------- ooni/oonibclient.py | 4 +-- 2 files changed, 77 insertions(+), 13 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 889e17e..22ff0d5 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -1,4 +1,4 @@ -#-*- coding: … [View More]utf-8 -*- +# -*- coding: utf-8 -*- from ooni.oonibclient import OONIBClient from ooni.nettest import NetTestLoader @@ -14,6 +14,7 @@ import yaml import json from hashlib import sha256 + class InputFile(object): def __init__(self, input_hash, base_path=config.inputs_directory): self.id = input_hash @@ -44,13 +45,13 @@ class InputFile(object): def save(self): with open(self.cached_descriptor, 'w+') as f: json.dump({ - 'name': self.name, - 'id': self.id, - 'version': self.version, - 'author': self.author, - 'date': self.date, - 'description': self.description - }, f) + 'name': self.name, + 'id': self.id, + 'version': self.version, + 'author': self.author, + 'date': self.date, + 'description': self.description + }, f) def load(self, descriptor): self.name = descriptor['name'] @@ -65,6 +66,7 @@ class InputFile(object): file_hash = sha256(f.read()) assert file_hash.hexdigest() == digest + def nettest_to_path(path, allow_arbitrary_paths=False): """ Takes as input either a path or a nettest name. @@ -87,6 +89,7 @@ def nettest_to_path(path, allow_arbitrary_paths=False): else: raise e.NetTestNotFound(path) + class Deck(InputFile): def __init__(self, deck_hash=None, deckFile=None, @@ -135,11 +138,13 @@ class Deck(InputFile): def insert(self, net_test_loader): """ Add a NetTestLoader to this test deck """ + def has_test_helper(missing_option): for rth in net_test_loader.requiredTestHelpers: if missing_option == rth['option']: return True return False + try: net_test_loader.checkOptions() if net_test_loader.requiresTor: @@ -161,8 +166,67 @@ class Deck(InputFile): yield self.fetchAndVerifyNetTestInput(net_test_loader) if self.bouncer: - log.msg("Looking up test helpers...") - yield self.lookupTestHelpers() + log.msg("Looking up collector and test helpers") + yield self.lookupCollector() + + @defer.inlineCallbacks + def lookupCollector(self): + self.oonibclient.address = self.bouncer + + required_nettests = [] + + requires_test_helpers = False + requires_collector = False + for net_test_loader in self.netTestLoaders: + nettest = { + 'name': net_test_loader.testDetails['test_name'], + 'version': net_test_loader.testDetails['test_version'], + 'test-helpers': [], + 'input-hashes': [x['hash'] for x in net_test_loader.inputFiles] + } + if not net_test_loader.collector: + requires_collector = True + + for th in net_test_loader.requiredTestHelpers: + # {'name':'', 'option':'', 'test_class':''} + if th['test_class'].localOptions[th['option']]: + continue + nettest['test-helpers'].append(th['name']) + requires_test_helpers = True + + required_nettests.append(nettest) + + if not requires_test_helpers and not requires_collector: + defer.returnValue(None) + + response = yield self.oonibclient.lookupTestCollector(required_nettests) + print response + provided_net_tests = response['net-tests'] + + def find_collector_and_test_helpers(test_name, test_version, input_files): + for net_test in provided_net_tests: + if net_test['name'] != test_name: + continue + if net_test['version'] != test_version: + continue + if set(net_test['input-hashes']) != set(input_files): + continue + return net_test['collector'], net_test['test-helpers'] + + for net_test_loader in self.netTestLoaders: + log.msg("Setting collector and test helpers for %s" % net_test_loader.testDetails['test_name']) + + collector, test_helpers = \ + find_collector_and_test_helpers(net_test_loader.testDetails['test_name'], + net_test_loader.testDetails['test_version'], + net_test_loader.inputFiles) + + for th in net_test_loader.requiredTestHelpers: + if not th['test_class'].localOptions[th['option']]: + th['test_class'].localOptions[th['option']] = test_helpers[th['name']].encode('utf-8') + + if not net_test_loader.collector: + net_test_loader.collector = collector.encode('utf-8') @defer.inlineCallbacks def lookupTestHelpers(self): @@ -192,7 +256,7 @@ class Deck(InputFile): # Only set the collector if the no collector has been specified # from the command line or via the test deck. if not net_test_loader.requiredTestHelpers and \ - net_test_loader in requires_collector: + net_test_loader in requires_collector: log.msg("Using the default collector: %s" % response['default']['collector']) net_test_loader.collector = response['default']['collector'].encode('utf-8') diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 05436e0..9871944 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -193,10 +193,10 @@ class OONIBClient(object): return d @defer.inlineCallbacks - def lookupTestCollector(self, test_name): + def lookupTestCollector(self, net_tests): try: test_collector = yield self.queryBackend('POST', '/bouncer', - query={'test-collector': test_name}) + query={'net-tests': net_tests}) except Exception: raise e.CouldNotFindTestCollector [View Less]

1 0

[ooni-probe/master] Fix bug in checking for the correct input hash.
by art＠torproject.org 01 Sep '14

01 Sep '14

commit 8c56b166ca5639e75bc2eeb6f54cd7bfd253481f Author: Arturo Filastò <art(a)fuffa.org> Date: Mon Sep 1 12:29:29 2014 +0200 Fix bug in checking for the correct input hash. --- ooni/deck.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ooni/deck.py b/ooni/deck.py index 6ea6740..d01378c 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -203,6 +203,7 @@ class Deck(InputFile): provided_net_tests = response['net-tests'] def find_collector_and_test_helpers(… [View More]

1 0

[ooni-probe/master] Review of policy aware changes in the client
by art＠torproject.org 01 Sep '14

01 Sep '14

commit 6b20b7fe62a42a6f3bab68cba25bf923f822f8b6 Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 25 23:11:29 2014 +0200 Review of policy aware changes in the client --- Vagrantfile | 2 +- ooni/deck.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index bd9d5db..4f9bc9b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant.configure("2") do |config| config.vm.synced_folder ".", "/ooni" # Place the … [View More]

1 0

[ooni-probe/master] Improved RESTfulness of the bouncer API.
by art＠torproject.org 01 Sep '14

01 Sep '14

commit 745039c45ba3f10ed7a63cc36d7f223d4c14bceb Author: kudrom <kudrom(a)riseup.net> Date: Fri Aug 29 18:43:14 2014 +0200 Improved RESTfulness of the bouncer API. --- ooni/oonibclient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 3d2e1b1..a26b771 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -201,7 +201,7 @@ class OONIBClient(object): @defer.inlineCallbacks def … [View More]

1 0

[ooni-probe/master] pep8 cleanup
by art＠torproject.org 01 Sep '14

01 Sep '14

commit f217bca743a6f4ed150c7179df6e00fdb48efa5d Author: kudrom <kudrom(a)riseup.net> Date: Mon Aug 25 15:36:38 2014 +0200 pep8 cleanup --- ooni/deck.py | 1 - ooni/oonibclient.py | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 22ff0d5..f77bfa6 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -200,7 +200,6 @@ class Deck(InputFile): defer.returnValue(None) response = yield … [View More]self.oonibclient.lookupTestCollector(required_nettests) - print response provided_net_tests = response['net-tests'] def find_collector_and_test_helpers(test_name, test_version, input_files): diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 9871944..3d2e1b1 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -22,8 +22,8 @@ class OONIBClient(object): if self.address.startswith('httpo://'): address = self.address.replace('httpo://', 'http://') agent = TrueHeadersSOCKS5Agent(reactor, - proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1', - config.tor.socks_port)) + proxyEndpoint=TCP4ClientEndpoint(reactor, '127.0.0.1', + config.tor.socks_port)) elif self.address.startswith('https://'): log.err("HTTPS based bouncers are currently not supported.") @@ -59,6 +59,7 @@ class OONIBClient(object): else: log.err("Failed. Giving up.") finished.errback(err) + d.addErrback(errback, attempts) perform_request(attempts) @@ -84,6 +85,7 @@ class OONIBClient(object): log.err("Got this backend error message %s" % response) raise e.get_error(response['error']) return response + return BodyReceiver(finished, content_length, process_response) return self._request(method, urn, genReceiver, bodyProducer) @@ -97,6 +99,7 @@ class OONIBClient(object): def getInput(self, input_hash): from ooni.deck import InputFile + input_file = InputFile(input_hash) if input_file.descriptorCached: return defer.succeed(input_file) @@ -121,12 +124,13 @@ class OONIBClient(object): def downloadInput(self, input_hash): from ooni.deck import InputFile + input_file = InputFile(input_hash) if input_file.fileCached: return defer.succeed(input_file) else: - d = self.download('/input/'+input_hash+'/file', input_file.cached_file) + d = self.download('/input/' + input_hash + '/file', input_file.cached_file) @d.addCallback def cb(res): @@ -151,6 +155,7 @@ class OONIBClient(object): def getDeck(self, deck_hash): from ooni.deck import Deck + deck = Deck(deck_hash) if deck.descriptorCached: return defer.succeed(deck) @@ -173,11 +178,12 @@ class OONIBClient(object): def downloadDeck(self, deck_hash): from ooni.deck import Deck + deck = Deck(deck_hash) if deck.fileCached: return defer.succeed(deck) else: - d = self.download('/deck/'+deck_hash+'/file', deck.cached_file) + d = self.download('/deck/' + deck_hash + '/file', deck.cached_file) @d.addCallback def cb(res): @@ -196,7 +202,7 @@ class OONIBClient(object): def lookupTestCollector(self, net_tests): try: test_collector = yield self.queryBackend('POST', '/bouncer', - query={'net-tests': net_tests}) + query={'net-tests': net_tests}) except Exception: raise e.CouldNotFindTestCollector @@ -206,7 +212,7 @@ class OONIBClient(object): def lookupTestHelpers(self, test_helper_names): try: test_helper = yield self.queryBackend('POST', '/bouncer', - query={'test-helpers': test_helper_names}) + query={'test-helpers': test_helper_names}) except Exception as exc: log.exception(exc) raise e.CouldNotFindTestHelper [View Less]

1 0

[oonib/master] Improved RESTfulness of the bouncer API.
by art＠torproject.org 01 Sep '14

01 Sep '14

commit fce1c169401ed3ec110c82eaeeade14f4aab8151 Author: kudrom <kudrom(a)riseup.net> Date: Fri Aug 29 18:43:14 2014 +0200 Improved RESTfulness of the bouncer API. --- oonib/bouncer/api.py | 8 +++-- oonib/bouncer/handlers.py | 46 ++++++++++++++++++++-------- oonib/test/test_bouncer.py | 71 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 99 insertions(+), 26 deletions(-) diff --git a/oonib/bouncer/api.py b/oonib/bouncer/api.py index 42f53e1..666c708 … [View More]100644 --- a/oonib/bouncer/api.py +++ b/oonib/bouncer/api.py @@ -1,6 +1,8 @@ from oonib.bouncer import handlers -#XXX: if bouncer is configured +# XXX: if bouncer is configured bouncerAPI = [ - #return a collector and helper of the requested type - (r"/bouncer", handlers.BouncerQueryHandler), + # return a collector and helper of the requested type + (r"/bouncer", handlers.BouncerQueryHandler), + (r"/bouncer/test-helpers", handlers.BouncerTestHelpers), + (r"/bouncer/net-tests", handlers.BouncerNetTests), ] diff --git a/oonib/bouncer/handlers.py b/oonib/bouncer/handlers.py index c49338e..c7914b5 100644 --- a/oonib/bouncer/handlers.py +++ b/oonib/bouncer/handlers.py @@ -165,27 +165,49 @@ class Bouncer(object): return {'net-tests': nettests} -class BouncerQueryHandler(OONIBHandler): - +class BouncerHandlerBase(OONIBHandler): def initialize(self): self.bouncer = Bouncer(config.main.bouncer_file) - def post(self): - try: - query = json.loads(self.request.body) - except ValueError: - raise e.InvalidRequest + def load_query(self): + if not 'query' in dir(self): + try: + self.query = json.loads(self.request.body) + except ValueError: + raise e.InvalidRequest + - if 'test-helpers' in query: - requested_helpers = query['test-helpers'] +class BouncerTestHelpers(BouncerHandlerBase): + def post(self): + self.load_query() + if 'test-helpers' in self.query: + requested_helpers = self.query['test-helpers'] if not isinstance(requested_helpers, list): raise e.InvalidRequest response = self.bouncer.filterHelperAddresses(requested_helpers) + else: + raise e.InvalidRequest + + self.write(response) - elif 'net-tests' in query: - response = self.bouncer.filterByNetTests(query['net-tests']) +class BouncerNetTests(BouncerHandlerBase): + def post(self): + self.load_query() + if 'net-tests' in self.query: + response = self.bouncer.filterByNetTests(self.query['net-tests']) else: - raise e.TestHelpersOrNetTestsKeyMissing + raise e.InvalidRequest self.write(response) + + +class BouncerQueryHandler(BouncerNetTests, BouncerTestHelpers): + def post(self): + self.load_query() + if 'test-helpers' in self.query: + BouncerTestHelpers.post(self) + elif 'net-tests' in self.query: + BouncerNetTests.post(self) + else: + raise e.TestHelpersOrNetTestsKeyMissing diff --git a/oonib/test/test_bouncer.py b/oonib/test/test_bouncer.py index 2724947..0f4c5ef 100644 --- a/oonib/test/test_bouncer.py +++ b/oonib/test/test_bouncer.py @@ -125,7 +125,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('error', response_body) @@ -144,6 +144,35 @@ class TestBouncer(BaseTestBouncer): ] } + response = yield self.request('/bouncer/net-tests', 'POST', data) + response_body = json.loads(response.body) + + self.assertIn('net-tests', response_body) + self.assertEqual(len(response_body['net-tests']), 1) + self.assertIn('name', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['name'], 'fake_nettest') + self.assertIn('version', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['version'], '1.0') + self.assertIn('input-hashes', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['input-hashes']), 0) + self.assertIn('test-helpers', response_body['net-tests'][0]) + self.assertEqual(len(response_body['net-tests'][0]['test-helpers']), 0) + self.assertIn('collector', response_body['net-tests'][0]) + self.assertEqual(response_body['net-tests'][0]['collector'], 'fake_address') + + @defer.inlineCallbacks + def test_backward_compatibility(self): + data = { + 'net-tests': [ + { + "test-helpers": [], + "input-hashes": [], + "name": 'fake_nettest', + "version": '1.0', + }, + ] + } + response = yield self.request('/bouncer', 'POST', data) response_body = json.loads(response.body) @@ -179,7 +208,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('net-tests', response_body) @@ -202,7 +231,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('error', response_body) @@ -221,7 +250,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('net-tests', response_body) @@ -245,7 +274,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('error', response_body) @@ -264,7 +293,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('net-tests', response_body) @@ -288,7 +317,7 @@ class TestBouncer(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('error', response_body) @@ -328,7 +357,7 @@ class TestDefaultCollector(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('net-tests', response_body) @@ -366,7 +395,7 @@ class TestMultipleCollectors(BaseTestBouncer): ] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/net-tests', 'POST', data) response_body = json.loads(response.body) self.assertIn('net-tests', response_body) @@ -396,7 +425,7 @@ class TestHelperTests(BaseTestBouncer): data = { 'test-helpers': ['invalid_test_helper'] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/test-helpers', 'POST', data) response_body = json.loads(response.body) self.assertIn('error', response_body) @@ -408,6 +437,26 @@ class TestHelperTests(BaseTestBouncer): 'test-helpers': ['fake_test_helper'] } + response = yield self.request('/bouncer/test-helpers', 'POST', data) + response_body = json.loads(response.body) + + self.assertEqual(len(response_body), 2) + self.assertIn('fake_test_helper', response_body) + self.assertIn('collector', response_body['fake_test_helper']) + self.assertIn(response_body['fake_test_helper']['collector'], ['fake_addressA', 'fake_addressB']) + self.assertIn('address', response_body['fake_test_helper']) + self.assertEqual('fake_hostname', response_body['fake_test_helper']['address']) + + self.assertIn('default', response_body) + self.assertIn('collector', response_body['default']) + self.assertEqual('fake_addressB', response_body['default']['collector']) + + @defer.inlineCallbacks + def test_backward_compatibility(self): + data = { + 'test-helpers': ['fake_test_helper'] + } + response = yield self.request('/bouncer', 'POST', data) response_body = json.loads(response.body) @@ -428,7 +477,7 @@ class TestHelperTests(BaseTestBouncer): 'test-helpers': ['fake_test_helper', 'exotic_test_helper'] } - response = yield self.request('/bouncer', 'POST', data) + response = yield self.request('/bouncer/test-helpers', 'POST', data) response_body = json.loads(response.body) self.assertEqual(len(response_body), 3) [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits September 2014