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

[translation/gettor] Update translations for gettor
by translation＠torproject.org 30 May '13

30 May '13

commit d78f6db6d8218b3e8b90dd8851a8ba03ccfd344c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 30 12:45:06 2013 +0000 Update translations for gettor --- pt_BR/gettor.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pt_BR/gettor.po b/pt_BR/gettor.po index 0e0f6e8..c786e3c 100644 --- a/pt_BR/gettor.po +++ b/pt_BR/gettor.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-05-28 13:50+0000\n" +"PO-Revision-Date: 2013-05-30 12:40+0000\n" "Last-Translator: Communia <ameaneantie(a)riseup.net>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -248,7 +248,7 @@ msgid "" "is no complete public list of them, even if your ISP is filtering\n" "connections to all the known Tor relays, they probably won't be able\n" "to block all the bridges." -msgstr "Se sua conexão com a Internet bloqueia o acesso à rede Tor, você pode\nprecisar de uma ponte retransmissora. Pontes retransmissoras (ou pontes\npara encurtar) são retransmissores que não estão listados no diretório\nprincipal. Como não há uma lista pública deles, mesmo que seu ISP\nesteja filtrando conexões para todos os retransmissores Tor conhecidos,\neles provavelmente não serão capazes de bloquear todas as pontes." +msgstr "Se sua conexão Internet bloqueia o acesso à rede Tor, talvez você precise de retransmissores de pontes.Retransmissores de pontes (ou 'pontes', para abreviar) são retransmissores não listados no diretório\nprincipal. Já que não há uma lista pública deles, mesmo se o seu ISP\nestiver filtrando conexões para todos os retransmissores Tor conhecidos,\neles provavelmente não serão capazes de bloquear todas as pontes." #: lib/gettor/i18n.py:167 msgid "" @@ -262,7 +262,7 @@ msgstr "Você pode adquirir uma ponte enviando um e-mail que contenha a frase\n\ msgid "" "It is also possible to fetch bridges with a web browser at the following\n" "url: https://bridges.torproject.org/" -msgstr "Também é possível encontrar pontes através de um navegador web na\nseguinte url: https://bridges.torproject.org/" +msgstr "Também é possível encontrar pontes utilizando um navegador web no\nseguinte endereço: https://bridges.torproject.org/" #: lib/gettor/i18n.py:175 msgid ""

1 0

[stem/master] Methods to query user tor is running as
by atagar＠torproject.org 30 May '13

30 May '13

commit d7d14a82e7d28ff863c71b4b027c9922e17a6661 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 29 20:44:23 2013 -0700 Methods to query user tor is running as Couple additions to make it easier to determine the user tor is running as: * stem.util.system.get_user(pid) => determines the user a process is running as * Controller.get_user() => provides the user that tor is running as --- docs/change_log.rst | 2 ++ stem/control.py | 36 +++++++++++++++++++++++++++-- stem/util/system.py | 36 +++++++++++++++++++++++++++++ test/integ/util/system.py | 48 +++++++++++++++++++++++++++++++++++++++ test/unit/control/controller.py | 29 +++++++++++++++++++++++ 5 files changed, 149 insertions(+), 2 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6e969fa..a2c92ea 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -44,6 +44,7 @@ The following are only available within stem's `git repository * :func:`~stem.control.Controller.attach_stream` could encounter an undocumented 555 response (:trac:`8701`, :spec:`7286576`) * :class:`~stem.descriptor.server_descriptor.RelayDescriptor` digest validation was broken when dealing with non-unicode content with python 3 (:trac:`8755`) * The :class:`~stem.control.Controller` use of cached content wasn't thread safe (:trac:`8607`) + * Added :func:`~stem.control.Controller.get_user` method to the:class:`~stem.control.Controller` * Added :func:`~stem.control.Controller.get_pid` method to the:class:`~stem.control.Controller` * **Descriptors** @@ -55,6 +56,7 @@ The following are only available within stem's `git repository * :func:`~stem.util.system.set_process_name` inserted spaces between characters (:trac:`8631`) * :func:`~stem.util.system.get_pid_by_name` can now pull for all processes with a given name * :func:`~stem.util.system.call` ignored the subprocess' exit status + * Added :func:`stem.util.system.get_user` * Added :func:`stem.util.system.get_start_time` * Added :func:`stem.util.system.get_bsd_jail_path` diff --git a/stem/control.py b/stem/control.py index d92acc9..53d49b9 100644 --- a/stem/control.py +++ b/stem/control.py @@ -24,6 +24,7 @@ providing its own for interacting at a higher level. |- get_exit_policy - provides our exit policy |- get_socks_listeners - provides where tor is listening for SOCKS connections |- 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 | |- get_microdescriptor - querying the microdescriptor for a relay @@ -991,6 +992,39 @@ class Controller(BaseController): else: return default + def get_user(self, default = UNDEFINED): + """ + Provides the user tor is running as. This often only works if tor is + running locally. Also, most of its checks are platform dependent, and hence + are not entirely reliable. + + :param object default: response if the query fails + + :returns: str with the username tor is running as + """ + + user = self._get_cache("user") + + if not user: + user = self.get_info("process/user", None) + + if not user and self.get_socket().is_localhost(): + pid = self.get_pid(None) + + if pid: + user = stem.util.system.get_user(pid) + + if user: + self._set_cache({"user": user}) + return user + elif default == UNDEFINED: + if self.get_socket().is_localhost(): + raise ValueError("Unable to resolve tor's user") + else: + raise ValueError("Tor isn't running locally") + else: + return default + def get_pid(self, default = UNDEFINED): """ Provides the process id of tor. This often only works if tor is running @@ -1008,8 +1042,6 @@ class Controller(BaseController): pid = self._get_cache("pid") if not pid: - # this is the only pid resolution method that works remotely - getinfo_pid = self.get_info("process/pid", None) if getinfo_pid and getinfo_pid.isdigit(): diff --git a/stem/util/system.py b/stem/util/system.py index 3e72d83..5887fb7 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -20,6 +20,7 @@ best-effort, providing **None** if the lookup fails. get_pid_by_port - gets the pid for a process listening to a given port get_pid_by_open_file - gets the pid for the process with an open file get_cwd - provides the current working directory for a given process + get_user - provides the user a process is running under get_start_time - provides the unix timestamp when the process started get_bsd_jail_id - provides the BSD jail id a given process is running within get_bsd_jail_path - provides the path of the given BSD jail @@ -34,6 +35,7 @@ import ctypes import ctypes.util import os import platform +import pwd import subprocess import time @@ -598,6 +600,37 @@ def get_cwd(pid): return None # all queries failed +def get_user(pid): + """ + Provides the user a process is running under. + + :param int pid: process id of the process to be queried + + :returns: **str** with the username a process is running under, **None** if + it can't be determined + """ + + if not isinstance(pid, int) or pid < 0: + return None + + if stem.util.proc.is_available(): + try: + uid = stem.util.proc.get_uid(pid) + + if uid and uid.isdigit(): + return pwd.getpwuid(int(uid)).pw_name + except: + pass + + if is_available("ps"): + results = call("ps -o user %s" % pid, []) + + if len(results) >= 2: + return results[1].strip() + + return None + + def get_start_time(pid): """ Provides the unix timestamp when the given process started. @@ -608,6 +641,9 @@ def get_start_time(pid): if it can't be determined """ + if not isinstance(pid, int) or pid < 0: + return None + if stem.util.proc.is_available(): try: return float(stem.util.proc.get_stats(pid, stem.util.proc.Stat.START_TIME)[0]) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index 0bf77ac..4bfda1e 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -383,6 +383,54 @@ class TestSystem(unittest.TestCase): runner_pid, tor_cwd = runner.get_pid(), runner.get_tor_cwd() self.assertEquals(tor_cwd, stem.util.system.get_cwd(runner_pid)) + def test_get_user_none(self): + """ + Tests the get_user function when the process doesn't exist. + """ + + self.assertEqual(None, stem.util.system.get_user(None)) + self.assertEqual(None, stem.util.system.get_user(-5)) + self.assertEqual(None, stem.util.system.get_start_time(98765)) + + def test_get_user_proc(self): + """ + Tests the get_user function with a proc response. + """ + + if not stem.util.proc.is_available(): + test.runner.skip(self, "(proc unavailable)") + return + + mocking.mock(stem.util.system.call, filter_system_call(['ps '])) + + # we started our tor process so it should be running with the same user + + pid = test.runner.get_runner().get_pid() + self.assertTrue(getpass.getuser(), stem.util.system.get_user(pid)) + + def test_get_user_ps(self): + """ + Tests the get_user function with a ps response. + """ + + if not stem.util.system.is_available("ps"): + test.runner.skip(self, "(ps unavailable)") + return + + mocking.mock(stem.util.proc.is_available, mocking.return_false()) + + pid = test.runner.get_runner().get_pid() + self.assertTrue(getpass.getuser(), stem.util.system.get_user(pid)) + + def test_get_start_time_none(self): + """ + Tests the get_start_time function when the process doesn't exist. + """ + + self.assertEqual(None, stem.util.system.get_start_time(None)) + self.assertEqual(None, stem.util.system.get_start_time(-5)) + self.assertEqual(None, stem.util.system.get_start_time(98765)) + def test_get_start_time_proc(self): """ Tests the get_start_time function with a proc response. diff --git a/test/unit/control/controller.py b/test/unit/control/controller.py index 449bc6d..a0deaf1 100644 --- a/test/unit/control/controller.py +++ b/test/unit/control/controller.py @@ -248,6 +248,35 @@ class TestControl(unittest.TestCase): self.assertRaises(ProtocolError, self.controller.get_protocolinfo) + def test_get_user_remote(self): + """ + Exercise the get_user() method for a non-local socket. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_false()) + + self.assertRaises(ValueError, self.controller.get_user) + self.assertEqual(123, self.controller.get_user(123)) + + def test_get_user_by_getinfo(self): + """ + Exercise the get_user() resolution via its getinfo option. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_true()) + mocking.mock_method(Controller, "get_info", mocking.return_value('atagar')) + self.assertEqual('atagar', self.controller.get_user()) + + def test_get_user_by_system(self): + """ + Exercise the get_user() resolution via the system module. + """ + + mocking.mock_method(ControlSocket, "is_localhost", mocking.return_true()) + mocking.mock(stem.util.system.get_pid_by_name, mocking.return_value(432)) + mocking.mock(stem.util.system.get_user, mocking.return_value('atagar')) + self.assertEqual('atagar', self.controller.get_user()) + def test_get_pid_remote(self): """ Exercise the get_pid() method for a non-local socket.

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 29 May '13

29 May '13

commit 10326cec6df022a7e0a25b2a1c712e79a1457bb0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 19:16:31 2013 +0000 Update translations for tor-launcher-network-settings_completed --- fr/network-settings.dtd | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 0136b06..634a8e1 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -1,20 +1,28 @@ -<!ENTITY torsettings.dialog.title "Paramètres réseaux de Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  -<!ENTITY torsettings.prompt "Avant que le naviguateur Tor ne tente de se connecter à l'Internet nous avons besoin que vous renseigniez quelques informations concernant votre connexion Internet."> +<!ENTITY torsettings.prompt "Avant que le navigateur Tor ne tente de se connecter au réseau Tor, vous devez fournir quelques informations concernant votre connexion Internet."> <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> -<!ENTITY torSettings.proxyQuestion "Utilisez-vous un proxy pour accéder à l'Internet ?"> +<!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation?"> +<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou détournée."> +<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configuré les paramètres réseau. "> +<!ENTITY torSettings.configure "Configurer"> +<!ENTITY torSettings.connectPrompt1 "La connexion internet de cet ordinateur est libre de tous obstacles."> +<!ENTITY torSettings.connectPrompt2 "Je voudrai me connecté directement au réseau Tor."> +<!ENTITY torSettings.connect "Connecter"> + +<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?">  <!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de répondre correctement à cette question regardez les paramètres Internet d'un autre navigateur afin de vérifier si vous utilisez un proxy."> <!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> <!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet passe à travers un pare-feu qui ne vous autorise à vous connecter qu'à travers certains ports ?"> -<!ENTITY torSettings.firewallHelp "Si vous n'êtes pas certain de répondre correctement à cette question choisissez Non. Si vous rencontrez des problèmes changez vos paramètres."> -<!ENTITY torSettings.enterFirewall "Entrez une liste de ports, séparés par des virgules, qui sont autorisés par votre pare-feu."> -<!ENTITY torSettings.bridgeQuestion "Si votre Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor vous devez utiliser des passerelles relais."> +<!ENTITY torSettings.firewallHelp "Si vous n'êtes pas certain de répondre correctement à cette question choisissez Non. Si vous rencontrez des problèmes pour vous connecter au réseau Tor, changez vos paramètres."> +<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par votre pare-feu."> +<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, vous devrez obtenir et utiliser des pont-relais.&#160; Sinon, cliquez simplement sur Connect.">  @@ -22,17 +30,17 @@ <!ENTITY torsettings.optional "Optionnel"> -<!ENTITY torsettings.useProxy.checkbox "J'utilise un proxy pour accéder à l'Internet."> +<!ENTITY torsettings.useProxy.checkbox "Cet ordinateur a besoin d'utiliser un proxy pour accéder à Internet"> +<!ENTITY torsettings.useProxy.type "Type de proxy"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> <!ENTITY torsettings.useProxy.username "Nom d'utilisateur :"> <!ENTITY torsettings.useProxy.password "Mot de passe :"> -<!ENTITY torsettings.useProxy.type "Type :"> <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "Mon pare-feu ne me laisse me connecter qu'à certains ports"> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor"> <!ENTITY torsettings.useBridges.label "Entrez une ou plusieurs passerelles relais sous la forme adresse:port"> @@ -42,5 +50,5 @@ <!ENTITY torsettings.bridgeHelpTitle "Aide pour les passerelles relais"> <!ENTITY torsettings.bridgeHelp1 "Si vous êtes dans l'incapacité de vous connecter au réseau Tor cela peut venir du fait que votre Fournisseur d'Accès Internet (FAI) bloque Tor. La plupart du temps vous pouvez contourner ce problème en utilisant les passerelles Tor qui sont des relais cachés, plus difficiles à bloquer."> <!ENTITY torsettings.bridgeHelp2 "Pour obtenir quelques passerelles relais utilisez un navigateur web pour aller sur la page suivante : https://bridges.torproject.org"> - -<!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver des passerelles relais publiques est d'envoyer un e-mail à bridges(a)torproject.org avec la seule ligne 'get bridges' dans le corps du message. Cependant, afin que nous puissions rendre plus difficile pour un attaquant d'amasser beaucoup d'adresses de passerelles, vous devez envoyer cette demande depuis une adresse e-mail issue d'un des domaines suivants : gmail.com ou yahoo.com."> +<!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver les adresses publiques de ponts est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'e-mail. Toutefois, afin que nous puissions rendre plus difficile pour un attaquant d'apprendre beaucoup d'adresses de ponts, vous devez adresser cette demande à partir d'une adresse e-mail appartenant à l'un des domaines suivants: gmail.com ou yahoo.com"> +<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander un pont-relais en envoyant un e-mail à help(a)rt.torproject.org.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 29 May '13

29 May '13

commit a687dbb8b84fff96c81646c20f31d6ac5eabcaa8 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 19:16:27 2013 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index e4ceafa..634a8e1 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -2,27 +2,27 @@  -<!ENTITY torsettings.prompt ""> +<!ENTITY torsettings.prompt "Avant que le navigateur Tor ne tente de se connecter au réseau Tor, vous devez fournir quelques informations concernant votre connexion Internet."> <!ENTITY torSettings.yes "Oui"> <!ENTITY torSettings.no "Non"> -<!ENTITY torSettings.firstQuestion ""> +<!ENTITY torSettings.firstQuestion "Laquelle des phrases suivantes décrit le mieux votre situation?"> <!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou détournée."> -<!ENTITY torSettings.configurePrompt2 ""> -<!ENTITY torSettings.configure ""> -<!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.configurePrompt2 "J'ai besoin de configuré les paramètres réseau. "> +<!ENTITY torSettings.configure "Configurer"> +<!ENTITY torSettings.connectPrompt1 "La connexion internet de cet ordinateur est libre de tous obstacles."> +<!ENTITY torSettings.connectPrompt2 "Je voudrai me connecté directement au réseau Tor."> <!ENTITY torSettings.connect "Connecter"> -<!ENTITY torSettings.proxyQuestion ""> +<!ENTITY torSettings.proxyQuestion "Est-ce que cet ordinateur à besoin d'un proxy pour accéder à internet ?">  -<!ENTITY torSettings.proxyHelp ""> -<!ENTITY torSettings.enterProxy ""> -<!ENTITY torSettings.firewallQuestion ""> -<!ENTITY torSettings.firewallHelp ""> -<!ENTITY torSettings.enterFirewall ""> -<!ENTITY torSettings.bridgeQuestion ""> +<!ENTITY torSettings.proxyHelp "Si vous n'êtes pas certain de répondre correctement à cette question regardez les paramètres Internet d'un autre navigateur afin de vérifier si vous utilisez un proxy."> +<!ENTITY torSettings.enterProxy "Entrez les paramètres de votre proxy."> +<!ENTITY torSettings.firewallQuestion "Est-ce que votre connexion Internet passe à travers un pare-feu qui ne vous autorise à vous connecter qu'à travers certains ports ?"> +<!ENTITY torSettings.firewallHelp "Si vous n'êtes pas certain de répondre correctement à cette question choisissez Non. Si vous rencontrez des problèmes pour vous connecter au réseau Tor, changez vos paramètres."> +<!ENTITY torSettings.enterFirewall "Entrez la liste de ports, séparés par des virgules, qui sont autorisés par votre pare-feu."> +<!ENTITY torSettings.bridgeQuestion "Si la connexion Internet de cet ordinateur est censurée, vous devrez obtenir et utiliser des pont-relais.&#160; Sinon, cliquez simplement sur Connect.">  @@ -30,8 +30,8 @@ <!ENTITY torsettings.optional "Optionnel"> -<!ENTITY torsettings.useProxy.checkbox ""> -<!ENTITY torsettings.useProxy.type ""> +<!ENTITY torsettings.useProxy.checkbox "Cet ordinateur a besoin d'utiliser un proxy pour accéder à Internet"> +<!ENTITY torsettings.useProxy.type "Type de proxy"> <!ENTITY torsettings.useProxy.address "Adresse :"> <!ENTITY torsettings.useProxy.address.placeholder "Adresse IP ou nom d'hôte"> <!ENTITY torsettings.useProxy.port "Port :"> @@ -40,7 +40,7 @@ <!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> <!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> <!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox ""> +<!ENTITY torsettings.firewall.checkbox "Cet ordinateur passe par un pare-feu qui autorise uniquement les connexions à certains ports"> <!ENTITY torsettings.firewall.allowedPorts "Ports autorisés :"> <!ENTITY torsettings.useBridges.checkbox "Mon Fournisseur d'Accès Internet (FAI) bloque les connexions au réseau Tor"> <!ENTITY torsettings.useBridges.label "Entrez une ou plusieurs passerelles relais sous la forme adresse:port"> @@ -48,7 +48,7 @@ <!ENTITY torsettings.copyLog "Copier les logs de Tor dans le Press-papier"> <!ENTITY torsettings.bridgeHelpTitle "Aide pour les passerelles relais"> -<!ENTITY torsettings.bridgeHelp1 ""> +<!ENTITY torsettings.bridgeHelp1 "Si vous êtes dans l'incapacité de vous connecter au réseau Tor cela peut venir du fait que votre Fournisseur d'Accès Internet (FAI) bloque Tor. La plupart du temps vous pouvez contourner ce problème en utilisant les passerelles Tor qui sont des relais cachés, plus difficiles à bloquer."> <!ENTITY torsettings.bridgeHelp2 "Pour obtenir quelques passerelles relais utilisez un navigateur web pour aller sur la page suivante : https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver les adresses publiques de ponts est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'e-mail. Toutefois, afin que nous puissions rendre plus difficile pour un attaquant d'apprendre beaucoup d'adresses de ponts, vous devez adresser cette demande à partir d'une adresse e-mail appartenant à l'un des domaines suivants: gmail.com ou yahoo.com"> <!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander un pont-relais en envoyant un e-mail à help(a)rt.torproject.org.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 29 May '13

29 May '13

commit 2a7f280852e92a87abdce53f4067be5c66707df0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:46:35 2013 +0000 Update translations for tor-launcher-network-settings --- fr/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fr/network-settings.dtd b/fr/network-settings.dtd index 35317f0..e4ceafa 100644 --- a/fr/network-settings.dtd +++ b/fr/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title "Paramètres réseaux de Tor"> +<!ENTITY torsettings.dialog.title "Paramètres du réseau Tor">  @@ -8,7 +8,7 @@ <!ENTITY torSettings.no "Non"> <!ENTITY torSettings.firstQuestion ""> -<!ENTITY torSettings.configurePrompt1 ""> +<!ENTITY torSettings.configurePrompt1 "La connexion Internet de cet ordinateur est censurée, filtrée ou détournée."> <!ENTITY torSettings.configurePrompt2 ""> <!ENTITY torSettings.configure ""> <!ENTITY torSettings.connectPrompt1 ""> @@ -50,5 +50,5 @@ <!ENTITY torsettings.bridgeHelpTitle "Aide pour les passerelles relais"> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "Pour obtenir quelques passerelles relais utilisez un navigateur web pour aller sur la page suivante : https://bridges.torproject.org"> -<!ENTITY torsettings.bridgeHelp3 ""> -<!ENTITY torsettings.bridgeHelp4 ""> +<!ENTITY torsettings.bridgeHelp3 "Une autre façon de trouver les adresses publiques de ponts est d'envoyer un mail à bridges(a)torproject.org avec la ligne "get bridges" dans le corps de l'e-mail. Toutefois, afin que nous puissions rendre plus difficile pour un attaquant d'apprendre beaucoup d'adresses de ponts, vous devez adresser cette demande à partir d'une adresse e-mail appartenant à l'un des domaines suivants: gmail.com ou yahoo.com"> +<!ENTITY torsettings.bridgeHelp4 "Vous pouvez également demander un pont-relais en envoyant un e-mail à help(a)rt.torproject.org.">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 29 May '13

29 May '13

commit 5a43dd5f1afc2c2d3a38548f916fb51416abf0a9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:46:05 2013 +0000 Update translations for whisperback_completed --- ar/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 3b33712..82e36a2 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-29 18:00+0000\n" +"PO-Revision-Date: 2013-05-29 18:40+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -157,13 +157,13 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "ويسبرباك - أرسل تعليقاتك و آرائك بإيميلات مشفرة. ⏎ حقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز tails(a)boum.org ⏎ هذا البرنامج مجاني، يمكنك إعادة توزيعه أو تغييره تحت بنود رخصة غنو العامة كما نشرتها منظمة البرمجيات الحرة، النسخة الثالثة أو أي نسخة أحدث. ⏎ هذا البرنامج يتم توزيعه على أمل الاستفادة منه، لكن من دون أي نوع من الضمانات. راجع رخصة غنو العامة لمزيد من التفاصيل. ⏎ يجب ان تكون استلمت نسخة من رخصة غنو العامة مع هذا البرنامج، اذا لم تستلمها، راجع <http://www.gnu.org/licenses/>\n.\n" +msgstr "ويسبرباك - أرسل تعليقاتك و آرائك بإيميلات مشفرة.\nحقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز <tails(a)boum.org>\n\n هذا البرنامج مجاني، يمكنك إعادة توزيعه أو تغييره تحت بنود رخصة جنو العامة كما نشرتها منظمة البرمجيات الحرة، النسخة الثالثة أو أي نسخة أحدث. هذا البرنامج يتم توزيعه على أمل الاستفادة منه، لكن من دون أي نوع من الضمانات. راجع رخصة جنو العامة لمزيد من التفاصيل. يجب ان تكون استلمت نسخة من رخصة غنو العامة مع هذا البرنامج، اذا لم تستلمها، اجع <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr " أردتنا أن نشفر الرد على رسالتك، أضف هوية مفتاحك> رابط لمفتاحك أو الجزء العام من المفتاح." +msgstr "إذا اردت ان نشفر ردنا عليك، أضف هوية مفتاحك، رابط لمفتاحك أو الجزء العام من المفتاح:" #: ../data/whisperback.ui.h:22 msgid "Summary"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 29 May '13

29 May '13

commit 05097b274c063f54051c9c386adaff1e0af4f4db Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:46:02 2013 +0000 Update translations for whisperback --- ar/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 3b33712..82e36a2 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-29 18:00+0000\n" +"PO-Revision-Date: 2013-05-29 18:40+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -157,13 +157,13 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "ويسبرباك - أرسل تعليقاتك و آرائك بإيميلات مشفرة. ⏎ حقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز tails(a)boum.org ⏎ هذا البرنامج مجاني، يمكنك إعادة توزيعه أو تغييره تحت بنود رخصة غنو العامة كما نشرتها منظمة البرمجيات الحرة، النسخة الثالثة أو أي نسخة أحدث. ⏎ هذا البرنامج يتم توزيعه على أمل الاستفادة منه، لكن من دون أي نوع من الضمانات. راجع رخصة غنو العامة لمزيد من التفاصيل. ⏎ يجب ان تكون استلمت نسخة من رخصة غنو العامة مع هذا البرنامج، اذا لم تستلمها، راجع <http://www.gnu.org/licenses/>\n.\n" +msgstr "ويسبرباك - أرسل تعليقاتك و آرائك بإيميلات مشفرة.\nحقوق النسخ ٢٠٠٩ - ٢٠١٢ مطوري تايلز <tails(a)boum.org>\n\n هذا البرنامج مجاني، يمكنك إعادة توزيعه أو تغييره تحت بنود رخصة جنو العامة كما نشرتها منظمة البرمجيات الحرة، النسخة الثالثة أو أي نسخة أحدث. هذا البرنامج يتم توزيعه على أمل الاستفادة منه، لكن من دون أي نوع من الضمانات. راجع رخصة جنو العامة لمزيد من التفاصيل. يجب ان تكون استلمت نسخة من رخصة غنو العامة مع هذا البرنامج، اذا لم تستلمها، اجع <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid "" "If you want us to encrypt messages when we respond to you, add your key ID, " "a link to your key, or the key as a public key block:" -msgstr " أردتنا أن نشفر الرد على رسالتك، أضف هوية مفتاحك> رابط لمفتاحك أو الجزء العام من المفتاح." +msgstr "إذا اردت ان نشفر ردنا عليك، أضف هوية مفتاحك، رابط لمفتاحك أو الجزء العام من المفتاح:" #: ../data/whisperback.ui.h:22 msgid "Summary"

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 29 May '13

29 May '13

commit 9219605a60ed574d0a4d55a5172573f6465abeb0 Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:16:06 2013 +0000 Update translations for whisperback_completed --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 7061bdc..3b33712 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-23 16:30+0000\n" +"PO-Revision-Date: 2013-05-29 18:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -106,7 +106,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "لم نتمكن من ارسال التقرير لمشاكل في الاتصال. تأكد من اتصالك بالشبكة و كرر المحاولة.\n\nكحل مؤقت يمكنك حفظ التقرير على ذاكرة فلاش و ارسالها لنا على %s من بريدك الالكتروني باستخدام جهاز آخر.\n\nلن يتم تسليم التقرير بكامل الخصوصية الا اذا استخدمت تور على الجهاز الآخر حين ارسالك الرسالة.\n\nهل تريد حفظ التقرير؟" +msgstr "لم نتمكن من ارسال تقرير الأخطاء وذلك لخطأ في الاتصال.\n\nكحل مؤقت يمكنك حفظ التقرير على ذاكرة فلاش و ارسالها لنا على %s من بريدك الالكتروني باستخدام جهاز آخر. لن يتم تسليم التقرير بكامل الخصوصية الا اذا استخدمت تور على الجهاز الآخر حين ارسالك الرسالة.\n\nهل تريد حفظ التقرير في ملف؟" #: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 29 May '13

29 May '13

commit 134b91658624d4324496fbb3cb8a892bf356cede Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 29 18:16:02 2013 +0000 Update translations for whisperback --- ar/ar.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 7061bdc..3b33712 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-26 15:50+0100\n" -"PO-Revision-Date: 2013-05-23 16:30+0000\n" +"PO-Revision-Date: 2013-05-29 18:00+0000\n" "Last-Translator: Sherief Alaa <sheriefalaa.w(a)gmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/torproject/language/ar/)\n" "MIME-Version: 1.0\n" @@ -106,7 +106,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "لم نتمكن من ارسال التقرير لمشاكل في الاتصال. تأكد من اتصالك بالشبكة و كرر المحاولة.\n\nكحل مؤقت يمكنك حفظ التقرير على ذاكرة فلاش و ارسالها لنا على %s من بريدك الالكتروني باستخدام جهاز آخر.\n\nلن يتم تسليم التقرير بكامل الخصوصية الا اذا استخدمت تور على الجهاز الآخر حين ارسالك الرسالة.\n\nهل تريد حفظ التقرير؟" +msgstr "لم نتمكن من ارسال تقرير الأخطاء وذلك لخطأ في الاتصال.\n\nكحل مؤقت يمكنك حفظ التقرير على ذاكرة فلاش و ارسالها لنا على %s من بريدك الالكتروني باستخدام جهاز آخر. لن يتم تسليم التقرير بكامل الخصوصية الا اذا استخدمت تور على الجهاز الآخر حين ارسالك الرسالة.\n\nهل تريد حفظ التقرير في ملف؟" #: ../whisperBack/gui.py:386 ../data/whisperback.ui.h:21 msgid "WhisperBack"

1 0

[stem/master] Checking is_caching_enabled() when using cache
by atagar＠torproject.org 29 May '13

29 May '13

commit f5bdd944df426410fe6b21088280cf3779709ed1 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 29 08:53:12 2013 -0700 Checking is_caching_enabled() when using cache Adding a is_caching_enabled() call to our getter/setter for the Controller's cache. This has a couple advantages... * It prevents us from accidently caching stuff when the cache should be disabled. In at least one point we were using the cache without checking is_caching_enabled(), which was probably an error. * Lets us simplify our code a bit by making is_caching_enabled() optional for the cache getter/setter callers. --- stem/control.py | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0062007..d92acc9 100644 --- a/stem/control.py +++ b/stem/control.py @@ -853,16 +853,13 @@ class Controller(BaseController): """ try: - if not self.is_caching_enabled(): - return stem.version.Version(self.get_info("version")) - else: - version = self._get_cache("version") + version = self._get_cache("version") - if not version: - version = stem.version.Version(self.get_info("version")) - self._set_cache({"version": version}) + if not version: + version = stem.version.Version(self.get_info("version")) + self._set_cache({"version": version}) - return version + return version except Exception as exc: if default == UNDEFINED: raise exc @@ -1018,16 +1015,7 @@ class Controller(BaseController): if getinfo_pid and getinfo_pid.isdigit(): pid = int(getinfo_pid) - if self.is_caching_enabled(): - self._set_cache({"pid": pid}) - - if not pid: - if not self.get_socket().is_localhost(): - if default == UNDEFINED: - raise ValueError("Tor isn't running locally") - else: - return default - + if not pid and self.get_socket().is_localhost(): pid_file_path = self.get_conf("PidFile", None) if pid_file_path is not None: @@ -1048,13 +1036,14 @@ class Controller(BaseController): elif isinstance(control_socket, stem.socket.ControlSocketFile): pid = stem.util.system.get_pid_by_open_file(control_socket.get_socket_path()) - if pid and self.is_caching_enabled(): - self._set_cache({"pid": pid}) - if pid: + self._set_cache({"pid": pid}) return pid elif default == UNDEFINED: - raise ValueError("Unable to resolve tor's pid") + if self.get_socket().is_localhost(): + raise ValueError("Unable to resolve tor's pid") + else: + raise ValueError("Tor isn't running locally") else: return default @@ -1700,14 +1689,15 @@ class Controller(BaseController): with self._cache_lock: cached_values = {} - for param in params: - if namespace: - cache_key = "%s.%s" % (namespace, param) - else: - cache_key = param + if self.is_caching_enabled(): + for param in params: + if namespace: + cache_key = "%s.%s" % (namespace, param) + else: + cache_key = param - if cache_key in self._request_cache: - cached_values[param] = self._request_cache[cache_key] + if cache_key in self._request_cache: + cached_values[param] = self._request_cache[cache_key] return cached_values @@ -1721,6 +1711,9 @@ class Controller(BaseController): """ with self._cache_lock: + if not self.is_caching_enabled(): + return + for key, value in params.items(): if namespace: cache_key = "%s.%s" % (namespace, key)

1 0