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

[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

[flashproxy/master] add ChangLog entry for the browser proxy bugfix
by infinity0＠torproject.org 07 Mar '14

07 Mar '14

commit 81fa4ac056cc575bbb427bb00ba42c52614ce3b5 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Mar 7 14:30:58 2014 +0000 add ChangLog entry for the browser proxy bugfix --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5c8e54d..a7d7095 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + o Fixed a bug in the browser proxy which caused it to stop accepting + new connections once it had failed 5 previous connections. + Changes in version 1.6 o Allowed the --port-forwarding option to work when the remote port number is given as 0.

1 0

[flashproxy/master] use CONNECTIONS_PER_CLIENT and MAX_NUM_CLIENTS instead of a single MAX_NUM_PROXY_PAIRS
by infinity0＠torproject.org 07 Mar '14

07 Mar '14

commit 281c277c5e0c08a40583d3aca1f321e834e0ef34 Author: Ximin Luo <infinity0(a)torproject.org> Date: Fri Mar 7 13:51:54 2014 +0000 use CONNECTIONS_PER_CLIENT and MAX_NUM_CLIENTS instead of a single MAX_NUM_PROXY_PAIRS - the previous behaviour was misleading, max_clients was effectively half what the user specified --- proxy/flashproxy.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 5367dc6..12c4c1e 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -20,7 +20,7 @@ * * max_clients=<NUM> * How many clients to serve concurrently. The default is - * DEFAULT_MAX_NUM_PROXY_PAIRS. + * DEFAULT_MAX_NUM_CLIENTS. * * ratelimit=<FLOAT>(<UNIT>)?|off * What rate to limit all proxy traffic combined to. The special value "off" @@ -64,7 +64,11 @@ var DEFAULT_FACILITATOR_URL = DEFAULT_FACILITATOR_URL || "https://fp-facilitator.org/"; -var DEFAULT_MAX_NUM_PROXY_PAIRS = DEFAULT_MAX_NUM_PROXY_PAIRS || 10; +/* Start two connections because some versions of Tor make two PT connections: +https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html +https://trac.torproject.org/projects/tor/ticket/7733 */ +var CONNECTIONS_PER_CLIENT = 2 +var DEFAULT_MAX_NUM_CLIENTS = DEFAULT_MAX_NUM_CLIENTS || 10; var DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL = DEFAULT_INITIAL_FACILITATOR_POLL_INTERVAL || 60.0; var DEFAULT_FACILITATOR_POLL_INTERVAL = DEFAULT_FACILITATOR_POLL_INTERVAL || 3600.0; @@ -493,8 +497,8 @@ function FlashProxy() { this.fac_url = get_param_string(query, "facilitator", DEFAULT_FACILITATOR_URL); - this.max_num_proxy_pairs = get_param_integer(query, "max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); - if (this.max_num_proxy_pairs === null || this.max_num_proxy_pairs < 0) { + this.max_num_clients = get_param_integer(query, "max_clients", DEFAULT_MAX_NUM_CLIENTS); + if (this.max_num_clients === null || this.max_num_clients < 0) { puts("Error: max_clients must be a nonnegative integer."); this.die(); return; @@ -562,7 +566,7 @@ function FlashProxy() { var base_url, url; var xhr; - if (this.proxy_pairs.length >= this.max_num_proxy_pairs) { + if (this.proxy_pairs.length >= this.max_num_clients * CONNECTIONS_PER_CLIENT) { setTimeout(this.proxy_main.bind(this), this.facilitator_poll_interval * 1000); return; } @@ -657,12 +661,9 @@ function FlashProxy() { }; this.begin_proxy = function(client_addr, relay_addr) { - /* Start two proxy connections because of some versions of Tor making - two pt connections: - https://lists.torproject.org/pipermail/tor-dev/2012-December/004221.html - https://trac.torproject.org/projects/tor/ticket/7733 */ - this.make_proxy_pair(client_addr, relay_addr); - this.make_proxy_pair(client_addr, relay_addr); + for (var i=0; i<CONNECTIONS_PER_CLIENT; i++) { + this.make_proxy_pair(client_addr, relay_addr); + } }; this.make_proxy_pair = function(client_addr, relay_addr) {

1 0

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

07 Mar '14

commit 684f71074397087825bd3bff66d815765ff5d8d6 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:15:40 2014 +0000 Update translations for tails-misc_completed --- fr_CA.po | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index a180bb2..7e0372e 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-10 12:23+0100\n" -"PO-Revision-Date: 2014-01-11 08:57+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-03-06 14:52+0100\n" +"PO-Revision-Date: 2014-03-07 14:15+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" @@ -252,21 +252,21 @@ msgstr "Informations de version :\n%s" msgid "About Tails" msgstr "À propos de Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "Vos logiciels additionnels" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "La mise à niveau a échouée. Cela peut être dû à un problème réseau. Veuillez vérifier votre connexion réseau, essayer de redémarrer Tails, ou lire le journal système afin de mieux comprendre le problème." -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." msgstr "La mise à niveau a été réalisée avec succès." @@ -284,10 +284,45 @@ msgstr "Tor a besoin d'une horloge juste pour fonctionner correctement, en parti msgid "Failed to synchronize the clock!" msgstr "Échec de synchronisation de l'horloge!" +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 +msgid "Network connection blocked?" +msgstr "Connexion réseau bloquée?" + +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 +msgid "" +"It looks like you are blocked from the network. This may be related to the " +"MAC spoofing feature. For more information, see the <a " +"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" +" spoofing documentation</a>." +msgstr "Il semblerait que vous soyez bloqué du réseau. Ceci pourrait à voir avec la fonction d'usurpation d'adresse MAC. Pour plus d'informations, voir la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentation sur l'usurpation de l'adresse MAC</a>." + #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Cette version de Tails a des problèmes de sécurité connus :" +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "La carte réseau ${nic} est désactivée" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "L'usurpation de l'adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}) donc elle a été temporairement désactivée.\nVous pourriez préférer redémarrer Tails et désactiver l'usurpation de l'adresse MAC. Voir la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +msgid "All networking disabled" +msgstr "Tout le réseau est désactivé" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "L'usurpation d'adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a aussi échouée et le réseau est désactivé.\nVous pourriez préférer redémarrer Tails et désactiver l'usurpation de l'adresse MAC. Voir la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." + #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." msgstr "Démarrage de I2P..." @@ -414,10 +449,15 @@ msgstr "TrueCrypt sera bientôt enlever de Tails en raison d'inquiétudes concer msgid "Report an error" msgstr "Rapporter une erreur" -#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" msgstr "Documentation de Tails" +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "Apprenez comment utiliser Tails" + #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " msgstr "Réseau de recouvrement anonyme"

1 0

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

07 Mar '14

commit dc3f63d62d837f4b5e02ffaecd18815d5e964867 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 14:15:37 2014 +0000 Update translations for tails-misc --- fr_CA.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 42dabd6..7e0372e 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -12,8 +12,8 @@ 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 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 14:15+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" @@ -286,7 +286,7 @@ msgstr "Échec de synchronisation de l'horloge!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Connexion réseau bloquée?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -294,7 +294,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Il semblerait que vous soyez bloqué du réseau. Ceci pourrait à voir avec la fonction d'usurpation d'adresse MAC. Pour plus d'informations, voir la <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">documentation sur l'usurpation de l'adresse MAC</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -303,25 +303,25 @@ msgstr "Cette version de Tails a des problèmes de sécurité connus :" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "La carte réseau ${nic} est désactivée" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "L'usurpation de l'adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}) donc elle a été temporairement désactivée.\nVous pourriez préférer redémarrer Tails et désactiver l'usurpation de l'adresse MAC. Voir la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "" +msgstr "Tout le réseau est désactivé" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "L'usurpation d'adresse MAC a échoué pour la carte réseau ${nic_name} (${nic}). La récupération d'erreur a aussi échouée et le réseau est désactivé.\nVous pourriez préférer redémarrer Tails et désactiver l'usurpation de l'adresse MAC. Voir la <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -456,7 +456,7 @@ msgstr "Documentation de Tails" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Apprenez comment utiliser Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network "

1 0

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

07 Mar '14

commit de9197d792b18426beb72929be616da121422716 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 13:15:24 2014 +0000 Update translations for tails-greeter_completed --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index 28ce8d7..d8f61f7 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,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 12:40+0000\n" +"PO-Revision-Date: 2014-03-07 12:53+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Mar '14

commit 23fe2086e642a1ccee2c5286af6ff27a9f03099a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 13:15:20 2014 +0000 Update translations for tails-greeter --- ja/ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/ja.po b/ja/ja.po index 28ce8d7..d8f61f7 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,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 12:40+0000\n" +"PO-Revision-Date: 2014-03-07 12:53+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n"

1 0

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

07 Mar '14

commit 4cf0593fad57e743daaaaabc69963349caa0c436 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 12:45:41 2014 +0000 Update translations for tails-misc_completed --- nb.po | 58 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/nb.po b/nb.po index ffc052d..0310684 100644 --- a/nb.po +++ b/nb.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-01-29 15:05+0100\n" -"PO-Revision-Date: 2014-02-08 15:10+0000\n" +"POT-Creation-Date: 2014-03-06 14:52+0100\n" +"PO-Revision-Date: 2014-03-07 12:41+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -250,21 +250,21 @@ msgstr "Versjon informasjon:\n%s" msgid "About Tails" msgstr "Om Tails" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:115 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:121 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:118 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:124 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:128 msgid "Your additional software" msgstr "Din tilleggsprogramvare" -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:116 -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:126 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:119 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:129 msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." msgstr "Oppdateringen feilet. Dette kan skyldes et nettverksproblem. Vennligst sjekk nettverksforbindelsen din, prøv å starte Tails på nytt, eller les systemloggen for å forstå problemet bedre. " -#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:122 +#: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." msgstr "Oppgraderingen var vellykket." @@ -282,10 +282,45 @@ msgstr "Tor trenger en nøyaktig klokke for å fungere optimalt, spesielt for Hi msgid "Failed to synchronize the clock!" msgstr "Synkronisering av klokken feilet!" +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 +msgid "Network connection blocked?" +msgstr "Nettverksforbindelsen blokkert?" + +#: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 +msgid "" +"It looks like you are blocked from the network. This may be related to the " +"MAC spoofing feature. For more information, see the <a " +"href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" +" spoofing documentation</a>." +msgstr "Det ser ut til at du er blokkert fra nettverket. Dette kan være relatert til MAC-parodieringsfunksjonen. For mer informasjon se <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC-parodierings dokumentasjon</a>." + #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:" +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 +#, sh-format +msgid "Network card ${nic} disabled" +msgstr "Nettverkskort ${nic} deaktivert" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}) så det er midlertidig deaktivert.\nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 +msgid "All networking disabled" +msgstr "Alt nettverk deaktivert" + +#: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 +#, sh-format +msgid "" +"MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" +"You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." +msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}). Feilgjenopprettingen feilet også, så alt nettverk er deaktivert. \nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." + #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." msgstr "Starter I2P..." @@ -412,10 +447,15 @@ msgstr "TrueCrypt vil snart fjernes fra Tails grunnet bekymringer rundt lisens o msgid "Report an error" msgstr "Rapporter en feil" -#: ../config/chroot_local-includes/etc/skel/Desktop/Tails_documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/etc/skel/Desktop/tails-documentation.desktop.in.h:1 +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:1 msgid "Tails documentation" msgstr "Tails dokumentasjon" +#: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 +msgid "Learn how to use Tails" +msgstr "Lær hvordan du bruker Tails" + #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network " msgstr "Anonymt overlay-nettverk"

1 0

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

07 Mar '14

commit 135e85228fd8d3091748bc3a353d9b3a8d928416 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 12:45:38 2014 +0000 Update translations for tails-misc --- nb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nb.po b/nb.po index 1f85cf7..0310684 100644 --- a/nb.po +++ b/nb.po @@ -10,8 +10,8 @@ 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 08:49+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-07 12:41+0000\n" +"Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -284,7 +284,7 @@ msgstr "Synkronisering av klokken feilet!" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:38 msgid "Network connection blocked?" -msgstr "" +msgstr "Nettverksforbindelsen blokkert?" #: config/chroot_local-includes/usr/local/sbin/tails-restricted-network-detector:40 msgid "" @@ -292,7 +292,7 @@ msgid "" "MAC spoofing feature. For more information, see the <a " "href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC" " spoofing documentation</a>." -msgstr "" +msgstr "Det ser ut til at du er blokkert fra nettverket. Dette kan være relatert til MAC-parodieringsfunksjonen. For mer informasjon se <a href=\\\"file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html#blocked\\\">MAC-parodierings dokumentasjon</a>." #: config/chroot_local-includes/usr/local/bin/tails-security-check:145 msgid "This version of Tails has known security issues:" @@ -301,25 +301,25 @@ msgstr "Denne versjonen av Tails har kjente sikkerhetsproblem:" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:29 #, sh-format msgid "Network card ${nic} disabled" -msgstr "" +msgstr "Nettverkskort ${nic} deaktivert" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:30 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}) so it is temporarily disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}) så det er midlertidig deaktivert.\nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/tails/website/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:39 msgid "All networking disabled" -msgstr "" +msgstr "Alt nettverk deaktivert" #: config/chroot_local-includes/usr/local/sbin/tails-spoof-mac:40 #, sh-format msgid "" "MAC spoofing failed for network card ${nic_name} (${nic}). The error recovery also failed so all networking is disabled.\n" "You might prefer to restart Tails and disable MAC spoofing. See the <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>documentation</a>." -msgstr "" +msgstr "MAC-parodiering feilet for nettverkskort ${nic_name} (${nic}). Feilgjenopprettingen feilet også, så alt nettverk er deaktivert. \nDet anbefales å starte Tails på nytt og deaktivere MAC-parodiering. Se <a href='file:///usr/share/doc/first_steps/startup_options/mac_spoofing.en.html'>dokumentasjonen</a>." #: config/chroot_local-includes/usr/local/bin/tails-start-i2p:62 msgid "Starting I2P..." @@ -454,7 +454,7 @@ msgstr "Tails dokumentasjon" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails" -msgstr "" +msgstr "Lær hvordan du bruker Tails" #: ../config/chroot_local-includes/usr/share/applications/i2p.desktop.in.h:1 msgid "Anonymous overlay network "

1 0

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

07 Mar '14

commit dae250fe1949d74cfa2b1bdd3ca26a605714353b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 7 12:45:25 2014 +0000 Update translations for tails-greeter_completed --- ja/ja.po | 48 ++++++++++++++++++++++++++++++++++++------------ nb/nb.po | 46 +++++++++++++++++++++++++++++++++++----------- 2 files changed, 71 insertions(+), 23 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 869a670..28ce8d7 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -8,8 +8,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:00+0000\n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-07 12:40+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -35,8 +35,8 @@ msgid "Use persistence?" msgstr "永続性を使用しますか？" #: ../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\">ヘルプ</a>" +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">ドキュメント</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -69,8 +69,8 @@ msgstr "管理者パスワード" #: ../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\">ヘルプ</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\">ドキュメント</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -91,14 +91,14 @@ msgid "Passwords do not match" msgstr "パスワードが一致しません" #: ../glade/optionswindow.glade.h:10 -msgid "Windows Camouflage" -msgstr "Windowsカモフラージュ" +msgid "Windows camouflage" +msgstr "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\">ヘルプ</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\">ドキュメント</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -115,8 +115,10 @@ msgid "MAC address spoofing" msgstr "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\">ヘルプ</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\">ドキュメント</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -134,6 +136,28 @@ msgstr "普通は MAC アドレスをスプーフィングするほうが安全 msgid "Spoof all MAC addresses" msgstr "すべての MAC アドレスをスプーフィングする" +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "ネットワーク設定" + +#: ../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\">ドキュメント</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 "このコンピューターのインターネット接続には障害がありません。 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 "このコンピューターのインターネット接続は検閲されているか、フィルターされているか、プロキシを通します。ブリッジないしファイアーウォール、プロキシ設定を構成する必要があります。" + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " " diff --git a/nb/nb.po b/nb/nb.po index d182ff6..b8b0702 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -8,8 +8,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 09:00+0000\n" +"POT-Creation-Date: 2014-03-06 17:16+0100\n" +"PO-Revision-Date: 2014-03-07 12:30+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -35,8 +35,8 @@ msgid "Use persistence?" msgstr "Bruke vedvarende lagring?" #: ../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\">Hjelp</a>" +msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>" +msgstr "<a href=\"doc/first_steps/persistence/use.en.html\">Dokumentasjon</a>" #: ../glade/persistencewindow.glade.h:6 msgid "Yes" @@ -69,8 +69,8 @@ msgstr "Administratorpassord" #: ../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\">Hjelp</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\">Dokumentasjon</a>" #: ../glade/optionswindow.glade.h:5 msgid "" @@ -91,14 +91,14 @@ msgid "Passwords do not match" msgstr "Passordene samsvarer ikke" #: ../glade/optionswindow.glade.h:10 -msgid "Windows Camouflage" +msgid "Windows camouflage" msgstr "Windows-kamuflasje" #: ../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\">Hjelp</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\">Dokumentasjon</a>" #: ../glade/optionswindow.glade.h:12 msgid "" @@ -115,8 +115,10 @@ msgid "MAC address spoofing" msgstr "MAC-adresse parodiering" #: ../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\">Hjelp</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\">Dokumentasjon</a>" #: ../glade/optionswindow.glade.h:16 msgid "" @@ -134,6 +136,28 @@ msgstr "Det er generelt tryggere å parodiere MAC-adresser, men det kan også vi msgid "Spoof all MAC addresses" msgstr "Parodier alle MAC-adresser" +#: ../glade/optionswindow.glade.h:19 +msgid "Network configuration" +msgstr "Nettverkskonfigurasjon" + +#: ../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\">Dokumentasjon</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 "Denne datamaskinens internettforbindelse er uten hindringer. Du ønsker å koble direkte til Tor-nettverket." + +#: ../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 "Denne datamaskinens internettforbindelse er sensurert, filtrert eller går via en proxy. Du må konfigurere bro, brannmur, eller proxy-innstillinger. " + #: ../glade/langpanel.glade.h:1 msgid " " msgstr " "

1 0