May 2012 - tor-commits - lists.torproject.org

[stem/master] Replacing enums with class instances for connect_* functions
by atagar＠torproject.org 17 May '12

17 May '12

commit bca28c1e409a318bf9303a635530382c13c17115 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 17 09:29:04 2012 -0700 Replacing enums with class instances for connect_* functions The connect_port and connect_socket_file convenience functions accept a controller type that we would like to return. I had been using an enum for this argument, but this means that we both (a) need to manually update it when adding controllers and (b) can't recognize controller the user makes. Replacing this with a class instance, like what TorCtl does. Tested by running against a script for printing BW events. --- stem/connection.py | 42 +++++++++++++++++++------------------ test/integ/connection/connect.py | 4 +- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 825edf5..b81a8f7 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -90,9 +90,6 @@ import stem.util.enum import stem.util.system import stem.util.log as log -# enums representing classes that the connect_* methods can return -Controller = stem.util.enum.Enum("NONE") - # Methods by which a controller can authenticate to the control port. Tor gives # a list of all the authentication methods it will accept in response to # PROTOCOLINFO queries. @@ -194,7 +191,7 @@ AUTHENTICATE_EXCEPTIONS = ( AuthenticationFailure, ) -def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = None, chroot_path = None, controller = Controller.NONE): +def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = None, chroot_path = None, controller = None): """ Convenience function for quickly getting a control connection. This is very handy for debugging or CLI setup, handling setup and prompting for a password @@ -202,15 +199,16 @@ def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = Non description of the problem and returns None. Arguments: - control_addr (str) - ip address of the controller - control_port (int) - port number of the controller - password (str) - passphrase to authenticate to the socket - chroot_path (str) - path prefix if in a chroot environment - controller (Controller) - controller type to be returned + control_addr (str) - ip address of the controller + control_port (int) - port number of the controller + password (str) - passphrase to authenticate to the socket + chroot_path (str) - path prefix if in a chroot environment + controller (Class) - BaseController subclass to be returned, this provides + a ControlSocket if None Returns: - Authenticated control connection, the type based on the controller enum... - Controller.NONE => stem.socket.ControlPort + Authenticated control connection, the type based on the controller + argument. """ # TODO: replace the controller arg's default when we have something better @@ -223,16 +221,17 @@ def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = Non return _connect(control_port, password, chroot_path, controller) -def connect_socket_file(socket_path = "/var/run/tor/control", password = None, chroot_path = None, controller = Controller.NONE): +def connect_socket_file(socket_path = "/var/run/tor/control", password = None, chroot_path = None, controller = None): """ Convenience function for quickly getting a control connection. For more information see the connect_port function. Arguments: - socket_path (str) - path where the control socket is located - password (str) - passphrase to authenticate to the socket - chroot_path (str) - path prefix if in a chroot environment - controller (Controller) - controller type to be returned + socket_path (str) - path where the control socket is located + password (str) - passphrase to authenticate to the socket + chroot_path (str) - path prefix if in a chroot environment + controller (Class) - BaseController subclass to be returned, this provides + a ControlSocket if None Returns: Authenticated control connection, the type based on the controller enum. @@ -252,9 +251,10 @@ def _connect(control_socket, password, chroot_path, controller): Arguments: control_socket (stem.socket.ControlSocket) - socket being authenticated to - password (str) - passphrase to authenticate to the socket - chroot_path (str) - path prefix if in a chroot environment - controller (Controller) - controller type to be returned + password (str) - passphrase to authenticate to the socket + chroot_path (str) - path prefix if in a chroot environment + controller (Class) - BaseController subclass to be returned, this provides + a ControlSocket if None Returns: Authenticated control connection with a type based on the controller enum. @@ -263,8 +263,10 @@ def _connect(control_socket, password, chroot_path, controller): try: authenticate(control_socket, password, chroot_path) - if controller == Controller.NONE: + if controller == None: return control_socket + else: + return controller(control_socket) except MissingPassword: assert password is None, "BUG: authenticate raised MissingPassword despite getting one" diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index ac66ceb..3af249b 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -31,7 +31,7 @@ class TestConnect(unittest.TestCase): control_port = test.runner.CONTROL_PORT, password = test.runner.CONTROL_PASSWORD, chroot_path = runner.get_chroot(), - controller = stem.connection.Controller.NONE) + controller = None) if test.runner.Torrc.PORT in runner.get_options(): test.runner.exercise_controller(self, control_socket) @@ -50,7 +50,7 @@ class TestConnect(unittest.TestCase): socket_path = test.runner.CONTROL_SOCKET_PATH, password = test.runner.CONTROL_PASSWORD, chroot_path = runner.get_chroot(), - controller = stem.connection.Controller.NONE) + controller = None) if test.runner.Torrc.SOCKET in runner.get_options(): test.runner.exercise_controller(self, control_socket)

1 0

[stem/master] Helper function to only run tests once
by atagar＠torproject.org 17 May '12

17 May '12

commit b69db7feba640967c2bb6f2740d0aac2bf32666f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 17 09:19:28 2012 -0700 Helper function to only run tests once Adding a helper function to skip tests if they've been run before. This is needed because some of our tests take a long time to run and are uneffected by testing targets, so there's no point in wasting time on running them repeatedly. --- test/integ/descriptor/extrainfo_descriptor.py | 11 ++++------- test/integ/descriptor/server_descriptor.py | 14 ++++---------- test/runner.py | 17 +++++++++++++++++ 3 files changed, 25 insertions(+), 17 deletions(-) diff --git a/test/integ/descriptor/extrainfo_descriptor.py b/test/integ/descriptor/extrainfo_descriptor.py index ea58807..479ff01 100644 --- a/test/integ/descriptor/extrainfo_descriptor.py +++ b/test/integ/descriptor/extrainfo_descriptor.py @@ -10,8 +10,6 @@ import stem.descriptor.extrainfo_descriptor import test.runner import test.integ.descriptor -RAN_CACHED_DESCRIPTOR_TEST = False - class TestExtraInfoDescriptor(unittest.TestCase): def test_metrics_descriptor(self): """ @@ -68,15 +66,14 @@ k0d2aofcVbHr4fPQOSST0LXDrhFl5Fqo5um296zpJGvRUeO6S44U/EfJAGShtqWw additions. """ - global RAN_CACHED_DESCRIPTOR_TEST + # lengthy test and uneffected by targets, so only run once + test.runner.only_run_once(self, "test_cached_descriptor") + descriptor_path = test.runner.get_runner().get_test_dir("cached-extrainfo") - if RAN_CACHED_DESCRIPTOR_TEST: - self.skipTest("(already ran)") - elif not os.path.exists(descriptor_path): + if not os.path.exists(descriptor_path): self.skipTest("(no cached descriptors)") - RAN_CACHED_DESCRIPTOR_TEST = True with open(descriptor_path) as descriptor_file: for desc in stem.descriptor.extrainfo_descriptor.parse_file(descriptor_file): unrecognized_lines = desc.get_unrecognized_lines() diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index b5664c4..5d7e62d 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -12,11 +12,6 @@ import stem.descriptor.server_descriptor import test.runner import test.integ.descriptor -# 'test_cached_descriptor' is a lengthy test and uneffected by testing targets, -# so including a flag to prevent it from being ran multiple times - -RAN_CACHED_DESCRIPTOR_TEST = False - class TestServerDescriptor(unittest.TestCase): def test_metrics_descriptor(self): """ @@ -146,15 +141,14 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= additions. """ - global RAN_CACHED_DESCRIPTOR_TEST + # lengthy test and uneffected by targets, so only run once + test.runner.only_run_once(self, "test_cached_descriptor") + descriptor_path = test.runner.get_runner().get_test_dir("cached-descriptors") - if RAN_CACHED_DESCRIPTOR_TEST: - self.skipTest("(already ran)") - elif not os.path.exists(descriptor_path): + if not os.path.exists(descriptor_path): self.skipTest("(no cached descriptors)") - RAN_CACHED_DESCRIPTOR_TEST = True with open(descriptor_path) as descriptor_file: for desc in stem.descriptor.server_descriptor.parse_file(descriptor_file): # the following attributes should be deprecated, and not appear in the wild diff --git a/test/runner.py b/test/runner.py index 5ee9098..2dc0cbb 100644 --- a/test/runner.py +++ b/test/runner.py @@ -86,6 +86,9 @@ Torrc = stem.util.enum.Enum( ("PTRACE", "DisableDebuggerAttachment 0"), ) +# (test_instance, test_name) tuples that we've registered as having been ran +RAN_TESTS = [] + class RunnerStopped(Exception): "Raised when we try to use a Runner that doesn't have an active tor instance" pass @@ -117,6 +120,20 @@ def require_version(test_case, req_version): if get_runner().get_tor_version() < req_version: test_case.skipTest("(requires %s)" % req_version) +def only_run_once(test_case, test_name): + """ + Skips the test if it has ran before. If it hasn't then flags it as being ran. + + Arguments: + test_case (unittest.TestCase) - test being ran + test_name (str) - name of the test being ran + """ + + if (test_case, test_name) in RAN_TESTS: + test_case.skipTest("(already ran)") + else: + RAN_TESTS.append((test_case, test_name)) + def exercise_controller(test_case, controller): """ Checks that we can now use the socket by issuing a 'GETINFO config-file'

1 0

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

17 May '12

commit d374c5f7c6dd1d05b7adc1c23a2435705a25f3d4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 15:15:29 2012 +0000 Update translations for https_everywhere --- it/ssl-observatory.dtd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/it/ssl-observatory.dtd b/it/ssl-observatory.dtd index 8c60222..479f445 100644 --- a/it/ssl-observatory.dtd +++ b/it/ssl-observatory.dtd @@ -56,7 +56,7 @@ Mouseover the options for further details:">--> ""> -<!ENTITY ssl-observatory.prefs.hide ""> +<!ENTITY ssl-observatory.prefs.hide "Nascondi opzioni avanzate"> <!ENTITY ssl-observatory.prefs.nonanon ""> @@ -70,7 +70,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip ""> -<!ENTITY ssl-observatory.prefs.show ""> +<!ENTITY ssl-observatory.prefs.show "Mostra opzioni avanzate"> <!ENTITY ssl-observatory.prefs.title "">

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 May '12

17 May '12

commit 0f32d57945d8de30a81daa04bca281ac112bde29 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 15:15:11 2012 +0000 Update translations for vidalia_alpha --- it/vidalia_it.po | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/it/vidalia_it.po b/it/vidalia_it.po index d06c0aa..a977335 100644 --- a/it/vidalia_it.po +++ b/it/vidalia_it.po @@ -1,5 +1,6 @@ # # Translators: +# <09luca(a)live.it>, 2012. # <a.n0on3(a)gmail.com>, 2012. # <balelo(a)mailforspam.com>, 2011. # <perlon(a)yopmail.com>, 2012. @@ -11,8 +12,8 @@ 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:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" -"Last-Translator: n0on3 <a.n0on3(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-17 15:03+0000\n" +"Last-Translator: pu_pazzo <09luca(a)live.it>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1382,7 +1383,7 @@ msgstr "" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "Eccezioni" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2697,7 +2698,7 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1: Errore nell'apertura di %2" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" @@ -3213,15 +3214,15 @@ msgstr "L'indirizzo email per contattarti se ci fosse un \nproblema col tuo rela msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "giorno" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "settimana" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "mese" msgctxt "ServerPage" msgid "Enable accounting" @@ -3584,7 +3585,7 @@ msgstr "" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "Disconnesso" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 17 May '12

17 May '12

commit 62cba2dc5a82c2fb293c051dcbe0e9a44677941a Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 12:15:17 2012 +0000 Update translations for vidalia_help --- hi/log.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/hi/log.po b/hi/log.po index 3e371cd..c474606 100644 --- a/hi/log.po +++ b/hi/log.po @@ -157,5 +157,3 @@ msgstr "" #: en/log.html:100 msgid "Click <i>Save Settings</i> to save your log destination." msgstr "" - -

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 17 May '12

17 May '12

commit 7fac98daf96f3b4f6cb3f8555deff85882297e80 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 12:15:09 2012 +0000 Update translations for vidalia --- hi/qt_hi.po | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/hi/qt_hi.po b/hi/qt_hi.po index 8ca424b..91c924c 100644 --- a/hi/qt_hi.po +++ b/hi/qt_hi.po @@ -1,12 +1,13 @@ -# # Translators: +# Translators: +# <ra.rishab(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: 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-05-17 12:09+0000\n" +"Last-Translator: Rishab Arora <ra.rishab(a)gmail.com>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,102 +19,102 @@ msgstr "" #: qaccessibleobject.cpp:348 msgctxt "QApplication" msgid "Activate" -msgstr "" +msgstr "चालू करें " #: qmessagebox.h:319 msgctxt "QApplication" msgid "Executable '%1' requires Qt %2, found Qt %3." -msgstr "" +msgstr "Executable '%1' को Qt %2 की आवश्यकता है | मिला Qt %3 |" #: qmessagebox.h:321 msgctxt "QApplication" msgid "Incompatible Qt Library Error" -msgstr "" +msgstr "अनुचित Qt Library ऐरर " #: qapplication.cpp:2095 msgctxt "QApplication" msgid "QT_LAYOUT_DIRECTION" -msgstr "" +msgstr "QT_LAYOUT_DIRECTION" #: qaccessibleobject.cpp:350 msgctxt "QApplication" msgid "Activates the program's main window" -msgstr "" +msgstr "प्रोग्राम की मुख्य विन्डो को चालू करता है " #: qmessagebox.cpp:2104 msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "ठीक है " #: qdialogbuttonbox.cpp:528 msgctxt "QDialogButtonBox" msgid "Save" -msgstr "" +msgstr "सुरक्षित करें " #: qdialogbuttonbox.cpp:531 msgctxt "QDialogButtonBox" msgid "Open" -msgstr "" +msgstr "खोलें " #: qdialogbuttonbox.cpp:534 msgctxt "QDialogButtonBox" msgid "Cancel" -msgstr "" +msgstr "रद्द करें " #: qdialogbuttonbox.cpp:537 msgctxt "QDialogButtonBox" msgid "Close" -msgstr "" +msgstr "बंद करें " #: qdialogbuttonbox.cpp:540 msgctxt "QDialogButtonBox" msgid "Apply" -msgstr "" +msgstr "लागू करें " #: qdialogbuttonbox.cpp:543 msgctxt "QDialogButtonBox" msgid "Reset" -msgstr "" +msgstr "रीसेट करें" #: qdialogbuttonbox.cpp:546 msgctxt "QDialogButtonBox" msgid "Help" -msgstr "" +msgstr "मदद" #: qdialogbuttonbox.cpp:550 msgctxt "QDialogButtonBox" msgid "Don't Save" -msgstr "" +msgstr "सुरक्षित न करें " #: qdialogbuttonbox.cpp:554 msgctxt "QDialogButtonBox" msgid "Discard" -msgstr "" +msgstr "रद्द करें " #: qdialogbuttonbox.cpp:557 msgctxt "QDialogButtonBox" msgid "&Yes" -msgstr "" +msgstr "हां" #: qdialogbuttonbox.cpp:560 msgctxt "QDialogButtonBox" msgid "Yes to &All" -msgstr "" +msgstr "सभी के लिए हाँ" #: qdialogbuttonbox.cpp:563 msgctxt "QDialogButtonBox" msgid "&No" -msgstr "" +msgstr "नहीं" #: qdialogbuttonbox.cpp:566 msgctxt "QDialogButtonBox" msgid "N&o to All" -msgstr "" +msgstr "सभी के लिए नहीं" #: qdialogbuttonbox.cpp:569 msgctxt "QDialogButtonBox" msgid "Save All" -msgstr "" +msgstr "सभी सुरक्षित करें" #: qdialogbuttonbox.cpp:572 msgctxt "QDialogButtonBox" @@ -431,5 +432,3 @@ msgstr "" msgctxt "QFileSystemModel" msgid "%1 bytes" msgstr "" - -

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 May '12

17 May '12

commit d1815873673248760c7a643362c766643b90d1ff Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 06:45:11 2012 +0000 Update translations for vidalia_alpha --- hi/vidalia_hi.po | 124 +++++++++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 62 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index 98e98cd..37ce17b 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -7,7 +7,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:46+0000\n" -"PO-Revision-Date: 2012-05-17 06:14+0000\n" +"PO-Revision-Date: 2012-05-17 06:34+0000\n" "Last-Translator: sujoyb <gumpsujoy(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -961,187 +961,187 @@ msgstr "पाकिस्तान" msgctxt "CountryInfo" msgid "Palau" -msgstr "" +msgstr "पलाऊ" msgctxt "CountryInfo" msgid "Palestine" -msgstr "" +msgstr "पलेस्टाइन" msgctxt "CountryInfo" msgid "Panama" -msgstr "" +msgstr "पनामा" msgctxt "CountryInfo" msgid "Papua New Guinea" -msgstr "" +msgstr "पापुआ न्यू गिनी" msgctxt "CountryInfo" msgid "Paraguay" -msgstr "" +msgstr "पैराग्वे" msgctxt "CountryInfo" msgid "Peru" -msgstr "" +msgstr "पेरू" msgctxt "CountryInfo" msgid "Philippines" -msgstr "" +msgstr "फ़िलिपींस" msgctxt "CountryInfo" msgid "Poland" -msgstr "" +msgstr "पोलैंड" msgctxt "CountryInfo" msgid "Portugal" -msgstr "" +msgstr "पुर्तगाल" msgctxt "CountryInfo" msgid "Qatar" -msgstr "" +msgstr "क़तर" msgctxt "CountryInfo" msgid "Romania" -msgstr "" +msgstr "रोमानिया" msgctxt "CountryInfo" msgid "Russia" -msgstr "" +msgstr "रूस" msgctxt "CountryInfo" msgid "Rwanda" -msgstr "" +msgstr "रवांडा" msgctxt "CountryInfo" msgid "Saint Kitts & Nevis" -msgstr "" +msgstr "सेंट किट्स और नेविस" msgctxt "CountryInfo" msgid "Saint Lucia" -msgstr "" +msgstr "सेंट लूसिया" msgctxt "CountryInfo" msgid "Saint Vincent & the Grenadines" -msgstr "" +msgstr "सेंट विन्सेंट और ग्रेनेजियन्स" msgctxt "CountryInfo" msgid "Samoa" -msgstr "" +msgstr "सामोआ" msgctxt "CountryInfo" msgid "San Marino" -msgstr "" +msgstr "सैन मारिनो" msgctxt "CountryInfo" msgid "Sao Tome & Principe" -msgstr "" +msgstr "साओ टोम और प्रिंसिपे" msgctxt "CountryInfo" msgid "Saudi Arabia" -msgstr "" +msgstr "सऊदी अरब" msgctxt "CountryInfo" msgid "Senegal" -msgstr "" +msgstr "सेनेगल" msgctxt "CountryInfo" msgid "Serbia" -msgstr "" +msgstr "सर्बिआ" msgctxt "CountryInfo" msgid "Seychelles" -msgstr "" +msgstr "सेशेल्स" msgctxt "CountryInfo" msgid "Sierra Leone" -msgstr "" +msgstr "सिएरा लियोन" msgctxt "CountryInfo" msgid "Singapore" -msgstr "" +msgstr "सिंगापुर" msgctxt "CountryInfo" msgid "Slovakia" -msgstr "" +msgstr "स्लोवाकिया" msgctxt "CountryInfo" msgid "Slovenia" -msgstr "" +msgstr "स्लोवेनिया" msgctxt "CountryInfo" msgid "Solomon Islands" -msgstr "" +msgstr "सोलोमन आइलैंड्स" msgctxt "CountryInfo" msgid "Somalia" -msgstr "" +msgstr "सोमालिया" msgctxt "CountryInfo" msgid "South Africa" -msgstr "" +msgstr "दक्षिण अफ्रीका" msgctxt "CountryInfo" msgid "Spain" -msgstr "" +msgstr "स्पेन" msgctxt "CountryInfo" msgid "Sri Lanka" -msgstr "" +msgstr "श्रीलंका" msgctxt "CountryInfo" msgid "Sudan" -msgstr "" +msgstr "सूडान" msgctxt "CountryInfo" msgid "Suriname" -msgstr "" +msgstr "सूरीनाम" msgctxt "CountryInfo" msgid "Swaziland" -msgstr "" +msgstr "स्वाज़ीलैंड" msgctxt "CountryInfo" msgid "Sweden" -msgstr "" +msgstr "स्वीडन" msgctxt "CountryInfo" msgid "Switzerland" -msgstr "" +msgstr "स्विजरलैंड" msgctxt "CountryInfo" msgid "Syria" -msgstr "" +msgstr "सीरिया" msgctxt "CountryInfo" msgid "Tajikistan" -msgstr "" +msgstr "ताजीकिस्तान" msgctxt "CountryInfo" msgid "Tanzania" -msgstr "" +msgstr "तंज़ानिया" msgctxt "CountryInfo" msgid "Thailand" -msgstr "" +msgstr "थाईलैंड" msgctxt "CountryInfo" msgid "Timor-Leste (East Timor)" -msgstr "" +msgstr "तिमोर लेस्ते (पूर्वी तिमोर)" msgctxt "CountryInfo" msgid "Togo" -msgstr "" +msgstr "टोगो" msgctxt "CountryInfo" msgid "Tonga" -msgstr "" +msgstr "टोंगा" msgctxt "CountryInfo" msgid "Trinidad & Tobago" -msgstr "" +msgstr "त्रिनिदाद एवं टोबैगो" msgctxt "CountryInfo" msgid "Tunisia" -msgstr "" +msgstr "ट्यूनीशिया" msgctxt "CountryInfo" msgid "Turkey" @@ -2045,7 +2045,7 @@ msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "प्रचाल के लिया मूल्य अपेक्षित:" msgctxt "MainWindow" msgid "" @@ -2082,11 +2082,11 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(शायद टेलनेट)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(शायद ईमेल क्लाइंट)" msgctxt "MainWindow" msgid "" @@ -2683,7 +2683,7 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Processing..." -msgstr "" +msgstr "%1: प्रसंस्करण..." msgctxt "PluginWrapper" msgid "" @@ -2711,11 +2711,11 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1: शुरू हो रहा है..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1: बांध हो रहा है..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" @@ -3209,15 +3209,15 @@ msgstr "" msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "दिन" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "सप्ताह" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "माह" msgctxt "ServerPage" msgid "Enable accounting" @@ -3241,19 +3241,19 @@ msgstr "" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" @@ -3261,7 +3261,7 @@ msgstr "" msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "समय" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3880,7 +3880,7 @@ msgstr "" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "प्रचाल के लिया मूल्य अपेक्षित:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 May '12

17 May '12

commit 3f8c55d5803347283535e48e4607a875524fed9b Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 06:15:11 2012 +0000 Update translations for vidalia_alpha --- hi/vidalia_hi.po | 114 +++++++++++++++++++++++++++--------------------------- 1 files changed, 57 insertions(+), 57 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index ce96181..98e98cd 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -7,7 +7,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:46+0000\n" -"PO-Revision-Date: 2012-05-17 05:44+0000\n" +"PO-Revision-Date: 2012-05-17 06:14+0000\n" "Last-Translator: sujoyb <gumpsujoy(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -454,15 +454,15 @@ msgstr "सहायता" msgctxt "ConfigDialog" msgid "Error Saving Settings" -msgstr "" +msgstr "सेटिंग्स बचाने में समस्या" msgctxt "ConfigDialog" msgid "Vidalia was unable to save your %1 settings." -msgstr "" +msgstr "विडालिया %1 सेटिंग्स बचा नहीं पाया" msgctxt "ConfigDialog" msgid "Error Applying Settings" -msgstr "" +msgstr "सेटिंग्स लागू करने में समस्या" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." @@ -549,131 +549,131 @@ msgstr "" msgctxt "CountryInfo" msgid "Azerbaijan" -msgstr "" +msgstr "अज़रबैजान" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "" +msgstr "बहमास" msgctxt "CountryInfo" msgid "Bangladesh" -msgstr "" +msgstr "बांग्लादेश" msgctxt "CountryInfo" msgid "Barbados" -msgstr "" +msgstr "बारबाडोस" msgctxt "CountryInfo" msgid "Belarus" -msgstr "" +msgstr "बेलारूस" msgctxt "CountryInfo" msgid "Belgium" -msgstr "" +msgstr "बेल्जियम" msgctxt "CountryInfo" msgid "Belize" -msgstr "" +msgstr "बेलीज़" msgctxt "CountryInfo" msgid "Bhutan" -msgstr "" +msgstr "भूटान" msgctxt "CountryInfo" msgid "Bolivia" -msgstr "" +msgstr "बोलीविया" msgctxt "CountryInfo" msgid "Bosnia & Herzegovina" -msgstr "" +msgstr "बोस्निया और हर्जेगोविना" msgctxt "CountryInfo" msgid "Botswana" -msgstr "" +msgstr "बोत्सवाना" msgctxt "CountryInfo" msgid "Brazil" -msgstr "" +msgstr "ब्राज़िल" msgctxt "CountryInfo" msgid "Brunei Darussalam" -msgstr "" +msgstr "ब्रुनेई दारुसलाम" msgctxt "CountryInfo" msgid "Bulgaria" -msgstr "" +msgstr "बुल्गारिया" msgctxt "CountryInfo" msgid "Burkina Faso" -msgstr "" +msgstr "बुर्किना फासो" msgctxt "CountryInfo" msgid "Burundi" -msgstr "" +msgstr "बुरुंडी" msgctxt "CountryInfo" msgid "Cambodia" -msgstr "" +msgstr "कंबोडिया" msgctxt "CountryInfo" msgid "Cameroon" -msgstr "" +msgstr "कैमरून" msgctxt "CountryInfo" msgid "Canada" -msgstr "" +msgstr "कनाडा" msgctxt "CountryInfo" msgid "Cape Verde" -msgstr "" +msgstr "केप वर्ड" msgctxt "CountryInfo" msgid "Central African Republic" -msgstr "" +msgstr "मध्य अफ्रीकी गणराज्य" msgctxt "CountryInfo" msgid "Chad" -msgstr "" +msgstr "चाद" msgctxt "CountryInfo" msgid "Chile" -msgstr "" +msgstr "चिली" msgctxt "CountryInfo" msgid "China" -msgstr "" +msgstr "चीन" msgctxt "CountryInfo" msgid "Colombia" -msgstr "" +msgstr "कोलंबिया" msgctxt "CountryInfo" msgid "Comoros" -msgstr "" +msgstr "कोमोरोज़" msgctxt "CountryInfo" msgid "Congo, The Democratic Republic of the" -msgstr "" +msgstr "कांगो लोकतांत्रिक गणराज्य" msgctxt "CountryInfo" msgid "Congo" -msgstr "" +msgstr "कांगो" msgctxt "CountryInfo" msgid "Costa Rica" -msgstr "" +msgstr "कोस्टा रिका" msgctxt "CountryInfo" msgid "Cote dâIvoire" -msgstr "" +msgstr "कोटे डा आइवर" msgctxt "CountryInfo" msgid "Croatia" -msgstr "" +msgstr "क्रोएशिया" msgctxt "CountryInfo" msgid "Cuba" -msgstr "" +msgstr "क्यूबा" msgctxt "CountryInfo" msgid "Cyprus" @@ -681,71 +681,71 @@ msgstr "" msgctxt "CountryInfo" msgid "Czech Republic" -msgstr "" +msgstr "चेक गणराज्य" msgctxt "CountryInfo" msgid "Denmark" -msgstr "" +msgstr "डेनमार्क" msgctxt "CountryInfo" msgid "Djibouti" -msgstr "" +msgstr "जिबोटी" msgctxt "CountryInfo" msgid "Dominica" -msgstr "" +msgstr "डॉमिनिका" msgctxt "CountryInfo" msgid "Dominican Republic" -msgstr "" +msgstr "डॉमिनिक गणराज्य" msgctxt "CountryInfo" msgid "Ecuador" -msgstr "" +msgstr "इक्वेडोर" msgctxt "CountryInfo" msgid "Egypt" -msgstr "" +msgstr "मिस्र" msgctxt "CountryInfo" msgid "El Salvador" -msgstr "" +msgstr "अल सल्वाडोर" msgctxt "CountryInfo" msgid "Equatorial Guinea" -msgstr "" +msgstr "इक्वेटोरियल गिनी" msgctxt "CountryInfo" msgid "Eritrea" -msgstr "" +msgstr "इरीट्रिया" msgctxt "CountryInfo" msgid "Estonia" -msgstr "" +msgstr "एस्तोनिया" msgctxt "CountryInfo" msgid "France" -msgstr "" +msgstr "फ्रांस" msgctxt "CountryInfo" msgid "Gabon" -msgstr "" +msgstr "गैबन" msgctxt "CountryInfo" msgid "Gambia" -msgstr "" +msgstr "जाम्बिया" msgctxt "CountryInfo" msgid "Georgia" -msgstr "" +msgstr "जॉर्जिया" msgctxt "CountryInfo" msgid "Germany" -msgstr "" +msgstr "जर्मनी" msgctxt "CountryInfo" msgid "Ghana" -msgstr "" +msgstr "घाना" msgctxt "CountryInfo" msgid "Grenada" @@ -945,19 +945,19 @@ msgstr "" msgctxt "CountryInfo" msgid "Nigeria" -msgstr "" +msgstr "नाइजीरिया" msgctxt "CountryInfo" msgid "Norway" -msgstr "" +msgstr "नॉर्वे" msgctxt "CountryInfo" msgid "Oman" -msgstr "" +msgstr "ओमान" msgctxt "CountryInfo" msgid "Pakistan" -msgstr "" +msgstr "पाकिस्तान" msgctxt "CountryInfo" msgid "Palau"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 May '12

17 May '12

commit 458d33cdfe1a862f4bb8eaeb807a3073997a027c Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 05:45:11 2012 +0000 Update translations for vidalia_alpha --- hi/vidalia_hi.po | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index 0d5ae52..ce96181 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -7,7 +7,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:46+0000\n" -"PO-Revision-Date: 2012-05-17 05:14+0000\n" +"PO-Revision-Date: 2012-05-17 05:44+0000\n" "Last-Translator: sujoyb <gumpsujoy(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -48,7 +48,7 @@ msgstr "आपने 'पासवर्ड' प्रमाणीकरण क msgctxt "AdvancedPage" msgid "Select Tor Configuration File" -msgstr "" +msgstr "संरूपण फाइल चुने" msgctxt "AdvancedPage" msgid "File Not Found" @@ -233,7 +233,7 @@ msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." -msgstr "" +msgstr "विडालिया टोर सेवा को हटा नहीं पाया.\n\nआपको इसे स्वयं हटाने की आवश्यकता हो सकती है." msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" @@ -282,7 +282,7 @@ msgstr "" msgctxt "BandwidthGraph" msgid "Hide Settings" -msgstr "" +msgstr "सेटिंग्स छुपाएँ" msgctxt "BandwidthGraph" msgid "Show Settings" @@ -362,7 +362,7 @@ msgstr "" msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "" +msgstr "देश" msgctxt "BridgeUsageDialog" msgid "# Clients" @@ -446,11 +446,11 @@ msgstr "" msgctxt "ConfigDialog" msgid "Advanced" -msgstr "" +msgstr "उन्नत" msgctxt "ConfigDialog" msgid "Help" -msgstr "" +msgstr "सहायता" msgctxt "ConfigDialog" msgid "Error Saving Settings" @@ -466,11 +466,11 @@ msgstr "" msgctxt "ConfigDialog" msgid "Vidalia was unable to apply your %1 settings to Tor." -msgstr "" +msgstr "विडालिया %1 सेटिंग्स टोर पर लागू नहीं कर पाया" msgctxt "ConfigDialog" msgid "Settings" -msgstr "" +msgstr "सेटिंग्स" msgctxt "ControlConnection" msgid "Vidalia was unable to connect to Tor. (%1)"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 17 May '12

17 May '12

commit eb12c789d4a3299b5699fb8a055861915f86ffc5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 05:15:13 2012 +0000 Update translations for vidalia_alpha --- hi/vidalia_hi.po | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hi/vidalia_hi.po b/hi/vidalia_hi.po index 5e22235..0d5ae52 100644 --- a/hi/vidalia_hi.po +++ b/hi/vidalia_hi.po @@ -1,13 +1,14 @@ # # Translators: +# <gumpsujoy(a)gmail.com>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. 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:46+0000\n" -"PO-Revision-Date: 2012-03-22 09:01+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-05-17 05:14+0000\n" +"Last-Translator: sujoyb <gumpsujoy(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,15 +27,15 @@ msgstr "लाइसेंस" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" -msgstr "" +msgstr "विडालिया 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "" +msgstr "टोर 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." @@ -43,7 +44,7 @@ msgstr "'% १' IP पता मन्य नहि है ।" msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." -msgstr "" +msgstr "आपने 'पासवर्ड' प्रमाणीकरण का चयन किया है, लेकिन पासवर्ड निर्दिष्ट नहीं किया" msgctxt "AdvancedPage" msgid "Select Tor Configuration File" @@ -123,7 +124,7 @@ msgstr "आपकि संरूपण संचिका के लिये msgctxt "AdvancedPage" msgid "Browse" -msgstr "" +msgstr "ब्राउज़" msgctxt "AdvancedPage" msgid "Data Directory" @@ -248,7 +249,7 @@ msgstr "वीडालीया मे प्रयुक्त होने msgctxt "AppearancePage" msgid "Style" -msgstr "" +msgstr "शैली" msgctxt "AppearancePage" msgid "Choose Vidalia's interface style" @@ -293,11 +294,11 @@ msgstr "पुनःस्थाप" msgctxt "BandwidthGraph" msgid "Receive Rate" -msgstr "" +msgstr "जानकारी प्राप्त का दर" msgctxt "BandwidthGraph" msgid "Send Rate" -msgstr "" +msgstr "जानकारी भेजें जाने का दर " msgctxt "BandwidthGraph" msgid "Always on Top"

1 0