July 2013 - tor-commits - lists.torproject.org

[torbirdy/master] Update translation settings
by sukhbir＠torproject.org 08 Jul '13

08 Jul '13

commit bb2f3f66eadb78224d6d453975c7bcb0d1493f0e Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Sun Jul 7 23:08:15 2013 -0400 Update translation settings --- chrome.manifest | 2 ++ chrome/locale/si-LK/torbirdy.dtd | 59 +++++++++++++++++++++++++++++++ chrome/locale/si-LK/torbirdy.properties | 19 ++++++++++ chrome/locale/si_LK/torbirdy.dtd | 59 ------------------------------- chrome/locale/si_LK/torbirdy.properties | 19 ---------- 5 files changed, 80 insertions(+), 78 deletions(-) diff --git a/chrome.manifest b/chrome.manifest index 0cb6850..e76ae9f 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -26,6 +26,7 @@ locale castironthunderbirdclub gu chrome/locale/gu/ locale castironthunderbirdclub he chrome/locale/he/ locale castironthunderbirdclub hu chrome/locale/hu/ locale castironthunderbirdclub it chrome/locale/it/ +locale castironthunderbirdclub ja chrome/locale/ja/ locale castironthunderbirdclub ko chrome/locale/ko/ locale castironthunderbirdclub lv chrome/locale/lv/ locale castironthunderbirdclub nb chrome/locale/nb/ @@ -34,6 +35,7 @@ locale castironthunderbirdclub pa chrome/locale/pa/ locale castironthunderbirdclub pl chrome/locale/pl/ locale castironthunderbirdclub pt-BR chrome/locale/pt-BR/ locale castironthunderbirdclub ru chrome/locale/ru/ +locale castironthunderbirdclub si-LK chrome/locale/si-LK/ locale castironthunderbirdclub sk chrome/locale/sk/ locale castironthunderbirdclub sr chrome/locale/sr/ locale castironthunderbirdclub sv chrome/locale/sv/ diff --git a/chrome/locale/si-LK/torbirdy.dtd b/chrome/locale/si-LK/torbirdy.dtd new file mode 100644 index 0000000..d9e341b --- /dev/null +++ b/chrome/locale/si-LK/torbirdy.dtd @@ -0,0 +1,59 @@ +<!ENTITY torbirdy.accountprefs.title "ගිණුම් වින්‍යාසය "> +<!ENTITY torbirdy.accountprefs.startup.label "ඇරඹුමේදී නව පණිවිඩ පරීක්ෂා කරන්න"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "නව පණිවිඩ පරීක්ෂා කරන්න සෑම"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "මිනිත්තු "> +<!ENTITY torbirdy.accountprefs.cancel.button "අවලංගු කරන්න "> +<!ENTITY torbirdy.accountprefs.save.button "සුරකින්න"> +<!ENTITY torbirdy.accountprefs.save.key "S"> + +<!ENTITY torbirdy.prefs.title "TorBirdy මනාපයන් "> +<!ENTITY torbirdy.prefs.save.button "සුරකින්න"> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "අවලංගු කරන්න"> +<!ENTITY torbirdy.prefs.extra2.button "පරීක්ෂණ සිටවුම්"> +<!ENTITY torbirdy.prefs.extra2.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "සේවාදායක සැකසුම්"> +<!ENTITY torbirdy.prefs.privacy.label "පෞද්ගලික සිටවුම් "> +<!ENTITY torbirdy.prefs.enigmail.label "Enigmail සිටවුම්"> +<!ENTITY torbirdy.prefs.security.label "ආරක්ෂණ සැකසුම්"> +<!ENTITY torbirdy.prefs.recommended.text "TorBirdy (Tor) සදහා නිර්දේශිත නියුතු සේවාදායක සිටවුම් භාවිතා කරන්න "> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "නිර්ණාමික සේවාවක් තෝරන්න "> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "අභිරුචි නියුතු සේවාදායක සැකසුම් භාවිතා කරන්න"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "සත්කාරක සොකට්:"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "පොර්ටය:"> +<!ENTITY torbirdy.prefs.socks_port.key "p"> +<!ENTITY torbirdy.prefs.torification.label "පාරදෘශ්‍ය Tor බවට පත් කිරීම (අවවාදය: ව්‍යවහාරික පාරදෘශ්‍ය සේවාදායකයෙක් හෝ Tor රවුටරයක් අවශ්‍යය)"> +<!ENTITY torbirdy.prefs.torification.key "t"> +<!ENTITY torbirdy.prefs.global "ගෝලීය "> +<!ENTITY torbirdy.prefs.imap.label "IMAP ගිණුම් සදහා විද්‍යුත් තැපෑල තල්ලු ආධාරය සබල කරන්න[default: disabled]"> +<!ENTITY torbirdy.prefs.imap.key "i"> +<!ENTITY torbirdy.prefs.startup_folder.label "ඇරඹුමේදී අවසන් වරට පිවිසුණු ලිපි ෆෝල්ඩරය තෝරන්න [default: disabled, select Local Folders]"> +<!ENTITY torbirdy.prefs.startup_folder.key "l"> +<!ENTITY torbirdy.prefs.timezone.label "UTC සදහා Thunderbird වේලා කලාපය යෙදීමෙන් වැළකී සිටින්න [default: set to UTC]"> +<!ENTITY torbirdy.prefs.timezone.key "z"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "ලබන්නාගේ අනන්‍යතා යතුර සංකේතනය කරන ලද පණිවිඩ වලට යොදන්න [default: do not put]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> +<!ENTITY torbirdy.prefs.confirmemail.label "Enigmail සබල කර ඇත්නම් විද්‍යුත් තැපෑල එවීමට පෙර තහවුරු කරන්න [default: do not confirm]"> +<!ENTITY torbirdy.prefs.confirmemail.key "m"> +<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird ගේ ස්වයංක්‍රීය විද්‍යුත් තැපෑල වින්‍යාස විශාරද සබල කරන්න [default: disabled]"> +<!ENTITY torbirdy.prefs.emailwizard.key "w"> +<!ENTITY torbirdy.prefs.renegotiation.label "ආරක්‍ෂිත නැවත හුවමාරුවක් සහිත SSL/TLS අනුබල නොදෙන සේවාදායකයන්ට සම්බන්ධ වීමට ඉඩහරින්න [default: do not allow]"> +<!ENTITY torbirdy.prefs.renegotiation.key "r"> +<!ENTITY torbirdy.prefs.account_specific "විශේෂිත-ගිණුම "> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "ගිණුමක් තෝරන්න:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "මුලික සේවාදායක(යන්) භාවිතා කිරීමට:"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Tor Onion රවුටරය භාවිතා කරන්න "> +<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) භාවිතා කරන්න"> +<!ENTITY torbirdy.panel.usewhonix.label "Whonix භාවිතා කරන්න "> +<!ENTITY torbirdy.panel.preferences.label "TorBirdy මනාපයන් විවෘත කරන්න "> + +<!ENTITY torbirdy.firstrun.title "TorBirdy පළමු-දිගහැරුම"> diff --git a/chrome/locale/si-LK/torbirdy.properties b/chrome/locale/si-LK/torbirdy.properties new file mode 100644 index 0000000..c462c3e --- /dev/null +++ b/chrome/locale/si-LK/torbirdy.properties @@ -0,0 +1,19 @@ +torbirdy.name=TorBirdy + +torbirdy.enabled.tor=TorBirdy සබල කිරීම: Tor +torbirdy.enabled.jondo=TorBirdy සබල කිරීම: JonDo +torbirdy.enabled.custom=TorBirdy සබල කිරීම: අභිරුචි නියතු සේවාදායකයා +torbirdy.enabled.torification=TorBirdy සබල කිරීම: පාරදෘශ්‍ය Tor බවට පත් කිරීම +torbirdy.enabled.whonix=TorBirdy සබල කිරීම: Whonix +torbirdy.disabled=TorBirdy: අබල කර ඇත! + +torbirdy.email.prompt=TorBirdy මගින් Thunderbird හී ස්වයංක්‍රීය වින්‍යාස විජ්ජාව ඔබේ නිර්නාමිකත්වය සුරැකීම කිරීම සදහා අබල කර ඇත.\n\nනිර්දේශිත ආරක්ෂක සිටවුම් %S සදහා සකස් කර ඇත.\n\nඔබට දැන් ගිණුමේහි අඩංගු අනෙකුත් කට්ටල අංග වෙනස් කිරීමේ හැකියාවක් ඇත. + +torbirdy.email.advanced=TorBirdy තුල උසස් සිටුවම් වෙනස් කිරීමේ හැකියාවක් නොමැති බව කරුණාවෙන් සලකන්න.\n\nඔබ කරන කටයුත්ත පිළිබද පුර්ණ විශ්වාසයක් ඇතිනම් පමණක් ඉදිරියට යන්න. +torbirdy.email.advanced.nextwarning=මෙම අවවාදය ඊලග වතාවේදී නැවත පෙන්වන්න. +torbirdy.email.advanced.title=TorBirdy උසස් සිටුවම් + +torbirdy.restart=වේලා කලාප අභිරුචිය ක්‍රියාත්මක කිරීමට කරුණාකර Thunderbird වසා දමා නැවත පටන් ගන්න. + +torbirdy.firstrun=ඔබ දැන් TorBirdy ක්‍රියාත්මක කර ඇත. \n\nඔබේ නිර්නාමිකභාවය ආරක්ෂා කිරීමට TorBirdy මගින් Thunderbird හි ස්ථාවර සිටවුම් බලගන්වයි. එමගින් ඔබට හෝ ඕනෑම ඈදුමක් හට එහි වෙනස්කම් සිදුකල නොහැක. නමුත් TorBirdy හී අභිරුචි සංවාදයෙහි ඇති සිටවුම් වෙනස් කල හැක. TorBirdy අස්ථාපනය කලවිට හා අක්‍රිය කලවිට වෙනස් වන සියළු සිටවුම් ඒවායේ පෙරනිමි අගයන් (TorBirdy ස්ථාපනයට පෙර අගයන්) හට ප්‍රත්‍යාරම්භ වේ.\n\nඔබ නව පරිශීලකයෙක් නම්, TorBirdy වෙ බ් අඩවිය කියවීමෙන් TorBirdy අප යොදාගැනීමට හේතුව පිළිබද දැනුවත් විය හැක. +torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy diff --git a/chrome/locale/si_LK/torbirdy.dtd b/chrome/locale/si_LK/torbirdy.dtd deleted file mode 100644 index d9e341b..0000000 --- a/chrome/locale/si_LK/torbirdy.dtd +++ /dev/null @@ -1,59 +0,0 @@ -<!ENTITY torbirdy.accountprefs.title "ගිණුම් වින්‍යාසය "> -<!ENTITY torbirdy.accountprefs.startup.label "ඇරඹුමේදී නව පණිවිඩ පරීක්ෂා කරන්න"> -<!ENTITY torbirdy.accountprefs.startup.key "C"> -<!ENTITY torbirdy.accountprefs.minutes.label "නව පණිවිඩ පරීක්ෂා කරන්න සෑම"> -<!ENTITY torbirdy.accountprefs.minutes.key "y"> -<!ENTITY torbirdy.accountprefs.minutes.trail.label "මිනිත්තු "> -<!ENTITY torbirdy.accountprefs.cancel.button "අවලංගු කරන්න "> -<!ENTITY torbirdy.accountprefs.save.button "සුරකින්න"> -<!ENTITY torbirdy.accountprefs.save.key "S"> - -<!ENTITY torbirdy.prefs.title "TorBirdy මනාපයන් "> -<!ENTITY torbirdy.prefs.save.button "සුරකින්න"> -<!ENTITY torbirdy.prefs.save.key "s"> -<!ENTITY torbirdy.prefs.cancel.button "අවලංගු කරන්න"> -<!ENTITY torbirdy.prefs.extra2.button "පරීක්ෂණ සිටවුම්"> -<!ENTITY torbirdy.prefs.extra2.key "n"> -<!ENTITY torbirdy.prefs.proxy.label "සේවාදායක සැකසුම්"> -<!ENTITY torbirdy.prefs.privacy.label "පෞද්ගලික සිටවුම් "> -<!ENTITY torbirdy.prefs.enigmail.label "Enigmail සිටවුම්"> -<!ENTITY torbirdy.prefs.security.label "ආරක්ෂණ සැකසුම්"> -<!ENTITY torbirdy.prefs.recommended.text "TorBirdy (Tor) සදහා නිර්දේශිත නියුතු සේවාදායක සිටවුම් භාවිතා කරන්න "> -<!ENTITY torbirdy.prefs.recommended.key "r"> -<!ENTITY torbirdy.prefs.anonservice.text "නිර්ණාමික සේවාවක් තෝරන්න "> -<!ENTITY torbirdy.prefs.anonservice.key "a"> -<!ENTITY torbirdy.prefs.customsettings.text "අභිරුචි නියුතු සේවාදායක සැකසුම් භාවිතා කරන්න"> -<!ENTITY torbirdy.prefs.customsettings.key "c"> -<!ENTITY torbirdy.prefs.socks_host.label "සත්කාරක සොකට්:"> -<!ENTITY torbirdy.prefs.socks_host.key "h"> -<!ENTITY torbirdy.prefs.socks_port.label "පොර්ටය:"> -<!ENTITY torbirdy.prefs.socks_port.key "p"> -<!ENTITY torbirdy.prefs.torification.label "පාරදෘශ්‍ය Tor බවට පත් කිරීම (අවවාදය: ව්‍යවහාරික පාරදෘශ්‍ය සේවාදායකයෙක් හෝ Tor රවුටරයක් අවශ්‍යය)"> -<!ENTITY torbirdy.prefs.torification.key "t"> -<!ENTITY torbirdy.prefs.global "ගෝලීය "> -<!ENTITY torbirdy.prefs.imap.label "IMAP ගිණුම් සදහා විද්‍යුත් තැපෑල තල්ලු ආධාරය සබල කරන්න[default: disabled]"> -<!ENTITY torbirdy.prefs.imap.key "i"> -<!ENTITY torbirdy.prefs.startup_folder.label "ඇරඹුමේදී අවසන් වරට පිවිසුණු ලිපි ෆෝල්ඩරය තෝරන්න [default: disabled, select Local Folders]"> -<!ENTITY torbirdy.prefs.startup_folder.key "l"> -<!ENTITY torbirdy.prefs.timezone.label "UTC සදහා Thunderbird වේලා කලාපය යෙදීමෙන් වැළකී සිටින්න [default: set to UTC]"> -<!ENTITY torbirdy.prefs.timezone.key "z"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "ලබන්නාගේ අනන්‍යතා යතුර සංකේතනය කරන ලද පණිවිඩ වලට යොදන්න [default: do not put]"> -<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "g"> -<!ENTITY torbirdy.prefs.confirmemail.label "Enigmail සබල කර ඇත්නම් විද්‍යුත් තැපෑල එවීමට පෙර තහවුරු කරන්න [default: do not confirm]"> -<!ENTITY torbirdy.prefs.confirmemail.key "m"> -<!ENTITY torbirdy.prefs.emailwizard.label "Thunderbird ගේ ස්වයංක්‍රීය විද්‍යුත් තැපෑල වින්‍යාස විශාරද සබල කරන්න [default: disabled]"> -<!ENTITY torbirdy.prefs.emailwizard.key "w"> -<!ENTITY torbirdy.prefs.renegotiation.label "ආරක්‍ෂිත නැවත හුවමාරුවක් සහිත SSL/TLS අනුබල නොදෙන සේවාදායකයන්ට සම්බන්ධ වීමට ඉඩහරින්න [default: do not allow]"> -<!ENTITY torbirdy.prefs.renegotiation.key "r"> -<!ENTITY torbirdy.prefs.account_specific "විශේෂිත-ගිණුම "> -<!ENTITY torbirdy.prefs.select_account.key "C"> -<!ENTITY torbirdy.prefs.select_account.label "ගිණුමක් තෝරන්න:"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label "මුලික සේවාදායක(යන්) භාවිතා කිරීමට:"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> - -<!ENTITY torbirdy.panel.usetor.label "Tor Onion රවුටරය භාවිතා කරන්න "> -<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) භාවිතා කරන්න"> -<!ENTITY torbirdy.panel.usewhonix.label "Whonix භාවිතා කරන්න "> -<!ENTITY torbirdy.panel.preferences.label "TorBirdy මනාපයන් විවෘත කරන්න "> - -<!ENTITY torbirdy.firstrun.title "TorBirdy පළමු-දිගහැරුම"> diff --git a/chrome/locale/si_LK/torbirdy.properties b/chrome/locale/si_LK/torbirdy.properties deleted file mode 100644 index c462c3e..0000000 --- a/chrome/locale/si_LK/torbirdy.properties +++ /dev/null @@ -1,19 +0,0 @@ -torbirdy.name=TorBirdy - -torbirdy.enabled.tor=TorBirdy සබල කිරීම: Tor -torbirdy.enabled.jondo=TorBirdy සබල කිරීම: JonDo -torbirdy.enabled.custom=TorBirdy සබල කිරීම: අභිරුචි නියතු සේවාදායකයා -torbirdy.enabled.torification=TorBirdy සබල කිරීම: පාරදෘශ්‍ය Tor බවට පත් කිරීම -torbirdy.enabled.whonix=TorBirdy සබල කිරීම: Whonix -torbirdy.disabled=TorBirdy: අබල කර ඇත! - -torbirdy.email.prompt=TorBirdy මගින් Thunderbird හී ස්වයංක්‍රීය වින්‍යාස විජ්ජාව ඔබේ නිර්නාමිකත්වය සුරැකීම කිරීම සදහා අබල කර ඇත.\n\nනිර්දේශිත ආරක්ෂක සිටවුම් %S සදහා සකස් කර ඇත.\n\nඔබට දැන් ගිණුමේහි අඩංගු අනෙකුත් කට්ටල අංග වෙනස් කිරීමේ හැකියාවක් ඇත. - -torbirdy.email.advanced=TorBirdy තුල උසස් සිටුවම් වෙනස් කිරීමේ හැකියාවක් නොමැති බව කරුණාවෙන් සලකන්න.\n\nඔබ කරන කටයුත්ත පිළිබද පුර්ණ විශ්වාසයක් ඇතිනම් පමණක් ඉදිරියට යන්න. -torbirdy.email.advanced.nextwarning=මෙම අවවාදය ඊලග වතාවේදී නැවත පෙන්වන්න. -torbirdy.email.advanced.title=TorBirdy උසස් සිටුවම් - -torbirdy.restart=වේලා කලාප අභිරුචිය ක්‍රියාත්මක කිරීමට කරුණාකර Thunderbird වසා දමා නැවත පටන් ගන්න. - -torbirdy.firstrun=ඔබ දැන් TorBirdy ක්‍රියාත්මක කර ඇත. \n\nඔබේ නිර්නාමිකභාවය ආරක්ෂා කිරීමට TorBirdy මගින් Thunderbird හි ස්ථාවර සිටවුම් බලගන්වයි. එමගින් ඔබට හෝ ඕනෑම ඈදුමක් හට එහි වෙනස්කම් සිදුකල නොහැක. නමුත් TorBirdy හී අභිරුචි සංවාදයෙහි ඇති සිටවුම් වෙනස් කල හැක. TorBirdy අස්ථාපනය කලවිට හා අක්‍රිය කලවිට වෙනස් වන සියළු සිටවුම් ඒවායේ පෙරනිමි අගයන් (TorBirdy ස්ථාපනයට පෙර අගයන්) හට ප්‍රත්‍යාරම්භ වේ.\n\nඔබ නව පරිශීලකයෙක් නම්, TorBirdy වෙ බ් අඩවිය කියවීමෙන් TorBirdy අප යොදාගැනීමට හේතුව පිළිබද දැනුවත් විය හැක. -torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

1 0

r26245: {website} use the newer blurb for tor (website/trunk/about/en)
by Roger Dingledine 08 Jul '13

08 Jul '13

Author: arma Date: 2013-07-08 00:23:40 +0000 (Mon, 08 Jul 2013) New Revision: 26245 Modified: website/trunk/about/en/jobs.wml Log: use the newer blurb for tor Modified: website/trunk/about/en/jobs.wml =================================================================== --- website/trunk/about/en/jobs.wml 2013-07-08 00:20:35 UTC (rev 26244) +++ website/trunk/about/en/jobs.wml 2013-07-08 00:23:40 UTC (rev 26245) @@ -33,15 +33,15 @@ About the company: The Tor Project is a US 501(c)(3) non-profit dedicated to research, development, and education about online anonymity and privacy. The Tor - network's 3000 volunteer relays carry 16 Gbps for upwards of half a million - daily users, including ordinary citizens who want protection from identity - theft and prying corporations, corporations who want to look at a - competitor's website in private, people around the world whose Internet - connections are censored, and even governments and law enforcement. Tor has - a staff of 14 paid developers, researchers, and advocates, plus many dozen - volunteers who help out on a daily basis. Tor is funded in part by - government research and development grants, and in part by individual and - corporate donations. + network's 3000 volunteer relays carry 16 Gbps for upwards of half a + million daily users, including ordinary citizens who want protection + from identity theft and prying corporations, corporations who want + to look at a competitor's website in private, people around the world + whose Internet connections are censored, and even governments and law + enforcement. Tor has a staff of 30 paid developers, researchers, and + advocates, plus many dozen volunteers who help out on a daily basis. Tor + is funded in part by government research and development grants, and + in part by individual and corporate donations. </div>

1 0

r26244: {website} the sidenav still pointed to the old job posting. thanks to (website/trunk/about/en)
by Roger Dingledine 08 Jul '13

08 Jul '13

Author: arma Date: 2013-07-08 00:20:35 +0000 (Mon, 08 Jul 2013) New Revision: 26244 Modified: website/trunk/about/en/sidenav.wmi Log: the sidenav still pointed to the old job posting. thanks to "dan" for noticing. Modified: website/trunk/about/en/sidenav.wmi =================================================================== --- website/trunk/about/en/sidenav.wmi 2013-07-08 00:20:15 UTC (rev 26243) +++ website/trunk/about/en/sidenav.wmi 2013-07-08 00:20:35 UTC (rev 26244) @@ -44,8 +44,8 @@ {'url' => 'about/jobs', 'txt' => 'Jobs', 'subelements' => [ - {'url' => 'about/jobs-pluggabletransport', - 'txt' => 'Pluggable transport dev', + {'url' => 'about/jobs-lead-automation', + 'txt' => 'Lead Automation Engineer', }] },

1 0

r26243: {website} commit a clarification that's been sitting in my inbox (website/trunk/about/en)
by Roger Dingledine 08 Jul '13

08 Jul '13

Author: arma Date: 2013-07-08 00:20:15 +0000 (Mon, 08 Jul 2013) New Revision: 26243 Modified: website/trunk/about/en/contact.wml Log: commit a clarification that's been sitting in my inbox Modified: website/trunk/about/en/contact.wml =================================================================== --- website/trunk/about/en/contact.wml 2013-07-06 21:42:33 UTC (rev 26242) +++ website/trunk/about/en/contact.wml 2013-07-08 00:20:15 UTC (rev 26243) @@ -46,9 +46,11 @@ <ul> <li>tor-talk(a)lists.torproject.org is for all discussion - about theory, design, development, and use of Onion Routing.</li> - <li>tor-dev(a)lists.torproject.org is for all discussion - regarding Tor research and development.</li> + about theory, design, development, and use of Onion Routing. + tor-dev(a)lists.torproject.org is for Tor research and + development. For both of these <a href="<page + docs/documentation>#MailingLists">mailing lists</a>, + you must subscribe before you can post.</li> <li>tor-translation(a)lists.torproject.org can put new <a href="<page getinvolved/translation>">translations</a> into place, and help answer questions about existing and new translations.</li>

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Jul '13

07 Jul '13

commit 95523f8530044dd9170cefada93ffd03eff55ac8 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 7 22:46:30 2013 +0000 Update translations for tor-launcher-network-settings --- th/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/th/network-settings.dtd b/th/network-settings.dtd index 85cdfba..7cbea98 100644 --- a/th/network-settings.dtd +++ b/th/network-settings.dtd @@ -1,4 +1,4 @@ -<!ENTITY torsettings.dialog.title ""> +<!ENTITY torsettings.dialog.title "ตั้งค่าเครือข่าย Tor">  @@ -12,7 +12,7 @@ <!ENTITY torSettings.configurePrompt2 ""> <!ENTITY torSettings.configure "ปรับแต่ง"> <!ENTITY torSettings.connectPrompt1 ""> -<!ENTITY torSettings.connectPrompt2 ""> +<!ENTITY torSettings.connectPrompt2 "ฉันอยากจะเชื่อมต่อโดยตรงกับเครือข่าย Tor"> <!ENTITY torSettings.connect "เชื่อมต่อ"> <!ENTITY torSettings.proxyQuestion ""> @@ -44,9 +44,9 @@ <!ENTITY torsettings.firewall.allowedPorts "พอร์ตที่อนุญาต:"> <!ENTITY torsettings.useBridges.checkbox ""> <!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.placeholder "address:port"> -<!ENTITY torsettings.copyLog ""> +<!ENTITY torsettings.copyLog "คัดลอกปูม Tor ไปที่คลิปบอร์ด"> <!ENTITY torsettings.bridgeHelpTitle ""> <!ENTITY torsettings.bridgeHelp1 ""> <!ENTITY torsettings.bridgeHelp2 "">

1 0

[torbrowser/maint-2.4] bump tbb beta (formerly known as alpha) for tor 0.2.4.15-rc
by erinn＠torproject.org 07 Jul '13

07 Jul '13

commit ce483b53bcfde57e9698dda7e5a7732f8e0329b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 7 18:43:41 2013 -0300 bump tbb beta (formerly known as alpha) for tor 0.2.4.15-rc --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/versions-alpha.mk | 6 +++--- changelog.linux-2.4 | 7 +++++++ changelog.osx-2.4 | 7 +++++++ changelog.windows-2.4 | 7 +++++++ 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index c62865b..19d141f 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for GNU/Linux (alpha) +Tor Browser Bundle for GNU/Linux (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 8ed423c..d9ade29 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for Mac OS X (alpha) +Tor Browser Bundle for Mac OS X (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.WIN-2.4 b/README.WIN-2.4 index df0be97..ec8b342 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for Windows (alpha) +Tor Browser Bundle for Windows (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index ea0913a..ce623c8 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.14-alpha-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.14-alpha-1</string> + <string>2.4.15-beta-1</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.14-alpha-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index de0cbb8..4331995 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.14-alpha +RELEASE_VER=2.4.15-beta ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k @@ -8,12 +8,12 @@ LIBPNG_VER=1.5.16 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.14-alpha +TOR_VER=0.2.4.15-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.6 +NOSCRIPT_VER=2.6.6.7 HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 184b2f2..2c0acc2 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=linux + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:52 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=linux * Update Tor to 0.2.4.14-alpha diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index ac2b503..593f8f2 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=osx + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:48 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=osx * Update Tor to 0.2.4.14-alpha diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 36093cb..1d6c064 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=windows + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:50 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=windows * Update Tor to 0.2.4.14-alpha

1 0

[torbrowser/master] bump tbb beta (formerly known as alpha) for tor 0.2.4.15-rc
by erinn＠torproject.org 07 Jul '13

07 Jul '13

commit ce483b53bcfde57e9698dda7e5a7732f8e0329b4 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 7 18:43:41 2013 -0300 bump tbb beta (formerly known as alpha) for tor 0.2.4.15-rc --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/versions-alpha.mk | 6 +++--- changelog.linux-2.4 | 7 +++++++ changelog.osx-2.4 | 7 +++++++ changelog.windows-2.4 | 7 +++++++ 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index c62865b..19d141f 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for GNU/Linux (alpha) +Tor Browser Bundle for GNU/Linux (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 8ed423c..d9ade29 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for Mac OS X (alpha) +Tor Browser Bundle for Mac OS X (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/README.WIN-2.4 b/README.WIN-2.4 index df0be97..ec8b342 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -1,14 +1,14 @@ -Tor Browser Bundle for Windows (alpha) +Tor Browser Bundle for Windows (beta) =============== Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) +Tor 0.2.4.15-rc (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.7esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.6 + |_ NoScript 2.6.6.7 |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 diff --git a/build-scripts/config/Info.plist b/build-scripts/config/Info.plist index ea0913a..ce623c8 100644 --- a/build-scripts/config/Info.plist +++ b/build-scripts/config/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>TorBrowserBundle</string> <key>CFBundleGetInfoString</key> - <string>Tor Browser Bundle 2.4.14-alpha-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>CFBundleIconFile</key> <string>vidalia.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>2.4.14-alpha-1</string> + <string>2.4.15-beta-1</string> <key>CFBundleSignature</key> <string>????</string> <key>LSEnvironment</key> @@ -35,7 +35,7 @@ <key>NSAppleScriptEnabled</key> <false/> <key>NSHumanReadableCopyright</key> - <string>Tor Browser Bundle 2.4.14-alpha-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> + <string>Tor Browser Bundle 2.4.15-beta-1 Copyright 2010, 2011, 2012, 2013 The Tor Project</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index de0cbb8..4331995 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,6 +1,6 @@ #!/usr/bin/make -RELEASE_VER=2.4.14-alpha +RELEASE_VER=2.4.15-beta ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k @@ -8,12 +8,12 @@ LIBPNG_VER=1.5.16 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.14-alpha +TOR_VER=0.2.4.15-rc PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.7esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.6 +NOSCRIPT_VER=2.6.6.7 HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index 184b2f2..2c0acc2 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=linux + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:52 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=linux * Update Tor to 0.2.4.14-alpha diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index ac2b503..593f8f2 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=osx + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:48 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=osx * Update Tor to 0.2.4.14-alpha diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 36093cb..1d6c064 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,10 @@ +Tor Browser Bundle (2.4.15-beta-1); suite=windows + + * Update Tor to 0.2.4.15-rc + * Update NoScript to 2.6.6.7 + + -- Erinn Clark <erinn(a)torproject.org> Sun Jul 7 18:38:50 BRT 2013 + Tor Browser Bundle (2.4.14-alpha-1); suite=windows * Update Tor to 0.2.4.14-alpha

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 07 Jul '13

07 Jul '13

commit b5188b2676e52a11d41e98becf5cea27c69f4e30 Merge: 6acfa0b ce483b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Jul 7 18:44:18 2013 -0300 Merge branch 'maint-2.4' README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/config/Info.plist | 6 +++--- build-scripts/versions-alpha.mk | 6 +++--- changelog.linux-2.4 | 7 +++++++ changelog.osx-2.4 | 7 +++++++ changelog.windows-2.4 | 7 +++++++ 8 files changed, 36 insertions(+), 15 deletions(-)

1 0

[stem/master] Checking for testing prereq of mock 0.8.0
by atagar＠torproject.org 07 Jul '13

07 Jul '13

commit d0ce002d568627876c59c3ff23d6d86fbb049aa9 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 4 13:34:56 2013 -0700 Checking for testing prereq of mock 0.8.0 We had a requirement on mock 0.7.0 but it turns out that we're using a 0.8.0 feature too. Spotted this while trying to use ubuntu jaunty's apt-get version... Traceback (most recent call last): File "./run_tests.py", line 405, in <module> main() File "./run_tests.py", line 184, in main for test_class in test.util.get_unit_tests(args.test_prefix): File "/home/atagar/Desktop/stem/test/util.py", line 130, in _get_tests module = __import__(module_name) File "/home/atagar/Desktop/stem/test/unit/tutorial.py", line 23, in <module> class TestTutorial(unittest.TestCase): File "/home/atagar/Desktop/stem/test/unit/tutorial.py", line 24, in TestTutorial @patch('sys.stdout', new_callable = StringIO.StringIO) TypeError: patch() got an unexpected keyword argument 'new_callable' --- docs/change_log.rst | 4 ++-- run_tests.py | 2 +- stem/prereq.py | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 635a8de..5adbd08 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -45,8 +45,8 @@ The following are only available within stem's `git repository * :func:`~stem.control.Controller.attach_stream` could encounter an undocumented 555 response (:trac:`8701`, :spec:`7286576`) * :class:`~stem.descriptor.server_descriptor.RelayDescriptor` digest validation was broken when dealing with non-unicode content with python 3 (:trac:`8755`) * The :class:`~stem.control.Controller` use of cached content wasn't thread safe (:trac:`8607`) - * Added :func:`~stem.control.Controller.get_user` method to the:class:`~stem.control.Controller` - * Added :func:`~stem.control.Controller.get_pid` method to the:class:`~stem.control.Controller` + * Added :func:`~stem.control.Controller.get_user` method to the :class:`~stem.control.Controller` + * Added :func:`~stem.control.Controller.get_pid` method to the :class:`~stem.control.Controller` * :class:`~stem.response.events.StreamEvent` didn't recognize IPv6 addresses (:trac:`9181`) * **Descriptors** diff --git a/run_tests.py b/run_tests.py index 207b0fe..c209e1a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -83,7 +83,7 @@ https://pypi.python.org/pypi/mock/ MOCK_OUT_OF_DATE_MSG = """\ To run stem's tests you'll need mock. You have version %s, but you need -version 0.7.0 or later... +version 0.8.0 or later... https://pypi.python.org/pypi/mock/ """ diff --git a/stem/prereq.py b/stem/prereq.py index 25573ab..7932361 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -19,6 +19,7 @@ Checks for stem dependencies. We require python 2.6 or greater (including the is_crypto_available - checks if the pycrypto module is available """ +import inspect import sys IS_CRYPTO_AVAILABLE = None @@ -101,11 +102,16 @@ def is_mock_available(): try: import mock - # we use mock's patch.dict() which was introduced in version 0.7.0 + # check for mock's patch.dict() which was introduced in version 0.7.0 if not hasattr(mock.patch, 'dict'): raise ImportError() + # check for mock's new_callable argument for patch() which was introduced in version 0.8.0 + + if not 'new_callable' in inspect.getargspec(mock.patch).args: + raise ImportError() + IS_MOCK_AVAILABLE = True except ImportError: IS_MOCK_AVAILABLE = False

1 0

[stem/master] Pyflakes and PEP8 corrections
by atagar＠torproject.org 07 Jul '13

07 Jul '13

commit 5cd89263f0acc5a7b6fcdd4021efa09a4f1634ab Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 4 13:41:22 2013 -0700 Pyflakes and PEP8 corrections After upgrading both they each complained about a few new things. Mostly pyflakes getting confused by pydoc comments, but there were a couple fair catches. --- stem/util/conf.py | 2 +- test/settings.cfg | 2 ++ test/unit/descriptor/networkstatus/document_v3.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 14cc306..f897aac 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -299,7 +299,7 @@ def parse_enum_csv(key, value, enumeration, count = None): raise ValueError("The count must be None, an int, or two value tuple. Got '%s' (%s)'" % (count, type(count))) result = [] - enum_keys = [key.upper() for key in enumeration.keys()] + enum_keys = [k.upper() for k in enumeration.keys()] enum_values = list(enumeration) for val in values: diff --git a/test/settings.cfg b/test/settings.cfg index 96fc407..16d8c8b 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -129,6 +129,7 @@ pep8.ignore E127 # False positives from pyflakes. These are mappings between the path and the # issue. +pyflakes.ignore stem/control.py => undefined name 'control' pyflakes.ignore stem/prereq.py => 'RSA' imported but unused pyflakes.ignore stem/prereq.py => 'asn1' imported but unused pyflakes.ignore stem/prereq.py => 'mock' imported but unused @@ -137,6 +138,7 @@ pyflakes.ignore stem/descriptor/__init__.py => redefinition of unused 'OrderedDi pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_bytes_impl' from line 51 pyflakes.ignore stem/util/str_tools.py => redefinition of function '_to_unicode_impl' from line 57 pyflakes.ignore test/mocking.py => undefined name 'builtins' +pyflakes.ignore test/mocking.py => undefined name 'test' pyflakes.ignore test/unit/response/events.py => 'from stem import *' used; unable to detect undefined names # Test modules we want to run. Modules are roughly ordered by the dependencies diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 366b516..ece95de 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -220,7 +220,9 @@ class TestNetworkStatusDocument(unittest.TestCase): for index in xrange(len(lines) - 1): # once we reach the crypto blob we're done since swapping those won't # be detected - if lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): break + + if lines[index].startswith(stem.util.str_tools._to_bytes(CRYPTO_BLOB[1:10])): + break # swaps this line with the one after it test_lines = list(lines)

1 0