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

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 26c9df183f9e0199709c0d24e54e48a0e3b3d60a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 12:15:19 2012 +0000 Update translations for vidalia_alpha --- zh_CN/vidalia_zh_CN.po | 120 ++++++++++++++++++++++++------------------------ 1 files changed, 60 insertions(+), 60 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index bb7cda9..ea176c9 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-29 11:42+0000\n" +"PO-Revision-Date: 2012-10-29 12:13+0000\n" "Last-Translator: ln191810 <ln191810(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -208,7 +208,7 @@ msgstr "警告：如果您手选密码将以纯文本方式保存在 Vida msgctxt "AdvancedPage" msgid "Panic" -msgstr "" +msgstr "Panic" msgctxt "AdvancedPage" msgid "" @@ -2525,19 +2525,19 @@ msgctxt "NetViewer" msgid "" "If your relay isn't listed among the others, it may be because it doesn't " "have a Running flag yet. <a href=\"server.consensus\">What's this?</a>" -msgstr "" +msgstr "您的中继没有出现在其他人的列表中，可能是因为未被标记为正在运行。 <a href=\"server.consensus\">这是什么？</a>" msgctxt "NetViewer" msgid "Exit circuits" -msgstr "" +msgstr "出口线路" msgctxt "NetViewer" msgid "Internal circuits" -msgstr "" +msgstr "内部线路" msgctxt "NetViewer" msgid "Hidden Service circuits" -msgstr "" +msgstr "隐藏服务线路" msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" @@ -2677,33 +2677,33 @@ msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." -msgstr "" +msgstr "您必须指定一个或多个网桥。" msgctxt "PluginEngine" msgid "WARNING: %1 doesn't have an info file." -msgstr "" +msgstr "警告：%1 不是一个信息文件。" msgctxt "PluginWrapper" msgid "%1: Processing..." -msgstr "" +msgstr "%1：进行中..." msgctxt "PluginWrapper" msgid "" "%4: ERROR: Line: %1 - Column: %2\n" "%3" -msgstr "" +msgstr "%4：错误：行：%1 - Column: %2\n%3" msgctxt "PluginWrapper" msgid "%1: Error opening file %2" -msgstr "" +msgstr "%1：错误：打开文件 %2" msgctxt "PluginWrapper" msgid "%2: ERROR: Cannot open %1" -msgstr "" +msgstr "%2：错误：无法打开 %1" msgctxt "PluginWrapper" msgid "%2: ERROR: Parsing %1" -msgstr "" +msgstr "%2：错误：解析 %1" msgctxt "PluginWrapper" msgid "" @@ -2713,11 +2713,11 @@ msgstr "" msgctxt "PluginWrapper" msgid "%1: Starting..." -msgstr "" +msgstr "%1：正在启动..." msgctxt "PluginWrapper" msgid "%1: Stoping..." -msgstr "" +msgstr "%1：正在停止..." msgctxt "PluginWrapper" msgid "%1: WARNING: doesn't have a GUI, and buildGUI() was called" @@ -2751,7 +2751,7 @@ msgstr "拒绝" msgctxt "QDialogButtonBox" msgid "OK" -msgstr "" +msgstr "确定" msgctxt "QObject" msgid "There were some settings that Vidalia wasn't able to apply together" @@ -3211,19 +3211,19 @@ msgstr "中继故障时联系您的Email地址\n您还可以同时提供您的PG msgctxt "ServerPage" msgid "day" -msgstr "" +msgstr "天" msgctxt "ServerPage" msgid "week" -msgstr "" +msgstr "周" msgctxt "ServerPage" msgid "month" -msgstr "" +msgstr "月" msgctxt "ServerPage" msgid "Enable accounting" -msgstr "" +msgstr "启用计划" msgctxt "ServerPage" msgid "h:mm" @@ -3231,39 +3231,39 @@ msgstr "" msgctxt "ServerPage" msgid "at" -msgstr "" +msgstr "在" msgctxt "ServerPage" msgid "per" -msgstr "" +msgstr "每" msgctxt "ServerPage" msgid "bytes" -msgstr "" +msgstr "字节" msgctxt "ServerPage" msgid "KB" -msgstr "" +msgstr "KB" msgctxt "ServerPage" msgid "MB" -msgstr "" +msgstr "MB" msgctxt "ServerPage" msgid "GB" -msgstr "" +msgstr "GB" msgctxt "ServerPage" msgid "TB" -msgstr "" +msgstr "TB" msgctxt "ServerPage" msgid "Push no more than" -msgstr "" +msgstr "按不超过" msgctxt "ServerPage" msgid "time" -msgstr "" +msgstr "时间" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" @@ -3275,11 +3275,11 @@ msgstr "Tor 软件正在运行" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "您当前正在运行的 Tor 软件的版本是 \"%1\"。" msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor 程序不在运行" msgctxt "StatusEventWidget" msgid "" @@ -3306,11 +3306,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Tor Software is Out-of-date" -msgstr "" +msgstr "您的 Tor 软件已过期" msgctxt "StatusEventWidget" msgid "Connected to the Tor Network" -msgstr "" +msgstr "已连接到 Tor 网络" msgctxt "StatusEventWidget" msgid "" @@ -3320,7 +3320,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Tor Software Error" -msgstr "" +msgstr "Tor 程序出错" msgctxt "StatusEventWidget" msgid "" @@ -3377,7 +3377,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" -msgstr "" +msgstr "未知 SOCKS 协议" msgctxt "StatusEventWidget" msgid "" @@ -3399,7 +3399,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "External IP Address Changed" -msgstr "" +msgstr "外部 IP 地址发生变化" msgctxt "StatusEventWidget" msgid "" @@ -3410,7 +3410,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "DNS Hijacking Detected" -msgstr "" +msgstr "已检测到 DNS 劫持" msgctxt "StatusEventWidget" msgid "" @@ -3428,7 +3428,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" -msgstr "" +msgstr "检查服务器端口是否可以访问" msgctxt "StatusEventWidget" msgid "" @@ -3439,15 +3439,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Successful!" -msgstr "" +msgstr "服务器端口访问测试成功" msgctxt "StatusEventWidget" msgid "Your relay's server port is reachable from the Tor network!" -msgstr "" +msgstr "您的中继服务器端口可以接入 Tor 网络" msgctxt "StatusEventWidget" msgid "Server Port Reachability Test Failed" -msgstr "" +msgstr "服务器端口访问测试失败" msgctxt "StatusEventWidget" msgid "" @@ -3459,7 +3459,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "检查目录端口是否可以访问" msgctxt "StatusEventWidget" msgid "" @@ -3470,15 +3470,15 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "目录端口访问测试成功" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "您的中继目录端口可以接入 Tor 网络" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "目录端口访问测试失败" msgctxt "StatusEventWidget" msgid "" @@ -3490,7 +3490,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "" +msgstr "中继描述被拒绝" msgctxt "StatusEventWidget" msgid "" @@ -3500,7 +3500,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Your Relay is Online" -msgstr "" +msgstr "您的中继在线" msgctxt "StatusEventWidget" msgid "" @@ -3512,19 +3512,19 @@ msgstr "" msgctxt "StatusTab" msgid "Status" -msgstr "" +msgstr "状态" msgctxt "StatusTab" msgid "Message Log" -msgstr "" +msgstr "消息日志" msgctxt "StatusTab" msgid "Tor Status" -msgstr "" +msgstr "Tor 状态" msgctxt "StatusTab" msgid "Show on startup" -msgstr "" +msgstr "在启动时显示" msgctxt "Stream" msgid "New" @@ -3566,23 +3566,23 @@ msgctxt "TorControl" msgid "" "Vidalia has not started Tor. You need to stop Tor through the interface you " "started it." -msgstr "" +msgstr "Vidalia 没有启动 Tor。您需要在界面中启动它。" msgctxt "TorControl" msgid "Start failed: %1" -msgstr "" +msgstr "启动失败：%1" msgctxt "TorControl" msgid "Process finished: ExitCode=%1" -msgstr "" +msgstr "进程完成：退出代码=%1" msgctxt "TorControl" msgid "Connection failed: %1" -msgstr "" +msgstr "连接失败：%1" msgctxt "TorControl" msgid "Disconnected" -msgstr "" +msgstr "已断开" msgctxt "TorProcess" msgid "Process %1 failed to stop. [%2]" @@ -3602,15 +3602,15 @@ msgstr "密码指纹生成失败。" msgctxt "TorrcDialog" msgid "Editing torrc" -msgstr "" +msgstr "编辑 rorrc" msgctxt "TorrcDialog" msgid "Cut" -msgstr "" +msgstr "剪切" msgctxt "TorrcDialog" msgid "Copy" -msgstr "" +msgstr "复制" msgctxt "TorrcDialog" msgid "Paste" @@ -3882,7 +3882,7 @@ msgstr "无法打开日志文件 '%1': %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "所需参数值：" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 8a6b181c6a619f92faa80587ded9ec9f5a72213f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 11:45:19 2012 +0000 Update translations for vidalia_alpha --- zh_CN/vidalia_zh_CN.po | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 9a610d0..bb7cda9 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-29 11:14+0000\n" +"PO-Revision-Date: 2012-10-29 11:42+0000\n" "Last-Translator: ln191810 <ln191810(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -1364,23 +1364,23 @@ msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "在应用程序崩溃之前您相关操作的信息及其下列相应的崩溃报告文件：" msgctxt "DebugDialog" msgid "Plugin debug output" -msgstr "" +msgstr "插件调试输出" msgctxt "DebugDialog" msgid "Plugin Output" -msgstr "" +msgstr "插件输出" msgctxt "DebugDialog" msgid "Syntax Errors" -msgstr "" +msgstr "语法错误" msgctxt "DebugDialog" msgid "Exceptions" -msgstr "" +msgstr "排除" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2007,47 +2007,47 @@ msgstr "Vidalia 无法重新加载 Tor 配置。" msgctxt "MainWindow" msgid "No dettached tabs" -msgstr "" +msgstr "没有独立标签" msgctxt "MainWindow" msgid "Panic is enabled" -msgstr "" +msgstr "Panic 已启用" msgctxt "MainWindow" msgid "" "WARNING: The Panic button is enabled. Use it carefully because it " "will remove Tor completely." -msgstr "" +msgstr "警告： Panic 按钮已启用。请谨慎使用，因为它会完全移除 Tor 。" msgctxt "MainWindow" msgid "New Circuit" -msgstr "" +msgstr "新的路线" msgctxt "MainWindow" msgid "Debug output" -msgstr "" +msgstr "调试输出" msgctxt "MainWindow" msgid "Panic!" -msgstr "" +msgstr "Panic!" msgctxt "MainWindow" msgid "Reattach tabs" -msgstr "" +msgstr "刷新标签" msgctxt "MainWindow" msgid "Plugins" -msgstr "" +msgstr "插件" msgctxt "MainWindow" msgid "Your clock is wrong" -msgstr "" +msgstr "您的时钟错误" msgctxt "MainWindow" msgid "" "Your computer's clock is wrong, tor may not work as expected. Please check " "the Message Log for more information." -msgstr "" +msgstr "您计算机的时钟是错误的，Tor 可能无法按预期正常工作。更多信息请检查消息日志。" msgctxt "MainWindow" msgid "" @@ -2055,14 +2055,14 @@ msgid "" "\n" "Here's the last error message:\n" " %2" -msgstr "" +msgstr "Vidalia 无法和 Tor 进行通讯，因为无法访问文件：%1\n\n最后的错误信息：%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Vidalia 已启动但 Tor 似乎并未运行。\n\n更多信息请查看高级消息日志。" msgctxt "MainWindow" msgid "" @@ -2084,17 +2084,17 @@ msgstr "失败（%1）" msgctxt "MainWindow" msgid "(probably Telnet)" -msgstr "" +msgstr "（可能是 Telnet）" msgctxt "MainWindow" msgid "(probably an email client)" -msgstr "" +msgstr "（可能是一个邮件客户端）" msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "您的应用程序 %1 似乎正连接到一个潜在的未经加密和不安全的端口 %2。" msgctxt "MainWindow" msgid "" @@ -2519,7 +2519,7 @@ msgstr "状态" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" -msgstr "" +msgstr "<a href=\"server.offline\">我什么我的中继离线？</a>" msgctxt "NetViewer" msgid ""

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 2e16fefa7a52e6eb563b140e7899e4fbf49c4c39 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 11:15:18 2012 +0000 Update translations for vidalia_alpha --- zh_CN/vidalia_zh_CN.po | 90 ++++++++++++++++++++++++------------------------ 1 files changed, 45 insertions(+), 45 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 1f19500..9a610d0 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-29 10:45+0000\n" +"PO-Revision-Date: 2012-10-29 11:14+0000\n" "Last-Translator: ln191810 <ln191810(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -198,13 +198,13 @@ msgstr "选择一个文件用于 Tor 的 socket 路径" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" -msgstr "" +msgstr "自动配置控制端口" msgctxt "AdvancedPage" msgid "" "WARNING: If you hand pick the password it will be saved as plain text" " in Vidalia's configuration file. Using a random password is safer." -msgstr "" +msgstr "警告：如果您手选密码将以纯文本方式保存在 Vidalia's 的配置文件中。使用一个随机密码会更加安全。" msgctxt "AdvancedPage" msgid "Panic" @@ -213,22 +213,22 @@ msgstr "" msgctxt "AdvancedPage" msgid "" "WARNING: The panic button will erease the application if pressed" -msgstr "" +msgstr "警告：如果按下 painc 按钮将擦除应用程序" msgctxt "AdvancedPage" msgid "Enable panic button" -msgstr "" +msgstr "启用 panic 按钮" msgctxt "AdvancedPage" msgid "Panic path:" -msgstr "" +msgstr "Panic 路径：" msgctxt "AdvancedPage" msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "您已选中了“自动配置控制端口”选项，但没有提供数据目录。请添加一个目录或取消“自动配置控制端口”选项。" msgctxt "AdvancedPage" msgid "" @@ -239,7 +239,7 @@ msgstr "Vidalia 无法删除 Tor 服务。\n\n你需要手工将其删除。" msgctxt "AdvancedPage" msgid "Select a Directory to Use for Panic" -msgstr "" +msgstr "选择一个用于 Panic 的目录" msgctxt "AppearancePage" msgid "Language" @@ -264,19 +264,19 @@ msgstr "Vidalia 无法载入选中的语言。" msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "系统图标首选项（更改将在重新启动 Vidalia 后生效）" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "显示托盘图标和 Dock 图标（默认）" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "隐藏托盘图标" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "隐藏 Dock 图标" msgctxt "BandwidthGraph" msgid "Since:" @@ -1345,20 +1345,20 @@ msgstr "无法自动重新启动 Vidalia 。请手动重新启动 Vidalia 。" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "请填入通行证：" msgctxt "CrashReportDialog" msgid "" "<a " "href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" -msgstr "" +msgstr "<a href=\"https://trac.torproject.org/projects/tor/newticket\">https://trac.torproject.org/projects/tor/newticket</a>" msgctxt "CrashReportDialog" msgid "" "A crash report has been created that you can send to the Vidalia developers " "to help identify and fix the problem. The submitted report does not contain " "any personally identifying information." -msgstr "" +msgstr "已创建崩溃报告，您可以将它发送给 Vidalia 开发组，以帮助我们识别和修复此问题。提交的报告不包含您的任何个人身份信息。" msgctxt "CrashReportDialog" msgid "" @@ -2003,7 +2003,7 @@ msgstr "重新加载配置时出错" msgctxt "MainWindow" msgid "Vidalia was unable to reload Tor's configuration." -msgstr "" +msgstr "Vidalia 无法重新加载 Tor 配置。" msgctxt "MainWindow" msgid "No dettached tabs" @@ -2356,7 +2356,7 @@ msgstr "自动保存新的消息内容至文件" msgctxt "MessageLog" msgid "toolbar" -msgstr "" +msgstr "工具栏" msgctxt "MessageLog" msgid "Always Save New Log Messages" @@ -2503,19 +2503,19 @@ msgstr "Ctrl+F" msgctxt "NetViewer" msgid "Network Map" -msgstr "" +msgstr "网络地图" msgctxt "NetViewer" msgid "Relay" -msgstr "" +msgstr "中继" msgctxt "NetViewer" msgid "Connection" -msgstr "" +msgstr "连接" msgctxt "NetViewer" msgid "Status" -msgstr "" +msgstr "状态" msgctxt "NetViewer" msgid "<a href=\"server.offline\">Why is my relay offline?</a>" @@ -2653,27 +2653,27 @@ msgstr "单击帮助查看获取新网桥的其他渠道。" msgctxt "NetworkPage" msgid "Address:" -msgstr "" +msgstr "地址：" msgctxt "NetworkPage" msgid "Type:" -msgstr "" +msgstr "类型：" msgctxt "NetworkPage" msgid "You must select the proxy type." -msgstr "" +msgstr "您必须选择代理类型。" msgctxt "NetworkPage" msgid "SOCKS 4" -msgstr "" +msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -3185,19 +3185,19 @@ msgstr "<a href=\"#bridgeUsage\">谁曾使用过我的网桥?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">这是什么？</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "自动分配我的网桥地址" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Tor 网络内部中继通讯（非出口中继）" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Tor 网络中继通讯（出口中继）" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3267,11 +3267,11 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "复制到剪贴板" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor 软件正在运行" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." @@ -3614,51 +3614,51 @@ msgstr "" msgctxt "TorrcDialog" msgid "Paste" -msgstr "" +msgstr "粘贴" msgctxt "TorrcDialog" msgid "Undo" -msgstr "" +msgstr "撤销" msgctxt "TorrcDialog" msgid "Redo" -msgstr "" +msgstr "重做" msgctxt "TorrcDialog" msgid "Select All" -msgstr "" +msgstr "全部选择" msgctxt "TorrcDialog" msgid "Error" -msgstr "" +msgstr "错误" msgctxt "TorrcDialog" msgid "An error ocurred while opening torrc file" -msgstr "" +msgstr "打开 rorrc 文件时发生错误" msgctxt "TorrcDialog" msgid "Ctrl+X" -msgstr "" +msgstr "Ctrl+X" msgctxt "TorrcDialog" msgid "Ctrl+C" -msgstr "" +msgstr "Ctrl+C" msgctxt "TorrcDialog" msgid "Ctrl+V" -msgstr "" +msgstr "Ctrl+V" msgctxt "TorrcDialog" msgid "Ctrl+Z" -msgstr "" +msgstr "Ctrl+Z" msgctxt "TorrcDialog" msgid "Ctrl+Shift+Z" -msgstr "" +msgstr "Ctrl+Shift+Z" msgctxt "TorrcDialog" msgid "Ctrl+A" -msgstr "" +msgstr "Ctrl+A" msgctxt "UPNPControl" msgid "Success"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 983e3e93a7f4143cbed392f8809bd2288876ddcc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 10:45:23 2012 +0000 Update translations for vidalia_alpha --- zh_CN/vidalia_zh_CN.po | 52 ++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index a85c193..1f19500 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-10-29 10:13+0000\n" +"PO-Revision-Date: 2012-10-29 10:45+0000\n" "Last-Translator: ln191810 <ln191810(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -490,20 +490,20 @@ msgctxt "ControlPasswordInputDialog" msgid "" "Vidalia can try to restart Tor for you. Doing so will close all currently " "active connections through your Tor process." -msgstr "" +msgstr "Vidalia 可以尝试重新启动您的 Tor。这样做的话当前所有通过您的 Tor 进程的活动连接都会被关闭。" msgctxt "ControlPasswordInputDialog" msgid "" "Tor is already running, but Vidalia can't connect to it.\n" "\n" "This can happen when something else (such as another active Vidalia process, or a Vidalia process that crashed) launched Tor." -msgstr "" +msgstr "Tor 已在运行，但 Vidalia 无法和它进行连接。\n\n在某些因素下（例如有另一个活动的 Vidalia 进程或一个崩溃的 Vidalia 进程）启动 Tor 时会产生这种情况。" msgctxt "ControlPasswordInputDialog" msgid "" "You will need to shut down the Tor process before Vidalia can launch a new " "one." -msgstr "" +msgstr "您需要关闭当前的 Vidalia 进程后再来启动一个新的 Vidalia 进程。" msgctxt "ControlSocket" msgid "Control socket is not connected." @@ -1219,7 +1219,7 @@ msgstr "津巴布韦" msgctxt "CountryInfo" msgid "Zaire" -msgstr "" +msgstr "扎伊尔" msgctxt "CountryInfo" msgid "Albania" @@ -1319,29 +1319,29 @@ msgstr "台湾" msgctxt "CrashReportDialog" msgid "Submit a Crash Report" -msgstr "" +msgstr "提交崩溃报告" msgctxt "CrashReportDialog" msgid "Vidalia encountered an error and needed to close" -msgstr "" +msgstr "Vidalia 遇到一个错误并且需要被关闭" msgctxt "CrashReportDialog" msgid "Restart Vidalia" -msgstr "" +msgstr "重新启动 Vidalia" msgctxt "CrashReportDialog" msgid "Don't Restart" -msgstr "" +msgstr "不要重新启动" msgctxt "CrashReportDialog" msgid "Unable to restart Vidalia" -msgstr "" +msgstr "无法重新启动 Vidalia" msgctxt "CrashReportDialog" msgid "" "We were unable to automatically restart Vidalia. Please restart Vidalia " "manually." -msgstr "" +msgstr "无法自动重新启动 Vidalia 。请手动重新启动 Vidalia 。" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" @@ -1420,7 +1420,7 @@ msgstr "现在检查" msgctxt "GeneralPage" msgid "Connect to Tor automatically" -msgstr "" +msgstr "自动连接到 Tor" msgctxt "GraphFrame" msgid "%1 KB/s" @@ -1641,27 +1641,27 @@ msgstr "未知" msgctxt "LogTreeItem" msgid "Debug" -msgstr "" +msgstr "调试" msgctxt "LogTreeItem" msgid "Info" -msgstr "" +msgstr "信息" msgctxt "LogTreeItem" msgid "Notice" -msgstr "" +msgstr "注意" msgctxt "LogTreeItem" msgid "Warning" -msgstr "" +msgstr "警告" msgctxt "LogTreeItem" msgid "Error" -msgstr "" +msgstr "错误" msgctxt "LogTreeItem" msgid "Unknown" -msgstr "" +msgstr "未知" msgctxt "MainWindow" msgid "Start Tor" @@ -1969,37 +1969,37 @@ msgid "" "Anything sent over this connection could be monitored. Please check your " "application's configuration and use only encrypted protocols, such as SSL, " "if possible." -msgstr "" +msgstr "以上发送的任何连接都可以被监控。请检查您应用程序的配置并使用加密协议，例如 SSL，如果可能的话。" msgctxt "MainWindow" msgid "toolBar" -msgstr "" +msgstr "工具栏" msgctxt "MainWindow" msgid "Restart" -msgstr "" +msgstr "重新启动" msgctxt "MainWindow" msgid "Reload Tor's config" -msgstr "" +msgstr "重载 Tor 配置" msgctxt "MainWindow" msgid "Actions" -msgstr "" +msgstr "操作" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "引导启动 torrc 从 %1 到 %2" msgctxt "MainWindow" msgid "" "Vidalia tried to restart Tor, but was not able to. Please check your Task " "Manager to ensure there are no other Tor processes running." -msgstr "" +msgstr "Vidalia 试图重新启动 Tor 但没有成功。请检查您的任务管理器以确保没有其他正在运行的 Tor 进程。" msgctxt "MainWindow" msgid "Error reloading configuration" -msgstr "" +msgstr "重新加载配置时出错" msgctxt "MainWindow" msgid "Vidalia was unable to reload Tor's configuration."

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 29 Oct '12

29 Oct '12

commit 7b4a830dbd960b11d0f39c41c845344f01839985 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 29 10:15:18 2012 +0000 Update translations for vidalia_alpha --- zh_CN/vidalia_zh_CN.po | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 53531f4..a85c193 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -1,5 +1,6 @@ # # Translators: +# <ln191810(a)gmail.com>, 2012. # <reg(a)8863.co.cc>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # <zhazhenzhong(a)gmail.com>, 2012. @@ -8,14 +9,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-08-04 04:28+0000\n" -"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" +"PO-Revision-Date: 2012-10-29 10:13+0000\n" +"Last-Translator: ln191810 <ln191810(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" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -171,13 +172,13 @@ msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "" +msgstr "指定的 Tor 配置文件的位置中包含的字符无法在您当前的 8 位字符编码的系统中表达。" msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "" +msgstr "指定的 Tor 数据目录的位置中包含的字符无法在您当前的 8 位字符编码的系统中表达。" msgctxt "AdvancedPage" msgid "Warning" @@ -185,15 +186,15 @@ msgstr "警告" msgctxt "AdvancedPage" msgid "You changed torrc path, would you like to restart Tor?" -msgstr "" +msgstr "您更改了 Torrc 的路径，您想要重新启动 Tor 吗？" msgctxt "AdvancedPage" msgid "Tor Configuration File (torrc);;All Files (*)" -msgstr "" +msgstr "Tor 配置文件 (torrc);;所有文件 (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "选择一个文件用于 Tor 的 socket 路径" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -331,7 +332,7 @@ msgstr "取消" msgctxt "BandwidthGraph" msgid "Bandwidth Graph" -msgstr "" +msgstr "带宽图表" msgctxt "BridgeDownloader" msgid "Starting HTTPS bridge request..." @@ -483,7 +484,7 @@ msgstr "控制接口当前未连接。" msgctxt "ControlPasswordInputDialog" msgid "Problem connecting to Tor" -msgstr "" +msgstr "连接到 Tor 时发生问题" msgctxt "ControlPasswordInputDialog" msgid ""

1 0

[flashproxy/master] Add -4 and -6 options to flashproxy-reg-email.
by dcf＠torproject.org 29 Oct '12

29 Oct '12

commit b9784a4644ca8661b05167b0757d2f1805c9be11 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 28 20:18:29 2012 -0700 Add -4 and -6 options to flashproxy-reg-email. Otherwise the Python socket library looks up A or AAAA depending on system configuration. For me this is IPv6 by default, which causes Gmail's SMTP server to tell me my own IPv6 address, which I don't have configured to accept incoming connections. --- flashproxy-reg-email | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/flashproxy-reg-email b/flashproxy-reg-email index 9feb38a..d9a6546 100755 --- a/flashproxy-reg-email +++ b/flashproxy-reg-email @@ -82,6 +82,7 @@ class options(object): email_addr = None smtp_addr = None debug = False + address_family = socket.AF_UNSPEC def usage(f = sys.stdout): print >> f, """\ @@ -96,6 +97,8 @@ unless you have made special arrangements to connect them to a facilitator. This program requires the M2Crypto library for Python. + -4 name lookups use only IPv4. + -6 name lookups use only IPv6. -d, --debug enable debugging output (Python smtplib messages). -e, --email=ADDRESS send mail to ADDRESS (default "%(email_addr)s"). -h, --help show this help. @@ -162,9 +165,13 @@ options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT) options.email_addr = DEFAULT_EMAIL_ADDRESS options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT) -opts, args = getopt.gnu_getopt(sys.argv[1:], "de:hs:", ["debug", "email=", "help", "smtp="]) +opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:", ["debug", "email=", "help", "smtp="]) for o, a in opts: - if o == "-d" or o == "--debug": + if o == "-4": + options.address_family = socket.AF_INET + elif o == "-6": + options.address_family = socket.AF_INET6 + elif o == "-d" or o == "--debug": options.debug = True elif o == "-e" or o == "--email": options.email_addr = a @@ -193,6 +200,12 @@ On Debian-like systems, use the command "apt-get install python-m2crypto".\ """ sys.exit(1) +if options.address_family != socket.AF_UNSPEC: + getaddrinfo = socket.getaddrinfo + def getaddrinfo_replacement(host, port, family, *args, **kwargs): + return getaddrinfo(host, port, options.address_family, *args, **kwargs) + socket.getaddrinfo = getaddrinfo_replacement + smtp = smtplib.SMTP(options.smtp_addr[0], options.smtp_addr[1], EHLO_FQDN) if options.debug:

1 0

[stem/master] Fixing spelling of check_requriements()
by atagar＠torproject.org 28 Oct '12

28 Oct '12

commit 0afe836c94f83f3e11435cdb9f8a3f33dbb9f106 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 28 14:37:39 2012 -0700 Fixing spelling of check_requriements() Spelling mistake caught by eoinof... https://trac.torproject.org/7245 --- run_tests.py | 2 +- stem/prereq.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 969f28f..266ed0e 100755 --- a/run_tests.py +++ b/run_tests.py @@ -272,7 +272,7 @@ def _clean_orphaned_pyc(): if __name__ == '__main__': try: - stem.prereq.check_requriements() + stem.prereq.check_requirements() except ImportError, exc: print exc print diff --git a/stem/prereq.py b/stem/prereq.py index 3e899dd..67611fd 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -12,7 +12,7 @@ series). Other requirements for complete functionality are... :: - check_requriements - checks for minimum requirements for running stem + check_requirements - checks for minimum requirements for running stem is_python_26 - checks if python 2.6 or later is available is_python_27 - checks if python 2.7 or later is available @@ -26,7 +26,7 @@ import stem.util.log as log IS_RSA_AVAILABLE = None -def check_requriements(): +def check_requirements(): """ Checks that we meet the minimum requirements to run stem. If we don't then this raises an ImportError with the issue.

1 0

[stem/master] Added a count of how many, if any, tests were skipped.
by atagar＠torproject.org 28 Oct '12

28 Oct '12

commit 1d8cdb206e54354fa563f578615b3079da8c7abb Author: Eoin o Fearghail <eoin.o.fearghail(a)gmail.com> Date: Sun Oct 28 20:45:23 2012 +0000 Added a count of how many, if any, tests were skipped. This count is then displayed at the end of the test run as skipped tests may not otherwise be noticed! --- run_tests.py | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index 8cd393c..969f28f 100755 --- a/run_tests.py +++ b/run_tests.py @@ -284,6 +284,9 @@ if __name__ == '__main__': # override flag to indicate at the end that testing failed somewhere testing_failed = False + # count how many tests have been skipped. + skipped_test_count = 0 + # loads and validates our various configurations test_config = stem.util.conf.get_config("test") @@ -333,7 +336,9 @@ if __name__ == '__main__': test.output.print_divider(test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() - unittest.TextTestRunner(test_results, verbosity=2).run(suite) + run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) + if stem.prereq.is_python_27(): + skipped_test_count += len(run_result.skipped) sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print @@ -409,7 +414,9 @@ if __name__ == '__main__': test.output.print_divider(test_class.__module__) suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() - unittest.TextTestRunner(test_results, verbosity=2).run(suite) + run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) + if stem.prereq.is_python_27(): + skipped_test_count += len(run_result.skipped) sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) print @@ -473,6 +480,10 @@ if __name__ == '__main__': for line in error_tracker: test.output.print_line(" %s" % line, *ERROR_ATTR) + elif skipped_test_count > 0: + test.output.print_line("%i TESTS WERE SKIPPED" % skipped_test_count, term.Color.BLUE, term.Attr.BOLD) + test.output.print_line("ALL OTHER TESTS PASSED %s" % runtime_label, term.Color.GREEN, term.Attr.BOLD) + print else: test.output.print_line("TESTING PASSED %s" % runtime_label, term.Color.GREEN, term.Attr.BOLD) print

1 0

[stem/master] Revised API docs for stem.descriptor.reader
by atagar＠torproject.org 28 Oct '12

28 Oct '12

commit 31cc49aa7606ce0f2b18a18fcdb0823a8d4448ec Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Oct 23 09:44:51 2012 -0700 Revised API docs for stem.descriptor.reader --- docs/api.rst | 5 +++ docs/descriptor/reader.rst | 5 +++ stem/descriptor/reader.py | 83 +++++++++++++++++++++++++++---------------- 3 files changed, 62 insertions(+), 31 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index b0531b0..0dfe441 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -7,3 +7,8 @@ Types * `stem.exit_policy <types/exit_policy.html>`_ - Relay policy for the destinations it will or won't allow traffic to. * `stem.version <types/version.html>`_ - Tor versions that can be compared to determine Tor's capablilites. +Descriptors +----------- + +* `stem.descriptor.reader <descriptor/reader.html>`_ - Reads and parses descriptor files from disk. + diff --git a/docs/descriptor/reader.rst b/docs/descriptor/reader.rst new file mode 100644 index 0000000..89c1a69 --- /dev/null +++ b/docs/descriptor/reader.rst @@ -0,0 +1,5 @@ +Descriptor Reader +================= + +.. automodule:: stem.descriptor.reader + diff --git a/stem/descriptor/reader.py b/stem/descriptor/reader.py index eb2265b..809015a 100644 --- a/stem/descriptor/reader.py +++ b/stem/descriptor/reader.py @@ -1,6 +1,6 @@ """ Utilities for reading descriptors from local directories and archives. This is -mostly done through the DescriptorReader class, which is an iterator for the +mostly done through the :class:`~stem.descriptor.reader.DescriptorReader` class, which is an iterator for the descriptor data in a series of destinations. For example... :: @@ -17,14 +17,15 @@ descriptor data in a series of destinations. For example... This ignores files that cannot be processed due to read errors or unparsable content. To be notified of skipped files you can register a listener with -:func:`stem.descriptor.reader.DescriptorReader.register_skip_listener`. +:func:`~stem.descriptor.reader.DescriptorReader.register_skip_listener`. -The DescriptorReader keeps track of the last modified timestamps for descriptor -files that it has read so it can skip unchanged files if ran again. This -listing of processed files can also be persisted and applied to other -DescriptorReaders. For instance, the following prints descriptors as they're -changed over the course of a minute, and picks up where it left off if ran -again... +The :class:`~stem.descriptor.reader.DescriptorReader` keeps track of the last +modified timestamps for descriptor files that it has read so it can skip +unchanged files if ran again. This listing of processed files can also be +persisted and applied to other +:class:`~stem.descriptor.reader.DescriptorReader` instances. For example, the +following prints descriptors as they're changed over the course of a minute, +and picks up where it left off if ran again... :: @@ -37,7 +38,7 @@ again... start_time = time.time() - while time.time() - start_time < 60: + while (time.time() - start_time) < 60: # prints any descriptors that have changed since last checked with reader: for descriptor in reader: @@ -94,7 +95,12 @@ class FileSkipped(Exception): "Base error when we can't provide descriptor data from a file." class AlreadyRead(FileSkipped): - "Already read a file with this 'last modified' timestamp or later." + """ + Already read a file with this 'last modified' timestamp or later. + + :param int last_modified: unix timestamp for when the file was last modified + :param int last_modified_when_read: unix timestamp for the modification time when we last read this file + """ def __init__(self, last_modified, last_modified_when_read): super(AlreadyRead, self).__init__() @@ -102,7 +108,11 @@ class AlreadyRead(FileSkipped): self.last_modified_when_read = last_modified_when_read class ParsingFailure(FileSkipped): - "File contents could not be parsed as descriptor data." + """ + File contents could not be parsed as descriptor data. + + :param ValueError exception: issue that arose when parsing + """ def __init__(self, parsing_exception): super(ParsingFailure, self).__init__() @@ -112,6 +122,8 @@ class UnrecognizedType(FileSkipped): """ File doesn't contain descriptor data. This could either be due to its file type or because it doesn't conform to a recognizable descriptor type. + + :param tuple mime_type: the (type, encoding) tuple provided by mimetypes.guess_type() """ def __init__(self, mime_type): @@ -119,7 +131,11 @@ class UnrecognizedType(FileSkipped): self.mime_type = mime_type class ReadFailed(FileSkipped): - "An IOError occured while trying to read the file." + """ + An IOError occured while trying to read the file. + + :param IOError exception: issue that arose when reading the file, **None** if this arose due to the file not being present + """ def __init__(self, read_exception): super(ReadFailed, self).__init__() @@ -134,16 +150,16 @@ class FileMissing(ReadFailed): def load_processed_files(path): """ Loads a dictionary of 'path => last modified timestamp' mappings, as - persisted by :func:`stem.descriptor.reader.save_processed_files`, from a + persisted by :func:`~stem.descriptor.reader.save_processed_files`, from a file. :param str path: location to load the processed files dictionary from - :returns: dict of 'path (str) => last modified unix timestamp (int)' mappings + :returns: **dict** of 'path (str) => last modified unix timestamp (int)' mappings :raises: - * IOError if unable to read the file - * TypeError if unable to parse the file's contents + * **IOError** if unable to read the file + * **TypeError** if unable to parse the file's contents """ processed_files = {} @@ -171,15 +187,17 @@ def load_processed_files(path): def save_processed_files(path, processed_files): """ Persists a dictionary of 'path => last modified timestamp' mappings (as - provided by the DescriptorReader's get_processed_files() method) so that they - can be loaded later and applied to another DescriptorReader. + provided by the DescriptorReader's + :func:`~stem.descriptor.reader.DescriptorReader.get_processed_files` method) + so that they can be loaded later and applied to another + :class:`~stem.descriptor.reader.DescriptorReader`. :param str path: location to save the processed files dictionary to :param dict processed_files: 'path => last modified' mappings :raises: - * IOError if unable to write to the file - * TypeError if processed_files is of the wrong type + * **IOError** if unable to write to the file + * **TypeError** if processed_files is of the wrong type """ # makes the parent directory if it doesn't already exist @@ -206,8 +224,9 @@ class DescriptorReader(object): Our persistence_path argument is a convenient method to persist the listing of files we have processed between runs, however it doesn't allow for error - handling. If you want that then use the load/save_processed_files functions - instead. + handling. If you want that then use the + :func:`~stem.descriptor.reader.load_processed_files` and + :func:`~stem.descriptor.reader.save_processed_files` functions instead. :param str,list target: path or list of paths for files or directories to be read from :param bool follow_links: determines if we'll follow symlinks when traversing directories (requires python 2.6) @@ -253,10 +272,12 @@ class DescriptorReader(object): absolute path (str) => last modified unix timestamp (int) - This includes entries set through the set_processed_files() method. After - each run is reset to only the files that were present during that run. + This includes entries set through the + :func:`~stem.descriptor.reader.DescriptorReader.set_processed_files` + method. Each run resets this to only the files that were present during + that run. - :returns: dict with the absolute paths and unix timestamp for the last modified times of the files we have processed + :returns: **dict** with the absolute paths and unix timestamp for the last modified times of the files we have processed """ # make sure that we only provide back absolute paths @@ -264,11 +285,11 @@ class DescriptorReader(object): def set_processed_files(self, processed_files): """ - Sets the listing of the files we have processed. Most often this is useful - as a method for pre-populating the listing of descriptor files that we have - seen. + Sets the listing of the files we have processed. Most often this is used + with a newly created :class:`~stem.descriptor.reader.DescriptorReader` to + pre-populate the listing of descriptor files that we have seen. - :param dict processed_files: mapping of absolute paths (str) to unix timestamps for the last modified time (int) + :param dict processed_files: mapping of absolute paths (**str**) to unix timestamps for the last modified time (**int**) """ self._processed_files = dict(processed_files) @@ -292,7 +313,7 @@ class DescriptorReader(object): Provides the number of descriptors that are waiting to be iterated over. This is limited to the buffer_size that we were constructed with. - :returns: int for the estimated number of currently enqueued descriptors, this is not entirely reliable + :returns: **int** for the estimated number of currently enqueued descriptors, this is not entirely reliable """ return self._unreturned_descriptors.qsize() @@ -301,7 +322,7 @@ class DescriptorReader(object): """ Starts reading our descriptor files. - :raises: ValueError if we're already reading the descriptor files + :raises: **ValueError** if we're already reading the descriptor files """ with self._reader_thread_lock:

1 0

[stem/master] Only including prepared API docs
by atagar＠torproject.org 28 Oct '12

28 Oct '12

commit 0cc97d2dcc15ce227983cfc72c234bf995b4857a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 21 20:04:30 2012 -0700 Only including prepared API docs Our sphinx-apidoc made it so all our pydocs were included in our built documentation. This is great, except that those documentation dumps are completely unreadable. Dropping the sphinx-apidoc call in favor of including specific autodoc pages we've prepared. Made some revisions to stem.version's documentation and including that to start. --- docs/Makefile | 2 -- docs/api.rst | 44 +++----------------------------------------- docs/conf.py | 9 --------- docs/index.rst | 4 ---- docs/types/version.rst | 5 +++++ stem/version.py | 37 +++++++++++++++++-------------------- 6 files changed, 25 insertions(+), 76 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 22f3516..e0febbd 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -38,8 +38,6 @@ clean: @rm -f ./stem.* ./modules.rst html: - @sphinx-apidoc -f -o /tmp/stem_docs ../stem - @rsync --size-only /tmp/stem_docs/* . $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html @echo @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." diff --git a/docs/api.rst b/docs/api.rst index 0e71afa..3015210 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -1,46 +1,8 @@ API === -:mod:`stem.connection` ----------------------- +Types +----- -Connecting and authenticating to a Tor process. - -:mod:`stem.control` -------------------- - -Provides the :class:`~stem.control.Controller` class which, as the name implies, is used for talking with and controlling a Tor instance. As a user this is the primary class that you'll need. - -:mod:`stem.socket` ------------------- - -Base classes for communicating with a Tor control socket. - -:mod:`stem.process` -------------------- - -Used for launching Tor and managing the process. - -:mod:`stem.version` -------------------- - -Parsed versions that can be compared to the requirement for various features. - -`stem.descriptor <stem.descriptor.html>`_ ------------------------------------------ - -Utilities for working with the Tor consensus and descriptors. - -`stem.response <stem.response.html>`_ -------------------------------------- - -Parsed replies that we receive from the Tor control socket. - -`stem.util <stem.util.html>`_ ------------------------------ - -Utility functions available to stem and its users. - -.. toctree:: - :maxdepth: 2 +* `stem.version <types/version.html>`_ - Tor versions that can be compared to determine Tor's capablilites. diff --git a/docs/conf.py b/docs/conf.py index 0bdd83c..ada61ec 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,15 +13,6 @@ import sys, os -# Our make file calls sphinx-apidoc, but read-the-docs uses our config instead -# (so it skips that step). Calling apidoc here instead if we're being built -# there. - -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' - -if on_rtd: - os.system("sphinx-apidoc -f -o . ../stem") - # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. diff --git a/docs/index.rst b/docs/index.rst index 95c1589..aa5ab03 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -21,7 +21,3 @@ Indices and tables *Last updated:* |today| - - - - diff --git a/docs/types/version.rst b/docs/types/version.rst new file mode 100644 index 0000000..ad9e875 --- /dev/null +++ b/docs/types/version.rst @@ -0,0 +1,5 @@ +Version +======= + +.. automodule:: stem.version + diff --git a/stem/version.py b/stem/version.py index 342c400..bb75c18 100644 --- a/stem/version.py +++ b/stem/version.py @@ -4,10 +4,11 @@ easily parsed and compared, for instance... :: - >>> my_version = stem.version.get_system_tor_version() + >>> from stem.version import get_system_tor_version, Requirement + >>> my_version = get_system_tor_version() >>> print my_version 0.2.1.30 - >>> my_version.meets_requirements(stem.version.Requirement.CONTROL_SOCKET) + >>> my_version.meets_requirements(Requirement.CONTROL_SOCKET) True **Module Overview:** @@ -48,9 +49,9 @@ def get_system_tor_version(tor_cmd = "tor"): :param str tor_cmd: command used to run tor - :returns: :class:`stem.version.Version` provided by the tor command + :returns: :class:`~stem.version.Version` provided by the tor command - :raises: IOError if unable to query or parse the version + :raises: **IOError** if unable to query or parse the version """ if not tor_cmd in VERSION_CACHE: @@ -90,14 +91,14 @@ class Version(object): :var int major: major version :var int minor: minor version :var int micro: micro version - :var int patch: optional patch level (None if undefined) - :var str status: optional status tag without the preceding dash such as 'alpha', 'beta-dev', etc (None if undefined) - :var str extra: optional extra information without the proceeding space nor its parentheses such as 'git-8be6058d8f31e578' (None if undefined) - :var str git_commit: optional git commit id (None if it wasn't provided) + :var int patch: patch level (**None** if undefined) + :var str status: status tag such as 'alpha' or 'beta-dev' (**None** if undefined) + :var str extra: extra information without its parentheses such as 'git-8be6058d8f31e578' (**None** if undefined) + :var str git_commit: git commit id (**None** if it wasn't provided) :param str version_str: version to be parsed - :raises: ValueError if input isn't a valid tor version + :raises: **ValueError** if input isn't a valid tor version """ def __init__(self, version_str): @@ -129,10 +130,9 @@ class Version(object): def meets_requirements(self, requirements): """ - Checks if this version meets the requirements for a given feature. - - Requirements can be either a :class:`stem.version.Version` or - :class:`stem.version.VersionRequirements`. + Checks if this version meets the requirements for a given feature. We can + be compared to either a :class:`~stem.version.Version` or + :class:`~stem.version.VersionRequirements`. :param requirements: requrirements to be checked for """ @@ -147,15 +147,14 @@ class Version(object): def __str__(self): """ - Provides the string used to construct the Version. + Provides the string used to construct the version. """ return self.version_str def __cmp__(self, other): """ - Simple comparison of versions. An undefined patch level is treated as zero - and status tags are not included in comparisions (as per the version spec). + Compares version ordering according to the spec. """ if not isinstance(other, Version): @@ -182,17 +181,15 @@ class Version(object): class VersionRequirements(object): """ - Series of version constraints that can be compared to. For instance, it + Series of version constraints that can be compared to. For instance, this allows for comparisons like 'if I'm greater than version X in the 0.2.2 series, or greater than version Y in the 0.2.3 series'. This is a logical 'or' of the series of rules. """ - def __init__(self, rule = None): + def __init__(self): self.rules = [] - - if rule: self.greater_than(rule) def greater_than(self, version, inclusive = True): """

1 0