- tor-commits - lists.torproject.org

[translation/orbot] Update translations for orbot
by translation＠torproject.org 09 Feb '12

09 Feb '12

commit ac34a7d8ad1e0780cb45ae0e61b00651c6b40af9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 9 09:15:04 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 727a609..ee3d796 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -80,7 +80,7 @@ </string> <string name="wizard_final">Orbot est prêt!</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string> - <string name="connect_first_time"> Vous êtes connectés avec succés au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> + <string name="connect_first_time"> Vous êtes connectés avec succès au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string> <string name="pref_hs_group">Services cachés</string> <string name="pref_general_group">Général</string> @@ -98,7 +98,7 @@ <string name="wizard_tips_gibberbot">Gibberbot: application de clavardage sécurisé avec chiffrement Off-the-Record</string> <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</string> <string name="wizard_transproxy_title">Proxy transparent</string> <string name="wizard_transproxy_msg">Cela permet à vos applications d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string> <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string> @@ -137,7 +137,7 @@ <string name="bridge_error">Erreur de passerelle</string> <string name="bridge_requires_ip">Avant de pouvoir utiliser les passerelles, vous devez entrer au moins l\'adresse IP d\'une passerelle</string> <string name="send_email_for_bridges">Envoyez un e-mail à bridges(a)torproject.org avec \"get bridges\" dans le corps de l\'e-mail - fonctionne si le mail est envoyé d\'une adresse Gmail</string> - <string name="error">Erreur !</string> + <string name="error">Erreur</string> <string name="your_reachableaddresses_settings_caused_an_exception_">Les paramètres pour ReachableAddresses ont provoqué une erreur !</string> <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont provoqué une erreur !</string> <string name="exit_nodes">Nœuds de sortie</string> @@ -182,16 +182,16 @@ <string name="libevent_version">Libevent v1.4.13 : http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12 : http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7 : http://www.netfilter.org</string> - <string name="openssl_version"></string> + <string name="openssl_version">OpenSSL v1.0.0f: http://www.openssl.org</string> <string name="hidden_service_request">Une application veut ouvrir le port %S du serveur caché sur le réseau Tor. C\'est sécuritaire si vous faites confiance à l\'application.</string> <string name="found_existing_tor_process">trouvé un processus existant de Tor ...</string> <string name="something_bad_happened">Quelque chose d\'incorrect s\'est passé. Vérifiez le journal</string> <string name="hidden_service_on">service caché sur :</string> <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string> <string name="unable_to_start_tor">Impossible de démarrer Tor :</string> - <string name="pref_use_sys_iptables_title"></string> - <string name="pref_use_sys_iptables_summary"></string> - <string name="error_installing_binares"></string> - <string name="pref_use_persistent_notifications"></string> - <string name="pref_use_persistent_notifications_title"></string> + <string name="pref_use_sys_iptables_title">Utiliser Iptables par défaut</string> + <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire embarqué avec Orbot</string> + <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installé ou mis à jour.</string> + <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string> + <string name="pref_use_persistent_notifications_title">Toujours activé les Notifications</string> </resources>

1 0

[tor/master] revert the revert in master, since I didn't want to revert it there
by arma＠torproject.org 09 Feb '12

09 Feb '12

commit 6c3cffe45017de0a0c0c27f4977a7fc1bb1fd502 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 9 04:03:36 2012 -0500 revert the revert in master, since I didn't want to revert it there --- src/config/torrc.sample.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 5b8fc7d..1ea5d9f 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/tor-manual.html, +## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform:

1 0

[tor/master] Revert "add a "docs" to the manual URI as listed in torrc.sample.in"
by arma＠torproject.org 09 Feb '12

09 Feb '12

commit 85c539009a91385058bafe286d89f214014da719 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 9 03:57:04 2012 -0500 Revert "add a "docs" to the manual URI as listed in torrc.sample.in" This reverts commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa. The conversation from irc: > weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2, since i don't want to make all your stable users have to deal with a torrc change. but nickm changed it. is it in fact the case that a change in that file means a change in the deb? <weasel> it means you'll prompt every single user who ever touched their torrc <weasel> and they will be asked if they like your new version better than what they have right now <weasel> so it's not great Instead I changed the website to redirect requests for the tor-manual URL listed in maint-0.2.2's torrc.sample.in so the link will still work. --- changes/manual_uri_in_torrc | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/changes/manual_uri_in_torrc b/changes/manual_uri_in_torrc deleted file mode 100644 index 30b12ec..0000000 --- a/changes/manual_uri_in_torrc +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (documentation): - - Fix the URL for the online version of the manual that's listed in - torrc.sample. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 6455cbe..f0c78ce 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, +## See 'man tor', or https://www.torproject.org/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform:

1 0

[tor/master] Merge branch 'maint-0.2.2'
by arma＠torproject.org 09 Feb '12

09 Feb '12

commit 929ebde2b908616fac381be78a5828c9d0fdd273 Merge: ca431c5 85c5390 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 9 04:02:18 2012 -0500 Merge branch 'maint-0.2.2' changes/manual_uri_in_torrc | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-)

1 0

[tor/maint-0.2.2] Revert "add a "docs" to the manual URI as listed in torrc.sample.in"
by arma＠torproject.org 09 Feb '12

09 Feb '12

commit 85c539009a91385058bafe286d89f214014da719 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Feb 9 03:57:04 2012 -0500 Revert "add a "docs" to the manual URI as listed in torrc.sample.in" This reverts commit 55e8cae81553678ec77ce6b8fb1bf2d5e483e0aa. The conversation from irc: > weasel: i had intended to leave torrc.sample.in alone in maint-0.2.2, since i don't want to make all your stable users have to deal with a torrc change. but nickm changed it. is it in fact the case that a change in that file means a change in the deb? <weasel> it means you'll prompt every single user who ever touched their torrc <weasel> and they will be asked if they like your new version better than what they have right now <weasel> so it's not great Instead I changed the website to redirect requests for the tor-manual URL listed in maint-0.2.2's torrc.sample.in so the link will still work. --- changes/manual_uri_in_torrc | 3 --- src/config/torrc.sample.in | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/changes/manual_uri_in_torrc b/changes/manual_uri_in_torrc deleted file mode 100644 index 30b12ec..0000000 --- a/changes/manual_uri_in_torrc +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (documentation): - - Fix the URL for the online version of the manual that's listed in - torrc.sample. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 6455cbe..f0c78ce 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -6,7 +6,7 @@ ## that begin with just "#" are disabled commands: you can enable them ## by removing the "#" symbol. ## -## See 'man tor', or https://www.torproject.org/docs/tor-manual.html, +## See 'man tor', or https://www.torproject.org/tor-manual.html, ## for more options you can use in this file. ## ## Tor will look for this file in various places based on your platform:

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 09 Feb '12

09 Feb '12

commit 820e140776c518dbbd20d104ca088eff4623c98a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Feb 9 08:45:04 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 06312ac..727a609 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -33,7 +33,7 @@ <string name="menu_exit">Sortie</string> <string name="powered_by">propulsé par le Projet Tor </string> <string name="press_to_start">- appuyez longtemps pour démarrer -</string> - <string name="pref_trans_proxy_group">Proxy transparent (accès privilègié requis) </string> + <string name="pref_trans_proxy_group">Proxy transparent (accès privilégié requis) </string> <string name="pref_trans_proxy_title">Proxy transparent</string> <string name="pref_trans_proxy_summary">Torifaction automatique des applications</string> <string name="pref_transparent_all_title">Tout passer par Tor</string>

1 0

r25382: {website} resume crediting matt for vidalia. tell users they should no (website/trunk/projects/en)
by Roger Dingledine 09 Feb '12

09 Feb '12

Author: arma Date: 2012-02-09 08:38:31 +0000 (Thu, 09 Feb 2012) New Revision: 25382 Modified: website/trunk/projects/en/vidalia.wml Log: resume crediting matt for vidalia. tell users they should not be installing vidalia themselves. fix grammar at the bottom, including a fun bug where when "#vidalia" is at the beginning of the line it silently turns the whole line into a comment. Modified: website/trunk/projects/en/vidalia.wml =================================================================== --- website/trunk/projects/en/vidalia.wml 2012-02-09 08:28:08 UTC (rev 25381) +++ website/trunk/projects/en/vidalia.wml 2012-02-09 08:38:31 UTC (rev 25382) @@ -28,7 +28,8 @@ href="http://qt.nokia.com/">Qt</a> framework. Vidalia runs on most platforms supported by Qt 4.3 or later, including Microsoft Windows, Apple OS X, and Linux or other Unix variants using the X11 window - system. + system. It was originally written by Matt Edman, and is currently + maintained by Tomás Touceda. </p> <p> Vidalia lets you start and stop Tor, see how much bandwidth you are @@ -47,6 +48,8 @@ <p> You should simply download Vidalia as part of a <a href="<page download/download-easy>">Tor software bundle</a>. + <b>Users should be using Tor Browser Bundle, not installing Vidalia + themselves.</b> </p> <ul> @@ -114,13 +117,12 @@ </p> <p> - Every project member inside Tor mostly uses IRC to communicate. Vidalia is - being developed primarily by Tomas Touceda. You can find them in - #vidalia channel at OFTC under the nick chiiph, repectively. You - should get in touch in order to see what's everyone working on and - to share what you've been working on or what you want to do. If you - intend to join the team, it's expected you stay around IRC, either - in Vidalia's channel, or #tor-dev. + Most Tor project members use IRC to communicate. You can find Tomás + in the <i>#vidalia</i> channel at OFTC under the nick chiiph. Please + get in touch in order to see what everyone's working on, and to + share what you've been working on or what you want to do. If you + intend to join the team, it's expected that you stay around IRC, + either in Vidalia's channel, or <i>#tor-dev</i>. </p> <p>

1 0

r25381: {website} turn the anchors into links (website/trunk/about/en)
by Roger Dingledine 09 Feb '12

09 Feb '12

Author: arma Date: 2012-02-09 08:28:08 +0000 (Thu, 09 Feb 2012) New Revision: 25381 Modified: website/trunk/about/en/contact.wml Log: turn the anchors into links Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-02-09 08:25:44 UTC (rev 25380) +++ website/trunk/about/en/contact.wml 2012-02-09 08:28:08 UTC (rev 25381) @@ -13,15 +13,15 @@ <div id="maincol"> <h2>Tor: Contact</h2> <ul> - <li><a href="<page about/contact>#email">Email</a></li> - <li><a href="<page about/contact>#identica">Identi.ca</a></li> - <li><a href="<page about/contact>#irc">IRC</a></li> - <li><a href="<page about/contact>#livechat">Live Chat</a></li> - <li><a href="<page about/contact>#phone">Telephone</a></li> + <li><a href="#email">Email</a></li> + <li><a href="#identica">Identi.ca</a></li> + <li><a href="#irc">IRC</a></li> + <li><a href="#livechat">Live Chat</a></li> + <li><a href="#phone">Telephone</a></li> </ul> <a id="email"></a> - <h3>Email</h3> + <h3><a class="anchor" href="#email">Email</a></h3> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -49,12 +49,12 @@ </ul> <a id="identica"></a> - <h3>Identi.ca</h3> + <h3><a class="anchor" href="#identica">Identi.ca</a></h3> <p>Contact us via our microblogging Identi.ca account <a href="https://identi.ca/torproject">@torproject</a>.</p> <a id="irc"></a> - <h3>IRC</h3> + <h3><a class="anchor" href="#irc">IRC</a></h3> <p>Tor users and developers can also be found in the following channels on <a href="http://www.oftc.net/oftc/">OFTC</a>:</p> @@ -70,7 +70,7 @@ </ul> <a id="livechat"></a> - <h3>Live Chat</h3> + <h3><a class="anchor" href="#livechat">Live Chat</a></h3> <p>Tor is experimenting with live chat (XMPP/Jabber/GChat), Voice over IP (VOIP), VOIP+ZRTP, SIP, Video, and desktop sharing through the <a href="http://jitsi.org/">Jitsi Open Source Communicator</a>. Contact @@ -85,7 +85,7 @@ Messenging.</p> <a id="phone"></a> - <h3>Telephone</h3> + <h3><a class="anchor" href="#phone">Telephone</a></h3> <p>If none of the above appeal to you, calling +1-781-352-0568 will reach the Tor office. Should there be no answer, please leave a message with a way to reach you.</p>

1 0

r25380: {website} make the anchors point to the section heads, not to just bel (website/trunk/about/en)
by Roger Dingledine 09 Feb '12

09 Feb '12

Author: arma Date: 2012-02-09 08:25:44 +0000 (Thu, 09 Feb 2012) New Revision: 25380 Modified: website/trunk/about/en/contact.wml Log: make the anchors point to the section heads, not to just below them Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2012-02-08 16:46:17 UTC (rev 25379) +++ website/trunk/about/en/contact.wml 2012-02-09 08:25:44 UTC (rev 25380) @@ -20,8 +20,8 @@ <li><a href="<page about/contact>#phone">Telephone</a></li> </ul> + <a id="email"></a> <h3>Email</h3> - <a id="email"></a> <i>tor-assistants at torproject.org</i> is the catch-all address for everything. It can be used for reaching people working on Tor. @@ -48,13 +48,13 @@ certification, etc.</li> </ul> + <a id="identica"></a> <h3>Identi.ca</h3> - <p><a id="identica"></a> - Contact us via our microblogging Identi.ca account <a + <p>Contact us via our microblogging Identi.ca account <a href="https://identi.ca/torproject">@torproject</a>.</p> + <a id="irc"></a> <h3>IRC</h3> - <a id="irc"></a> <p>Tor users and developers can also be found in the following channels on <a href="http://www.oftc.net/oftc/">OFTC</a>:</p> @@ -69,8 +69,8 @@ stuff that is not related to Tor.</li> </ul> + <a id="livechat"></a> <h3>Live Chat</h3> - <a id="livechat"></a> <p>Tor is experimenting with live chat (XMPP/Jabber/GChat), Voice over IP (VOIP), VOIP+ZRTP, SIP, Video, and desktop sharing through the <a href="http://jitsi.org/">Jitsi Open Source Communicator</a>. Contact @@ -84,8 +84,8 @@ href="http://www.cypherpunks.ca/otr/">Off-the-Record</a> Messenging.</p> + <a id="phone"></a> <h3>Telephone</h3> - <a id="phone"></a> <p>If none of the above appeal to you, calling +1-781-352-0568 will reach the Tor office. Should there be no answer, please leave a message with a way to reach you.</p>

1 0

[stem/master] Raising NotImplementedError for _make_socket()
by atagar＠torproject.org 09 Feb '12

09 Feb '12

commit db0e9ce6d969674a6a46d24d250fe8acd6245af3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Feb 8 19:35:36 2012 -0800 Raising NotImplementedError for _make_socket() ControlSocket is an abstract class without an implementation for _make_socket(). In python the proper type of exception to raise for this is a NotImplementedError. --- stem/socket.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 616fd6a..5ae4418 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -242,9 +242,10 @@ class ControlSocket: Raises: stem.socket.SocketError if unable to make a socket + NotImplementedError if not implemented by a subclass """ - raise SocketError("Unsupported Operation: this should be implemented by the ControlSocket subclass") + raise NotImplementedError("Unsupported Operation: this should be implemented by the ControlSocket subclass") class ControlPort(ControlSocket): """

1 0