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

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 6621f0a9109bc9d8011571d67eb30d9c21f7f873 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:15:35 2014 +0000 Update translations for tor-launcher-network-settings --- de/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/network-settings.dtd b/de/network-settings.dtd index 1e35d64..38adea5 100644 --- a/de/network-settings.dtd +++ b/de/network-settings.dtd @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Geben Sie hier die Anschlüsse ein, die von der Firewall erlaubt werden. Trennen Sie die Anschlüsse jeweils mit einem Komma."> <!ENTITY torSettings.bridgeQuestion "Blockiert oder zensiert Ihr Internetdienstanbieter (ISP) Verbindungen zum Tor-Netzwerk?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.&#160; If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "Sie können den Standardsatz von Brücken verwenden, oder Sie können einen benutzerdefinierten Satz von Brücken eingeben.">

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 7c4038fb8325791fea9def8bca80e603da9a404f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 15:15:23 2014 +0000 Update translations for tails-greeter --- de/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index 3973041..2142739 100644 --- a/de/de.po +++ b/de/de.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 14:41+0000\n" +"PO-Revision-Date: 2014-03-07 15:03+0000\n" "Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" @@ -102,7 +102,7 @@ msgstr "Passwörter stimmen nicht überein" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Windows-Tarnmodus" #: ../glade/optionswindow.glade.h:11 msgid "" @@ -148,7 +148,7 @@ msgstr "Alle MAC-Adressen manipulieren" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Netzwerkonfiguration" #: ../glade/optionswindow.glade.h:20 msgid ""

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 6d63968086d5c04f80218c4ffa459d5be9089d0f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:57 2014 +0000 Update translations for tails-misc_completed --- fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA.po b/fr_CA.po index 7e0372e..669a8b8 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 14:15+0000\n" +"PO-Revision-Date: 2014-03-07 14:21+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit d625be874a8a4b8cc9fb7bac808207453e77183f Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:55 2014 +0000 Update translations for tails-misc --- fr_CA.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr_CA.po b/fr_CA.po index 7e0372e..669a8b8 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 14:52+0100\n" -"PO-Revision-Date: 2014-03-07 14:15+0000\n" +"PO-Revision-Date: 2014-03-07 14:21+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit c8b116ef61fc9bb11aaf20a09a4e1d1e0bc6294e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:42 2014 +0000 Update translations for tails-greeter_completed --- fr_CA/fr_CA.po | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index dc723b5..4a606be 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-03-04 11:11+0100\n" -"PO-Revision-Date: 2014-03-05 17:50+0000\n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-07 14:31+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -37,8 +37,8 @@ msgid "Use persistence?" msgstr "Utiliser la persistance?" #: ../glade/persistencewindow.glade.h:5 -msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Aide</a>" +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -71,8 +71,8 @@ msgstr "Mot de passe d'administration" #: ../glade/optionswindow.glade.h:4 msgid "" "<a " -"href=\"doc/first_steps/startup_options/administration_password.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Aide</a>" +"href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -93,14 +93,14 @@ msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" #: ../glade/optionswindow.glade.h:10 -msgid "Windows Camouflage" +msgid "Windows camouflage" msgstr "Camouflage Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " -"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Aide</a>" +"href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -117,8 +117,10 @@ msgid "MAC address spoofing" msgstr "Usurpation d'adresse MAC" #: ../glade/optionswindow.glade.h:15 -msgid "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Help</a>" -msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Aide</a>" +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -136,6 +138,28 @@ msgstr "Il est généralement plus sécuritaire d'usurper les adresses MAC mais msgid "Spoof all MAC addresses" msgstr "Usurper toutes les adresses MAC" +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Configuration du réseau" + +#: ../glade/optionswindow.glade.h:20 +msgid "" +"<a " +"href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" + +#: ../glade/optionswindow.glade.h:21 +msgid "" +"This computer's Internet connection is clear of obstacles. You would like to" +" connect directly to the Tor network." +msgstr "La connexion réseau de cet ordinateur est sans obstacle. Voudriez-vous vous connecter directement au réseau Tor?" + +#: ../glade/optionswindow.glade.h:22 +msgid "" +"This computer's Internet connection is censored, filtered, or proxied. You " +"need to configure bridge, firewall, or proxy settings." +msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, coupe-feu ou serveur mandataire." + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 99e57012790695e68097be760f5d3a0cee3fc768 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:39 2014 +0000 Update translations for tails-greeter --- de/de.po | 6 +++--- fr_CA/fr_CA.po | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/de/de.po b/de/de.po index 64470ac..3973041 100644 --- a/de/de.po +++ b/de/de.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 14:41+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +46,7 @@ msgstr "Persistenz benutzen?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index c0d70c8..4a606be 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 17:16+0100\n" -"PO-Revision-Date: 2014-03-07 08:52+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 14:31+0000\n" +"Last-Translator: Alain-Olivier Breysse\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" @@ -38,7 +38,7 @@ msgstr "Utiliser la persistance?" #: ../glade/persistencewindow.glade.h:5 msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -72,7 +72,7 @@ msgstr "Mot de passe d'administration" msgid "" "<a " "href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/administration_password.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -94,13 +94,13 @@ msgstr "Les mots de passe ne correspondent pas" #: ../glade/optionswindow.glade.h:10 msgid "Windows camouflage" -msgstr "" +msgstr "Camouflage Windows" #: ../glade/optionswindow.glade.h:11 msgid "" "<a " "href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -120,7 +120,7 @@ msgstr "Usurpation d'adresse MAC" msgid "" "<a " "href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -140,25 +140,25 @@ msgstr "Usurper toutes les adresses MAC" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Configuration du réseau" #: ../glade/optionswindow.glade.h:20 msgid "" "<a " "href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" -msgstr "" +msgstr "<a href=\"doc/first_steps/startup_options/network_configuration.en.html\">Documentation</a>" #: ../glade/optionswindow.glade.h:21 msgid "" "This computer's Internet connection is clear of obstacles. You would like to" " connect directly to the Tor network." -msgstr "" +msgstr "La connexion réseau de cet ordinateur est sans obstacle. Voudriez-vous vous connecter directement au réseau Tor?" #: ../glade/optionswindow.glade.h:22 msgid "" "This computer's Internet connection is censored, filtered, or proxied. You " "need to configure bridge, firewall, or proxy settings." -msgstr "" +msgstr "La connexion réseau de cet ordinateur est censurée, filtrée ou relayée par un serveur mandataire. Vous devez configurer les paramètres de pont, coupe-feu ou serveur mandataire." #: ../glade/langpanel.glade.h:1 msgid " "

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit 694dcb388759bb65501b0d3316e53418f98da379 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:34 2014 +0000 Update translations for liveusb-creator_completed --- fr_CA/fr_CA.po | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 5dadf4b..ad1c036 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 11:27+0100\n" -"PO-Revision-Date: 2014-01-11 09:30+0000\n" +"POT-Creation-Date: 2014-03-06 18:42+0100\n" +"PO-Revision-Date: 2014-03-07 14:31+0000\n" "Last-Translator: Alain-Olivier Breysse\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -258,11 +258,8 @@ msgid "No mount points found" msgstr "Aucun point de montage trouvé" #: ../liveusb/creator.py:393 -#, python-format -msgid "" -"Not enough free space on device.\n" -"%dMB ISO + %dMB overlay > %dMB free space" -msgstr "Pas assez d'espace libre sur le périphérique.\nISO de %dMo + %dMo de persistance > %dMo d'espace libre" +msgid "Not enough free space on device." +msgstr "Pas assez d'espace libre sur le dispositif." #: ../liveusb/gui.py:554 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 07 Mar '14

07 Mar '14

commit d378bc857b5362b46137aed5ef66c33748626f3b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:45:32 2014 +0000 Update translations for liveusb-creator --- fr_CA/fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/fr_CA.po b/fr_CA/fr_CA.po index 70334d0..ad1c036 100644 --- a/fr_CA/fr_CA.po +++ b/fr_CA/fr_CA.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-06 18:42+0100\n" -"PO-Revision-Date: 2014-03-07 09:10+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 14:31+0000\n" +"Last-Translator: Alain-Olivier Breysse\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" @@ -259,7 +259,7 @@ msgstr "Aucun point de montage trouvé" #: ../liveusb/creator.py:393 msgid "Not enough free space on device." -msgstr "" +msgstr "Pas assez d'espace libre sur le dispositif." #: ../liveusb/gui.py:554 msgid "Partition is FAT16; Restricting overlay size to 2G"

1 0

[flashproxy/master] add a logging timestamp, and per-connection info
by infinity0＠torproject.org 07 Mar '14

07 Mar '14

commit 9dea0c6c90dedc868dfaa84add2bfa19a2039281 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Mar 7 13:22:29 2014 +0000 add a logging timestamp, and per-connection info --- proxy/flashproxy.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 133266a..0ce3495 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -103,6 +103,8 @@ if (HEADLESS) { function puts(s) { if (DEBUG) { + s = new Date().toISOString() + " | " + s; + /* This shows up in the Web Console in Firefox and F12 developer tools in Internet Explorer. */ (console.debug || console.log).call(console, s); @@ -711,6 +713,9 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { var MAX_BUFFER = 10 * 1024 * 1024; function log(s) { + if (!SAFE_LOGGING) { + s = format_addr(client_addr) + '|' + format_addr(relay_addr) + ' : ' + s + } puts(s) }

1 0

[flashproxy/master] remove failed connections from proxy_pairs as well
by infinity0＠torproject.org 07 Mar '14

07 Mar '14

commit 05b9c101ba9afe4653d1eff6f5414f90f22ef042 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Mar 7 13:39:31 2014 +0000 remove failed connections from proxy_pairs as well - this is a pretty major fix, as the previous behaviour effectively disabled a proxy after 5 failed connections (= max_num_proxy_pairs / 2) --- proxy/flashproxy.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 0ce3495..5367dc6 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -670,8 +670,7 @@ function FlashProxy() { proxy_pair = new ProxyPair(client_addr, relay_addr, this.rate_limit); this.proxy_pairs.push(proxy_pair); - proxy_pair.complete_callback = function(event) { - puts("Complete."); + proxy_pair.cleanup_callback = function(event) { /* Delete from the list of active proxy pairs. */ this.proxy_pairs.splice(this.proxy_pairs.indexOf(proxy_pair), 1); if (this.badge) @@ -730,7 +729,7 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { this.flush_timeout_id = null; /* This callback function can be overridden by external callers. */ - this.complete_callback = function() { + this.cleanup_callback = function() { }; this.connect = function() { @@ -766,15 +765,23 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { log(ws.label + ": connected."); }.bind(this); + this.maybe_cleanup = function() { + if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { + this.running = false; + this.cleanup_callback(); + return true; + } + return false; + } + this.onclose_callback = function(event) { var ws = event.target; log(ws.label + ": closed."); this.flush(); - if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) { - this.running = false; - this.complete_callback(); + if (this.maybe_cleanup()) { + puts("Complete."); } }.bind(this); @@ -783,6 +790,11 @@ function ProxyPair(client_addr, relay_addr, rate_limit) { log(ws.label + ": error."); this.close(); + + // we can't rely on onclose_callback to cleanup, since one common error + // case is when the client fails to connect and the relay never starts. + // in that case close() is a NOP and onclose_callback is never called. + this.maybe_cleanup(); }.bind(this); this.onmessage_client_to_relay = function(event) {

1 0