- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Jun '12

23 Jun '12

commit fb823211d9eec98883b3e81946d6ab3cf285a81f Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 21:45:10 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index bea72fe..68f0ec4 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-06-23 16:49+0000\n" +"PO-Revision-Date: 2012-06-23 21:44+0000\n" "Last-Translator: Knut Ole <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -197,7 +197,7 @@ msgstr "Velg en fil for Tors kontaktplugg (socket)" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Konfigurér KontrollPorten automatisk" msgctxt "AdvancedPage" msgid "" @@ -1312,20 +1312,20 @@ msgstr "Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia man msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Vennligst fyll inn en melding på:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" "A crash report has been created that you can send to the Vidalia developers " "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." -msgstr "" +msgstr "Det er opprettet en krasj-rapport som du kan sende til Vidalia-utviklerene for å hjelpe dem med å identifisere og rette problemet. Rapporten inneholder ingen informasjon som kan identifisere deg overhodet." msgctxt "CrashReportDialog" msgid "" @@ -3456,7 +3456,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "" +msgstr "Ditt relay er nå koblet til nettet og klart til bruk for andre i Tor-nettverket. Du burde se en økning i internett-trafikk i trafikk-grafen i løpet av noen timer, etter som flere og flere brukere får vite om ditt relay. Takk for at du bidrar til Tor-nettverket!" msgctxt "Stream" msgid "New" @@ -3512,37 +3512,37 @@ msgstr "Feil ved kryptering av kontrollpassord." msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "Redigér torrc" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." -msgstr "" +msgstr "Lagre innstillinger. Hvis ikke valgt, vil endringene kun gjelde nå og ikke for fremtidig bruk av Tor." msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Klipp ut" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Kopier" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Lim inn" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Angre" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Gjør om" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Velg alt" msgctxt "TorrcDialog" msgid "Apply all" @@ -3554,7 +3554,7 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "Feil ved tilkobling til Tor" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" @@ -3562,15 +3562,15 @@ msgstr "" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "Feil i linje %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Feil" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "En feil oppstod under åpning av torrc filen" msgctxt "UPNPControl" msgid "Success"

1 0

[tor/master] Catch a few more K&R violations with make check-spaces
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a6688c574e569a2a018038414198ab440344ba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:51:48 2012 -0400 Catch a few more K&R violations with make check-spaces We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful. --- contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index a18df99..682dbce 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -32,10 +32,18 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. + ## Warn about #else #if instead of #elif. if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; } + ## Warn about some K&R violations + if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and + $lastline !~ /\{$/) { + print "non-K&R {:$fn:$.\n"; + } + if (/^\s*else/ and $lastline =~ /\}$/) { + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. if ($lastnil && /^\s*}\n/) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956..074b78d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b..95ac8d6 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f3024..d178508 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 8e5d3cab2636aa7a41fd14a09e027cee9fe42df2 Merge: 95ad59f a6688c5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:54:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.3] Catch a few more K&R violations with make check-spaces
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit a6688c574e569a2a018038414198ab440344ba95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:51:48 2012 -0400 Catch a few more K&R violations with make check-spaces We now catch bare {s that should be on the previous line with a do, while, if, or for, and elses that should share a line with their preceding }. That is, if (foo) { and if (foo) { ... } else are now detected. We should think about maybe making Tor uncrustify-clean some day, but configuring uncrustify is an exercise in bizarreness, and reformatting huge gobs of Tor is always painful. --- contrib/checkSpace.pl | 10 +++++++++- src/or/circuitbuild.c | 3 +-- src/or/main.c | 3 +-- src/or/nodelist.c | 3 +-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index a18df99..682dbce 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -32,10 +32,18 @@ for $fn (@ARGV) { if ($C && /\s(?:if|while|for|switch)\(/) { print " KW(:$fn:$.\n"; } - ## Warn about #else #if instead of #elif. + ## Warn about #else #if instead of #elif. if (($lastline =~ /^\# *else/) and ($_ =~ /^\# *if/)) { print " #else#if:$fn:$.\n"; } + ## Warn about some K&R violations + if (/^\s+\{/ and $lastline =~ /^\s*(if|while|for|else if)/ and + $lastline !~ /\{$/) { + print "non-K&R {:$fn:$.\n"; + } + if (/^\s*else/ and $lastline =~ /\}$/) { + print " }\\nelse:$fn:$.\n"; + } $lastline = $_; ## Warn about unnecessary empty lines. if ($lastnil && /^\s*}\n/) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfd1956..074b78d 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -5602,8 +5602,7 @@ rewrite_node_address_for_bridge(const bridge_info_t *bridge, node_t *node) /* XXXipv6 we lack support for falling back to another address for the same relay, warn the user */ - if (!tor_addr_is_null(&ri->ipv6_addr)) - { + if (!tor_addr_is_null(&ri->ipv6_addr)) { tor_addr_port_t ap; router_get_pref_orport(ri, &ap); log_notice(LD_CONFIG, diff --git a/src/or/main.c b/src/or/main.c index 1f3117b..95ac8d6 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2597,8 +2597,7 @@ tor_main(int argc, char *argv[]) // a file on a folder shared by the wm emulator. // if no flashcard (real or emulated) is present, // log files will be written in the root folder - if (find_flashcard_path(path,MAX_PATH) == -1) - { + if (find_flashcard_path(path,MAX_PATH) == -1) { redir = _wfreopen( L"\\stdout.log", L"w", stdout ); redirdbg = _wfreopen( L"\\stderr.log", L"w", stderr ); } else { diff --git a/src/or/nodelist.c b/src/or/nodelist.c index f7f3024..d178508 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -689,8 +689,7 @@ node_get_prim_orport(const node_t *node, tor_addr_port_t *ap_out) { if (node->ri) { router_get_prim_orport(node->ri, ap_out); - } - else if (node->rs) { + } else if (node->rs) { tor_addr_from_ipv4h(&ap_out->addr, node->rs->addr); ap_out->port = node->rs->or_port; }

1 0

[tor/master] fix broken utf8-ism
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit ce44346aa5b4dddf37aff992755ef472d0d1f5a2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:42:18 2012 -0400 fix broken utf8-ism --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90d6084..e2e9f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,7 +287,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 0.2.2.11-alpha. - Correctly handle checking the permissions on the parent directory of a control socket in the root directory. Bug found - by Esteban Manchado VelÃ¡zquez. Fixes bug 5089; bugfix on Tor + by Esteban Manchado Velázquez. Fixes bug 5089; bugfix on Tor 0.2.2.26-beta. - When told to add a bridge with the same digest as a preexisting bridge but a different addr:port, change the addr:port as

1 0

[tor/master] Merge branch 'maint-0.2.3'
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit 95ad59fa79cba73a6916b5deccee12b541d5f756 Merge: db9ce36 ce44346 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:46:29 2012 -0400 Merge branch 'maint-0.2.3' ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.3] fix broken utf8-ism
by arma＠torproject.org 23 Jun '12

23 Jun '12

commit ce44346aa5b4dddf37aff992755ef472d0d1f5a2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jun 23 15:42:18 2012 -0400 fix broken utf8-ism --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90d6084..e2e9f45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,7 +287,7 @@ Changes in version 0.2.3.16-alpha - 2012-06-05 0.2.2.11-alpha. - Correctly handle checking the permissions on the parent directory of a control socket in the root directory. Bug found - by Esteban Manchado VelÃ¡zquez. Fixes bug 5089; bugfix on Tor + by Esteban Manchado Velázquez. Fixes bug 5089; bugfix on Tor 0.2.2.26-beta. - When told to add a bridge with the same digest as a preexisting bridge but a different addr:port, change the addr:port as

1 0

[tor/master] Improve log message issued when a managed proxy fails to launch.
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit 8c3a4a1d21870254b38327a859bd27026058f3b2 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Jun 23 17:36:16 2012 +0300 Improve log message issued when a managed proxy fails to launch. --- changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 new file mode 100644 index 0000000..ddcd03a --- /dev/null +++ b/changes/bug5099 @@ -0,0 +1,3 @@ + o Minor features: + - Improve log message issued when a managed proxy fails to + launch. Resolves ticket 5099. diff --git a/src/or/transports.c b/src/or/transports.c index 1522756..e43ec6c 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -697,7 +697,19 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) return; } else if (!strcmpstart(line, SPAWN_ERROR_MESSAGE)) { - log_warn(LD_GENERAL, "Could not launch managed proxy executable!"); + /* managed proxy launch failed: parse error message to learn why. */ + int retval, child_state, saved_errno; + retval = tor_sscanf(line, SPAWN_ERROR_MESSAGE "%x/%x", + &child_state, &saved_errno); + if (retval == 2) { + log_warn(LD_GENERAL, + "Could not launch managed proxy executable at '%s' ('%s').", + mp->argv[0], strerror(saved_errno)); + } else { /* failed to parse error message */ + log_warn(LD_GENERAL,"Could not launch managed proxy executable at '%s'.", + mp->argv[0]); + } + mp->conf_state = PT_PROTO_FAILED_LAUNCH; return; }

1 0

[tor/master] Tweak bug5099 changes file
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit f54ac08846b98465c9d29842df0583cea98a923c Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:10:43 2012 -0400 Tweak bug5099 changes file --- changes/bug5099 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug5099 b/changes/bug5099 index ddcd03a..4c46a39 100644 --- a/changes/bug5099 +++ b/changes/bug5099 @@ -1,3 +1,3 @@ - o Minor features: + o Minor bugfixes: - Improve log message issued when a managed proxy fails to - launch. Resolves ticket 5099. + launch. Fixes bug 5099; bugfix on 0.2.3.6-alpha.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 23 Jun '12

23 Jun '12

commit db9ce36b2576144c0fd2ab48de1915cdb008bd2a Merge: 7761c1d d0243e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Jun 23 15:37:57 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug5099 | 3 +++ src/or/transports.c | 14 +++++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-)

1 0