- tor-commits - lists.torproject.org

[tor/master] Turn the read_file_until_eof tests into a single implementation
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 4b362d002ccd2008ebfa4b44e3ca61e8efa96cac Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 12:23:31 2012 -0400 Turn the read_file_until_eof tests into a single implementation --- src/test/test_util.c | 119 ++++++++++++++++---------------------------------- 1 files changed, 38 insertions(+), 81 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index cc3a03f..1734108 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -19,114 +19,71 @@ #endif static void -test_util_read_file_fifo_tiny_limit(void *arg) +test_util_read_until_eof_impl(const char *fname, size_t file_len, + size_t read_limit) { -#ifndef _WIN32 char *fifo_name = NULL; + char *test_str = NULL; char *str = NULL; + size_t sz = 9999999; int fd = -1; - int read_fd = -1; - size_t sz; - (void)arg; + int r; - fifo_name = tor_strdup(get_fname("tor_test_fifo_tiny")); - fd = open(fifo_name, O_WRONLY | O_CREAT, 0600); - test_neq(fd, -1); - test_eq(write(fd, "short", 6), 6); - close(fd); + fifo_name = tor_strdup(get_fname(fname)); + test_str = tor_malloc(file_len); + crypto_rand(test_str, file_len); - // purposely set limit shorter than what we wrote to the FIFO to - // test the maximum, and that it puts the NUL in the right spot + r = write_bytes_to_file(fifo_name, test_str, file_len, 1); + tt_int_op(r, ==, 0); + + fd = open(fifo_name, O_RDONLY|O_BINARY); + tt_int_op(fd, >=, 0); + str = read_file_to_str_until_eof(fd, read_limit, &sz); + close(fd); + tt_assert(str != NULL); - read_fd = open(fifo_name, O_RDONLY); - str = read_file_to_str_until_eof(read_fd, 4, &sz); - close(read_fd); + if (read_limit < file_len) + tt_int_op(sz, ==, read_limit); + else + tt_int_op(sz, ==, file_len); - test_eq(str[0], 's'); - test_eq(str[1], 'h'); - test_eq(str[2], 'o'); - test_eq(str[3], 'r'); - test_eq(str[4], '\0'); + test_mem_op(test_str, ==, str, sz); + test_assert(str[sz] == '\0'); done: unlink(fifo_name); tor_free(fifo_name); + tor_free(test_str); tor_free(str); -#endif } static void -test_util_read_file_fifo_two_loops(void *arg) +test_util_read_file_eof_tiny_limit(void *arg) { -#ifndef _WIN32 - char *fifo_name = NULL; - char *str = NULL; - char data[2048]; - int i = 0; - int fd = -1; - int read_fd = -1; - size_t sz; (void)arg; + // purposely set limit shorter than what we wrote to the FIFO to + // test the maximum, and that it puts the NUL in the right spot - while (i < 2048) { - data[i] = (char)(i & 0xff); - ++i; - } + test_util_read_until_eof_impl("tor_test_fifo_tiny", 5, 4); +} +static void +test_util_read_file_eof_two_loops(void *arg) +{ + (void)arg; // write more than 1024 bytes to the FIFO to test two passes through // the loop in the method; if the re-alloc size is changed this // should be updated as well. - fifo_name = tor_strdup(get_fname("tor_fifo_test_2k")); - fd = open(fifo_name, O_WRONLY | O_CREAT, 0600); - test_neq(fd, -1); - test_eq(write(fd, data, 2048), 2048); - close(fd); - - read_fd = open(fifo_name, O_RDONLY); - str = read_file_to_str_until_eof(read_fd, 1024*1024, &sz); - close(read_fd); - - for (i = 0; i < 2048; ++i) { - test_eq(str[i], (char)(i & 0xff)); - } - - done: - unlink(fifo_name); - tor_free(fifo_name); - tor_free(str); -#endif + test_util_read_until_eof_impl("tor_test_fifo_2k", 2048, 10000); } static void -test_util_read_file_fifo_zero_bytes(void *arg) +test_util_read_file_eof_zero_bytes(void *arg) { -#ifndef _WIN32 - char *fifo_name = NULL; - char *str = NULL; - int fd = -1; - int read_fd = -1; - size_t sz; (void)arg; - - fifo_name = tor_strdup(get_fname("tor_fifo_test_zero_bytes")); // zero-byte fifo - fd = open(fifo_name, O_WRONLY | O_CREAT, 0600); - test_neq(fd, -1); - close(fd); - - read_fd = open(fifo_name, O_RDONLY); - str = read_file_to_str_until_eof(read_fd, 1024, &sz); - close(read_fd); - - test_neq(str, NULL); - test_eq(str[0], '\0'); - - done: - unlink(fifo_name); - tor_free(fifo_name); - tor_free(str); -#endif + test_util_read_until_eof_impl("tor_test_fifo_empty", 0, 10000); } static void @@ -3302,9 +3259,9 @@ struct testcase_t util_tests[] = { UTIL_TEST(envnames, 0), UTIL_TEST(make_environment, 0), UTIL_TEST(set_env_var_in_sl, 0), - UTIL_TEST(read_file_fifo_tiny_limit, 0), - UTIL_TEST(read_file_fifo_two_loops, 0), - UTIL_TEST(read_file_fifo_zero_bytes, 0), + UTIL_TEST(read_file_eof_tiny_limit, 0), + UTIL_TEST(read_file_eof_two_loops, 0), + UTIL_TEST(read_file_eof_zero_bytes, 0), END_OF_TESTCASES };

1 0

[tor/master] Note which compiler caused bug 6842
by nickm＠torproject.org 17 Sep '12

17 Sep '12

commit 2939cc3ba3afe5ef2c6a273eef18577274e6867b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 17 09:38:48 2012 -0400 Note which compiler caused bug 6842 --- ChangeLog | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c517207..3ba1286 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,9 +36,9 @@ Changes in version 0.2.4.3-alpha - 2012-09-?? Previously, Tor would have confused (as-yet-unused) protocol version numbers greater than 32 with lower ones on many platforms. Fixes bug 6827; bugfix on 0.2.0.10-alpha. Found by George Kadianakis. - - Fix building with older versions of GCC that don't like preprocessor - directives inside macro arguments. Found by grarpamp. Fixes bug - 6842; bugfix on 0.2.4.2-alpha. + - Fix building with older versions of GCC (2.95, for one) that don't + like preprocessor directives inside macro arguments. Found by + grarpamp. Fixes bug 6842; bugfix on 0.2.4.2-alpha. - Switch weighted node selection rule from using a list of doubles to using a list of int64_t. This change should make the process slightly easier to debug and maintain. Needed to finish ticket 6538.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 Sep '12

17 Sep '12

commit a47bffead1711e718568032e152273ba6355522d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 17 12:45:30 2012 +0000 Update translations for https_everywhere --- ja/https-everywhere.dtd | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/ja/https-everywhere.dtd b/ja/https-everywhere.dtd new file mode 100644 index 0000000..b0dfb95 --- /dev/null +++ b/ja/https-everywhere.dtd @@ -0,0 +1,37 @@ +<!ENTITY https-everywhere.about.title ""> +<!ENTITY https-everywhere.about.ext_name ""> +<!ENTITY https-everywhere.about.ext_description ""> +<!ENTITY https-everywhere.about.version ""> +<!ENTITY https-everywhere.about.created_by ""> +<!ENTITY https-everywhere.about.librarians ""> +<!ENTITY https-everywhere.about.thanks ""> +<!ENTITY https-everywhere.about.contribute ""> +<!ENTITY https-everywhere.about.donate_tor ""> +<!ENTITY https-everywhere.about.tor_lang_code ""> +<!ENTITY https-everywhere.about.donate_eff ""> + +<!ENTITY https-everywhere.menu.about ""> +<!ENTITY https-everywhere.menu.observatory ""> +<!ENTITY https-everywhere.menu.globalEnable ""> +<!ENTITY https-everywhere.menu.globalDisable ""> + +<!ENTITY https-everywhere.prefs.title ""> +<!ENTITY https-everywhere.prefs.enable_all ""> +<!ENTITY https-everywhere.prefs.disable_all ""> +<!ENTITY https-everywhere.prefs.reset_defaults ""> +<!ENTITY https-everywhere.prefs.search ""> +<!ENTITY https-everywhere.prefs.site ""> +<!ENTITY https-everywhere.prefs.notes ""> +<!ENTITY https-everywhere.prefs.list_caption ""> +<!ENTITY https-everywhere.prefs.enabled ""> +<!ENTITY https-everywhere.prefs.ruleset_howto ""> +<!ENTITY https-everywhere.prefs.here_link ""> +<!ENTITY https-everywhere.prefs.toggle ""> +<!ENTITY https-everywhere.prefs.reset_default ""> +<!ENTITY https-everywhere.prefs.view_xml_source ""> + +<!ENTITY https-everywhere.source.downloading ""> +<!ENTITY https-everywhere.source.filename ""> +<!ENTITY https-everywhere.source.unable_to_download ""> + +

1 0

[arm/master] Failing over when proc fails to get the uptime
by atagar＠torproject.org 17 Sep '12

17 Sep '12

commit 74567bb166c68584e3d1459f98e1ea08d09927c3 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Sep 16 17:13:07 2012 -0700 Failing over when proc fails to get the uptime The header panel caches tor's start time which is great... unless the following happens. 1. We try to fetch the start time via proc contents and fail. 2. The header panel caches the None result. 3. Arm later discovers that proc is unusable and turns it off, but it's too late since the header panel has cached the result. Accounting for this by failing over to 'ps' whenever the proc query fails. Issue caught by drforbin on... https://trac.torproject.org/6862 Only testing done was a basic sanity test that arm runs against a relay. --- src/util/torTools.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 5b70c6a..a4d49c7 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -2370,16 +2370,20 @@ class Controller(TorCtl.PostEventListener): myPid = self.getMyPid() if myPid: - try: - if procTools.isProcAvailable(): + if procTools.isProcAvailable(): + try: result = float(procTools.getStats(myPid, procTools.Stat.START_TIME)[0]) - else: + except: pass + + if not result: + # if we're either not using proc or it fails then try using ps + try: psCall = sysTools.call("ps -p %s -o etime" % myPid) if psCall and len(psCall) >= 2: etimeEntry = psCall[1].strip() result = time.time() - uiTools.parseShortTimeLabel(etimeEntry) - except: pass + except: pass elif key == "authorities": # There's two configuration options that can overwrite the default # authorities: DirServer and AlternateDirAuthority.

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit 8f08bca75f20a333fd6e8fbfbdcbf7a064de188d Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:45:27 2012 +0000 Update translations for torcheck --- bs/torcheck.po | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/bs/torcheck.po b/bs/torcheck.po new file mode 100644 index 0000000..c92ae5c --- /dev/null +++ b/bs/torcheck.po @@ -0,0 +1,57 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# Kenan Dervišević <kenan(a)dkenan.com>, 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-09-16 21:18+0000\n" +"Last-Translator: Kenan Dervišević <kenan(a)dkenan.com>\n" +"Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: bs\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "Čestitamo. Vaš browser je konfigurisan da koristi Tor." + +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 "" + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "Dostupna je sigurnosta nadogradnja za Tor Browser Bundle." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "" + +msgid "Sorry. You are not using Tor." +msgstr "Žao nam je. Ne koristite 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://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "" + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "" + +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 "" + +msgid "Your IP address appears to be: " +msgstr "Vaša IP adresa je:"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit 3a377e1213a4a29ecff483c1bdb057ed0bacb569 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:45:09 2012 +0000 Update translations for vidalia --- bs/qt_bs.po | 30 +++++++------- bs/vidalia_bs.po | 118 ++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 89 insertions(+), 59 deletions(-) diff --git a/bs/qt_bs.po b/bs/qt_bs.po index 3f086a4..65729f6 100644 --- a/bs/qt_bs.po +++ b/bs/qt_bs.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-08-20 03:25+0000\n" -"PO-Revision-Date: 2012-09-16 21:15+0000\n" +"PO-Revision-Date: 2012-09-16 21:17+0000\n" "Last-Translator: Kenan Dervišević <kenan(a)dkenan.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "Nekompatibilna Qt biblioteka" #: qapplication.cpp:2095 msgctxt "QApplication" msgid "QT_LAYOUT_DIRECTION" -msgstr "" +msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" @@ -209,7 +209,7 @@ msgid "" "%1\n" "File not found.\n" "Please verify the correct file name was given." -msgstr "" +msgstr "%1\nDatoteka nije pronađena.\nMolimo vas da provjerite naziv datoteke, a zatim da pokušate ponovo." #: qdirmodel.cpp:833 msgctxt "QFileDialog" @@ -376,59 +376,59 @@ msgstr "" #: qfilesystemmodel.cpp:832 msgctxt "QFileSystemModel" msgid "Name" -msgstr "" +msgstr "Ime" #: qfilesystemmodel.cpp:834 msgctxt "QFileSystemModel" msgid "Size" -msgstr "" +msgstr "Veličina" #: qfilesystemmodel.cpp:838 msgctxt "QFileSystemModel" msgid "Kind" -msgstr "" +msgstr "Vrsta" #: qfilesystemmodel.cpp:840 msgctxt "QFileSystemModel" msgid "Type" -msgstr "" +msgstr "Tip" #: qfilesystemmodel.cpp:847 msgctxt "QFileSystemModel" msgid "Date Modified" -msgstr "" +msgstr "Datum modificiranja" #: qfilesystemmodel_p.h:198 msgctxt "QFileSystemModel" msgid "My Computer" -msgstr "" +msgstr "Moj računar" #: qfilesystemmodel_p.h:200 msgctxt "QFileSystemModel" msgid "Computer" -msgstr "" +msgstr "Računar" #: qfilesystemmodel.cpp:677 msgctxt "QFileSystemModel" msgid "%1 TB" -msgstr "" +msgstr "%1 TB" #: qfilesystemmodel.cpp:679 msgctxt "QFileSystemModel" msgid "%1 GB" -msgstr "" +msgstr "%1 GB" #: qfilesystemmodel.cpp:681 msgctxt "QFileSystemModel" msgid "%1 MB" -msgstr "" +msgstr "%1 MB" #: qfilesystemmodel.cpp:683 msgctxt "QFileSystemModel" msgid "%1 KB" -msgstr "" +msgstr "%1 KB" #: qfilesystemmodel.cpp:684 msgctxt "QFileSystemModel" msgid "%1 bytes" -msgstr "" +msgstr "%1 bajta" diff --git a/bs/vidalia_bs.po b/bs/vidalia_bs.po index 54e3e62..419cd54 100644 --- a/bs/vidalia_bs.po +++ b/bs/vidalia_bs.po @@ -1,43 +1,44 @@ # # Translators: +# Kenan Dervišević <kenan(a)dkenan.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2010-12-05 20:03+0000\n" -"Last-Translator: \n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-09-16 21:20+0000\n" +"Last-Translator: Kenan Dervišević <kenan(a)dkenan.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" msgid "About Vidalia" -msgstr "" +msgstr "O Vidaliai" msgctxt "AboutDialog" msgid "License" -msgstr "" +msgstr "Licenca" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "" +msgstr "Vidalia 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "" +msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" -msgstr "" +msgstr "Qt 4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "" +msgstr "'%1' nije ispravna IP adresa." msgctxt "AdvancedPage" msgid "" @@ -50,7 +51,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "File Not Found" -msgstr "" +msgstr "Datoteka nije pronađena." msgctxt "AdvancedPage" msgid "%1 does not exist. Would you like to create it?" @@ -198,6 +199,13 @@ msgstr "" msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "" + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -223,6 +231,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "" +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "" @@ -1748,10 +1773,6 @@ msgid "Connected to the Tor network!" msgstr "" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "" @@ -2063,45 +2084,60 @@ msgid "" msgstr "" msgctxt "MainWindow" -msgid "failed (%1)" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "" + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "" + +msgctxt "MainWindow" +msgid "(probably an email client)" msgstr "" msgctxt "MainWindow" msgid "" -"Your relay is shutting down.\n" -"Click 'Stop' again to stop your relay now." +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." msgstr "" msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" +msgid "failed (%1)" msgstr "" msgctxt "MainWindow" msgid "" -"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" -"\n" -"Would you like to shutdown gracefully and give clients time to find a new relay?" +"Your relay is shutting down.\n" +"Click 'Stop' again to stop your relay now." msgstr "" msgctxt "MainWindow" msgid "" -"Vidalia detected that the Tor software exited unexpectedly.\n" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" "\n" -"Please check the message log for recent warning or error messages." +"Here's the last error message:\n" +"%2" msgstr "" msgctxt "MainWindow" -msgid "(probably Telnet)" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." msgstr "" msgctxt "MainWindow" -msgid "(probably an email client)" +msgid "" +"You are currently running a relay. Terminating your relay will interrupt any open connections from clients.\n" +"\n" +"Would you like to shutdown gracefully and give clients time to find a new relay?" msgstr "" msgctxt "MainWindow" msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." +"Vidalia detected that the Tor software exited unexpectedly.\n" +"\n" +"Please check the message log for recent warning or error messages." msgstr "" msgctxt "MessageLog" @@ -2516,14 +2552,6 @@ msgid "Ctrl+F" msgstr "" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "" - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "" @@ -2656,11 +2684,11 @@ msgid "SOCKS 5" msgstr "" msgctxt "NetworkPage" -msgid "HTTP" +msgid "HTTP / HTTPS" msgstr "" msgctxt "NetworkPage" -msgid "HTTP / HTTPS" +msgid "You must specify one or more bridges." msgstr "" msgctxt "Policy" @@ -2840,10 +2868,6 @@ msgid "Run as a client only" msgstr "" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "" @@ -3088,6 +3112,14 @@ msgid "Automatically distribute my bridge address" msgstr "" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "" @@ -3812,5 +3844,3 @@ msgstr "" msgctxt "stringutil.h" msgid "%1 mins" msgstr "" - -

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit ea023423c8c6ab2e16d4a8f8a0ac0b1154849639 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 21:15:10 2012 +0000 Update translations for vidalia --- bs/qt_bs.po | 137 +++++++++++++++++++++++++++++------------------------------ 1 files changed, 68 insertions(+), 69 deletions(-) diff --git a/bs/qt_bs.po b/bs/qt_bs.po index 119546d..3f086a4 100644 --- a/bs/qt_bs.po +++ b/bs/qt_bs.po @@ -1,34 +1,35 @@ -# # Translators: +# Translators: +# Kenan Dervišević <kenan(a)dkenan.com>, 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-08-20 03:25+0000\n" -"PO-Revision-Date: 2010-12-05 19:59+0000\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2012-09-16 21:15+0000\n" +"Last-Translator: Kenan Dervišević <kenan(a)dkenan.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: bs\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Vidalia ts2po 0.2\n" #: qaccessibleobject.cpp:348 msgctxt "QApplication" msgid "Activate" -msgstr "" +msgstr "Aktiviraj" #: qmessagebox.h:319 msgctxt "QApplication" msgid "Executable '%1' requires Qt %2, found Qt %3." -msgstr "" +msgstr "Izvršna datoteka '%1' zahtjeva Qt %2, pronađen je Qt %3." #: qmessagebox.h:321 msgctxt "QApplication" msgid "Incompatible Qt Library Error" -msgstr "" +msgstr "Nekompatibilna Qt biblioteka" #: qapplication.cpp:2095 msgctxt "QApplication" @@ -38,169 +39,169 @@ msgstr "" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "" +msgstr "Aktivira glavni prozor programa" #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "U redu" #: qdialogbuttonbox.cpp:528 msgctxt "QDialogButtonBox" msgid "Save" -msgstr "" +msgstr "Sačuvaj" #: qdialogbuttonbox.cpp:531 msgctxt "QDialogButtonBox" msgid "Open" -msgstr "" +msgstr "Otvori" #: qdialogbuttonbox.cpp:534 msgctxt "QDialogButtonBox" msgid "Cancel" -msgstr "" +msgstr "Otkaži" #: qdialogbuttonbox.cpp:537 msgctxt "QDialogButtonBox" msgid "Close" -msgstr "" +msgstr "Zatvori" #: qdialogbuttonbox.cpp:540 msgctxt "QDialogButtonBox" msgid "Apply" -msgstr "" +msgstr "Primijeni" #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" msgid "Reset" -msgstr "" +msgstr "Resetuj" #: qdialogbuttonbox.cpp:546 msgctxt "QDialogButtonBox" msgid "Help" -msgstr "" +msgstr "Pomoć" #: qdialogbuttonbox.cpp:550 msgctxt "QDialogButtonBox" msgid "Don't Save" -msgstr "" +msgstr "Nemoj sačuvati" #: qdialogbuttonbox.cpp:554 msgctxt "QDialogButtonBox" msgid "Discard" -msgstr "" +msgstr "Odbaci" #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" msgid "&Yes" -msgstr "" +msgstr "&Da" #: qdialogbuttonbox.cpp:560 msgctxt "QDialogButtonBox" msgid "Yes to &All" -msgstr "" +msgstr "Da za &sve" #: qdialogbuttonbox.cpp:563 msgctxt "QDialogButtonBox" msgid "&No" -msgstr "" +msgstr "&Ne" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" msgid "N&o to All" -msgstr "" +msgstr "N&e za sve" #: qdialogbuttonbox.cpp:569 msgctxt "QDialogButtonBox" msgid "Save All" -msgstr "" +msgstr "Sačuvaj sve" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" msgid "Abort" -msgstr "" +msgstr "Prekini" #: qdialogbuttonbox.cpp:575 msgctxt "QDialogButtonBox" msgid "Retry" -msgstr "" +msgstr "Ponovi" #: qdialogbuttonbox.cpp:578 msgctxt "QDialogButtonBox" msgid "Ignore" -msgstr "" +msgstr "Zanemari" #: qdialogbuttonbox.cpp:581 msgctxt "QDialogButtonBox" msgid "Restore Defaults" -msgstr "" +msgstr "Vrati početno" #: qdialogbuttonbox.cpp:552 msgctxt "QDialogButtonBox" msgid "Close without Saving" -msgstr "" +msgstr "Zatvori bez snimanja" #: qdialogbuttonbox.cpp:525 msgctxt "QDialogButtonBox" msgid "&OK" -msgstr "" +msgstr "&U redu" #: qdirmodel.cpp:423 msgctxt "QDirModel" msgid "Name" -msgstr "" +msgstr "Ime" #: qdirmodel.cpp:424 msgctxt "QDirModel" msgid "Size" -msgstr "" +msgstr "Veličina" #: qdirmodel.cpp:427 msgctxt "QDirModel" msgid "Kind" -msgstr "" +msgstr "Vrsta" #: qdirmodel.cpp:429 msgctxt "QDirModel" msgid "Type" -msgstr "" +msgstr "Tip" #: qdirmodel.cpp:435 msgctxt "QDirModel" msgid "Date Modified" -msgstr "" +msgstr "Datum modificiranja" #: qfiledialog_win.cpp:126 msgctxt "QFileDialog" msgid "All Files (*)" -msgstr "" +msgstr "Sve datoteke (*)" #: qfiledialog.cpp:881 msgctxt "QFileDialog" msgid "Directories" -msgstr "" +msgstr "Folderi" #: qfiledialog.cpp:2408 msgctxt "QFileDialog" msgid "&Open" -msgstr "" +msgstr "&Otvori" #: qfiledialog.cpp:919 msgctxt "QFileDialog" msgid "&Save" -msgstr "" +msgstr "&Sačuvaj" #: qfiledialog.cpp:435 msgctxt "QFileDialog" msgid "Open" -msgstr "" +msgstr "Otvori" #: qfiledialog.cpp:1670 msgctxt "QFileDialog" msgid "" "%1 already exists.\n" "Do you want to replace it?" -msgstr "" +msgstr "%1 već postoji.\nŽelite li ga prebrisati?" #: qfiledialog.cpp:1690 msgctxt "QFileDialog" @@ -213,52 +214,52 @@ msgstr "" #: qdirmodel.cpp:833 msgctxt "QFileDialog" msgid "My Computer" -msgstr "" +msgstr "Moj računar" #: qfiledialog.cpp:462 msgctxt "QFileDialog" msgid "&Rename" -msgstr "" +msgstr "&Preimenuj" #: qfiledialog.cpp:463 msgctxt "QFileDialog" msgid "&Delete" -msgstr "" +msgstr "&Obriši" #: qfiledialog.cpp:464 msgctxt "QFileDialog" msgid "Show &hidden files" -msgstr "" +msgstr "Prikaži &sakrivene datoteke" #: ui_qfiledialog.h:264 msgctxt "QFileDialog" msgid "Back" -msgstr "" +msgstr "Nazad" #: ui_qfiledialog.h:274 msgctxt "QFileDialog" msgid "Parent Directory" -msgstr "" +msgstr "Matični folder" #: ui_qfiledialog.h:284 msgctxt "QFileDialog" msgid "List View" -msgstr "" +msgstr "Lista" #: ui_qfiledialog.h:289 msgctxt "QFileDialog" msgid "Detail View" -msgstr "" +msgstr "Detalji" #: ui_qfiledialog.h:292 msgctxt "QFileDialog" msgid "Files of type:" -msgstr "" +msgstr "Datoteke tipa:" #: qfiledialog.cpp:883 msgctxt "QFileDialog" msgid "Directory:" -msgstr "" +msgstr "Folder:" #: qfiledialog.cpp:2476 msgctxt "QFileDialog" @@ -283,87 +284,87 @@ msgstr "" #: qfiledialog.cpp:2299 msgctxt "QFileDialog" msgid "Could not delete directory." -msgstr "" +msgstr "Nije moguće obrisati folder." #: qfiledialog_win.cpp:128 msgctxt "QFileDialog" msgid "All Files (*.*)" -msgstr "" +msgstr "Sve datoteke (*.*)" #: qfiledialog.cpp:437 msgctxt "QFileDialog" msgid "Save As" -msgstr "" +msgstr "Sačuvaj kao" #: qfileiconprovider.cpp:379 msgctxt "QFileDialog" msgid "Drive" -msgstr "" +msgstr "Disk" #: qfileiconprovider.cpp:383 msgctxt "QFileDialog" msgid "File" -msgstr "" +msgstr "Datoteka" #: qfileiconprovider.cpp:412 msgctxt "QFileDialog" msgid "Unknown" -msgstr "" +msgstr "Nepoznato" #: qfiledialog.cpp:439 msgctxt "QFileDialog" msgid "Find Directory" -msgstr "" +msgstr "Pronađi folder" #: qfiledialog.cpp:458 msgctxt "QFileDialog" msgid "Show " -msgstr "" +msgstr "Prikaži" #: ui_qfiledialog.h:269 msgctxt "QFileDialog" msgid "Forward" -msgstr "" +msgstr "Proslijedi" #: qfiledialog.cpp:2137 msgctxt "QFileDialog" msgid "New Folder" -msgstr "" +msgstr "Novi folder" #: qfiledialog.cpp:465 msgctxt "QFileDialog" msgid "&New Folder" -msgstr "" +msgstr "&Novi folder" #: qfiledialog.cpp:917 msgctxt "QFileDialog" msgid "&Choose" -msgstr "" +msgstr "&Odaberi" #: qsidebar.cpp:388 msgctxt "QFileDialog" msgid "Remove" -msgstr "" +msgstr "Ukloni" #: qfiledialog.cpp:886 msgctxt "QFileDialog" msgid "File &name:" -msgstr "" +msgstr "Naziv &datoteke:" #: ui_qfiledialog.h:261 msgctxt "QFileDialog" msgid "Look in:" -msgstr "" +msgstr "Pogledaj u:" #: ui_qfiledialog.h:279 msgctxt "QFileDialog" msgid "Create New Folder" -msgstr "" +msgstr "Kreiraj novi folder" #: qfilesystemmodel.cpp:761 msgctxt "QFileSystemModel" msgid "Invalid filename" -msgstr "" +msgstr "Neispravno ime datoteke" #: qfilesystemmodel.cpp:763 msgctxt "QFileSystemModel" @@ -431,5 +432,3 @@ msgstr "" msgctxt "QFileSystemModel" msgid "%1 bytes" msgstr "" - -

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit 83af5bc78f8871bbd1ebb11ab7aa7add9e89ab7f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 18:45:10 2012 +0000 Update translations for vidalia --- ia/vidalia_ia.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ia/vidalia_ia.po b/ia/vidalia_ia.po index 92ea25d..c7c9470 100644 --- a/ia/vidalia_ia.po +++ b/ia/vidalia_ia.po @@ -2,19 +2,20 @@ # Translators: # Emilio Sepúlveda <djfunkinmixer(a)gmail.com>, 2011. # Emilio Sepúlveda <emisepulvedam(a)gmail.com>, 2011. +# SoftInterlingua <>, 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-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-05-11 04:36+0000\n" -"Last-Translator: Emilio Sepúlveda <emisepulvedam(a)gmail.com>\n" +"PO-Revision-Date: 2012-09-16 18:33+0000\n" +"Last-Translator: SoftInterlingua <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ia\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -68,7 +69,7 @@ msgstr "Non pote crear %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "" +msgstr "Seleciona un dossier a usar pro datos de Tor" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" @@ -359,7 +360,7 @@ msgstr "Nove" msgctxt "Circuit" msgid "Open" -msgstr "" +msgstr "Aperir" msgctxt "Circuit" msgid "Building"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit 195770f61766f14c0d7a535f8b59655986778a04 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 14:45:19 2012 +0000 Update translations for vidalia_help --- he/bridges.po | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/he/bridges.po b/he/bridges.po index ecf7cb2..fa59be9 100644 --- a/he/bridges.po +++ b/he/bridges.po @@ -1,33 +1,34 @@ # # Translators: +# <jacobpa9(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:58+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-09-16 14:39+0000\n" +"Last-Translator: jacobpa <jacobpa9(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: he\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: Content of: <html><body><h1> #: en/bridges.html:16 msgid "Bridge Relays" -msgstr "" +msgstr "גשרי ממסר" #. type: Content of: <html><body> #: en/bridges.html:19 msgid "<a name=\"about\"/>" -msgstr "" +msgstr "אודות" #. type: Content of: <html><body><h3> #: en/bridges.html:20 msgid "What are bridge relays?" -msgstr "" +msgstr "מהם גשרי הממסר?" #. type: Content of: <html><body><p> #: en/bridges.html:22 @@ -40,7 +41,7 @@ msgid "" "no complete public list of them, even if your ISP is filtering connections " "to all the known Tor relays, they probably won't be able to block all the " "bridges." -msgstr "" +msgstr "ישנם ספקים מסויימים אשר חוסמים חיבורים עם ממסרים ידועים. גשרי ממסר (או בקיצור \"גשרים\") הינם ממסרים אשר עוזרים לאותם משתמשים מצונזרים לגשת לרשת Tor. שלא כמו ממסרים אחרים, גשרים אינם מופיעים באותם רשימות ציבוריות כמו ממסרים רגילים. מאחר ואין רשימה מדוייקת שלהם, גם אם הספק שלך חוסם חיבורים לכל הממסרים הידועים, ככל הנראה הספק לא יצליח לחסום את כל הגשרים." #. type: Content of: <html><body> #: en/bridges.html:31 @@ -50,22 +51,22 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/bridges.html:32 msgid "How do I find a bridge relay?" -msgstr "" +msgstr "איך מוצאים גשרי ממסר?" #. type: Content of: <html><body><p> #: en/bridges.html:34 msgid "There are two main ways to learn about a bridge address:" -msgstr "" +msgstr "ישנם שני דרכים מרכזיות לשימוש בגשרים:" #. type: Content of: <html><body><p><ol><li> #: en/bridges.html:36 msgid "Get some friends to run private bridges for you" -msgstr "" +msgstr "בקש מחבריך להריץ גשרים פרטיים למענך" #. type: Content of: <html><body><p><ol><li> #: en/bridges.html:37 msgid "Use some of the public bridges" -msgstr "" +msgstr "השתמש בגשרים ציבוריים" #. type: Content of: <html><body><p> #: en/bridges.html:42 @@ -97,6 +98,4 @@ msgstr "" msgid "" "Configuring more than one bridge address will make your Tor connection more " "stable, in case some of the bridges become unreachable." -msgstr "" - - +msgstr "שימוש ביותר מגשר אחד ייצב את חיבור ה-Tor שלך, במידה וחלק מהגשרים אינם נגישים."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 16 Sep '12

16 Sep '12

commit af0475c79aff4a0c569c7484e68a308b72a1bd32 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Sep 16 14:15:35 2012 +0000 Update translations for https_everywhere_completed --- he/https-everywhere.properties | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/he/https-everywhere.properties b/he/https-everywhere.properties new file mode 100644 index 0000000..b639efe --- /dev/null +++ b/he/https-everywhere.properties @@ -0,0 +1,5 @@ +https-everywhere.menu.globalEnable = להפעיל את HTTPS Everywhere +https-everywhere.menu.globalDisable = להשבית את HTTPS Everywhere +https-everywhere.menu.enableDisable = להפעיל/להשבית כללים +https-everywhere.menu.noRules = (אין כללים עבור דף זה) +https-everywhere.menu.unknownRules = (כללים לדף זה אינם ידועים)

1 0