- tor-commits - lists.torproject.org

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

22 Jun '12

commit a08bbefa9b6d9bf9693ea63e212d7817228e4a3d Merge: f96f319 4a7e412 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:23:20 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug5557 | 3 + src/common/util.c | 148 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/util.h | 2 + src/test/test_util.c | 49 +++++++++++++++-- 4 files changed, 173 insertions(+), 29 deletions(-)

1 0

[tor/maint-0.2.3] Make format_helper_exit_status() avoid unnecessary spaces
by nickm＠torproject.org 22 Jun '12

22 Jun '12

commit 4c62cc6f9997c215ff2687ce342e00d630d922c7 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Tue Jun 19 04:07:30 2012 -0700 Make format_helper_exit_status() avoid unnecessary spaces --- changes/bug5557 | 3 + src/common/util.c | 100 ++++++++++++++++++++++++++++++++++++++----------- src/test/test_util.c | 10 ++-- 3 files changed, 85 insertions(+), 28 deletions(-) diff --git a/changes/bug5557 b/changes/bug5557 new file mode 100644 index 0000000..c73fbe2 --- /dev/null +++ b/changes/bug5557 @@ -0,0 +1,3 @@ + o Minor bugfixes + - Make format_helper_exit_status() avoid unnecessary space padding and + stop confusing log_from_pipe(). Fixes ticket 5557. diff --git a/src/common/util.c b/src/common/util.c index 28ecff3..63a8aff 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3208,8 +3208,9 @@ void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno) { - unsigned int unsigned_errno; - char *cur; + unsigned int unsigned_errno, len, tmp_uint; + char *cur, *tmp; + unsigned char tmp_uchar; size_t i; /* Fill hex_errno with spaces, and a trailing newline (memset may @@ -3225,35 +3226,88 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, unsigned_errno = (unsigned int) saved_errno; } - /* Convert errno to hex (start before \n) */ - cur = hex_errno + HEX_ERRNO_SIZE - 2; + /* How many chars do we need for child_state ? */ + if ( child_state > 0 ) { + len = 0; + tmp_uchar = child_state; + while (tmp_uchar > 0) { + tmp_uchar >>= 4; + ++len; + } + } + else len = 1; - /* Check for overflow on first iteration of the loop */ - if (cur < hex_errno) - return; + /* Bail if we would go past the end (on this or the '/') */ + if ( len + 2 > HEX_ERRNO_SIZE) + goto err; + + /* Point to last one */ + cur = hex_errno + len - 1; + /* Convert child_state to hex */ do { - *cur-- = "0123456789ABCDEF"[unsigned_errno % 16]; - unsigned_errno /= 16; - } while (unsigned_errno != 0 && cur >= hex_errno); + *cur-- = "0123456789ABCDEF"[child_state & 0xf]; + child_state >>= 4; + } while (child_state != 0 && cur >= hex_errno); - /* Prepend the minus sign if errno was negative */ - if (saved_errno < 0 && cur >= hex_errno) - *cur-- = '-'; + /* Check for overflow on first iteration of the loop */ + if (cur + 1 < hex_errno) + goto err; - /* Leave a gap */ - if (cur >= hex_errno) - *cur-- = '/'; + /* Now the '/' */ + hex_errno[len] = '/'; - /* Check for overflow on first iteration of the loop */ - if (cur < hex_errno) - return; + /* Save a pointer to the start of second number */ + tmp = hex_errno + len; - /* Convert child_state to hex */ + /* How many chars do we need for unsigned_errno? */ + if ( unsigned_errno > 0 ) { + len = 0; + tmp_uint = unsigned_errno; + while (tmp_uint > 0) { + tmp_uint >>= 4; + ++len; + } + } + else len = 1; + + /* Need minus? */ + if (saved_errno < 0) { + if ( tmp + 1 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + goto err; + + *(++tmp) = '-'; + } + + /* Last check for space */ + if ( tmp + len + 2 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + goto err; + + /* Point to last one */ + cur = tmp + len; + + /* Convert unsigned_errno to hex */ do { - *cur-- = "0123456789ABCDEF"[child_state % 16]; - child_state /= 16; - } while (child_state != 0 && cur >= hex_errno); + *cur-- = "0123456789ABCDEF"[unsigned_errno & 0xf]; + unsigned_errno >>= 4; + } while (unsigned_errno != 0 && cur >= tmp); + + /* Emit the newline and NUL */ + cur = tmp + len; + *(++cur) = '\n'; + *(++cur) = '\0'; + + goto done; + +err: + /* + * In error exit, just write a '\0' in the first char so whatever called + * this at least won't fall off the end. + */ + *hex_errno = '\0'; + +done: + return; } /* Maximum number of file descriptors, if we cannot get it via sysconf() */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 7484b9e..a3a5450 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2143,11 +2143,11 @@ test_util_exit_status(void *ptr) clear_hex_errno(hex_errno); format_helper_exit_status(0, 0, hex_errno); - test_streq(" 0/0\n", hex_errno); + test_streq("0/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0, 0x7FFFFFFF, hex_errno); - test_streq(" 0/7FFFFFFF\n", hex_errno); + test_streq("0/7FFFFFFF\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0xFF, -0x80000000, hex_errno); @@ -2155,11 +2155,11 @@ test_util_exit_status(void *ptr) clear_hex_errno(hex_errno); format_helper_exit_status(0x7F, 0, hex_errno); - test_streq(" 7F/0\n", hex_errno); + test_streq("7F/0\n", hex_errno); clear_hex_errno(hex_errno); format_helper_exit_status(0x08, -0x242, hex_errno); - test_streq(" 8/-242\n", hex_errno); + test_streq("8/-242\n", hex_errno); done: ; @@ -2357,7 +2357,7 @@ test_util_spawn_background_fail(void *ptr) tor_snprintf(code, sizeof(code), "%x/%x", 9 /* CHILD_STATE_FAILEXEC */ , ENOENT); tor_snprintf(expected_out, sizeof(expected_out), - "ERR: Failed to spawn background process - code %12s\n", code); + "ERR: Failed to spawn background process - code %s\n", code); run_util_spawn_background(argv, expected_out, expected_err, 255, expected_status);

1 0

[tor/maint-0.2.3] Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c
by nickm＠torproject.org 22 Jun '12

22 Jun '12

commit c21af69f29ca5a55385a926fdac4a8e6c8fb6d37 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 20 14:43:50 2012 -0700 Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c --- src/common/util.c | 154 +++++++++++++++++++++++++++++++++-------------------- src/common/util.h | 2 + 2 files changed, 99 insertions(+), 57 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 63a8aff..79e7a70 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3191,6 +3191,61 @@ tor_join_win_cmdline(const char *argv[]) return joined_argv; } +/** + * Helper function to output hex numbers, called by + * format_helper_exit_status(). This writes the hexadecimal digits of x into + * buf, up to max_len digits, and returns the actual number of digits written. + * If there is insufficient space, it will write nothing and return 0. + * + * This accepts an unsigned int because format_helper_exit_status() needs to + * call it with a signed int and an unsigned char, and since the C standard + * does not guarantee that an int is wider than a char (an int must be at + * least 16 bits but it is permitted for a char to be that wide as well), we + * can't assume a signed int is sufficient to accomodate an unsigned char. + * Thus, format_helper_exit_status() will still need to emit any require '-' + * on its own. + */ + +int +format_hex_number_for_helper_exit_status(unsigned int x, char *buf, + int max_len) +{ + int len; + unsigned int tmp; + char *cur; + + /* Sanity check */ + if (!buf || max_len <= 0) + return 0; + + /* How many chars do we need for x? */ + if (x > 0) { + len = 0; + tmp = x; + while (tmp > 0) { + tmp >>= 4; + ++len; + } + } + else len = 1; + + /* Bail if we would go past the end of the buffer */ + if (len > max_len) + return 0; + + /* Point to last one */ + cur = buf + len - 1; + + /* Convert x to hex */ + do { + *cur-- = "0123456789ABCDEF"[x & 0xf]; + x >>= 4; + } while (x != 0 && cur >= buf); + + /* Return len */ + return len; +} + /** Format child_state and saved_errno as a hex string placed in * hex_errno. Called between fork and _exit, so must be signal-handler * safe. @@ -3208,9 +3263,9 @@ void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno) { - unsigned int unsigned_errno, len, tmp_uint; - char *cur, *tmp; - unsigned char tmp_uchar; + unsigned int unsigned_errno; + int written, left; + char *cur; size_t i; /* Fill hex_errno with spaces, and a trailing newline (memset may @@ -3226,87 +3281,72 @@ format_helper_exit_status(unsigned char child_state, int saved_errno, unsigned_errno = (unsigned int) saved_errno; } - /* How many chars do we need for child_state ? */ - if ( child_state > 0 ) { - len = 0; - tmp_uchar = child_state; - while (tmp_uchar > 0) { - tmp_uchar >>= 4; - ++len; - } - } - else len = 1; + /* + * Count how many chars of space we have left, and keep a pointer into the + * current point in the buffer. + */ + left = HEX_ERRNO_SIZE; + cur = hex_errno; - /* Bail if we would go past the end (on this or the '/') */ - if ( len + 2 > HEX_ERRNO_SIZE) + /* Emit child_state */ + written = format_hex_number_for_helper_exit_status(child_state, + cur, left); + if (written <= 0) goto err; - /* Point to last one */ - cur = hex_errno + len - 1; - - /* Convert child_state to hex */ - do { - *cur-- = "0123456789ABCDEF"[child_state & 0xf]; - child_state >>= 4; - } while (child_state != 0 && cur >= hex_errno); - - /* Check for overflow on first iteration of the loop */ - if (cur + 1 < hex_errno) + /* Adjust left and cur */ + left -= written; + cur += written; + if (left <= 0) goto err; /* Now the '/' */ - hex_errno[len] = '/'; - - /* Save a pointer to the start of second number */ - tmp = hex_errno + len; + *cur = '/'; - /* How many chars do we need for unsigned_errno? */ - if ( unsigned_errno > 0 ) { - len = 0; - tmp_uint = unsigned_errno; - while (tmp_uint > 0) { - tmp_uint >>= 4; - ++len; - } - } - else len = 1; + /* Adjust left and cur */ + ++cur; + --left; + if (left <= 0) + goto err; /* Need minus? */ if (saved_errno < 0) { - if ( tmp + 1 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + *cur = '-'; + ++cur; + --left; + if (left <= 0) goto err; - - *(++tmp) = '-'; } - /* Last check for space */ - if ( tmp + len + 2 - hex_errno > (ptrdiff_t)(HEX_ERRNO_SIZE) ) + /* Emit unsigned_errno */ + written = format_hex_number_for_helper_exit_status(unsigned_errno, + cur, left); + + if (written <= 0) goto err; - /* Point to last one */ - cur = tmp + len; + /* Adjust left and cur */ + left -= written; + cur += written; - /* Convert unsigned_errno to hex */ - do { - *cur-- = "0123456789ABCDEF"[unsigned_errno & 0xf]; - unsigned_errno >>= 4; - } while (unsigned_errno != 0 && cur >= tmp); + /* Check that we have enough space left for a newline */ + if (left <= 0) + goto err; /* Emit the newline and NUL */ - cur = tmp + len; - *(++cur) = '\n'; - *(++cur) = '\0'; + *cur++ = '\n'; + *cur++ = '\0'; goto done; -err: + err: /* * In error exit, just write a '\0' in the first char so whatever called * this at least won't fall off the end. */ *hex_errno = '\0'; -done: + done: return; } diff --git a/src/common/util.h b/src/common/util.h index a2b196c..6b7c6fb 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -471,6 +471,8 @@ void tor_process_handle_destroy(process_handle_t *process_handle, #ifdef UTIL_PRIVATE /* Prototypes for private functions only used by util.c (and unit tests) */ +int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, + int max_len); void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno);

1 0

[tor/maint-0.2.3] Add unit test for format_hex_number_for_helper_exit_status()
by nickm＠torproject.org 22 Jun '12

22 Jun '12

commit 770374a6b3e6a60b65cf9616755b018f93a17d26 Author: Andrea Shepard <andrea(a)persephoneslair.org> Date: Wed Jun 20 18:38:07 2012 -0700 Add unit test for format_hex_number_for_helper_exit_status() --- src/test/test_util.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index a3a5450..d71d280 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2465,6 +2465,44 @@ test_util_spawn_background_partial_read(void *ptr) } /** + * Test for format_hex_number_for_helper_exit_status() + */ + +static void +test_util_format_hex_number(void *ptr) +{ + int i, len; + char buf[HEX_ERRNO_SIZE + 1]; + const struct { + const char *str; + unsigned int x; + } test_data[] = { + {"0", 0}, + {"1", 1}, + {"273A", 0x273a}, + {"FFFF", 0xffff}, +#if UINT_MAX >= 0xffffffff + {"31BC421D", 0x31bc421d}, + {"FFFFFFFF", 0xffffffff}, +#endif + {NULL, 0} + }; + + (void)ptr; + + for (i = 0; test_data[i].str != NULL; ++i) { + len = format_hex_number_for_helper_exit_status(test_data[i].x, + buf, HEX_ERRNO_SIZE); + test_neq(len, 0); + buf[len] = '\0'; + test_streq(buf, test_data[i].str); + } + + done: + return; +} + +/** * Test that we can properly format q Windows command line */ static void @@ -3031,6 +3069,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(spawn_background_ok, 0), UTIL_TEST(spawn_background_fail, 0), UTIL_TEST(spawn_background_partial_read, 0), + UTIL_TEST(format_hex_number, 0), UTIL_TEST(join_win_cmdline, 0), UTIL_TEST(split_lines, 0), UTIL_TEST(n_bits_set, 0),

1 0

[tor/maint-0.2.3] Style tweaks and add a warning about NUL-termination
by nickm＠torproject.org 22 Jun '12

22 Jun '12

commit 4a7e4129af6db990b9672b6d4f013b2e59aa81b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 22 22:17:24 2012 -0400 Style tweaks and add a warning about NUL-termination --- src/common/util.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 79e7a70..cb8ff85 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -3197,6 +3197,9 @@ tor_join_win_cmdline(const char *argv[]) * buf, up to max_len digits, and returns the actual number of digits written. * If there is insufficient space, it will write nothing and return 0. * + * This function DOES NOT add a terminating NUL character to its output: be + * careful! + * * This accepts an unsigned int because format_helper_exit_status() needs to * call it with a signed int and an unsigned char, and since the C standard * does not guarantee that an int is wider than a char (an int must be at @@ -3204,8 +3207,11 @@ tor_join_win_cmdline(const char *argv[]) * can't assume a signed int is sufficient to accomodate an unsigned char. * Thus, format_helper_exit_status() will still need to emit any require '-' * on its own. + * + * For most purposes, you'd want to use tor_snprintf("%x") instead of this + * function; it's designed to be used in code paths where you can't call + * arbitrary C functions. */ - int format_hex_number_for_helper_exit_status(unsigned int x, char *buf, int max_len) @@ -3226,8 +3232,9 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf, tmp >>= 4; ++len; } + } else { + len = 1; } - else len = 1; /* Bail if we would go past the end of the buffer */ if (len > max_len) @@ -3258,7 +3265,6 @@ format_hex_number_for_helper_exit_status(unsigned int x, char *buf, * CHILD_STATE_* macros for definition), and SAVED_ERRNO is the value of * errno when the failure occurred. */ - void format_helper_exit_status(unsigned char child_state, int saved_errno, char *hex_errno)

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 22 Jun '12

22 Jun '12

commit 42387b406c69e0f0c807464f335ff99168b9b71e Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 02:15:27 2012 +0000 Update translations for torcheck_completed --- nb/torcheck.po | 52 +++++++++++++++++++++------------------------------- 1 files changed, 21 insertions(+), 31 deletions(-) diff --git a/nb/torcheck.po b/nb/torcheck.po index c3708bd..326a9d6 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -1,15 +1,16 @@ # TorCheck gettext template -# Copyright (C) 2008 Jacob Appelbaum +# Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: # <kmdl(a)hotmail.no>, 2012. +# Knut Ole <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2008-04-24 20:28+PDT\n" -"PO-Revision-Date: 2012-02-14 10:00+0000\n" -"Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2012-06-23 01:50+0000\n" +"Last-Translator: Knut Ole <>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,8 +24,17 @@ msgstr "Gratulerer! Din nettleser er konfigurert for bruk av Tor." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " -"for further information about using Tor safely." -msgstr "Vennligst se <a href=\"https://www.torproject.org/\">Tor nettsiden</a> for mer informasjon om trygg bruk av Tor." +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "Vennligst gå til <a href=\"https://www.torproject.org/\">Tor nettsiden</a> for mer informasjon om hvordan bruke Tor på en sikker måte. Du kan nå fritt surfe anonymt på Internett." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "En sikkerhetsoppdatering er tilgjengelig for Tor Nettleser Pakken." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Trykk her for å gå til nedlastningssiden.</a>" msgid "Sorry. You are not using Tor." msgstr "Beklager. Du bruker ikke Tor." @@ -32,37 +42,17 @@ msgstr "Beklager. Du bruker ikke Tor." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" -" " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instructions" -" for configuring your Tor client</a>." -msgstr "Hvis du prøver å bruke en Tor-klient, vennligst se <a href=\"https://www.torproject.org/\">Tor nettsiden</a> og spesielt <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#ItDoesntWork\">instruksjoner for oppsett av Tor-klienten</a>." +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "Hvis du forsøker å bruke Tor, vennligst gå til <a href=\"https://www.torproject.org/\">Tor prosjektets nettside</a> og spesifikt til <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjonene for å konfigurere din Tor-klient.</a>" msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager, søket mislyktes eller et uventet svar ble mottatt." msgid "" "A temporary service outage prevents us from determining if your source IP " -"address is a <a href=\"https://www.torproject.org/\">Tor</a> node. For " -"other ways to test whether you are using Tor, please visit <a " -"href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">this" -" FAQ entry</a>." -msgstr "Et midlertidig avbrudd i tjenesten hindrer oss i å avgjøre om din IP-adresse er en <a href=\"https://www.torproject.org/\">Tor</a> node. For andre måter å sjekke om du bruker Tor, se <a href=\"https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ#IsMyConnectionPri…">denne FAQ oppføringen</a>." - -msgid "Additional information: " -msgstr "Ekstra informasjon:" +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "En midlertidig feil på denne tjenesten hindrer oss i å avgjøre om din avsender IP-adresse er en <a href=\"https://www.torproject.org/\">Tor</a> node." msgid "Your IP address appears to be: " msgstr "IP-adressen din ser ut til å være:" - -msgid "" -"This small script is powered by <a " -"href=\"http://exitlist.torproject.org/\">tordnsel</a>" -msgstr "Dette lille scriptet er drevet av <a href=\"http://exitlist.torproject.org/\">tordnsel</a>" - -msgid "" -"You may also be interested in the <a href=\"/cgi-" -"bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" -msgstr "Du er kanskje også interessert i <a href=\"/cgi-bin/TorBulkExitList.py\">Tor Bulk Exit List Exporter</a>" - -msgid "This server does not log any information about visitors." -msgstr "Denne serveren lagrer ingen informasjon om besøkende."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 22 Jun '12

22 Jun '12

commit 2979b6bf163a1ad2495085b2c6b739cb8dc257c8 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 02:15:26 2012 +0000 Update translations for torcheck --- nb/torcheck.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nb/torcheck.po b/nb/torcheck.po index 177e43c..326a9d6 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-06-23 01:43+0000\n" +"PO-Revision-Date: 2012-06-23 01:50+0000\n" "Last-Translator: Knut Ole <>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -29,7 +29,7 @@ msgid "" msgstr "Vennligst gå til <a href=\"https://www.torproject.org/\">Tor nettsiden</a> for mer informasjon om hvordan bruke Tor på en sikker måte. Du kan nå fritt surfe anonymt på Internett." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "En sikkerhetsoppdatering er tilgjengelig for Tor Nettleser Pakken." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -44,7 +44,7 @@ msgid "" "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "Hvis du forsøker å bruke Tor, vennligst gå til <a href=\"https://www.torproject.org/\">Tor prosjektets nettside</a> og spesifikt til <a href=\"https://www.torproject.org/docs/faq#DoesntWork\">instruksjonene for å konfigurere din Tor-klient.</a>" msgid "Sorry, your query failed or an unexpected response was received." msgstr "Beklager, søket mislyktes eller et uventet svar ble mottatt." @@ -52,7 +52,7 @@ msgstr "Beklager, søket mislyktes eller et uventet svar ble mottatt." msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "En midlertidig feil på denne tjenesten hindrer oss i å avgjøre om din avsender IP-adresse er en <a href=\"https://www.torproject.org/\">Tor</a> node." msgid "Your IP address appears to be: " msgstr "IP-adressen din ser ut til å være:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 22 Jun '12

22 Jun '12

commit 7a2be8fae97c960ec324d9410b46e25430dd5dfa Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 01:45:23 2012 +0000 Update translations for torcheck --- nb/torcheck.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nb/torcheck.po b/nb/torcheck.po index 70966ce..177e43c 100644 --- a/nb/torcheck.po +++ b/nb/torcheck.po @@ -3,13 +3,14 @@ # # Translators: # <kmdl(a)hotmail.no>, 2012. +# Knut Ole <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 09:03+0000\n" -"Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" +"PO-Revision-Date: 2012-06-23 01:43+0000\n" +"Last-Translator: Knut Ole <>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "Vennligst gå til <a href=\"https://www.torproject.org/\">Tor nettsiden</a> for mer informasjon om hvordan bruke Tor på en sikker måte. Du kan nå fritt surfe anonymt på Internett." msgid "There is a security update available for the Tor Browser Bundle." msgstr "" @@ -33,7 +34,7 @@ msgstr "" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Trykk her for å gå til nedlastningssiden.</a>" msgid "Sorry. You are not using Tor." msgstr "Beklager. Du bruker ikke Tor."

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 22 Jun '12

22 Jun '12

commit 75d3ddc7f10caee2b38bdaa986261ab26ded0df3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 01:45:05 2012 +0000 Update translations for orbot --- values-nb/strings.xml | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/values-nb/strings.xml b/values-nb/strings.xml index 715a4b4..66b96f4 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -12,8 +12,8 @@ <string name="status_disabled">\"Orbot er deaktivert</string> <string name="status_shutting_down">Orbot skrur seg av</string> <string name="tor_process_starting">Starter Tor...</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> + <string name="tor_process_complete">ferdig.</string> + <string name="tor_process_waiting">venter.</string> <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">Hjem</string> <string name="menu_browse">Gå til</string> @@ -82,12 +82,12 @@ <string name="pref_hs_group">Hidden Service Hosting</string> <string name="pref_general_group">Generelt</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> + <string name="pref_start_boot_summary">Start Orbot og Tor automatisk når din Android starter opp.</string>   - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> + <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg med å forsvare deg mot innholdsfiltrering, trafikkanalyse og nettverksovervåkning som kan true ditt personvern, din konfidensielle informasjon og dine personlige forhold.\n\nDenne steg-for-steg guiden hjelper deg med å konfigurere Orbot og Tor på ditt apparat.</string>  - <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_title">Advarsel</string> <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>  <string name="wizard_permissions_title">Permissions</string> @@ -108,7 +108,7 @@ <string name="wizard_transproxy_title">Transparent Proxying</string> <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> + <string name="wizard_transproxy_none">Ingen</string> <string name="pref_transparent_tethering_title">Tor Tethering</string> <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> <string name="button_grant_superuser">Request Superuser Access</string>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 22 Jun '12

22 Jun '12

commit 4919174941d7e51ed7dcfbb1474c3d1e8915d25a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 23 01:15:07 2012 +0000 Update translations for orbot --- values-nb/strings.xml | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/values-nb/strings.xml b/values-nb/strings.xml index ae46b03..715a4b4 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -11,7 +11,7 @@ <string name="status_activated">Tilkoblet Tor-nettverket</string> <string name="status_disabled">\"Orbot er deaktivert</string> <string name="status_shutting_down">Orbot skrur seg av</string> - <string name="tor_process_starting">Starting Tor client...</string> + <string name="tor_process_starting">Starter Tor...</string> <string name="tor_process_complete">complete.</string> <string name="tor_process_waiting">waiting.</string> <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string> @@ -35,7 +35,7 @@ <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> <string name="pref_trans_proxy_title">Transparent Proxying</string> <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Alt</string> + <string name="pref_transparent_all_title">Tor All Trafikk</string> <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> @@ -61,9 +61,9 @@ <string name="wizard_permissions_stock">Orbot Tilgangsnivåer</string> <string name="wizard_premissions_msg_root">Glimrende! Vi ser du har aktivert rot-tilgang for Orbot. Vi skal bruke disse kreftene klokt.</string> <string name="wizard_permissions_msg_stock">Selv om det ikke er påkrevd, vil Orbot være et kraftigere verktøy hvis du har rot-tilgang på apparatet ditt. Bruk knappen under for å gi Orbot superkrefter!</string> - <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang eller ikke aner hva vi snakker om, sørg ihvertfall for å programmer kompatible med Orbot.</string> + <string name="wizard_permissions_no_root">Hvis du ikke har rot-tilgang (eller ikke aner hva vi snakker om), sørg ihvertfall for å bruke programmer som er kompatible med Orbot.</string> <string name="wizard_permissions_consent">Jeg forstår og ønsker å fortsette uten Superbruker.</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_permission_enable_root">Gi Orbot tilgang.</string> <string name="wizard_configure">Configure Torification</string> <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> <string name="wizard_configure_all">Proxy All Apps Through Tor</string> @@ -74,13 +74,13 @@ <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> <string name="wizard_proxy_help_info">Proxy Settings</string> <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> + <string name="wizard_final">Orbot er klar!</string> + <string name="wizard_final_msg">Hundretusener av mennesker over hele verden bruker Tor til en lang rekke forskjellige formål.\n\nJournalister og bloggere, menneskerettighetsforkjempere, politietterforskere, militære, bedrifter, mennesker i undertrykkende regimer, og vanlige borgere...og nå er du klar til å bruke det også!</string>  - <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> + <string name="connect_first_time">Du er nå tilkoblet Tor-nettverket - men det betyr IKKE at ditt apparat er sikret. Du kan bruke \"Sjekk\" valget fra menyen for å sjekke din nettleser.\n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en email til help(a)guardianproject.info for å få vite mer.</string> + <string name="tor_check">Dette vil åpne din nettleser på https://check.torproject.org og sjekke om Orbot er riktig innstilt og om du er koblet til Tor.</string> <string name="pref_hs_group">Hidden Service Hosting</string> - <string name="pref_general_group">General</string> + <string name="pref_general_group">Generelt</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>

1 0