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

[tor/master] Change WIN32 to _WIN32 in configure.in, too.
by nickm＠torproject.org 01 Feb '12

01 Feb '12

commit 1fc42db57f3d1e789b2bc448142fa4666d2a57fc Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Jan 31 18:05:03 2012 +0100 Change WIN32 to _WIN32 in configure.in, too. --- configure.in | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index b97eba6..ef571b8 100644 --- a/configure.in +++ b/configure.in @@ -224,12 +224,12 @@ AC_ARG_WITH(tor-group, AC_SUBST(TORGROUP) -dnl If WIN32 is defined and non-zero, we are building for win32 +dnl If _WIN32 is defined and non-zero, we are building for win32 AC_MSG_CHECKING([for win32]) AC_RUN_IFELSE([AC_LANG_SOURCE([ int main(int c, char **v) { -#ifdef WIN32 -#if WIN32 +#ifdef _WIN32 +#if _WIN32 return 0; #else return 1; @@ -246,7 +246,7 @@ bwin32=cross; AC_MSG_RESULT([cross]) if test "$bwin32" = cross; then AC_MSG_CHECKING([for win32 (cross)]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -#ifdef WIN32 +#ifdef _WIN32 int main(int c, char **v) {return 0;} #else #error @@ -377,19 +377,19 @@ if test "$enable_static_libevent" = "yes"; then fi TOR_SEARCH_LIBRARY(libevent, $trylibeventdir, [-levent $STATIC_LIBEVENT_FLAGS $TOR_LIB_WS32], [ -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> #endif #include <stdlib.h> #include <sys/time.h> #include <sys/types.h> #include <event.h>], [ -#ifdef WIN32 +#ifdef _WIN32 #include <winsock2.h> #endif void exit(int); void *event_init(void);], [ -#ifdef WIN32 +#ifdef _WIN32 {WSADATA d; WSAStartup(0x101,&d); } #endif event_init(); exit(0);

1 0

[tor/master] Merge branch 'bug4991_v2'
by nickm＠torproject.org 01 Feb '12

01 Feb '12

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Feb '12

01 Feb '12

commit d5845f797c9afb8229e62b945a727519ab7cbbf3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 31 20:45:16 2012 +0000 Update translations for vidalia --- pt_BR/vidalia_pt_BR.po | 35 ++++++++++++++++++++++++----------- ru/vidalia_ru.po | 44 +++++++++++++++++++++++--------------------- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/pt_BR/vidalia_pt_BR.po b/pt_BR/vidalia_pt_BR.po index 9d09d44..1d48ca6 100644 --- a/pt_BR/vidalia_pt_BR.po +++ b/pt_BR/vidalia_pt_BR.po @@ -1,6 +1,7 @@ # # Translators: # <amimyself(a)live.co.uk>, 2011. +# daniel <>, 2012. # runasand <runa.sandvik(a)gmail.com>, 2011. # Sérgio <theparish2(a)yahoo.com>, 2012. msgid "" @@ -8,8 +9,8 @@ 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-04 02:18+0000\n" -"Last-Translator: Sérgio <theparish2(a)yahoo.com>\n" +"PO-Revision-Date: 2012-01-31 20:44+0000\n" +"Last-Translator: daniel <>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -173,6 +174,9 @@ msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." msgstr "" +"O local do arquivo especificado Tor de configuração contém caracteres que " +"não podem ser representadas em seu sistema de codificação de caracteres " +"atual de 8 bits." msgctxt "AdvancedPage" msgid "" @@ -200,7 +204,7 @@ msgstr "Selecione o arquivo a ser usado para o caminho do socket Tor" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "Configurar ControlPort automaticamente" msgctxt "AdvancedPage" msgid "" @@ -1298,7 +1302,7 @@ msgstr "" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "Por favor, preencha um tiquete em:" msgctxt "CrashReportDialog" msgid "" @@ -1321,6 +1325,9 @@ msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" msgstr "" +"com uma descrição do que você estava fazendo antes da aplicação quebrar, " +"juntamente com os seguintes arquivos correspondentes ao relatório de " +"acidente:" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -3472,6 +3479,9 @@ msgid "" " is not correct, please consider setting the 'Address' option in your " "relay's configuration." msgstr "" +"Tor tem determinado o endereço público do seu relé IP é atualmente %1%2. Se " +"isso não está correto, por favor, considere a definição do 'Endereço' opção " +"na configuração do seu relay." msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" @@ -3501,7 +3511,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "Verificando Acessibilidade à Porta do Servidor" msgctxt "StatusEventWidget" msgid "" @@ -3509,18 +3519,21 @@ msgid "" " Tor network by connecting to itself at %1:%2. This test could take several " "minutes." msgstr "" +"Tor está tentando determinar se a porta do seu servidor relé está acessível" +" a partir da rede Tor, ligando a si mesmo em %1:%2. Este teste pode demorar " +"alguns minutos." msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "Teste de Acessibilidade da Porta do Servidor com sucesso!" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "Seu servidor de relay está acessível na rede Tor!" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "Teste de Acessibilidade da Porta do Servidor falhou!" msgctxt "StatusEventWidget" msgid "" @@ -3532,7 +3545,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "Verificando Acessibilidade à Porta do Diretório" msgctxt "StatusEventWidget" msgid "" @@ -3543,7 +3556,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "Acessibilidade à Porta do Diretório com Sucesso!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" @@ -3551,7 +3564,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "Acessibilidade à Porta do Diretório Falhou" msgctxt "StatusEventWidget" msgid "" diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index ab82228..a21330e 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-31 20:15+0000\n" +"PO-Revision-Date: 2012-01-31 20:45+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" @@ -2664,8 +2664,8 @@ msgid "" "Check to encrypt directory requests and, optionally, use bridge relays to " "access the Tor network" msgstr "" -"Проверьте, чтобы зашифровать запросы каталогa и, при необходимости, " -"использовать мост для доступа к сети Tor" +"Удостоверьтесь, что запросы каталогa шифруются и, при необходимости, " +"используются ретрансляторы мостов для доступа к сети Tor" msgctxt "NetworkPage" msgid "My ISP blocks connections to the Tor network" @@ -2873,11 +2873,11 @@ msgstr "Ретранслятор" msgctxt "RouterListWidget" msgid "Zoom to Relay" -msgstr "Увеличить -> Сервер" +msgstr "Увеличить -> Ретранслятор" msgctxt "RouterListWidget" msgid "%1 relays online" -msgstr "%1 сервер онлайн" +msgstr "%1 ретранслятор(-а/-ов) онлайн" msgctxt "RouterListWidget" msgid "Copy" @@ -2900,7 +2900,7 @@ msgid "" "You have configured Tor to act as a bridge relay for censored users, but " "your version of Tor does not support bridges." msgstr "" -"Вы настроили Tor, чтобы действовать в качестве моста для заблокированных " +"Вы настроили Tor в качестве ретранслятора моста для заблокированных " "пользователей, но ваша версия Tor не поддерживает мостов." msgctxt "ServerPage" @@ -2908,15 +2908,15 @@ msgid "" "Please upgrade your Tor software or configure Tor to act as a normal Tor " "relay." msgstr "" -"Обновите или настройте Tor, чтобы действовать как обычный сервер Tor." +"Пожалуйста, обновите Tor или настройте его как обычный ретранслятор Tor." msgctxt "ServerPage" msgid "Your bridge relay is not running." -msgstr "Ваш мост не работает." +msgstr "Ваш мост не запущен." msgctxt "ServerPage" msgid "You must specify at least a relay nickname and port." -msgstr "Вы должны указать как минимум имя сервера и порт." +msgstr "Вы должны указать как минимум название ретранслятора и порт." msgctxt "ServerPage" msgid "Run as a client only" @@ -2924,15 +2924,15 @@ msgstr "Работать только как клиент" msgctxt "ServerPage" msgid "Relay traffic for the Tor network" -msgstr "Серверный трафик сети Tor" +msgstr "Трафик ретранслятора сети Tor" msgctxt "ServerPage" msgid "Relay Port:" -msgstr "Порт сервера:" +msgstr "Порт ретранслятора:" msgctxt "ServerPage" msgid "Enable to mirror the relay directory" -msgstr "Включите для зеркалирования Каталога Серверов" +msgstr "Включите для зеркалирования каталога ретрансляторов" msgctxt "ServerPage" msgid "Attempt to automatically configure port forwarding" @@ -2960,13 +2960,13 @@ msgstr "Контактная информация:" msgctxt "ServerPage" msgid "Name of your relay" -msgstr "Название вашего сервера" +msgstr "Название вашего ретранслятора" msgctxt "ServerPage" msgid "Port on which users and other relays can communicate with your relay" msgstr "" -"Порт, через который пользователи и другие серверы смогут общаться с вашим " -"сервером" +"Порт, через который пользователи и другие ретрансляторы смогут общаться с " +"вашим ретранслятором" msgctxt "ServerPage" msgid "Nickname:" @@ -3054,7 +3054,7 @@ msgstr "Порты 6660 - 6669 и 6697" msgctxt "ServerPage" msgid "Internet Relay Chat (IRC)" -msgstr "Интернет Реле Чат (IRC)" +msgstr "Internet Relay Chat (IRC)" msgctxt "ServerPage" msgid "Ports 110, 143, 993 and 995" @@ -3104,8 +3104,8 @@ msgctxt "ServerPage" msgid "" "What Internet resources should users be able to access from your relay?" msgstr "" -"К каким интернет-ресурсам пользователи смогут получить доступ с вашего " -"сервера?" +"К каким ресурсам Интернет пользователи смогут получить доступ через ваш " +"ретранслятор?" msgctxt "ServerPage" msgid "" @@ -3127,11 +3127,13 @@ msgstr "Дайте другим доступ к вашему мосту, пре msgctxt "ServerPage" msgid "" "This is the identity of your bridge relay that you can give to other people" -msgstr "Это идентефикация ваших моста, которой вы можете поделиться с другими" +msgstr "" +"Это идентификатор вашего моста, которым вы можете поделиться с другими " +"людьми" msgctxt "ServerPage" msgid "Copy your bridge relay's identity to the clipboard" -msgstr "Скопируйте идентификацию моста в буфер обмена" +msgstr "Скопировать идентификатор вашего моста в буфер обмена" msgctxt "ServerPage" msgid "No Recent Usage" @@ -3139,7 +3141,7 @@ msgstr "Нет нового использования" msgctxt "ServerPage" msgid "No clients have used your relay recently." -msgstr "Нет клиентов, которые недавно использовали ваш сервер." +msgstr "Нет клиентов недавно использовавших ваш сервер." msgctxt "ServerPage" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Feb '12

01 Feb '12

commit db3eb45da46c432c25fa2eaadd5e3771a60bb4c5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 31 20:15:16 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index cb66b53..ab82228 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-31 19:04+0000\n" +"PO-Revision-Date: 2012-01-31 20:15+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" @@ -328,7 +328,7 @@ msgstr "Число клиентов" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" -msgstr "Клиенты из следующих стран использовали ваш сервер с %1" +msgstr "Клиенты из следующих стран использовали ваш ретранслятор с %1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" @@ -1736,7 +1736,7 @@ msgstr "Vidalia не смогла запустить указанный в на msgctxt "MainWindow" msgid "Connecting to a relay directory" -msgstr "Подключение к каталогy серверов" +msgstr "Подключение к каталогy ретрансляторов" msgctxt "MainWindow" msgid "Establishing an encrypted directory connection" @@ -1756,11 +1756,11 @@ msgstr "Загрузка сертификатов" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "Запрос информации серверa" +msgstr "Запрос информации ретранслятора" msgctxt "MainWindow" msgid "Loading relay information" -msgstr "Загрузка информации реле" +msgstr "Загрузка информации ретранслятора" msgctxt "MainWindow" msgid "Connecting to the Tor network" @@ -1860,7 +1860,7 @@ msgstr "Ошибка при подключении" msgctxt "MainWindow" msgid "Relaying is Enabled" -msgstr "Ретрансляция Включенa" +msgstr "Ретрансляция включенa" msgctxt "MainWindow" msgid "Error Shutting Down" @@ -1980,7 +1980,7 @@ msgstr "Настройка ретрансляции" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" -msgstr "Настройте сервер и помогите росту сети" +msgstr "Установите ретранслятор и помогите росту сети" msgctxt "MainWindow" msgid "View the Network" @@ -2118,8 +2118,8 @@ msgid "" "Your relay is shutting down.\n" "Click 'Stop' again to stop your relay now." msgstr "" -"Ваш сервер выключается. Нажмите на кнопку \"Стоп\" для остановки вашего " -"сервера сейчас." +"Ваш ретранслятор выключается.\n" +"Нажмите \"Стоп\" для немедленной остановки вашего ретранслятора." msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" @@ -2131,9 +2131,9 @@ msgid "" "\n" "Would you like to shutdown gracefully and give clients time to find a new relay?" msgstr "" -"Вы в настоящее время работаете в режиме сервера. Выключение вашего сервера " -"прерывёт все открытые соединений от клиентов. Хотели бы Вы выключить сервер " -"в щадящем режиме и предоставить клиентам время, чтобы найти новйы сервер?" +"У вас в настоящее время работает ретранслятор. Выключение вашего ретранслятора прервёт все открытые соединения клиентов.\n" +"\n" +"Хотели бы Вы выключить ретранслятор в щадящем режиме и дать клиентам время найти новый ретранслятор?" msgctxt "MainWindow" msgid "" @@ -2485,7 +2485,7 @@ msgstr "Обновить" msgctxt "NetViewer" msgid "Refresh the list of Tor relays and connections" -msgstr "Обновить список серверов и соединений" +msgstr "Обновить список ретрансляторов и соединений Tor" msgctxt "NetViewer" msgid "Ctrl+R" @@ -2557,11 +2557,11 @@ msgstr "Ctrl+Z" msgctxt "NetViewer" msgid "Relay Not Found" -msgstr "Сервер не найден" +msgstr "Ретранслятор не найден" msgctxt "NetViewer" msgid "No details on the selected relay are available." -msgstr "Нет подробной информации о выбранном сервере." +msgstr "Нет подробной информации о выбранном ретрансляторе." msgctxt "NetViewer" msgid "Unknown" @@ -2639,8 +2639,8 @@ msgstr "Порт:" msgctxt "NetworkPage" msgid "Check to only connect to relays using ports allowed by your firewall" msgstr "" -"Проверьте, чтобы подключение к серверам Tor шло только через порты, " -"разрешаемые вашим сетевым экраном." +"Удостоверьтесь, чтобы подключение к ретрансляторам Tor шло только через " +"порты, разрешенные вашим сетевым экраном." msgctxt "NetworkPage" msgid "My firewall only lets me connect to certain ports" @@ -2809,7 +2809,7 @@ msgstr "Неизвестно" msgctxt "RouterInfoDialog" msgid "Relay Details" -msgstr "Подробности по серверу" +msgstr "Подробности по ретранслятору" msgctxt "RouterInfoDialog" msgid "Summary" @@ -2869,7 +2869,7 @@ msgstr "%1 Кб/с" msgctxt "RouterListWidget" msgid "Relay" -msgstr "Сервер" +msgstr "Ретранслятор" msgctxt "RouterListWidget" msgid "Zoom to Relay"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Feb '12

01 Feb '12

commit 2f9bded5535dff81fe1bfafbd261d110725b2433 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 31 19:15:30 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index 2e3dbd8..cb66b53 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-31 18:44+0000\n" +"PO-Revision-Date: 2012-01-31 19:04+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" @@ -2020,7 +2020,7 @@ msgstr "Посмотреть информацию о версии и о лице msgctxt "MainWindow" msgid "Exit Vidalia" -msgstr "Выход Vidalia" +msgstr "Выход из Vidalia" msgctxt "MainWindow" msgid "Show this window on startup" @@ -2920,7 +2920,7 @@ msgstr "Вы должны указать как минимум имя серве msgctxt "ServerPage" msgid "Run as a client only" -msgstr "Режим работы только как клиент" +msgstr "Работать только как клиент" msgctxt "ServerPage" msgid "Relay traffic for the Tor network" @@ -2932,11 +2932,11 @@ msgstr "Порт сервера:" msgctxt "ServerPage" msgid "Enable to mirror the relay directory" -msgstr "Разрешить зеркало каталога серверов" +msgstr "Включите для зеркалирования Каталога Серверов" msgctxt "ServerPage" msgid "Attempt to automatically configure port forwarding" -msgstr "Попытка автоматически настроить переадресацию портов" +msgstr "Пытаться автоматически настроить переадресацию портов" msgctxt "ServerPage" msgid "Test" @@ -3187,7 +3187,7 @@ msgstr "Автоматически распространять адрес мо msgctxt "ServerPage" msgid "Mirror the Relay Directory" -msgstr "Зеркало каталога серверов" +msgstr "Зеркалировать Каталог Серверов" msgctxt "ServerPage" msgid "" @@ -3228,7 +3228,7 @@ msgstr "" msgctxt "ServicePage" msgid "Target may only contain address:port, address, or port." -msgstr "Цель может содержать только адрес: порт, адрес или порт." +msgstr "Цель может содержать только адрес:порт, адрес или порт." msgctxt "ServicePage" msgid "Directory already in use by another service." @@ -3533,7 +3533,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "Проверяется доступность порта директории" +msgstr "Проверяется доступность порта каталога" msgctxt "StatusEventWidget" msgid "" @@ -3541,21 +3541,21 @@ msgid "" "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." msgstr "" -"Tor пытается определить доступен ли порт вашей директории ретрансляции в " -"сети Tor, путем соединения с сами собой на %1:%2. Этот тест может занять " +"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 "Порт вашей директории ретрансляции доступен в сети Tor!" +msgstr "Порт вашего каталога ретрансляции доступен в сети Tor!" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "Проверка доступности порта директории провалилась!" +msgstr "Проверка доступности порта каталога провалилась!" msgctxt "StatusEventWidget" msgid "" @@ -3564,10 +3564,10 @@ msgid "" "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." msgstr "" -"Порт вашей директории ретрансляции недоступен другим клиентам Tor. Это может" -" происходить если вы находитесь за роутером или брандмауэром, что требует от" -" вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт" -" директории, пожалуйста, проверьте настройки вашего ретранслятора." +"Порт вашего каталога ретрансляции недоступен другим клиентам Tor. Это может " +"происходить если вы находитесь за роутером или брандмауэром, что требует от " +"вас настроить проброс портов. Если %1:%2 не ваши правильные IP адрес и порт " +"каталога, пожалуйста, проверьте настройки вашего ретранслятора." msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" @@ -3579,7 +3579,7 @@ msgid "" " rejected by the directory server at %1:%2. The reason given was: %3" msgstr "" "Дескриптор вашего ретранслятора, который позволяет клиентам соединяться с " -"вашим ретранслятором, был отклонен сервером директории в %1:%2. По следущей " +"вашим ретранслятором, был отклонен сервером каталога в %1:%2. По следущей " "причине: %3" msgctxt "StatusEventWidget"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 01 Feb '12

01 Feb '12

commit b755c1c8ae04e0a8a551bd5a964a338830716079 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 31 18:45:16 2012 +0000 Update translations for vidalia --- ru/vidalia_ru.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ru/vidalia_ru.po b/ru/vidalia_ru.po index cd01f44..2e3dbd8 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 15:32+0000\n" +"PO-Revision-Date: 2012-01-31 18: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" @@ -1668,7 +1668,7 @@ msgstr "Помощь" msgctxt "MainWindow" msgid "New Identity" -msgstr "Сменить личину" +msgstr "Новая Личность" msgctxt "MainWindow" msgid "Ctrl+T" @@ -1772,7 +1772,7 @@ msgstr "Создание цепочки Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" -msgstr "Подключение к сети Tor!" +msgstr "Подключен к сети Tor!" msgctxt "MainWindow" msgid "Unrecognized startup status" @@ -1976,7 +1976,7 @@ msgstr "Ярлыки Vidalia" msgctxt "MainWindow" msgid "Setup Relaying" -msgstr "Настройка сервера\n" +msgstr "Настройка ретрансляции" msgctxt "MainWindow" msgid "Set up a relay and help the network grow" @@ -1992,7 +1992,7 @@ msgstr "Обзор карты сети Tor" msgctxt "MainWindow" msgid "Use a New Identity" -msgstr "Сменить личину" +msgstr "Использовать Новую Личность" msgctxt "MainWindow" msgid "Make subsequent connections appear new"

1 0

[stem/master] Previous socket use could break get_protocolinfo
by atagar＠torproject.org 31 Jan '12

31 Jan '12

commit c58177c50fcdba85e5eac7a929dbf6d87c666852 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 30 00:34:38 2012 -0800 Previous socket use could break get_protocolinfo If prior use of the control socket had caused a disconnect and already consumed the 'Authentication required.' response then future calls of get_protocolinfo would break. --- stem/connection.py | 17 ++++++++++++----- test/integ/connection/protocolinfo.py | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 5c1fc55..392ad9b 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -627,16 +627,23 @@ def get_protocolinfo(control_socket): socket """ - control_socket.send("PROTOCOLINFO 1") - protocolinfo_response = control_socket.recv() + try: + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() + except: + protocolinfo_response = None # Tor hangs up on sockets after receiving a PROTOCOLINFO query if it isn't # next followed by authentication. Transparently reconnect if that happens. - if str(protocolinfo_response) == "Authentication required.": + if not protocolinfo_response or str(protocolinfo_response) == "Authentication required.": control_socket.connect() - control_socket.send("PROTOCOLINFO 1") - protocolinfo_response = control_socket.recv() + + try: + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() + except stem.socket.SocketClosed, exc: + raise stem.socket.SocketError(exc) ProtocolInfoResponse.convert(protocolinfo_response) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index e0e8805..a0214a2 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -91,6 +91,23 @@ class TestProtocolInfo(unittest.TestCase): protocolinfo_response = stem.connection.get_protocolinfo(control_socket) self.assert_matches_test_config(protocolinfo_response) + def test_pre_disconnected_query(self): + """ + Tests making a PROTOCOLINFO query when previous use of the socket had + already disconnected it. + """ + + with test.runner.get_runner().get_tor_socket(False) as control_socket: + # makes a couple protocolinfo queries outside of get_protocolinfo first + control_socket.send("PROTOCOLINFO 1") + control_socket.recv() + + control_socket.send("PROTOCOLINFO 1") + control_socket.recv() + + protocolinfo_response = stem.connection.get_protocolinfo(control_socket) + self.assert_matches_test_config(protocolinfo_response) + def assert_matches_test_config(self, protocolinfo_response): """ Makes assertions that the protocolinfo response's attributes match those of

1 0

[stem/master] Accounting for big-endian architectures in proc
by atagar＠torproject.org 31 Jan '12

31 Jan '12

commit a31aa4ad506ccf4e529182e31d0a84966e38d6e1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 30 00:02:55 2012 -0800 Accounting for big-endian architectures in proc The proc utils were assuming that encoded ip addresses were little-endian. This was fixed in the project these utils are based on (psutil) and I'm adopting the fix... https://code.google.com/p/psutil/issues/detail?id=201 https://trac.torproject.org/projects/tor/ticket/4777 This evidently occures on OpenWRT (ar71xx), thanks to swalker for the catch! This is the same as arm commit 8ec7095d79ecad9d3432193a2b1f9fdefab8d7f3 --- stem/util/proc.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/stem/util/proc.py b/stem/util/proc.py index bf91ace..cbfc3c5 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -369,7 +369,15 @@ def _decode_proc_address_encoding(addr): # The IPv4 address portion is a little-endian four-byte hexadecimal number. # That is, the least significant byte is listed first, so we need to reverse # the order of the bytes to convert it to an IP address. - ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)[::-1]) + # + # This needs to account for the endian ordering as per... + # http://code.google.com/p/psutil/issues/detail?id=201 + # https://trac.torproject.org/projects/tor/ticket/4777 + + if sys.byteorder == 'little': + ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)[::-1]) + else: + ip = socket.inet_ntop(socket.AF_INET, base64.b16decode(ip)) return (ip, port)

1 0

[stem/master] Exercising is_alive in ControlMessage integ tests
by atagar＠torproject.org 31 Jan '12

31 Jan '12

commit 2ae0298e816ccb70bf9ab52996a4c78e26f897f0 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 31 09:23:31 2012 -0800 Exercising is_alive in ControlMessage integ tests Adding a basic check for the is_alive method. The method is a little troubesome because if you aren't continually pulling from the socket then you won't detect a disconnect until the following usage. This was already documented and iirc it won't be an issue in practice for controllers since they continually pull from the socket. But still, for low level controller interaction it's kinda confusing. --- test/integ/socket/control_message.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index ce25c8f..2eb2a6e 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -36,11 +36,17 @@ class TestControlMessage(unittest.TestCase): # an error until we read from the socket. However, with a control socket # the write will cause a SocketError. + self.assertTrue(control_socket.is_alive()) + try: control_socket.send("GETINFO version") except: pass + # at this point is_alive is True with a control port and False with a + # control socket + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) + self.assertFalse(control_socket.is_alive()) # Additional socket usage should fail, and pulling more responses will fail # with more closed exceptions.

1 0

[stem/master] Adding ControlLine peek_key method
by atagar＠torproject.org 31 Jan '12

31 Jan '12

commit 06498d8b61ad5f01c04c7011c70892a9846d4c27 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jan 31 07:46:53 2012 -0800 Adding ControlLine peek_key method Method to allow us to switch on the key/value mapping while parsing a line. This isn't needed yet (the only parsing done at this point is PROTOCOLINFO responses and that only uses positional entries). However, it's crossed my mind a few times that this will be needed later. --- stem/socket.py | 18 ++++++++++++++++++ test/unit/socket/control_line.py | 7 +++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/stem/socket.py b/stem/socket.py index 889713d..1b481ce 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -28,6 +28,7 @@ ControlLine - String subclass with methods for parsing controller responses. |- is_empty - checks if the remaining content is empty |- is_next_quoted - checks if the next entry is a quoted value |- is_next_mapping - checks if the next entry is a KEY=VALUE mapping + |- peek_key - provides the key of the next entry |- pop - removes and returns the next entry +- pop_mapping - removes and returns the next entry as a KEY=VALUE mapping @@ -487,6 +488,23 @@ class ControlLine(str): else: return False # doesn't start with a key + def peek_key(self): + """ + Provides the key of the next entry, providing None if it isn't a key/value + mapping. + + Returns: + str with the next entry's key + """ + + remainder = self._remainder + key_match = KEY_ARG.match(remainder) + + if key_match: + return key_match.groups()[0] + else: + return None + def pop(self, quoted = False, escaped = False): """ Parses the next space separated entry, removing it and the space from our diff --git a/test/unit/socket/control_line.py b/test/unit/socket/control_line.py index 6e59f43..7752147 100644 --- a/test/unit/socket/control_line.py +++ b/test/unit/socket/control_line.py @@ -52,6 +52,7 @@ class TestControlLine(unittest.TestCase): self.assertFalse(line.is_empty()) self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) + self.assertEquals(None, line.peek_key()) self.assertRaises(ValueError, line.pop_mapping) self.assertEquals(line.pop(), 'PROTOCOLINFO') @@ -59,6 +60,7 @@ class TestControlLine(unittest.TestCase): self.assertFalse(line.is_empty()) self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) + self.assertEquals(None, line.peek_key()) self.assertRaises(ValueError, line.pop_mapping) self.assertEquals(line.pop(), '1') @@ -66,6 +68,7 @@ class TestControlLine(unittest.TestCase): self.assertTrue(line.is_empty()) self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) + self.assertEquals(None, line.peek_key()) self.assertRaises(IndexError, line.pop_mapping) self.assertRaises(IndexError, line.pop) @@ -73,6 +76,7 @@ class TestControlLine(unittest.TestCase): self.assertTrue(line.is_empty()) self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) + self.assertEquals(None, line.peek_key()) def test_pop_mapping(self): """ @@ -90,6 +94,7 @@ class TestControlLine(unittest.TestCase): self.assertTrue(line.is_next_mapping(key = "Tor")) self.assertTrue(line.is_next_mapping(key = "Tor", quoted = True)) self.assertTrue(line.is_next_mapping(quoted = True)) + self.assertEquals("Tor", line.peek_key()) # try popping this as a non-quoted mapping self.assertEquals(line.pop_mapping(), ('Tor', '"0.2.1.30')) @@ -98,6 +103,7 @@ class TestControlLine(unittest.TestCase): self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) self.assertRaises(ValueError, line.pop_mapping) + self.assertEquals(None, line.peek_key()) # try popping this as a quoted mapping line = stem.socket.ControlLine(version_entry) @@ -106,6 +112,7 @@ class TestControlLine(unittest.TestCase): self.assertTrue(line.is_empty()) self.assertFalse(line.is_next_quoted()) self.assertFalse(line.is_next_mapping()) + self.assertEquals(None, line.peek_key()) def test_escapes(self): """

1 0