- tor-commits - lists.torproject.org

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit fa4dd70c95834dc6ff5b145292f9afa6e93b033d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 16:15:11 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 176 +++++++++++++++++++++++++++--------------------------- 1 files changed, 88 insertions(+), 88 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index 8940fd3..75307b8 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 15:34+0000\n" +"PO-Revision-Date: 2011-12-27 16:14+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -930,243 +930,243 @@ 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" -msgstr "" +msgstr "Турция" msgctxt "CountryInfo" msgid "Turkmenistan" -msgstr "" +msgstr "Туркменистан" msgctxt "CountryInfo" msgid "Tuvalu" -msgstr "" +msgstr "Тувалу" msgctxt "CountryInfo" msgid "Uganda" -msgstr "" +msgstr "Уганда" msgctxt "CountryInfo" msgid "Ukraine" -msgstr "" +msgstr "Украйна" msgctxt "CountryInfo" msgid "United Arab Emirates" -msgstr "" +msgstr "Обединени арабски емирства" msgctxt "CountryInfo" msgid "United Kingdom" -msgstr "" +msgstr "Обединено кралство Великобритания" msgctxt "CountryInfo" msgid "United States" -msgstr "" +msgstr "Съединени американски щати" msgctxt "CountryInfo" msgid "Uruguay" -msgstr "" +msgstr "Уругвай" msgctxt "CountryInfo" msgid "Uzbekistan" -msgstr "" +msgstr "Узбекистан" msgctxt "CountryInfo" msgid "Vanuatu" -msgstr "" +msgstr "Вануату" msgctxt "CountryInfo" msgid "Vatican" -msgstr "" +msgstr "Ватикана" msgctxt "CountryInfo" msgid "Venezuela" -msgstr "" +msgstr "Венецуела" msgctxt "CountryInfo" msgid "Vietnam" -msgstr "" +msgstr "Виетнам" msgctxt "CountryInfo" msgid "Western Sahara" -msgstr "" +msgstr "Западна Сахара" msgctxt "CountryInfo" msgid "Yemen" -msgstr "" +msgstr "Йемен" msgctxt "CountryInfo" msgid "Zambia" -msgstr "" +msgstr "Замбия" msgctxt "CountryInfo" msgid "Zimbabwe" -msgstr "" +msgstr "Зимбабве" msgctxt "CountryInfo" msgid "Zaire" @@ -1174,99 +1174,99 @@ msgstr "" msgctxt "CountryInfo" msgid "Albania" -msgstr "" +msgstr "Албания" msgctxt "CountryInfo" msgid "Algeria" -msgstr "" +msgstr "Алжир" msgctxt "CountryInfo" msgid "Austria" -msgstr "" +msgstr "Австрия" msgctxt "CountryInfo" msgid "Bahrain" -msgstr "" +msgstr "Бахрейн" msgctxt "CountryInfo" msgid "Benin" -msgstr "" +msgstr "Бенин" msgctxt "CountryInfo" msgid "Ethiopia" -msgstr "" +msgstr "Етиопия" msgctxt "CountryInfo" msgid "Fiji" -msgstr "" +msgstr "Фиджи" msgctxt "CountryInfo" msgid "Finland" -msgstr "" +msgstr "Финландия" msgctxt "CountryInfo" msgid "Greece" -msgstr "" +msgstr "Гърция" msgctxt "CountryInfo" msgid "Guam" -msgstr "" +msgstr "Гуам" msgctxt "CountryInfo" msgid "Hungary" -msgstr "" +msgstr "Унгария" msgctxt "CountryInfo" msgid "Iceland" -msgstr "" +msgstr "Исландия" msgctxt "CountryInfo" msgid "India" -msgstr "" +msgstr "Индия" msgctxt "CountryInfo" msgid "Indonesia" -msgstr "" +msgstr "Индонезия" msgctxt "CountryInfo" msgid "Iran" -msgstr "" +msgstr "Иран" msgctxt "CountryInfo" msgid "Iraq" -msgstr "" +msgstr "Ирак" msgctxt "CountryInfo" msgid "Ireland" -msgstr "" +msgstr "Ирландия" msgctxt "CountryInfo" msgid "Korea, North" -msgstr "" +msgstr "Северна Корея" msgctxt "CountryInfo" msgid "Korea, South" -msgstr "" +msgstr "Южна Корея" msgctxt "CountryInfo" msgid "Libya" -msgstr "" +msgstr "Либия" msgctxt "CountryInfo" msgid "Maldives" -msgstr "" +msgstr "Малдиви" msgctxt "CountryInfo" msgid "Mexico" -msgstr "" +msgstr "Мексико" msgctxt "CountryInfo" msgid "Myanmar" -msgstr "" +msgstr "Мианмар" msgctxt "CountryInfo" msgid "Taiwan" -msgstr "" +msgstr "Тайван" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" @@ -1327,15 +1327,15 @@ msgstr "Избери път до Тор" msgctxt "GeneralPage" msgid "Select Proxy Executable" -msgstr "" +msgstr "Избери изпълнимо прокси" msgctxt "GeneralPage" msgid "You must specify the name of your Tor executable." -msgstr "" +msgstr "Трябва да конкретизирате името на Вашия Тор изпълним файл" msgctxt "GeneralPage" msgid "Start Vidalia when my system starts" -msgstr "" +msgstr "Стартирай Видалия когато моята операционна система стартира" msgctxt "GeneralPage" msgid "Browse"

1 0

[metrics-db/master] Check bridge stats in sanitized bridge descriptors.
by karsten＠torproject.org 27 Dec '11

27 Dec '11

commit 5986188f93d897ba58dc56ad16d761b986471717 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Dec 27 16:33:08 2011 +0100 Check bridge stats in sanitized bridge descriptors. Make sure that there's always a bridge-stats-end line preceding the bridge-ips line. We should add more such checks in the future. This is probably something to implement in metrics-lib once it's more stable. --- .../ernie/db/SanitizedBridgesWriter.java | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index 7376e5a..520fd1f 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -787,6 +787,7 @@ public class SanitizedBridgesWriter { String line = null; StringBuilder scrubbed = null; String hashedBridgeIdentity = null; + boolean hasParsedBridgeStatsEndLine = false; while ((line = br.readLine()) != null) { /* When we have parsed both published and fingerprint line, look @@ -828,14 +829,27 @@ public class SanitizedBridgesWriter { this.haveWarnedAboutLimitedMapping = true; } + /* Write bridge-stats lines unmodified to the sanitized + * descriptor and make sure that there's always a bridge-stats-end + * line preceding the bridge-ips line. */ + } else if (line.startsWith("bridge-stats-end ")) { + scrubbed.append(line + "\n"); + hasParsedBridgeStatsEndLine = true; + } else if (line.startsWith("bridge-ips ")) { + if (!hasParsedBridgeStatsEndLine) { + this.logger.fine("bridge-ips line without preceding " + + "bridge-stats-end line in bridge descriptor. " + + "Skipping."); + return; + } + scrubbed.append(line + "\n"); + /* Write the following lines unmodified to the sanitized * descriptor. */ } else if (line.startsWith("write-history ") || line.startsWith("read-history ") || line.startsWith("geoip-start-time ") || line.startsWith("geoip-client-origins ") - || line.startsWith("bridge-stats-end ") - || line.startsWith("bridge-ips ") || line.startsWith("geoip-db-digest ")) { scrubbed.append(line + "\n");

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit c8224e5e222b31555b2a1bfbad8537a4b30bd732 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 15:45:11 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 162 +++++++++++++++++++++++++++--------------------------- 1 files changed, 81 insertions(+), 81 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index f1f1e10..8940fd3 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 15:14+0000\n" +"PO-Revision-Date: 2011-12-27 15:34+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -606,75 +606,75 @@ 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" -msgstr "" +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" @@ -682,251 +682,251 @@ 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" -msgstr "" +msgstr "Гренада" msgctxt "CountryInfo" msgid "Guatemala" -msgstr "" +msgstr "Гватемала" msgctxt "CountryInfo" msgid "Guinea" -msgstr "Главни" +msgstr "Гвинея" msgctxt "CountryInfo" msgid "Guinea-Bissau" -msgstr "" +msgstr "Гвинея-Бисау" msgctxt "CountryInfo" msgid "Guyana" -msgstr "" +msgstr "Гвиана" msgctxt "CountryInfo" msgid "Hong Kong" -msgstr "" +msgstr "Хонконг" msgctxt "CountryInfo" msgid "Haiti" -msgstr "" +msgstr "Хаити" msgctxt "CountryInfo" msgid "Honduras" -msgstr "" +msgstr "Хондурас" msgctxt "CountryInfo" msgid "Israel" -msgstr "" +msgstr "Израел" msgctxt "CountryInfo" msgid "Italy" -msgstr "" +msgstr "Италия" msgctxt "CountryInfo" msgid "Jamaica" -msgstr "" +msgstr "Ямайка" msgctxt "CountryInfo" msgid "Japan" -msgstr "" +msgstr "Япония" msgctxt "CountryInfo" msgid "Jordan" -msgstr "" +msgstr "Йордания" msgctxt "CountryInfo" msgid "Kazakhstan" -msgstr "" +msgstr "Казахстан" msgctxt "CountryInfo" msgid "Kenya" -msgstr "" +msgstr "Кения" msgctxt "CountryInfo" msgid "Kiribati" -msgstr "" +msgstr "Кирибати" msgctxt "CountryInfo" msgid "Kuwait" -msgstr "" +msgstr "Кувейт" msgctxt "CountryInfo" msgid "Kyrgyzstan" -msgstr "" +msgstr "Киргизстан" msgctxt "CountryInfo" msgid "Laos" -msgstr "" +msgstr "Лаос" msgctxt "CountryInfo" msgid "Latvia" -msgstr "" +msgstr "Латвия" msgctxt "CountryInfo" msgid "Lebanon" -msgstr "" +msgstr "Либия" msgctxt "CountryInfo" msgid "Lesotho" -msgstr "" +msgstr "Лесото" msgctxt "CountryInfo" msgid "Liberia" -msgstr "" +msgstr "Либерия" msgctxt "CountryInfo" msgid "Liechtenstein" -msgstr "" +msgstr "Лихтенщайн" msgctxt "CountryInfo" msgid "Lithuania" -msgstr "" +msgstr "Литва" msgctxt "CountryInfo" msgid "Luxembourg" -msgstr "" +msgstr "Люксембург" msgctxt "CountryInfo" msgid "Macedonia" -msgstr "" +msgstr "Македония" msgctxt "CountryInfo" msgid "Madagascar" -msgstr "" +msgstr "Мадагаскар" msgctxt "CountryInfo" msgid "Malawi" -msgstr "" +msgstr "Малави" msgctxt "CountryInfo" msgid "Malaysia" -msgstr "" +msgstr "Малайзия" msgctxt "CountryInfo" msgid "Mali" -msgstr "" +msgstr "Мали" msgctxt "CountryInfo" msgid "Malta" -msgstr "" +msgstr "Малта" msgctxt "CountryInfo" msgid "Marshall Islands" -msgstr "" +msgstr "Маршалови острови" msgctxt "CountryInfo" msgid "Mauritania" -msgstr "" +msgstr "Мавритания" msgctxt "CountryInfo" msgid "Mauritius" -msgstr "" +msgstr "Мавриций" msgctxt "CountryInfo" msgid "Micronesia" -msgstr "" +msgstr "Микронезия" msgctxt "CountryInfo" msgid "Moldova" -msgstr "" +msgstr "Молдова" msgctxt "CountryInfo" msgid "Monaco" -msgstr "" +msgstr "Монако" msgctxt "CountryInfo" msgid "Mongolia" -msgstr "" +msgstr "Монголия" msgctxt "CountryInfo" msgid "Montenegro" -msgstr "" +msgstr "Черна Гора" msgctxt "CountryInfo" msgid "Morocco" -msgstr "" +msgstr "Мароко" msgctxt "CountryInfo" msgid "Mozambique" -msgstr "" +msgstr "Мозамбик" msgctxt "CountryInfo" msgid "Namibia" -msgstr "" +msgstr "Намибия" msgctxt "CountryInfo" msgid "Nauru" -msgstr "" +msgstr "Науру" msgctxt "CountryInfo" msgid "Nepal" -msgstr "" +msgstr "Непал" msgctxt "CountryInfo" msgid "Netherlands" -msgstr "" +msgstr "Нидерландия" msgctxt "CountryInfo" msgid "New Zealand" -msgstr "" +msgstr "Нова Зеландия" msgctxt "CountryInfo" msgid "Nicaragua" -msgstr "" +msgstr "Никарагуа" msgctxt "CountryInfo" msgid "Niger" -msgstr "" +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" -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"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit 049cd4714b16ec9dc79627c95fd73057be8bb312 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 15:15:12 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index c032fd4..f1f1e10 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 14:44+0000\n" +"PO-Revision-Date: 2011-12-27 15:14+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -506,7 +506,7 @@ msgstr "Азарбейджан" msgctxt "CountryInfo" msgid "Bahamas" -msgstr "Бахамите" +msgstr "Бахамски острови" msgctxt "CountryInfo" msgid "Bangladesh" @@ -582,27 +582,27 @@ 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"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit a9044c9b3a79bc34a24899944bf7a02c13d483a0 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 14:45:12 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 86 +++++++++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 42 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index c794a30..c032fd4 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 14:14+0000\n" +"PO-Revision-Date: 2011-12-27 14:44+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -378,11 +378,11 @@ msgstr "Приближаване до Веригата" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)" -msgstr "" +msgstr "Затваряне на Веригата (Изтриване)" msgctxt "CircuitListWidget" msgid "Close Stream (Del)" -msgstr "" +msgstr "Затваряне на потока с данни (Изтриване)" msgctxt "ConfigDialog" msgid "General" @@ -390,15 +390,15 @@ msgstr "Главни" msgctxt "ConfigDialog" msgid "Network" -msgstr "" +msgstr "Мрежа" msgctxt "ConfigDialog" msgid "Sharing" -msgstr "" +msgstr "Споделяне" msgctxt "ConfigDialog" msgid "Services" -msgstr "" +msgstr "Услуги" msgctxt "ConfigDialog" msgid "Appearance" @@ -414,19 +414,19 @@ 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." -msgstr "" +msgstr "Видалия нямаше възможност да приложи твоите %1 настройки за Тор" msgctxt "ConfigDialog" msgid "Settings" @@ -434,29 +434,31 @@ msgstr "Опции" msgctxt "ControlConnection" msgid "Vidalia was unable to connect to Tor. (%1)" -msgstr "" +msgstr "Видалия нямаше възможност да се свърже с Тор. (%1)" msgctxt "ControlConnection" msgid "Control socket is not connected." -msgstr "" +msgstr "Контролното реле не е свързано." msgctxt "ControlPasswordInputDialog" msgid "Password Required" -msgstr "" +msgstr "Необходима е парола" msgctxt "ControlPasswordInputDialog" msgid "Remember my password" -msgstr "" +msgstr "Запомни моята парола" msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia has connected to a running Tor process that requires a password. " "Please enter your control password:" msgstr "" +"Видалия се свърза с активен Тор процес който изисква парола.\n" +"Моля, въведете Вашата контролна парола:" msgctxt "ControlSocket" msgid "Control socket is not connected." -msgstr "" +msgstr "Контролното реле не е свързано." msgctxt "ControlSocket" msgid "Error sending control command. [%1]" @@ -472,111 +474,111 @@ msgstr "Грешен контролен отговор. [%1]" msgctxt "CountryInfo" msgid "Afghanistan" -msgstr "" +msgstr "Афганистан" msgctxt "CountryInfo" msgid "Andorra" -msgstr "" +msgstr "Андора" msgctxt "CountryInfo" msgid "Angola" -msgstr "" +msgstr "Ангола" msgctxt "CountryInfo" msgid "Antigua & Barbuda" -msgstr "" +msgstr "Анти́гуа и Барбу́да" msgctxt "CountryInfo" msgid "Argentina" -msgstr "" +msgstr "Аржентина" msgctxt "CountryInfo" msgid "Armenia" -msgstr "" +msgstr "Армения" msgctxt "CountryInfo" msgid "Australia" -msgstr "Относно Видала" +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"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit d060e073b46f90cbb3dd14fb069a971511fb4ec1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 14:15:11 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index 62b4787..c794a30 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 13:32+0000\n" +"PO-Revision-Date: 2011-12-27 14:14+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "Отказ" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "Стартиране на заявка за HTTPS мост..." +msgstr "Стартиране на заявка за HTTPS мост-свързаност..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -297,43 +297,44 @@ msgstr "Свързване с %1:%2..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "Изпращане на " +msgstr "Изпращане на HTTPS заявка за мост-свързване..." msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..." -msgstr "" +msgstr "Сваляне на списък с мостове..." msgctxt "BridgeDownloaderProgressDialog" msgid "Downloading Bridges" -msgstr "" +msgstr "Сваляне на Мостове" msgctxt "BridgeDownloaderProgressDialog" msgid "Unable to download bridges: %1" -msgstr "" +msgstr "Невъзможно да свали мостове: %1" msgctxt "BridgeDownloaderProgressDialog" msgid "Retrying bridge request..." -msgstr "" +msgstr "Повторна заявка за мостове..." msgctxt "BridgeUsageDialog" msgid "Country" -msgstr "" +msgstr "Страна" msgctxt "BridgeUsageDialog" msgid "# Clients" -msgstr "" +msgstr "# Клиенти" msgctxt "BridgeUsageDialog" msgid "Clients from the following countries have used your relay since %1" msgstr "" +"Клиенти от следните страни са се възползвали от твоето препредаване от %1" msgctxt "BridgeUsageDialog" msgid "Bridge Usage Summary" -msgstr "" +msgstr "Извлечение за Мостово Използване" msgctxt "BridgeUsageDialog" msgid "Client Summary" -msgstr "" +msgstr "Клиентско извлечение" msgctxt "Circuit" msgid "New" @@ -373,7 +374,7 @@ msgstr "Статистика" msgctxt "CircuitListWidget" msgid "Zoom to Circuit" -msgstr "" +msgstr "Приближаване до Веригата" msgctxt "CircuitListWidget" msgid "Close Circuit (Del)"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit 4d6bd052c7630854cdbe73938de79cd577eb2884 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 13:45:11 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index 328dd7f..62b4787 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.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: 2011-12-27 13:14+0000\n" +"PO-Revision-Date: 2011-12-27 13:32+0000\n" "Last-Translator: raymen <svilen79(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -70,19 +70,19 @@ msgstr "Невъзможност за създаване на %1 [%2]" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Tor Data" -msgstr "" +msgstr "Изберете Директория, която да бъде използвана за Тор данни" msgctxt "AdvancedPage" msgid "Unable to remove Tor Service" -msgstr "" +msgstr "Невъзможно да премахне Тор услуги" msgctxt "AdvancedPage" msgid "Unable to install Tor Service" -msgstr "" +msgstr "Невъзможно да инсталира Тор услуги" msgctxt "AdvancedPage" msgid "Vidalia was unable to install the Tor service." -msgstr "" +msgstr "Видалия не можа да инсталира Тор услуги." msgctxt "AdvancedPage" msgid "Authentication:" @@ -94,7 +94,7 @@ msgstr "Адрес:" msgctxt "AdvancedPage" msgid "None" -msgstr "" +msgstr "Нищо" msgctxt "AdvancedPage" msgid "Cookie" @@ -110,7 +110,7 @@ msgstr "Случайно генериране" msgctxt "AdvancedPage" msgid ":" -msgstr "" +msgstr ":" msgctxt "AdvancedPage" msgid "Tor Configuration File" @@ -130,15 +130,16 @@ msgstr "Разлистване" msgctxt "AdvancedPage" msgid "Data Directory" -msgstr "" +msgstr "Директория за данни" msgctxt "AdvancedPage" msgid "Store data for the Tor software in the following directory" -msgstr "" +msgstr "Съхранете данни за Тор софтуеъра в следната директория" msgctxt "AdvancedPage" msgid "Select the directory used to store data for the Tor software" msgstr "" +"Изберете директорията, използвана за съхранение на данни за Тор софтуеъра. " msgctxt "AdvancedPage" msgid "Tor Control" @@ -206,6 +207,9 @@ msgid "" "\n" "You may need to remove it manually." msgstr "" +"Видалия не можа да премахне Тор услугите.\n" +"\n" +"Ще Ви се наложи да ги премахнете самостоятелно." msgctxt "AppearancePage" msgid "Language" @@ -225,7 +229,7 @@ msgstr "Избери интерфейсен стил на Видалиа" msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." -msgstr "" +msgstr "Видалия не успя да зареди избраният езиков пакет." msgctxt "BandwidthGraph" msgid "Since:" @@ -285,7 +289,7 @@ msgstr "Отказ" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." -msgstr "" +msgstr "Стартиране на заявка за HTTPS мост..." msgctxt "BridgeDownloader" msgid "Connecting to %1:%2..." @@ -293,7 +297,7 @@ msgstr "Свързване с %1:%2..." msgctxt "BridgeDownloader" msgid "Sending an HTTPS request for bridges..." -msgstr "" +msgstr "Изпращане на " msgctxt "BridgeDownloader" msgid "Downloading a list of bridges..."

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 27 Dec '11

27 Dec '11

commit 555ab8ec9f6b28cf9a041c122a25bcce73a502c8 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 27 13:15:12 2011 +0000 Update translations for vidalia --- bg/vidalia_bg.po | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bg/vidalia_bg.po b/bg/vidalia_bg.po index 2165a6c..328dd7f 100644 --- a/bg/vidalia_bg.po +++ b/bg/vidalia_bg.po @@ -1,13 +1,14 @@ # # Translators: # runasand <runa.sandvik(a)gmail.com>, 2011. +# <svilen79(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: 2011-12-27 13:14+0000\n" +"Last-Translator: raymen <svilen79(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" @@ -22,7 +23,7 @@ msgstr "Относно Видалия" msgctxt "AboutDialog" msgid "License" -msgstr "" +msgstr "Лиценз" msgctxt "AboutDialog" msgid "Vidalia 0.2.0" @@ -30,7 +31,7 @@ msgstr "Видалия 0.2.0" msgctxt "AboutDialog" msgid "Tor 0.2.0.32" -msgstr "" +msgstr "Tor 0.2.0.32" msgctxt "AboutDialog" msgid "Qt 4.4.2" @@ -38,12 +39,14 @@ msgstr "4.4.2" msgctxt "AdvancedPage" msgid "'%1' is not a valid IP address." -msgstr "" +msgstr "'%1' не е валиден IP адрес." msgctxt "AdvancedPage" msgid "" "You selected 'Password' authentication, but did not specify a password." msgstr "" +"Вие избрахте удостоверяване чрез \"Парола\", но не сте упоменали изрично " +"някаква парола." msgctxt "AdvancedPage" msgid "Select Tor Configuration File" @@ -83,7 +86,7 @@ msgstr "" msgctxt "AdvancedPage" msgid "Authentication:" -msgstr "Автентикация:" +msgstr "Удостоверяване:" msgctxt "AdvancedPage" msgid "Address:"

1 0

[stem/master] Unit test to exercise all general auth use cases
by atagar＠torproject.org 26 Dec '11

26 Dec '11

commit e642cb669ebc01055ac1873c709ef57585efe99f Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 26 13:52:17 2011 -0800 Unit test to exercise all general auth use cases I'm aiming for both expansive and deep unit testing for the general authenticate method and this does the former. It runs the authenticate() function under all combinations of valid input and having authenticate_* functions either succeed or raise one of its exceptions. At present this just checks that the authenticate() function always either succeeds or raises a AuthenticationFailure - an important test, but I'll next try to make it a deeper validity check. --- test/unit/connection/authentication.py | 66 +++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-) diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py index a570bfe..bae723f 100644 --- a/test/unit/connection/authentication.py +++ b/test/unit/connection/authentication.py @@ -20,7 +20,7 @@ def raise_exception(exception_type): if not exception_type: return no_op() def _raise(exc_type, *args): - raise exc_type + raise exc_type(None) return functools.partial(_raise, exception_type) @@ -31,6 +31,25 @@ def get_protocolinfo(auth_methods): protocolinfo_response.auth_methods = auth_methods return lambda *args: protocolinfo_response +def _get_all_auth_method_combinations(): + """ + Enumerates all types of authentication that a PROTOCOLINFO response may + provide, returning a tuple with the AuthMethod enums. + """ + + for is_none in (False, True): + for is_password in (False, True): + for is_cookie in (False, True): + for is_unknown in (False, True): + auth_methods = [] + + if is_none: auth_methods.append(stem.connection.AuthMethod.NONE) + if is_password: auth_methods.append(stem.connection.AuthMethod.PASSWORD) + if is_cookie: auth_methods.append(stem.connection.AuthMethod.COOKIE) + if is_unknown: auth_methods.append(stem.connection.AuthMethod.UNKNOWN) + + yield tuple(auth_methods) + class TestAuthenticate(unittest.TestCase): """ Under the covers the authentiate function really just translates a @@ -78,4 +97,49 @@ class TestAuthenticate(unittest.TestCase): # tests where get_protocolinfo raises a SocketError stem.connection.get_protocolinfo = raise_exception(stem.socket.SocketError) self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None) + + def test_all_use_cases(self): + """ + Does basic validation that all valid use cases for the PROTOCOLINFO input + and dependent functions result in either success or a AuthenticationFailed + subclass being raised. + """ + + # exceptions that the authentication functions are documented to raise + auth_none_exc_types = (None, + stem.connection.OpenAuthRejected) + + auth_password_exc_types = (None, + stem.connection.PasswordAuthRejected, + stem.connection.IncorrectPassword) + + auth_cookie_exc_types = (None, + stem.connection.IncorrectCookieSize, + stem.connection.UnreadableCookieFile, + stem.connection.CookieAuthRejected, + stem.connection.IncorrectCookieValue) + + # auth functions don't suppress controller exceptions + control_exc_types = ( + stem.socket.ProtocolError, + stem.socket.SocketError, + stem.socket.SocketClosed) + + for auth_methods in _get_all_auth_method_combinations(): + protocolinfo_input = get_protocolinfo(auth_methods)() + + for auth_none_exc in auth_none_exc_types + control_exc_types: + for auth_password_exc in auth_password_exc_types + control_exc_types: + for auth_cookie_exc in auth_cookie_exc_types + control_exc_types: + stem.connection.authenticate_none = raise_exception(auth_none_exc) + stem.connection.authenticate_password = raise_exception(auth_password_exc) + stem.connection.authenticate_cookie = raise_exception(auth_cookie_exc) + + # calling authenticate should either succeed or raise a + # AuthenticationFailure subclass + + try: + stem.connection.authenticate(None, protocolinfo_response = protocolinfo_input) + except stem.connection.AuthenticationFailure: + pass

1 0

[stem/master] General auth unit test for protocolinfo fetching
by atagar＠torproject.org 26 Dec '11

26 Dec '11

commit 39528a51489598b970d1f64cd37a3a5de97fc4cb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 24 17:37:39 2011 -0800 General auth unit test for protocolinfo fetching Unit tests for the general authentication function will be exercising it in various error conditions by mocking out the functions it uses. This first test exercises all of the use cases when the function needs to make a PROTOCOLINFO query and, more importantly, lays the groundwork the rest of these unit tests will use. --- run_tests.py | 2 + test/unit/connection/__init__.py | 2 +- test/unit/connection/authentication.py | 81 ++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index ddea103..73cfb9c 100755 --- a/run_tests.py +++ b/run_tests.py @@ -16,6 +16,7 @@ import test.runner import test.unit.version import test.unit.socket.control_message import test.unit.socket.control_line +import test.unit.connection.authentication import test.unit.connection.protocolinfo import test.unit.util.enum import test.unit.util.system @@ -36,6 +37,7 @@ DIVIDER = "=" * 70 UNIT_TESTS = (("stem.socket.ControlMessage", test.unit.socket.control_message.TestControlMessage), ("stem.socket.ControlLine", test.unit.socket.control_line.TestControlLine), ("stem.types.Version", test.unit.version.TestVersion), + ("stem.connection.authenticate", test.unit.connection.authentication.TestAuthenticate), ("stem.connection.ProtocolInfoResponse", test.unit.connection.protocolinfo.TestProtocolInfoResponse), ("stem.util.enum", test.unit.util.enum.TestEnum), ("stem.util.system", test.unit.util.system.TestSystem), diff --git a/test/unit/connection/__init__.py b/test/unit/connection/__init__.py index f93234b..4eae0fa 100644 --- a/test/unit/connection/__init__.py +++ b/test/unit/connection/__init__.py @@ -2,5 +2,5 @@ Unit tests for stem.connection. """ -__all__ = ["protocolinfo"] +__all__ = ["authentication", "protocolinfo"] diff --git a/test/unit/connection/authentication.py b/test/unit/connection/authentication.py new file mode 100644 index 0000000..a570bfe --- /dev/null +++ b/test/unit/connection/authentication.py @@ -0,0 +1,81 @@ +""" +Unit tests for the stem.connection.authenticate function. +""" + +import StringIO +import functools +import unittest + +import stem.connection + +# Functors to replace get_protocolinfo and authenticate_*. All of them take any +# number of arguments. +def no_op(): + def _no_op(*args): + pass + + return _no_op + +def raise_exception(exception_type): + if not exception_type: return no_op() + + def _raise(exc_type, *args): + raise exc_type + + return functools.partial(_raise, exception_type) + +def get_protocolinfo(auth_methods): + control_message = "250-PROTOCOLINFO 1\r\n250 OK\r\n" + protocolinfo_response = stem.socket.recv_message(StringIO.StringIO(control_message)) + stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) + protocolinfo_response.auth_methods = auth_methods + return lambda *args: protocolinfo_response + +class TestAuthenticate(unittest.TestCase): + """ + Under the covers the authentiate function really just translates a + PROTOCOLINFO response into authenticate_* calls, then does prioritization + on the exceptions if they all fail. + + This monkey patches the various functions authenticate relies on to exercise + various error conditions, and make sure that the right exception is raised. + """ + + def setUp(self): + # preserves all of the functors we'll need to monkey patch, and make them + # no-ops + + self.original_get_protocolinfo = stem.connection.get_protocolinfo + self.original_authenticate_none = stem.connection.authenticate_none + self.original_authenticate_password = stem.connection.authenticate_password + self.original_authenticate_cookie = stem.connection.authenticate_cookie + + stem.connection.get_protocolinfo = no_op() + stem.connection.authenticate_none = no_op() + stem.connection.authenticate_password = no_op() + stem.connection.authenticate_cookie = no_op() + + def tearDown(self): + # restore functions + stem.connection.get_protocolinfo = self.original_get_protocolinfo + stem.connection.authenticate_none = self.original_authenticate_none + stem.connection.authenticate_password = self.original_authenticate_password + stem.connection.authenticate_cookie = self.original_authenticate_cookie + + def test_with_get_protocolinfo(self): + """ + Tests the authenticate() function when it needs to make a get_protocolinfo. + """ + + # tests where get_protocolinfo succeeds + stem.connection.get_protocolinfo = get_protocolinfo((stem.connection.AuthMethod.NONE, )) + stem.connection.authenticate(None) + + # tests where get_protocolinfo raises a ProtocolError + stem.connection.get_protocolinfo = raise_exception(stem.socket.ProtocolError) + self.assertRaises(stem.connection.IncorrectSocketType, stem.connection.authenticate, None) + + # tests where get_protocolinfo raises a SocketError + stem.connection.get_protocolinfo = raise_exception(stem.socket.SocketError) + self.assertRaises(stem.connection.AuthenticationFailure, stem.connection.authenticate, None) +

1 0