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

[stem/master] Provide a nice error if accounting isn't enabled
by atagar＠torproject.org 14 Sep '14

14 Sep '14

commit 1fd1e38afd6c84ce2cc69d0fd9c6fd14e6e4db80 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 14 14:47:12 2014 -0700 Provide a nice error if accounting isn't enabled Check if accounting is abled when we first call get_accounting_stats() so we can provide a nicer error if it isn't. --- stem/control.py | 3 +++ test/unit/control/controller.py | 1 + 2 files changed, 4 insertions(+) diff --git a/stem/control.py b/stem/control.py index 57e4550..04098c0 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1228,6 +1228,9 @@ class Controller(BaseController): """ try: + if self.get_info('accounting/enabled') != '1': + raise stem.ControllerError("Accounting isn't enabled") + retrieved = time.time() status = self.get_info('accounting/hibernating') interval_end = self.get_info('accounting/interval-end') diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 4e04f9d..7c7911e 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -288,6 +288,7 @@ class TestControl(unittest.TestCase): """ get_info_mock.side_effect = lambda param, **kwargs: { + 'accounting/enabled': '1', 'accounting/hibernating': 'awake', 'accounting/interval-end': '2014-09-14 19:41:00', 'accounting/bytes': '4837 2050',

1 0

[stem/master] Adding get_accounting_stats()
by atagar＠torproject.org 14 Sep '14

14 Sep '14

commit b82c89ebc55f6d9fb54dfa93afd03af6e34980dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 14 14:40:22 2014 -0700 Adding get_accounting_stats() Controller method for fetching our accounting stats. Much nicer than calling getinfo() three times and parsing the results ourselves. --- docs/change_log.rst | 1 + stem/control.py | 73 +++++++++++++++++++++++++++++++++++++++ test/unit/control/controller.py | 30 ++++++++++++++++ 3 files changed, 104 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index ec7eaef..ff58d12 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -42,6 +42,7 @@ The following are only available within Stem's `git repository * **Controller** + * Added :func:`~stem.control.Controller.get_accounting_stats` to the :class:`~stem.control.Controller` * Added :func:`~stem.control.BaseController.connection_time` to the :class:`~stem.control.BaseController` * Changed :func:`~stem.control.Controller.get_microdescriptor`, :func:`~stem.control.Controller.get_server_descriptor`, and :func:`~stem.control.Controller.get_network_status` to get our own descriptor if no fingerprint or nickname is provided. * Added :class:`~stem.exit_policy.ExitPolicy` methods for more easily handling 'private' policies (the `default prefix <https://www.torproject.org/docs/tor-manual.html.en#ExitPolicyRejectPrivate>`_) and the defaultly appended suffix. This includes :func:`~stem.exit_policy.ExitPolicy.has_private`, :func:`~stem.exit_policy.ExitPolicy.strip_private`, :func:`~stem.exit_policy.ExitPolicy.has_default`, and :func:`~stem.exit_policy.ExitPolicy.strip_default` :class:`~stem.exit_policy.ExitPolicy` methods in addition to :func:`~stem.exit_policy.ExitPolicyRule.is_private` and :func:`~stem.exit_policy.ExitPolicyRule.is_default` for the :class:`~stem.exit_policy.ExitPolicyRule`. (:trac:`10107`) diff --git a/stem/control.py b/stem/control.py index 3c26666..57e4550 100644 --- a/stem/control.py +++ b/stem/control.py @@ -77,6 +77,7 @@ If you're fine with allowing your script to raise exceptions then this can be mo |- get_exit_policy - provides our exit policy |- get_ports - provides the local ports where tor is listening for connections |- get_listeners - provides the addresses and ports where tor is listening for connections + |- get_accounting_stats - provides stats related to relaying limits |- get_protocolinfo - information about the controller interface |- get_user - provides the user tor is running as |- get_pid - provides the pid of our tor process @@ -212,6 +213,9 @@ If you're fine with allowing your script to raise exceptions then this can be mo ============= =========== """ +import calendar +import collections +import datetime import io import os import Queue @@ -327,6 +331,19 @@ SERVER_DESCRIPTORS_UNSUPPORTED = "Tor is presently not configured to retrieve \ server descriptors. As of Tor version 0.2.3.25 it downloads microdescriptors \ instead unless you set 'UseMicrodescriptors 0' in your torrc." +AccountingStats = collections.namedtuple('AccountingStats', [ + 'retrieved', + 'status', + 'interval_end', + 'time_until_reset', + 'read_bytes', + 'read_bytes_left', + 'read_limit', + 'written_bytes', + 'write_bytes_left', + 'write_limit', +]) + class BaseController(object): """ @@ -1183,6 +1200,62 @@ class Controller(BaseController): else: return default + def get_accounting_stats(self, default = UNDEFINED): + """ + Provides stats related to our relaying limitations if AccountingMax was set + in our torrc. This provides a **namedtuple** with the following + attributes... + + * retrieved (float) - unix timestamp for when this was fetched + * status (str) - hibernation status of 'awake', 'soft', or 'hard' + * interval_end (datetime) + * time_until_reset (int) - seconds until our limits reset + * read_bytes (int) + * read_bytes_left (int) + * read_limit (int) + * written_bytes (int) + * write_bytes_left (int) + * write_limit (int) + + .. versionadded:: 1.3.0 + + :param object default: response if the query fails + + :returns: **namedtuple** with our accounting stats + + :raises: :class:`stem.ControllerError` if unable to determine the listeners + and no default was provided + """ + + try: + retrieved = time.time() + status = self.get_info('accounting/hibernating') + interval_end = self.get_info('accounting/interval-end') + used = self.get_info('accounting/bytes') + left = self.get_info('accounting/bytes-left') + + interval_end = datetime.datetime.strptime(interval_end, '%Y-%m-%d %H:%M:%S') + used_read, used_written = [int(val) for val in used.split(' ', 1)] + left_read, left_written = [int(val) for val in left.split(' ', 1)] + + return AccountingStats( + retrieved = retrieved, + status = status, + interval_end = interval_end, + time_until_reset = int(retrieved) - calendar.timegm(interval_end.timetuple()), + read_bytes = used_read, + read_bytes_left = left_read, + read_limit = used_read + left_read, + written_bytes = used_written, + write_bytes_left = left_written, + write_limit = used_written + left_written, + ) + except Exception as exc: + if default == UNDEFINED: + raise exc + else: + return default + def get_socks_listeners(self, default = UNDEFINED): """ Provides the SOCKS **(address, port)** tuples that tor has open. diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 17b64fd..4e04f9d 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -3,6 +3,7 @@ Unit tests for the stem.control module. The module's primarily exercised via integ tests, but a few bits lend themselves to unit testing. """ +import datetime import io import unittest @@ -279,6 +280,35 @@ class TestControl(unittest.TestCase): get_info_mock.return_value = response self.assertRaises(stem.ProtocolError, self.controller.get_socks_listeners) + @patch('stem.control.Controller.get_info') + @patch('time.time', Mock(return_value = 1410723698.276578)) + def test_get_accounting_stats(self, get_info_mock): + """ + Exercises the get_accounting_stats() method. + """ + + get_info_mock.side_effect = lambda param, **kwargs: { + 'accounting/hibernating': 'awake', + 'accounting/interval-end': '2014-09-14 19:41:00', + 'accounting/bytes': '4837 2050', + 'accounting/bytes-left': '102944 7440', + }[param] + + expected = stem.control.AccountingStats( + 1410723698.276578, + 'awake', + datetime.datetime(2014, 9, 14, 19, 41), + 38, + 4837, 102944, 107781, + 2050, 7440, 9490, + ) + + self.assertEqual(expected, self.controller.get_accounting_stats()) + + get_info_mock.side_effect = ControllerError('nope, too bad') + self.assertRaises(ControllerError, self.controller.get_accounting_stats) + self.assertEqual('my default', self.controller.get_accounting_stats('my default')) + @patch('stem.connection.get_protocolinfo') def test_get_protocolinfo(self, get_protocolinfo_mock): """

1 0

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

14 Sep '14

commit 41e2e315a18976f0a41974b1c95c000a60848222 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 14:15:54 2014 +0000 Update translations for tails-iuk_completed --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index 33716d9..a73b533 100644 --- a/fr.po +++ b/fr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-14 08:16+0000\n" +"PO-Revision-Date: 2014-09-14 13:49+0000\n" "Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

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

14 Sep '14

commit e456903d730cdf308265fda7ffc89508e259945f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 14:15:52 2014 +0000 Update translations for tails-iuk --- fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr.po b/fr.po index 33716d9..a73b533 100644 --- a/fr.po +++ b/fr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-14 08:16+0000\n" +"PO-Revision-Date: 2014-09-14 13:49+0000\n" "Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Sep '14

14 Sep '14

commit f032ed35924dc17226a94fd0443049d801cf7efa Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 14:15:13 2014 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index fdb1fd4..ddc352b 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-14 08:20+0000\n" +"PO-Revision-Date: 2014-09-14 13:48+0000\n" "Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Sep '14

14 Sep '14

commit 1eaa705e7b4dc4d3c1aaf9fbd612e8ebe4df3ac5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 14:15:08 2014 +0000 Update translations for torcheck --- fr/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index fdb1fd4..ddc352b 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-09-14 08:20+0000\n" +"PO-Revision-Date: 2014-09-14 13:48+0000\n" "Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

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

14 Sep '14

commit 47922e850127318bf3a2962e037baf9c4d7a5383 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 08:45:54 2014 +0000 Update translations for tails-iuk_completed --- fr.po | 87 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/fr.po b/fr.po index 25fc4af..33716d9 100644 --- a/fr.po +++ b/fr.po @@ -4,18 +4,19 @@ # # Translators: # bassmax, 2013 -# chioubaca <chioubaca(a)gmail.com>, 2014 +# Alex <chioubaca(a)gmail.com>, 2014 # tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 -# Emmanuel Sd <emanwebdev(a)gmail.com>, 2014 -# rike <u(a)451f.org>, 2014 -# Towatowa441, 2013-2014 +# Emmanuel Simond <emanediteur(a)gmail.com>, 2014 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 +# rike, 2014 +# Towinet, 2013-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 09:20+0000\n" -"Last-Translator: chioubaca <chioubaca(a)gmail.com>\n" +"POT-Creation-Date: 2014-08-31 15:23+0200\n" +"PO-Revision-Date: 2014-09-14 08:16+0000\n" +"Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,10 +24,10 @@ msgstr "" "Language: fr\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 des informations de débogage, consultez ~/.xsession-errors." +msgstr "Pour des informations de débogage, consultez /home/amnesia/.xsession-errors." #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -66,39 +67,43 @@ msgstr "pas assez de mémoire disponible sur ce système" msgid "No explanation available for reason '%{reason}s'." msgstr "Il n'y a pas d'explication disponible pour '%{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 à jour incrémentale disponible nécessite %{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 à jour 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 à jour incrémentale est disponible, mais pas de mise à jour complète.\nCela ne devrait pas arriver. Veuillez rapporter un bug." -#: ../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 des mises à jour 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" @@ -114,19 +119,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, allez sur %{details_url}s.\n\nIl est recommandé de fermer toutes les applications ouvertes pendant la mise à niveau. Le téléchargement de la mise à niveau pourrait prendre un long moment, de plusieurs minutes à quelques heures. Le réseau sera mis hors service après le téléchargement de la mise à niveau. \n\nTaille du téléchargement : %{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 à jour 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" @@ -138,20 +143,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 à jour manuellement vers %{name}s %{version}s.\n\nPour plus d'informations à propos de cette nouvelle version, rendez vous sur %{details_url}s.\n\nIl n'est pas possible de mettre à jour automatiquement votre appareil vers cette nouvelle version : %{explanation}s.\n\nPour savoir comme effectuer une mise à jour manuelle, rendez vous sur 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 à jour" -#: ../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 " @@ -159,26 +164,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érifiez votre connexion réseau et redémarrez Tails pour essayer de nouveau de mettre à niveau.\\n\\nSi le problème persiste, allez sur file:///usr/share/doc/tails/website/doc/upgrade/error/download.en.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 à jour" -#: ../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 bug." -#: ../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 dossier 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 dossier 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" @@ -188,46 +193,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 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 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 à jour 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 hors service." -#: ../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" @@ -235,6 +240,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 nécessite d'ê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.en.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 des mises à jour"

1 0

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

14 Sep '14

commit 8781653d228ea12a4471fa6f12593e03295db28d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 08:45:51 2014 +0000 Update translations for tails-iuk --- fr.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/fr.po b/fr.po index ea1e928..33716d9 100644 --- a/fr.po +++ b/fr.po @@ -7,6 +7,7 @@ # Alex <chioubaca(a)gmail.com>, 2014 # tneskovic <antoine_ecuador(a)yahoo.fr>, 2014 # Emmanuel Simond <emanediteur(a)gmail.com>, 2014 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 # rike, 2014 # Towinet, 2013-2014 msgid "" @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-08-31 15:23+0200\n" -"PO-Revision-Date: 2014-09-01 09:20+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-09-14 08:16+0000\n" +"Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +27,7 @@ msgstr "" #: ../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 des informations de débogage, consultez ~/.xsession-errors." +msgstr "Pour des informations de débogage, consultez /home/amnesia/.xsession-errors." #: ../lib/Tails/IUK/Frontend.pm:216 msgid "Error while checking for upgrades" @@ -68,7 +69,7 @@ msgstr "Il n'y a pas d'explication disponible pour '%{reason}s'." #: ../lib/Tails/IUK/Frontend.pm:279 msgid "XXX HEJ XXX" -msgstr "" +msgstr "XXX HEJ XXX" #: ../lib/Tails/IUK/Frontend.pm:285 msgid "The system is up-to-date"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 14 Sep '14

14 Sep '14

commit 57727b7657205ed31190286ce7b9a958ae18926f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 08:45:13 2014 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 19c0c42..fdb1fd4 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -5,16 +5,17 @@ # bassmax, 2013-2014 # arpalord <arpalord(a)gmail.com>, 2012 # fanjoe <fanjoe(a)netcourrier.com>, 2014 -# Maijin <maijin21(a)gmail.com>, 2013 +# Maxime <maijin21(a)gmail.com>, 2013 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 # Onizuka, 2013 -# rike <u(a)451f.org>, 2014 +# rike, 2014 # skhaen <skhaen(a)cyphercat.eu>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 14:10+0000\n" -"Last-Translator: fanjoe <fanjoe(a)netcourrier.com>\n" +"PO-Revision-Date: 2014-09-14 08:20+0000\n" +"Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,10 +83,10 @@ msgid "Go" msgstr "OK" msgid "Short User Manual" -msgstr "Manuel utilisateur en bref" +msgstr "Bref manuel utilisateur" msgid "Donate to Support Tor" -msgstr "Faire une donation pour aider Tor" +msgstr "Donner pour aider Tor" msgid "Tor Q&A Site" msgstr "Site Web Questions/Réponses"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 14 Sep '14

14 Sep '14

commit f53a0046bbed622c6982969069fcb65709fac2ca Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 14 08:45:09 2014 +0000 Update translations for torcheck --- fr/torcheck.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 19c0c42..fdb1fd4 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -5,16 +5,17 @@ # bassmax, 2013-2014 # arpalord <arpalord(a)gmail.com>, 2012 # fanjoe <fanjoe(a)netcourrier.com>, 2014 -# Maijin <maijin21(a)gmail.com>, 2013 +# Maxime <maijin21(a)gmail.com>, 2013 +# monsieurtino <monsieurtino(a)mailoo.org>, 2014 # Onizuka, 2013 -# rike <u(a)451f.org>, 2014 +# rike, 2014 # skhaen <skhaen(a)cyphercat.eu>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2014-05-06 14:10+0000\n" -"Last-Translator: fanjoe <fanjoe(a)netcourrier.com>\n" +"PO-Revision-Date: 2014-09-14 08:20+0000\n" +"Last-Translator: monsieurtino <monsieurtino(a)mailoo.org>\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -82,10 +83,10 @@ msgid "Go" msgstr "OK" msgid "Short User Manual" -msgstr "Manuel utilisateur en bref" +msgstr "Bref manuel utilisateur" msgid "Donate to Support Tor" -msgstr "Faire une donation pour aider Tor" +msgstr "Donner pour aider Tor" msgid "Tor Q&A Site" msgstr "Site Web Questions/Réponses"

1 0