- tor-commits - lists.torproject.org

[stem/master] Using mocking module for protocolinfo unit tests
by atagar＠torproject.org 29 Jan '12

29 Jan '12

commit 9a2b50138356f317220819b2351f666bd45564e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 27 18:53:39 2012 -0800 Using mocking module for protocolinfo unit tests Expanding the mocking module to provide a ControlMessage (very frequently needed in tests) and using the module to simplify the protocolinfo unit tests. --- test/mocking.py | 38 +++++++++++++++++++---- test/unit/connection/protocolinfo.py | 54 +++++++++++++++------------------- 2 files changed, 55 insertions(+), 37 deletions(-) diff --git a/test/mocking.py b/test/mocking.py index f6bf98c..0d01a60 100644 --- a/test/mocking.py +++ b/test/mocking.py @@ -1,6 +1,11 @@ """ Helper functions for creating mock objects and monkey patching to help with -testing. +testing. With python's builtin unit testing framework the setUp and test +functions set up mocking, which is then reverted in the tearDown method by +calling 'revert_mocking'. + +mock - replaces a function with an alternative implementation +revert_mocking - reverts any changes made by the mock function Mocking Functions no_op - does nothing @@ -10,10 +15,9 @@ Mocking Functions return_none - returns None raise_exception - raises an exception when called -mock - replaces a function with an alternative implementation -revert_mocking - reverts any changes made by the mock function - -get_protocolinfo_response - provides a ProtocolInfoResponse instance +Instance Constructors + get_message - stem.socket.ControlMessage + get_protocolinfo_response - stem.connection.ProtocolInfoResponse """ import inspect @@ -94,6 +98,27 @@ def revert_mocking(): MOCK_STATE.clear() +def get_message(content, reformat = True): + """ + Provides a ControlMessage with content modified to be parsable. This makes + the following changes unless 'reformat' is false... + - ensures the content ends with a newline + - newlines are replaced with a carrage return and newline pair + + Arguments: + content (str) - base content for the controller message + reformat (str) - modifies content to be more accomidateing to being parsed + + Returns: + stem.socket.ControlMessage instance + """ + + if reformat: + if not content.endswith("\n"): content += "\n" + content = content.replace("\n", "\r\n") + + return stem.socket.recv_message(StringIO.StringIO(content)) + def get_protocolinfo_response(**attributes): """ Provides a ProtocolInfoResponse, customized with the given attributes. The @@ -107,8 +132,7 @@ def get_protocolinfo_response(**attributes): stem.connection.ProtocolInfoResponse instance """ - control_message = "250-PROTOCOLINFO 1\r\n250 OK\r\n" - protocolinfo_response = stem.socket.recv_message(StringIO.StringIO(control_message)) + protocolinfo_response = get_message("250-PROTOCOLINFO 1\n250 OK") stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) for attr in attributes: diff --git a/test/unit/connection/protocolinfo.py b/test/unit/connection/protocolinfo.py index bc0fef3..0f47fe1 100644 --- a/test/unit/connection/protocolinfo.py +++ b/test/unit/connection/protocolinfo.py @@ -3,51 +3,44 @@ Unit tests for the stem.connection.ProtocolInfoResponse class. """ import unittest -import StringIO import stem.connection import stem.socket import stem.version +import test.mocking as mocking NO_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=NULL 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" PASSWORD_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=HASHEDPASSWORD 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" COOKIE_AUTH = r"""250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE COOKIEFILE="/tmp/my data\\\"dir//control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" MULTIPLE_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE,HASHEDPASSWORD COOKIEFILE="/home/atagar/.tor/control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" UNKNOWN_AUTH = """250-PROTOCOLINFO 1 250-AUTH METHODS=MAGIC,HASHEDPASSWORD,PIXIE_DUST 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" MINIMUM_RESPONSE = """250-PROTOCOLINFO 5 -250 OK -""".replace("\n", "\r\n") +250 OK""" RELATIVE_COOKIE_PATH = r"""250-PROTOCOLINFO 1 250-AUTH METHODS=COOKIE COOKIEFILE="./tor-browser_en-US/Data/control_auth_cookie" 250-VERSION Tor="0.2.1.30" -250 OK -""".replace("\n", "\r\n") +250 OK""" class TestProtocolInfoResponse(unittest.TestCase): """ @@ -61,7 +54,7 @@ class TestProtocolInfoResponse(unittest.TestCase): """ # working case - control_message = stem.socket.recv_message(StringIO.StringIO(NO_AUTH)) + control_message = mocking.get_message(NO_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) # now this should be a ProtocolInfoResponse (ControlMessage subclass) @@ -69,14 +62,15 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertTrue(isinstance(control_message, stem.connection.ProtocolInfoResponse)) # exercise some of the ControlMessage functionality + raw_content = (NO_AUTH + "\n").replace("\n", "\r\n") + self.assertEquals(raw_content, control_message.raw_content()) self.assertTrue(str(control_message).startswith("PROTOCOLINFO 1")) - self.assertEquals(NO_AUTH, control_message.raw_content()) # attempt to convert the wrong type self.assertRaises(TypeError, stem.connection.ProtocolInfoResponse.convert, "hello world") # attempt to convert a different message type - bw_event_control_message = stem.socket.recv_message(StringIO.StringIO("650 BW 32326 2856\r\n")) + bw_event_control_message = mocking.get_message("650 BW 32326 2856") self.assertRaises(stem.socket.ProtocolError, stem.connection.ProtocolInfoResponse.convert, bw_event_control_message) def test_no_auth(self): @@ -84,7 +78,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response when there's no authentication. """ - control_message = stem.socket.recv_message(StringIO.StringIO(NO_AUTH)) + control_message = mocking.get_message(NO_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals(1, control_message.protocol_version) @@ -98,7 +92,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with password authentication. """ - control_message = stem.socket.recv_message(StringIO.StringIO(PASSWORD_AUTH)) + control_message = mocking.get_message(PASSWORD_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.PASSWORD, ), control_message.auth_methods) @@ -108,7 +102,7 @@ class TestProtocolInfoResponse(unittest.TestCase): characters. """ - control_message = stem.socket.recv_message(StringIO.StringIO(COOKIE_AUTH)) + control_message = mocking.get_message(COOKIE_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.COOKIE, ), control_message.auth_methods) self.assertEquals("/tmp/my data\\\"dir//control_auth_cookie", control_message.cookie_path) @@ -118,7 +112,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with multiple authentication methods. """ - control_message = stem.socket.recv_message(StringIO.StringIO(MULTIPLE_AUTH)) + control_message = mocking.get_message(MULTIPLE_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.COOKIE, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) self.assertEquals("/home/atagar/.tor/control_auth_cookie", control_message.cookie_path) @@ -128,7 +122,7 @@ class TestProtocolInfoResponse(unittest.TestCase): Checks a response with an unrecognized authtentication method. """ - control_message = stem.socket.recv_message(StringIO.StringIO(UNKNOWN_AUTH)) + control_message = mocking.get_message(UNKNOWN_AUTH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals((stem.connection.AuthMethod.UNKNOWN, stem.connection.AuthMethod.PASSWORD), control_message.auth_methods) self.assertEquals(("MAGIC", "PIXIE_DUST"), control_message.unknown_auth_methods) @@ -139,7 +133,7 @@ class TestProtocolInfoResponse(unittest.TestCase): information to be a valid response. """ - control_message = stem.socket.recv_message(StringIO.StringIO(MINIMUM_RESPONSE)) + control_message = mocking.get_message(MINIMUM_RESPONSE) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals(5, control_message.protocol_version) @@ -162,23 +156,23 @@ class TestProtocolInfoResponse(unittest.TestCase): def call_mocking(command): if command == stem.util.system.GET_PID_BY_NAME_PGREP % "tor": return ["10"] - if command == stem.util.system.GET_CWD_PWDX % 10: + elif command == stem.util.system.GET_CWD_PWDX % 10: return ["10: /tmp/foo"] - stem.util.system.CALL_MOCKING = call_mocking + mocking.mock(stem.util.system.call, call_mocking) - control_message = stem.socket.recv_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + control_message = mocking.get_message(RELATIVE_COOKIE_PATH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals("/tmp/foo/tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_path) # exercise cookie expansion where both calls fail (should work, just # leaving the path unexpanded) - stem.util.system.CALL_MOCKING = lambda cmd: None - control_message = stem.socket.recv_message(StringIO.StringIO(RELATIVE_COOKIE_PATH)) + mocking.mock(stem.util.system.call, mocking.return_none()) + control_message = mocking.get_message(RELATIVE_COOKIE_PATH) stem.connection.ProtocolInfoResponse.convert(control_message) self.assertEquals("./tor-browser_en-US/Data/control_auth_cookie", control_message.cookie_path) # reset system call mocking - stem.util.system.CALL_MOCKING = None + mocking.revert_mocking()

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit bd155028cbc345b3037367090280c28763bc0fcc Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 04:15:17 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 12 ++++++------ ru/vidalia_ru.po | 15 ++++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 1d55b01..a25c4bc 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 03:33+0000\n" +"PO-Revision-Date: 2012-01-29 03:53+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1924,15 +1924,15 @@ msgstr "خواهشمند است تنظیمات احرازهویت پورتِ ک msgctxt "MainWindow" msgid "Tor Update Available" -msgstr "به روز رسانی تُر موجود می باشد" +msgstr "به روز رسانی برای تور موجود است" msgctxt "MainWindow" msgid "" "The currently installed version of Tor is out of date or no longer " "recommended. Please visit the Tor website to download the latest version." msgstr "" -"نسخه نصب شده تُر قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تُر " -"رفته و نهایی ترین نسخه آن را بارگذاری کنید." +"نسخه نصب شده تور قدیمی است و دیگر توصیه نمیشود. خواهشمند است به سایت تور " +"رفته و آخرین نسخه را بارگذاری کنید." msgctxt "MainWindow" msgid "Tor website: %1" @@ -1975,7 +1975,7 @@ msgstr "برپای بازپخش\n" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "برپا کردن یک بازپخش به منظور کمک و همکاری کردن در رشد شبکه" +msgstr "یک بازپخش راه‌اندازی و به رشد شبکه کمک کنید" msgctxt "MainWindow" msgid "View the Network" @@ -1983,7 +1983,7 @@ msgstr "مشاهده شبکه" msgctxt "MainWindow" msgid "View a map of the Tor network" -msgstr "مشاهده نقشه شبکه تُر" +msgstr "مشاهده نقشه شبکه تور" msgctxt "MainWindow" msgid "Use a New Identity" diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index 3f5012d..9b84607 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 03:44+0000\n" +"PO-Revision-Date: 2012-01-29 03:50+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -1316,6 +1316,9 @@ msgid "" "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." msgstr "" +"Отчет об аварийном завершении был создан и вы можете отправить его " +"разработчикам Vidalia что бы помочь им найти и устранить ошибку. " +"Отправляемый отчет не содержит какой-либо персональной информации." msgctxt "CrashReportDialog" msgid "" @@ -2117,7 +2120,7 @@ msgstr "" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "Начальная загрузка Tor от %1 до %2" msgctxt "MainWindow" msgid "" @@ -2141,17 +2144,19 @@ msgstr "" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "(вероятно Telnet)" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "(вероятно email клиент)" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." msgstr "" +"Похоже, что одно из ваших приложений %1 создает потенциально не " +"зашифрованное и небезопасное соединение на порт %2." msgctxt "MessageLog" msgid "Error Setting Filter" @@ -3873,7 +3878,7 @@ msgstr "" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "Требуется задать значение параметра:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit a845040c8af7a31d9175ae3632ea162dd04a4016 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:45:21 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 8 ++-- ru/vidalia_ru.po | 148 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 86 insertions(+), 70 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index 21c7ea8..1d55b01 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-28 13:29+0000\n" +"PO-Revision-Date: 2012-01-29 03:33+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1916,11 +1916,11 @@ msgstr "خطای احرازهویت" msgctxt "MainWindow" msgid "Vidalia was unable to authenticate to the Tor software. (%1)" -msgstr "ویدالیا قادر به احرازهویت درنرم افزار تُر نشد. (%1)" +msgstr "ویدالیا قادر به احرازهویت به نرم افزار تور نشد. (%1)" msgctxt "MainWindow" msgid "Please check your control port authentication settings." -msgstr "خواهشمند است پارامترهای احرازهویت درگاه کنترل خود را چک کنید." +msgstr "خواهشمند است تنظیمات احرازهویت پورتِ کنترل خود را چک کنید." msgctxt "MainWindow" msgid "Tor Update Available" @@ -1936,7 +1936,7 @@ msgstr "" msgctxt "MainWindow" msgid "Tor website: %1" -msgstr "وب سایت تُر: %1" +msgstr "وب سایت تور: %1" msgctxt "MainWindow" msgid "" diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index d13a7be..3f5012d 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-29 03:14+0000\n" +"PO-Revision-Date: 2012-01-29 03:44+0000\n" "Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" @@ -182,26 +182,28 @@ msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Путь к заданной папке данных Tor содержит символы которые не могут быть " +"представлены в текущей 8-битной кодировке вашей системы." msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Предупреждение" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "Вы изменили путь torrc, хотите перезапустить Tor?" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Файл конфигурации Tor (torrc);;Все файлы (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "Выберите файл для использования для пути сокета Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Настроить ControlPort автоматически" msgctxt "AdvancedPage" msgid "" @@ -1170,7 +1172,7 @@ msgstr "Зимбабве" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "Заир" msgctxt "CountryInfo" msgid "Albania" @@ -1270,39 +1272,43 @@ msgstr "Тайвань" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Отправить информацию об аварийном завершении" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia совершила ошибку и требует завершения" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Перезапустить Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Не перезапускать" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Невозможно перезапустить Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Мы не смогли автоматически перезапустить Vidalia. Пожалуйста, перезапустите " +"Vidalia вручную." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Пожалуйста, заполните тикет:" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgstr "" +"<a " +"href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" @@ -1596,27 +1602,27 @@ msgstr "Неизвестно" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Отладка" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Инфа" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "Замечание" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Предупреждение" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Ошибка" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "Неизвестно" msgctxt "MainWindow" msgid "Start Tor" @@ -2093,6 +2099,9 @@ msgid "" "application's configuration and use only encrypted protocols, such as SSL, " "if possible." msgstr "" +"Любая информация отправленная через это это соединение может быть " +"просмотрена. Пожалуйста, проверьте настройки вашей программы и используйте " +"только шифрующие протоколы, типа SSL, если это возможно." msgctxt "MainWindow" msgid "failed (%1)" @@ -2400,15 +2409,15 @@ msgstr "Автоматически сохранять новые сообщен msgctxt "MessageLog" msgid "Basic" -msgstr "" +msgstr "Основное" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Статус Tor" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Расширенные" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2698,31 +2707,31 @@ msgstr "" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Адрес:" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "Тип:" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Необходимо выбрать тип прокси." msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3162,11 +3171,11 @@ msgstr "<a href=\"#bridgeUsage\">Кто использовал мой мост?< msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Что это?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Автоматически распространять адрес моего моста" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3269,19 +3278,19 @@ msgstr "Создано Tor" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Скопировать с буфер обмена" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor запущен" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Вы используете версию \"%1\" Tor." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor не запущен" msgctxt "StatusEventWidget" msgid "" @@ -3308,11 +3317,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "Ваша версия Tor устарела" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "Связь с сетью Tor установлена" msgctxt "StatusEventWidget" msgid "" @@ -3322,7 +3331,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Ошибка Tor" msgctxt "StatusEventWidget" msgid "" @@ -3348,7 +3357,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" -msgstr "" +msgstr "Время вашего компьютера возможно не верно." msgctxt "StatusEventWidget" msgid "" @@ -3367,7 +3376,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" -msgstr "" +msgstr "Возможно опасное соединение!" msgctxt "StatusEventWidget" msgid "" @@ -3379,7 +3388,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "Неизвестный протокол SOCKS" msgctxt "StatusEventWidget" msgid "" @@ -3390,7 +3399,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" -msgstr "" +msgstr "Неверное имя хоста назначения" msgctxt "StatusEventWidget" msgid "" @@ -3401,7 +3410,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "Внешний IP адрес изменен" msgctxt "StatusEventWidget" msgid "" @@ -3412,7 +3421,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "Обнаружен взлом DNS" msgctxt "StatusEventWidget" msgid "" @@ -3430,7 +3439,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "Проверяется доступность порта сервера" msgctxt "StatusEventWidget" msgid "" @@ -3441,15 +3450,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "Проверка доступности порта сервера завершена успешно!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Порт вашего сервера ретрансляции доступен в сети Tor!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "Проверка доступности порта сервера провалилась!" msgctxt "StatusEventWidget" msgid "" @@ -3461,7 +3470,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "Проверяется доступность порта директории" msgctxt "StatusEventWidget" msgid "" @@ -3469,18 +3478,21 @@ msgid "" "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." msgstr "" +"Tor пытается определить доступен ли порт вашей директории ретрансляции в " +"сети Tor, путем соединения с сами собой на %1:%2. Этот тест может занять " +"несколько минут." msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "Проверка доступности порта директории завершена успешно!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "Порт вашей директории ретрансляции доступен в сети Tor!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "Проверка доступности порта директории провалилась!" msgctxt "StatusEventWidget" msgid "" @@ -3502,7 +3514,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "Ваш ретранслятор в сети" msgctxt "StatusEventWidget" msgid "" @@ -3566,65 +3578,69 @@ msgstr "Не удалось хэшировать пароль управлени msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "Редактирование torrc" msgctxt "TorrcDialog" msgid "" "Save settings. If unchecked it will only apply settings to the current Tor " "instance." msgstr "" +"Сохранить настройки. Если не выбрано, настройки будут применены только к " +"текущему запуску Tor." msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "Вырезать" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "Копировать" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "Вставить" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "Отменить" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "Повторить" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "Выбрать всё" msgctxt "TorrcDialog" msgid "Apply all" -msgstr "" +msgstr "Применить всё" msgctxt "TorrcDialog" msgid "Apply selection only" -msgstr "" +msgstr "Применить выбранное" msgctxt "TorrcDialog" msgid "Error connecting to Tor" -msgstr "" +msgstr "Ошибка соединения с Tor" msgctxt "TorrcDialog" msgid "Selection is empty. Please select some text, or check \"Apply all\"" msgstr "" +"Выбранная область пуста. Пожалуйста, выберите необходимый текст, или нажмите" +" \"Применить всё\"" msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "Ошибка в строке %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "Ошибка" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "Произошла ошибка во время открытия файла torrc" msgctxt "UPNPControl" msgid "Success"

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 6a7ebde80e47eccdd0560fcba296d5fdca7dbcd8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:15:23 2012 +0000 Update translations for vidalia_help --- ru/running.po | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ru/running.po b/ru/running.po index 7918279..43429ed 100644 --- a/ru/running.po +++ b/ru/running.po @@ -1,13 +1,14 @@ # # Translators: +# <liquixis(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: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-01-29 03:03+0000\n" +"Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,8 +28,8 @@ msgid "" "Tor, as well as monitoring Tor's status and letting you know if it exits " "unexpectedly." msgstr "" -"Vidalia поможет вам контролировать процесс Tor начиная с запуска заканчивая " -"остановкой, так же мониторинг статуса Tor и даст вам знать если Tor будет " +"Vidalia поможет вам управлять процессом Tor, позволяя запускать и " +"останавливать Tor, а так же наблюдать статус Tor и сообщит если Tor будет " "неожиданно завершен." #. type: Content of: <html><body> @@ -44,7 +45,7 @@ msgstr "Запуск и остановка Tor." #. type: Content of: <html><body> #: en/running.html:28 msgid "To start Tor," -msgstr "Для запуска Tor." +msgstr "Для запуска Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:30 @@ -55,7 +56,7 @@ msgstr "" #. type: Content of: <html><body><ol> #: en/running.html:30 en/running.html:45 msgid "." -msgstr "" +msgstr "." #. type: Content of: <html><body><ol><li> #: en/running.html:32 @@ -64,7 +65,7 @@ msgid "" "when Tor has started." msgstr "" "Иконка в трее Vidalia изменится со значка лука с красным X на зеленый лук " -"тогда Tor запустился." +"тогда Tor запустится." #. type: Content of: <html><body> #: en/running.html:36 @@ -82,7 +83,7 @@ msgstr "" #. type: Content of: <html><body> #: en/running.html:43 msgid "To stop Tor," -msgstr "Для остановки Tor." +msgstr "Для остановки Tor," #. type: Content of: <html><body><ol><li> #: en/running.html:45 @@ -175,8 +176,8 @@ msgid "" "about any problems Tor encountered before it exited." msgstr "" "Если Tor завершился неожидано.Vidalia сменит иконку на темную луковку с " -"красным X и отобразить ошибку с описанием проблемы.Вы так же можете " +"красным X и отобразить ошибку с описанием проблемы. Вы так же можете " "просмотреть <a href=\"log.html\">журнал сообщений</a> для более детальной " -"информации о проблеме которая спровоцировала выход." +"информации о возможных проблемах произошедших перед завершением Tor."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 29 Jan '12

29 Jan '12

commit 1ce9d09b264bbddad2fa6d617765beae484775aa Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 29 03:15:16 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index f253621..d13a7be 100644 --- a/ru/vidalia_ru.po +++ b/ru/vidalia_ru.po @@ -1,14 +1,15 @@ # # Translators: # axe <axe.rode(a)ymail.com>, 2011. +# <liquixis(a)gmail.com>, 2012. # Андрей Костенко <andrey(a)kostenko.name>, 2011. 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: 2011-09-08 00:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-29 03:14+0000\n" +"Last-Translator: liquixis <liquixis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.net/projects/p/torproject/team/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,37 +143,39 @@ msgstr "" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Управление Tor" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Использовать TCP соединение (ControlPort)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Путь:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "Использовать Unix domain socket (ControlSocket)" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Редактировать текущий torrc" msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "ПРИМЕЧАНИЕ: это изменит загруженный на данный момент torrc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "Путь ControlSocket не существует." msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"Путь к заданному файлу конфигурации Tor содержит символы которые не могут " +"быть представлены в текущей 8-битной кодировке вашей системы." msgctxt "AdvancedPage" msgid ""

1 0

r25357: {website} obfsproxy instructions update from asn (website/trunk/projects/en)
by Sebastian Hahn 28 Jan '12

28 Jan '12

Author: sebastian Date: 2012-01-28 14:08:25 +0000 (Sat, 28 Jan 2012) New Revision: 25357 Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: obfsproxy instructions update from asn Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 19:19:40 UTC (rev 25356) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-28 14:08:25 UTC (rev 25357) @@ -59,22 +59,22 @@ - Set up your Tor configuration file: - User tor - PIDFile /usr/local/var/run/tor/tor.pid - SocksPort 1999 # what port to open for local application connections - Log notice file /usr/local/var/log/tor/tor.log - DataDirectory /usr/local/var/lib/tor/data - UseBridges 1 - Bridge obfs2 192.0.2.34:34545 - ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Add the appropriate lines to your tor configuration file: - Replace 192.0.2.34 with the bridge supporting obfsproxy you - wish to use and 34545 with the port number the bridge uses. + + <tt> UseBridges 1 </tt> + <tt> Bridge obfs2 192.0.2.34:34545 </tt> + <tt> ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + Don't forget to replace 192.0.2.34 with the IP address of + the bridge you wish to use, and 34545 with the port + obfpsroxy is listening on. + + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the torrc file: @@ -98,17 +98,15 @@ - Set up your Tor configuration file: - User tor - PIDFile /usr/local/var/run/tor/tor.pid - ORPort 4367 - Log notice file /usr/local/var/log/tor/tor.log - DataDirectory /usr/local/var/lib/tor/data - BridgeRelay 1 - ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Add the appropriate lines to your tor configuration file: + <tt> BridgeRelay 1 </tt> + <tt> ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed </tt> + + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the torrc file: @@ -119,7 +117,7 @@ - Next, Find the TCP port opened by obfsproxy. Look in your log file + Next, find the TCP port opened by obfsproxy. Look in your log file for a line similar to this one: <img src="$(IMGROOT)/obfs-log_checking.png" alt="bridge torrc" width="437" height="14"></a>

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit c362dd8401960653e058834a355982ef9f68fc8d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 13:45:15 2012 +0000 Update translations for vidalia --- fa/vidalia_fa.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po index e9dc897..21c7ea8 100644 --- a/fa/vidalia_fa.po +++ b/fa/vidalia_fa.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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-27 06:43+0000\n" +"PO-Revision-Date: 2012-01-28 13:29+0000\n" "Last-Translator: Ardeshir <ardeshir(a)redteam.io>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1883,7 +1883,7 @@ msgid "" "The Tor software requires Vidalia to send the contents of an authentication " "cookie, but Vidalia was unable to find one." msgstr "" -"نرم افزار تُر نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد " +"نرم افزار تور نیاز به ارسال محتویات یک کوکی احراز هویت بوسیله ویدالیا دارد " "اما ویدالیا نتوانست آن را پیدا کند." msgctxt "MainWindow"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit 2d25dccaa3cee3fca25cc5f2fc7dce3c48076e9d Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 03:45:14 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 8f4f091..a96f11f 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-01-28 03:10+0000\n" +"PO-Revision-Date: 2012-01-28 03:27+0000\n" "Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -149,7 +149,7 @@ msgstr "Bruk TCP forbindelse (Kontroll Port)" msgctxt "AdvancedPage" msgid "Path:" -msgstr "" +msgstr "Vei:" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" @@ -161,7 +161,7 @@ msgstr "Rediger nåværende torrc." msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" -msgstr "" +msgstr "Advarsel: dette vil endre den nåværende lastede torcc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." @@ -1285,7 +1285,7 @@ msgstr "Ikke gjenoppta" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "Kunne ikke starte Vidalia på nytt" msgctxt "CrashReportDialog" msgid "" @@ -2402,11 +2402,11 @@ msgstr "" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "Tor Status" msgctxt "MessageLog" msgid "Advanced" -msgstr "" +msgstr "Avansert" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2703,7 +2703,7 @@ msgstr "Trykk på Hjelp for å se andre metoder for å finne nye broer." msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "Adresse:" msgctxt "NetworkPage" msgid "Type:" @@ -2711,7 +2711,7 @@ msgstr "" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "Du må velge proxy typen" msgctxt "NetworkPage" msgid "SOCKS 4" @@ -2723,11 +2723,11 @@ msgstr "" msgctxt "NetworkPage" msgid "HTTP" -msgstr "" +msgstr "HTTP" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "Policy" msgid "accept" @@ -3271,15 +3271,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor programmet kjører" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Du anvender deg nå av \"%1\" versjonen av Tor programmet." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor programmet kjører ikke" msgctxt "StatusEventWidget" msgid "" @@ -3287,6 +3287,9 @@ msgid "" "software. If Tor exited unexpectedly, select the \"Advanced\" tab above for " "details about any errors encountered." msgstr "" +"Klikk \"start Tor\" ved Vidalia kontroll panelet for og starte Tor " +"programmet på nytt. Hvis Tor avsluttet uventet, Velg \"Avansert\" ovenfor, " +"for informasjon om eventuelle feil som oppstod. " msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 28 Jan '12

28 Jan '12

commit dd549104aed5b474e6befe59af1cdb4c6d869846 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jan 28 03:15:15 2012 +0000 Update translations for vidalia --- nb/vidalia_nb.po | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/nb/vidalia_nb.po b/nb/vidalia_nb.po index 9b3db99..8f4f091 100644 --- a/nb/vidalia_nb.po +++ b/nb/vidalia_nb.po @@ -1,13 +1,14 @@ # # Translators: +# <kmdl(a)hotmail.no>, 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: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2011-09-08 00:46+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2012-01-28 03:10+0000\n" +"Last-Translator: FreedomIsGreat <kmdl(a)hotmail.no>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -140,11 +141,11 @@ msgstr "Velg mappen der Tor lagrer data" msgctxt "AdvancedPage" msgid "Tor Control" -msgstr "" +msgstr "Tor kontroll" msgctxt "AdvancedPage" msgid "Use TCP connection (ControlPort)" -msgstr "" +msgstr "Bruk TCP forbindelse (Kontroll Port)" msgctxt "AdvancedPage" msgid "Path:" @@ -156,7 +157,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Edit current torrc" -msgstr "" +msgstr "Rediger nåværende torrc." msgctxt "AdvancedPage" msgid "NOTE: this will edit the currently loaded torrc" @@ -177,10 +178,12 @@ msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." msgstr "" +"Den følgende mappe plasseringen inneholder tegn som ikke kan brukes i ditt " +"system sitt 8-bit karakter kodifikasjon" msgctxt "AdvancedPage" msgid "Warning" -msgstr "" +msgstr "Advarsel" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" @@ -1266,19 +1269,19 @@ msgstr "Taiwan" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "Send en feilrapport" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia støtte på et problem og måtte lukkes" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "Start Vidalia på nytt" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "Ikke gjenoppta" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" @@ -1289,6 +1292,7 @@ msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." msgstr "" +"Vi kunne ikke starte Vidalia på nytt automastisk. Gjenoppta Vidalia manuelt." msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1593,11 +1597,11 @@ msgstr "Ukjent" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "Debug" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "Informasjon" msgctxt "LogTreeItem" msgid "Notice" @@ -1605,11 +1609,11 @@ msgstr "" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "Advarsel" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "Feil" msgctxt "LogTreeItem" msgid "Unknown"

1 0

r25356: {website} Update obfsproxy instructions per armadev and asn's comments (in website/trunk: images projects/en)
by Sebastian Hahn 27 Jan '12

27 Jan '12

Author: sebastian Date: 2012-01-27 19:19:40 +0000 (Fri, 27 Jan 2012) New Revision: 25356 Removed: website/trunk/images/obfs-torrc_bridge.png website/trunk/images/obfs-torrc_client.png Modified: website/trunk/projects/en/obfsproxy-instructions.wml Log: Update obfsproxy instructions per armadev and asn's comments Patch contributed by Patrick R McDonald <marlowe(a)antagonism.org> Deleted: website/trunk/images/obfs-torrc_bridge.png =================================================================== (Binary files differ) Deleted: website/trunk/images/obfs-torrc_client.png =================================================================== (Binary files differ) Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 16:56:35 UTC (rev 25355) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2012-01-27 19:19:40 UTC (rev 25356) @@ -28,7 +28,7 @@ In a Linux system using the APT package manager you could do: - <tt># apt-get install autotools gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> + <tt># apt-get install autotools-dev gcc git libevent-2.0-5 libevent-openssl-2.0-5 libssl-dev</tt> @@ -60,9 +60,20 @@ Set up your Tor configuration file: - <img src="$(IMGROOT)/obfs-torrc_client.png" alt="client torrc"></a> + User tor + PIDFile /usr/local/var/run/tor/tor.pid + SocksPort 1999 # what port to open for local application connections + Log notice file /usr/local/var/log/tor/tor.log + DataDirectory /usr/local/var/lib/tor/data + UseBridges 1 + Bridge obfs2 192.0.2.34:34545 + ClientTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed + Replace 192.0.2.34 with the bridge supporting obfsproxy you + wish to use and 34545 with the port number the bridge uses. + + Launch Tor using this configuration file. You can do this by using your favorite init script, or by pointing the Tor binary to the @@ -88,7 +99,13 @@ Set up your Tor configuration file: - <img src="$(IMGROOT)/obfs-torrc_bridge.png" alt="bridge torrc"></a> + User tor + PIDFile /usr/local/var/run/tor/tor.pid + ORPort 4367 + Log notice file /usr/local/var/log/tor/tor.log + DataDirectory /usr/local/var/lib/tor/data + BridgeRelay 1 + ServerTransportPlugin obfs2 exec /usr/local/bin/obfsproxy --managed

1 0