[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2110: Updated Simplified and Traditional Chinese translations from (in trunk: . src/lang)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r2110: Updated Simplified and Traditional Chinese translations from (in trunk: . src/lang)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Fri, 9 Nov 2007 10:44:08 -0500 (EST)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Fri, 09 Nov 2007 10:44:26 -0500
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2007-11-09 10:44:08 -0500 (Fri, 09 Nov 2007)
New Revision: 2110

Modified:
   trunk/
   trunk/AUTHORS
   trunk/src/lang/vidalia_zh-cn.ts
   trunk/src/lang/vidalia_zh-tw.ts
Log:
 r2269@lysithea:  edmanm | 2007-11-09 10:44:03 -0500
 Updated Simplified and Traditional Chinese translations from LinHongJun. Also
 update Cloud's preferred nym.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2269] on dc66be73-d13e-47ba-a267-8dc7cda68c65

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2007-11-06 15:10:13 UTC (rev 2109)
+++ trunk/AUTHORS	2007-11-09 15:44:08 UTC (rev 2110)
@@ -63,7 +63,7 @@
   Russian     ygrek
   Spanish     desolator
   Simplified Chinese    Wu Xiaoguang
-                        Cloud
+                        LinHongJun
   Swedish     Amin Amini
-  Traditional Chinese   Cloud
+  Traditional Chinese   LinHongJun
 

Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts	2007-11-06 15:10:13 UTC (rev 2109)
+++ trunk/src/lang/vidalia_zh-cn.ts	2007-11-09 15:44:08 UTC (rev 2110)
@@ -165,72 +165,72 @@
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="112"/>
         <source>&apos;%1&apos; is not a valid IP address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 并非有效 IP 地址.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="162"/>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="123"/>
         <source>You selected &apos;Password&apos; authentication, but did not specify a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>你选择了 &apos;密码&apos; 验证方式,而你并未指定密码.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="255"/>
         <source>Select a Directory to Use for Tor Data</source>
-        <translation type="unfinished"></translation>
+        <translation>请选择一个用于保存 Tor 数据的文件夹</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="53"/>
         <source>Authentication:</source>
-        <translation type="unfinished"></translation>
+        <translation>验证:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="63"/>
         <source>Address:</source>
-        <translation type="unfinished">地址:</translation>
+        <translation>地址:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="96"/>
         <source>Cookie</source>
-        <translation type="unfinished"></translation>
+        <translation>Cookie</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="101"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="116"/>
         <source>Randomly Generate</source>
-        <translation type="unfinished"></translation>
+        <translation>随机生成</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="280"/>
         <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 数据文件夹</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="301"/>
         <source>Store Tor data in the following directory</source>
-        <translation type="unfinished"></translation>
+        <translation>保存 Tor 数据于下面的文件夹</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="320"/>
         <source>Select the directory used to store Tor data</source>
-        <translation type="unfinished"></translation>
+        <translation>选择保存 Tor 数据的文件夹</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="91"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>无</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="45"/>
         <source>Advanced</source>
-        <translation type="unfinished">高级</translation>
+        <translation>高级</translation>
     </message>
 </context>
 <context>
@@ -263,7 +263,7 @@
     <message>
         <location filename="../gui/config/appearancepage.cpp" line="34"/>
         <source>Appearance</source>
-        <translation type="unfinished">外观</translation>
+        <translation>外观</translation>
     </message>
 </context>
 <context>
@@ -413,7 +413,7 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="63"/>
         <source>General</source>
-        <translation>一般</translation>
+        <translation>常规</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="71"/>
@@ -453,32 +453,32 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="67"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>网络</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="168"/>
         <source>Error Saving Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>保存设定时发生错误</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="170"/>
         <source>Vidalia was unable to save your %1 settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 无法保存你的 %1 设定.</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="197"/>
         <source>Error Applying Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>应用设定时发生错误</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="199"/>
         <source>Vidalia was unable to apply your %1 settings to Tor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 无法应用你的 %1 设定于 Tor.</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="71"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>中继</translation>
     </message>
 </context>
 <context>
@@ -496,7 +496,7 @@
     <message>
         <location filename="../control/controlconnection.cpp" line="139"/>
         <source>Vidalia was unable to connect to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 无法连接至 Tor. (%1)</translation>
     </message>
 </context>
 <context>
@@ -582,7 +582,7 @@
     <message>
         <location filename="../gui/config/generalpage.cpp" line="32"/>
         <source>General</source>
-        <translation type="unfinished">一般</translation>
+        <translation>常规</translation>
     </message>
 </context>
 <context>
@@ -981,215 +981,215 @@
     <message>
         <location filename="../gui/mainwindow.ui" line="185"/>
         <source>Start Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>启动 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="122"/>
         <source>Tor is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 未运行</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="429"/>
         <source>Tor is shutting down</source>
-        <translation type="unfinished"></translation>
+        <translation>正在关闭 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="437"/>
         <source>Stop Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>停止 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="453"/>
         <source>Tor is starting up</source>
-        <translation type="unfinished"></translation>
+        <translation>正在启动 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="38"/>
         <source>Vidalia Control Panel</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 控制面板</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="68"/>
         <source>Tor Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 状态</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="170"/>
         <source>Vidalia Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 快捷方式</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="195"/>
         <source>Setup Relaying</source>
-        <translation type="unfinished"></translation>
+        <translation>设置中继服务器</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="198"/>
         <source>Set up a Tor relay and help the network grow</source>
-        <translation type="unfinished"></translation>
+        <translation>设置 Tor 中继服务器并帮助网络壮大</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="208"/>
         <source>View the Network</source>
-        <translation type="unfinished"></translation>
+        <translation>查看网络地图</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="211"/>
         <source>View a map of the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 网络的分布图</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="224"/>
         <source>Use a New Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>更换身份</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="227"/>
         <source>Make subsequent connections appear new</source>
-        <translation type="unfinished"></translation>
+        <translation>创建一个新的网络连接</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="259"/>
         <source>View Tor&apos;s bandwidth usage</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 的带宽使用状况</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="272"/>
         <source>View Tor&apos;s log message history</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 的日志</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="322"/>
         <source>View help documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>查看帮助文档</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="335"/>
         <source>Configure Tor and Vidalia</source>
-        <translation type="unfinished"></translation>
+        <translation>设置 Tor 和 Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="385"/>
         <source>View version and license information</source>
-        <translation type="unfinished"></translation>
+        <translation>查看版本和授权信息</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="398"/>
         <source>Exit Vidalia</source>
-        <translation type="unfinished"></translation>
+        <translation>退出 Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="450"/>
         <source>Show this window on startup</source>
-        <translation type="unfinished"></translation>
+        <translation>启动时显示此窗口</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="469"/>
         <source>Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="472"/>
         <source>Hide this window</source>
-        <translation type="unfinished"></translation>
+        <translation>隐藏此窗口</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="277"/>
         <source>Control Panel</source>
-        <translation type="unfinished"></translation>
+        <translation>控制面板</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="356"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Stop Tor Now</source>
-        <translation type="unfinished"></translation>
+        <translation>停止 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="457"/>
         <source>Starting Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>正在启动 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="756"/>
         <source>Cookie Authentication Required</source>
-        <translation type="unfinished"></translation>
+        <translation>需要 Cookie 验证</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="759"/>
         <source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 需要 Vidalia 发送的验证 Cookie 内容,但是 Vidalia 无法找到此内容.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="761"/>
         <source>Would you like to browse for the file &apos;control_auth_cookie&apos; yourself?</source>
-        <translation type="unfinished"></translation>
+        <translation>你要自己浏览 &apos;control_auth_cookie&apos; 文件吗?</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="768"/>
         <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 数据文件夹</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="770"/>
         <source>Tor Control Cookie (control_auth_cookie)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 控制 Cookie (control_auth_cookie)</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="812"/>
         <source>Error Registering for Events</source>
-        <translation type="unfinished"></translation>
+        <translation>事件记录错误</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="814"/>
         <source>Vidalia was unable to register for Tor events. Many of Vidalia&apos;s features may be unavailable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 无法记录 Tor 的事件信息.因此 Vidalia 的很多功能将无法使用.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="833"/>
         <source>Password Authentication Required</source>
-        <translation type="unfinished"></translation>
+        <translation>需要密码验证</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="846"/>
         <source>Error Authenticating to Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 验证错误</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="848"/>
         <source>Vidalia was unable to authenticate to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 无法验证 Tor 信息. (%1)</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="850"/>
         <source>Please check your control port authentication settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>请检查控制端口验证设定.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="834"/>
         <source>Please enter your control password (not the hash):</source>
-        <translation type="unfinished"></translation>
+        <translation>请输入你的控制密码(并非 Hash 数值):</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="427"/>
         <source>Your Tor relay is shutting down.
 Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
-        <translation type="unfinished"></translation>
+        <translation>你的 Tor 中继服务器正在关闭.再次点击 &apos;停止 Tor&apos; 强制关闭 Tor.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="623"/>
         <source>Relaying is Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>中继功能已启用</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>You are currently running a Tor relay. Terminating your relay will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new relay?</source>
-        <translation type="unfinished"></translation>
+        <translation>你当前正在运行 Tor 中继服务.终止你的中继服务将会中断所有客户端的连接.你想要正常的关闭并且给用户寻找其它中继服务器的时间吗?</translation>
     </message>
 </context>
 <context>
@@ -1654,12 +1654,12 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="32"/>
         <source>Tor Network Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 网络地图</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="259"/>
         <source>Refresh the list of Tor relays and connections</source>
-        <translation type="unfinished"></translation>
+        <translation>刷新 Tor 中继服务器和连接信息</translation>
     </message>
 </context>
 <context>
@@ -1667,137 +1667,137 @@
     <message>
         <location filename="../gui/config/networkpage.cpp" line="45"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>网络</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="178"/>
         <source>Invalid Bridge</source>
-        <translation type="unfinished"></translation>
+        <translation>无效网桥</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="179"/>
         <source>The specified bridge identifier is not valid.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定网桥识别无效</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="226"/>
         <source>Copy (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
+        <translation>复制(Ctrl+C)</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="255"/>
         <source>You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必须指定 Tor 用于访问网络的 IP 地址或主机名,以及端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="261"/>
         <source>You must specify one or more ports to which your firewall allows you to connect.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必须指定一个或多个端口用于连接防火墙.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="297"/>
         <source>&apos;%1&apos; is not a valid port number.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 不是一个有效的端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="30"/>
         <source>Check to configure Tor to use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>选择此项将 Tor 座位访问网络的代理服务器</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="33"/>
         <source>I use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>我使用代理服务器连接到网络</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="63"/>
         <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>代理设定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="75"/>
         <source>HTTP Proxy:</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP 代理:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="85"/>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>用户名</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="95"/>
         <source>Use this proxy for HTTPS also</source>
-        <translation type="unfinished"></translation>
+        <translation>将此代理同样应用于 HTTPS</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="113"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>密码:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="140"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="181"/>
         <source>Check to configure Tor to only connect to servers using ports allowed by your firewall</source>
-        <translation type="unfinished"></translation>
+        <translation>选择此项将只允许 Tor 连接防火墙所允许端口的服务器</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="184"/>
         <source>My firewall only lets me connect to certain ports</source>
-        <translation type="unfinished"></translation>
+        <translation>我的防火墙只允许我连接到指定端口</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="208"/>
         <source>Firewall Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>防火墙设定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="220"/>
         <source>Allowed Ports:</source>
-        <translation type="unfinished"></translation>
+        <translation>允许端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="230"/>
         <source>80, 443</source>
-        <translation type="unfinished">80, 443</translation>
+        <translation>80, 443</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="240"/>
         <source>Check to configure Tor to use bridge servers to access the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>选择此项允许 Tor 使用桥接服务器访问 Tor 网络</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="243"/>
         <source>My ISP blocks connections to the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>我的 ISP 阻挡了对 Tor 网络的连接</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="267"/>
         <source>Tor Bridge Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 网桥设定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="279"/>
         <source>The Tor version you are currently running does not support bridges. &lt;br&gt;Tor will still try to encrypt its directory connections.</source>
-        <translation type="unfinished"></translation>
+        <translation>当前运行的 Tor 版本不支持网桥功能.&lt;br&gt;Tor 仍将继续尝试加密连接.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="300"/>
         <source>Add a Bridge:</source>
-        <translation type="unfinished"></translation>
+        <translation>添加一个网桥:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="372"/>
         <source>Remove the selected bridges from the list</source>
-        <translation type="unfinished"></translation>
+        <translation>从列表中移除选中的网桥</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="394"/>
         <source>Copy the selected bridges to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>复制选中的网桥至剪贴板</translation>
     </message>
 </context>
 <context>
@@ -1897,17 +1897,17 @@
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>中继</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
         <source>Zoom to Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>移动至中继</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
         <source>%1 relays online (%2 total)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 个中继在线(全部 %2 个中继)</translation>
     </message>
 </context>
 <context>
@@ -2137,68 +2137,68 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="683"/>
         <source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
-        <translation type="unfinished"></translation>
+        <translation>你的最大带宽速率必须大于或等于你的平均带宽速率.两个数值必须至少 20KB/s</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="78"/>
         <source>Server</source>
-        <translation type="unfinished">服务器</translation>
+        <translation>服务器</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="136"/>
         <source>Bridge Support Unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>网桥功能不可用</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="139"/>
         <source>You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges.</source>
-        <translation type="unfinished"></translation>
+        <translation>你已将 Tor 设定为网桥中继服务器,然而你的 Tor 版本并不支持此功能.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="141"/>
         <source>Please upgrade your Tor software or configure Tor to act as a normal Tor relay.</source>
-        <translation type="unfinished"></translation>
+        <translation>请升级你的 Tor 软件或者将 Tor 设定为普通中继服务器.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="209"/>
         <source>You must specify at least a relay nickname and port.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必须指定至少一个中继名称和端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="30"/>
         <source>Run Tor as a client only</source>
-        <translation type="unfinished"></translation>
+        <translation>仅将 Tor 作为客户端运行</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="44"/>
         <source>Help censored users reach the Tor network (Tor 0.2.0.3-alpha or newer)</source>
-        <translation type="unfinished"></translation>
+        <translation>帮助用户访问 Tor 网络(限于 Tor 0.2.0.3-alpha 或更高版本)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="136"/>
         <source>Relay Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>中继端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="172"/>
         <source>Port on which users and other servers can communicate with your relay</source>
-        <translation type="unfinished"></translation>
+        <translation>你的中继服务器所使用的端口数值</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="259"/>
         <source>Email address at which you may be reached if there is a
 problem with your relay. You might also include your PGP or GPG fingerprint.</source>
-        <translation type="unfinished"></translation>
+        <translation>电子信箱地址,用于你的中继服务器出现故障时的联络.你可以包含 PGP 或 GPG 指纹信息.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="289"/>
         <source>Enable to mirror the Tor relay directory</source>
-        <translation type="unfinished"></translation>
+        <translation>启用 Tor 中继服务器目录镜像功能</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="292"/>
         <source>Mirror the Relay Directory </source>
-        <translation type="unfinished"></translation>
+        <translation>中继服务器目录镜像</translation>
     </message>
 </context>
 <context>
@@ -2246,7 +2246,7 @@
     <message>
         <location filename="../control/stream.cpp" line="137"/>
         <source>Remapped</source>
-        <translation type="unfinished"></translation>
+        <translation>重新映射</translation>
     </message>
 </context>
 <context>
@@ -2267,7 +2267,7 @@
     <message>
         <location filename="../control/torservice.cpp" line="173"/>
         <source>Unable to start the Tor service.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法启动 Tor 服务.</translation>
     </message>
 </context>
 <context>
@@ -2325,7 +2325,7 @@
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="98"/>
         <source>Browse</source>
-        <translation type="unfinished">浏览</translation>
+        <translation>浏览</translation>
     </message>
 </context>
 <context>
@@ -2355,62 +2355,62 @@
     <message>
         <location filename="../main.cpp" line="85"/>
         <source>Invalid Argument</source>
-        <translation type="unfinished"></translation>
+        <translation>无效参数</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="180"/>
         <source>Displays this usage message and exits.</source>
-        <translation type="unfinished"></translation>
+        <translation>显示使用信息和退出</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="182"/>
         <source>Resets ALL stored Vidalia settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>复位所有储存的 Vidalia 设定.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="184"/>
         <source>Sets the directory Vidalia uses for data files.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 数据保存位置.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="186"/>
         <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 进程文件的名称和保存位置.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="188"/>
         <source>Sets the name and location of Vidalia&apos;s logfile.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 日志文件的名称和保存位置</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="191"/>
         <source>Sets the verbosity of Vidalia&apos;s logging.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 的日志冗余.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="194"/>
         <source>Sets Vidalia&apos;s interface style.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 的界面样式.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="197"/>
         <source>Sets Vidalia&apos;s language.</source>
-        <translation type="unfinished"></translation>
+        <translation>设定 Vidalia 的界面语言.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="201"/>
         <source>Vidalia Usage Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 使用信息</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="262"/>
         <source>Invalid log level specified: </source>
-        <translation type="unfinished"></translation>
+        <translation>指定日志级别无效:</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="268"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开日志文件 &apos;%1&apos;: %2</translation>
     </message>
 </context>
 </TS>

Modified: trunk/src/lang/vidalia_zh-tw.ts
===================================================================
--- trunk/src/lang/vidalia_zh-tw.ts	2007-11-06 15:10:13 UTC (rev 2109)
+++ trunk/src/lang/vidalia_zh-tw.ts	2007-11-09 15:44:08 UTC (rev 2110)
@@ -40,7 +40,7 @@
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="79"/>
         <source>&lt;Not Running&gt;</source>
-        <translation>&lt;未執行&gt;</translation>
+        <translation>&lt;未運行&gt;</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="75"/>
@@ -53,17 +53,17 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="33"/>
         <source>Control Port</source>
-        <translation>控制埠口</translation>
+        <translation>控制端口</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="245"/>
         <source>Start Tor with the specified configuration file (torrc)</source>
-        <translation>使用指定的配置檔案啟動 Tor (torrc)</translation>
+        <translation>使用指定的配置文件啟動 Tor (torrc)</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="264"/>
         <source>Select path to Tor configuration file</source>
-        <translation>請選取 Tor 配置檔案的路徑</translation>
+        <translation>請選擇 Tor 配置文件的路徑</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="323"/>
@@ -78,42 +78,42 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="365"/>
         <source>Run as User:</source>
-        <translation>作為以下用戶執行:</translation>
+        <translation>作為以下用戶運行:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="378"/>
         <source>Vidalia will run with this User&apos;s permissions</source>
-        <translation>Vidalia 將會使用該用戶的權限執行</translation>
+        <translation>Vidalia 將會使用該用戶的權限運行</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="398"/>
         <source>Run as Group:</source>
-        <translation>作為以下用戶群組執行:</translation>
+        <translation>作為以下用戶組運行:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="405"/>
         <source>Vidalia will run with this Group&apos;s permissions</source>
-        <translation>Vidalia 將會使用該用戶群組的權限執行</translation>
+        <translation>Vidalia 將會使用該用戶組的權限運行</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="213"/>
         <source>Select Tor Configuration File</source>
-        <translation>請選取 Tor 配置檔案</translation>
+        <translation>請選擇 Tor 配置文件</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="226"/>
         <source>File Not Found</source>
-        <translation>未找到該檔案</translation>
+        <translation>未找到該文件</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="228"/>
         <source>%1 does not exist. Would you like to create it?</source>
-        <translation>%1 不存在.請問是否要創建該檔案?</translation>
+        <translation>%1 不存在.請問是否要創建該文件?</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="239"/>
         <source>Failed to Create File</source>
-        <translation>創建檔案失敗</translation>
+        <translation>創建文件失敗</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="240"/>
@@ -128,12 +128,12 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="444"/>
         <source>Enable this if you wish to run Tor as a Windows service</source>
-        <translation>如讓 Tor 作為 Windows 系統服務執行,請啟用該項</translation>
+        <translation>如讓 Tor 作為 Windows 系統服務運行,請啟用該項</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="447"/>
         <source>Run Tor in the background as a Windows service</source>
-        <translation>作為 Windows 後台系統服務執行 Tor (可在&quot;服務&quot;中進行設定)</translation>
+        <translation>作為 Windows 後台系統服務運行 Tor (可在&quot;服務&quot;中進行設定)</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="276"/>
@@ -160,77 +160,77 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="224"/>
         <source>Tor Configuration File</source>
-        <translation>Tor 配置檔案</translation>
+        <translation>Tor 配置文件</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="112"/>
         <source>&apos;%1&apos; is not a valid IP address.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 並非有效 IP 地址.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="162"/>
         <source>:</source>
-        <translation type="unfinished"></translation>
+        <translation>:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="123"/>
         <source>You selected &apos;Password&apos; authentication, but did not specify a password.</source>
-        <translation type="unfinished"></translation>
+        <translation>你選擇了 &apos;密碼&apos; 驗證方式,而你並未指定密碼.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="255"/>
         <source>Select a Directory to Use for Tor Data</source>
-        <translation type="unfinished"></translation>
+        <translation>請選擇一個用於保存 Tor 數據的文件夾</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="53"/>
         <source>Authentication:</source>
-        <translation type="unfinished"></translation>
+        <translation>驗證:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="63"/>
         <source>Address:</source>
-        <translation type="unfinished">地址:</translation>
+        <translation>地址:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="96"/>
         <source>Cookie</source>
-        <translation type="unfinished"></translation>
+        <translation>Cookie</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="101"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="116"/>
         <source>Randomly Generate</source>
-        <translation type="unfinished"></translation>
+        <translation>隨機生成</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="280"/>
         <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 數據文件夾</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="301"/>
         <source>Store Tor data in the following directory</source>
-        <translation type="unfinished"></translation>
+        <translation>保存 Tor 數據於下面的文件夾</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="320"/>
         <source>Select the directory used to store Tor data</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇保存 Tor 數據的文件夾</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="91"/>
         <source>None</source>
-        <translation type="unfinished"></translation>
+        <translation>無</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="45"/>
         <source>Advanced</source>
-        <translation type="unfinished">進階</translation>
+        <translation>高級</translation>
     </message>
 </context>
 <context>
@@ -243,12 +243,12 @@
     <message>
         <location filename="../gui/config/appearancepage.ui" line="57"/>
         <source>Choose the language used in Vidalia</source>
-        <translation>請選擇用於 Vidalia 介面顯示的語言</translation>
+        <translation>請選擇用於 Vidalia 界面顯示的語言</translation>
     </message>
     <message>
         <location filename="../gui/config/appearancepage.ui" line="89"/>
         <source>Changes to language will only take effect after restarting Vidalia!</source>
-        <translation>注意:介面語言的變更需要重新啟動 Vidalia 程式!</translation>
+        <translation>注意:界面語言的變更需要重新啟動 Vidalia 程序!</translation>
     </message>
     <message>
         <location filename="../gui/config/appearancepage.ui" line="105"/>
@@ -258,12 +258,12 @@
     <message>
         <location filename="../gui/config/appearancepage.ui" line="139"/>
         <source>Choose Vidalia&apos;s interface style</source>
-        <translation>請選擇 Vidalia 的介面風格</translation>
+        <translation>請選擇 Vidalia 的界面風格</translation>
     </message>
     <message>
         <location filename="../gui/config/appearancepage.cpp" line="34"/>
         <source>Appearance</source>
-        <translation type="unfinished">外觀</translation>
+        <translation>外觀</translation>
     </message>
 </context>
 <context>
@@ -271,7 +271,7 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="21"/>
         <source>Tor Bandwidth Usage</source>
-        <translation>Tor 頻寬使用</translation>
+        <translation>Tor 帶寬使用</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="45"/>
@@ -296,7 +296,7 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="304"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
-        <translation>請選擇頻寬顯示圖形的透明度</translation>
+        <translation>請選擇帶寬顯示圖形的透明度</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="463"/>
@@ -344,12 +344,12 @@
     <message>
         <location filename="../control/circuit.cpp" line="109"/>
         <source>New</source>
-        <translation>建立</translation>
+        <translation>新建</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="110"/>
         <source>Open</source>
-        <translation>開啟</translation>
+        <translation>打開</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="111"/>
@@ -413,17 +413,17 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="63"/>
         <source>General</source>
-        <translation>一般</translation>
+        <translation>常規</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="71"/>
         <source>Server</source>
-        <translation type="obsolete">伺服器</translation>
+        <translation type="obsolete">服務器</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="79"/>
         <source>Advanced</source>
-        <translation>進階</translation>
+        <translation>高級</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="98"/>
@@ -453,32 +453,32 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="67"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>網絡</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="168"/>
         <source>Error Saving Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>保存設定時發生錯誤</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="170"/>
         <source>Vidalia was unable to save your %1 settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 無法保存你的 %1 設定.</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="197"/>
         <source>Error Applying Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>應用設定時發生錯誤</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="199"/>
         <source>Vidalia was unable to apply your %1 settings to Tor.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 無法應用你的 %1 設定於 Tor.</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="71"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>中繼</translation>
     </message>
 </context>
 <context>
@@ -496,7 +496,7 @@
     <message>
         <location filename="../control/controlconnection.cpp" line="139"/>
         <source>Vidalia was unable to connect to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 無法連接至 Tor. (%1)</translation>
     </message>
 </context>
 <context>
@@ -504,12 +504,12 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="72"/>
         <source>Error sending control command. [%1]</source>
-        <translation>發送控制指令時發生錯誤. [%1]</translation>
+        <translation>發送控制命令時發生錯誤. [%1]</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="109"/>
         <source>Socket disconnected while attempting to read a line of data.</source>
-        <translation>當嘗試讀取資料時意外斷開接口連接.</translation>
+        <translation>當嘗試讀取數據時意外斷開接口連接.</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="147"/>
@@ -527,12 +527,12 @@
     <message>
         <location filename="../gui/config/generalpage.ui" line="69"/>
         <source>Path to Tor&apos;s executable</source>
-        <translation>請指定 Tor 可執行程式的路徑</translation>
+        <translation>請指定 Tor 可執行程序的路徑</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="88"/>
         <source>Select path to Tor executable</source>
-        <translation>請選取 Tor 可執行程式所在的路徑</translation>
+        <translation>請選擇 Tor 可執行程序所在的路徑</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="91"/>
@@ -547,42 +547,42 @@
     <message>
         <location filename="../gui/config/generalpage.ui" line="125"/>
         <source>Select to start Vidalia on system boot</source>
-        <translation>如想使 Vidalia 隨系統啟動而執行,則核取該項</translation>
+        <translation>如想使 Vidalia 隨系統啟動而運行,則復選該項</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="128"/>
         <source>Run Vidalia on system startup</source>
-        <translation>系統啟動時自動執行 Vidalia</translation>
+        <translation>系統啟動時自動運行 Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="141"/>
         <source>Set to start Tor when you launch Vidalia</source>
-        <translation>如想設定在啟動 Vidalia 同時執行 Tor,請核取該項)</translation>
+        <translation>如想設定在啟動 Vidalia 同時運行 Tor,請復選該項)</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="144"/>
         <source>Start Tor when Vidalia starts</source>
-        <translation>隨 Vidalia 啟動 Tor 程式</translation>
+        <translation>隨 Vidalia 啟動 Tor 程序</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="72"/>
         <source>Select Path to Tor</source>
-        <translation>請選取 Tor 的路徑</translation>
+        <translation>請選擇 Tor 的路徑</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="42"/>
         <source>Tor Executable</source>
-        <translation>Tor 程式</translation>
+        <translation>Tor 程序</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="63"/>
         <source>Executables (*.exe)</source>
-        <translation>應用程式 (*.exe)</translation>
+        <translation>應用程序 (*.exe)</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="32"/>
         <source>General</source>
-        <translation type="unfinished">一般</translation>
+        <translation>常規</translation>
     </message>
 </context>
 <context>
@@ -628,12 +628,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="184"/>
         <source>Find Previous</source>
-        <translation>搜尋上一個</translation>
+        <translation>查找上一個</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="197"/>
         <source>Find Next</source>
-        <translation>搜尋下一個</translation>
+        <translation>查找下一個</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="231"/>
@@ -653,12 +653,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="360"/>
         <source>Search</source>
-        <translation>搜尋</translation>
+        <translation>搜索</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="415"/>
         <source>Found Documents</source>
-        <translation>搜尋結果</translation>
+        <translation>搜索結果</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="494"/>
@@ -708,12 +708,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="560"/>
         <source>Find</source>
-        <translation>搜尋</translation>
+        <translation>查找</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="563"/>
         <source>Search for a word or phrase on current page (Ctrl+F)</source>
-        <translation>在當前頁搜尋關鍵詞或語句(Ctrl+F)</translation>
+        <translation>在當前頁搜索關鍵詞或語句(Ctrl+F)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="571"/>
@@ -743,37 +743,37 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="388"/>
         <source>Search reached end of document</source>
-        <translation>搜尋已到達文檔底部</translation>
+        <translation>搜索已到達文檔底部</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="390"/>
         <source>Search reached start of document</source>
-        <translation>搜尋已到達文檔頂部</translation>
+        <translation>搜索已到達文檔頂部</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="392"/>
         <source>Text not found in document</source>
-        <translation>搜尋內容未找到</translation>
+        <translation>搜索內容未找到</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="162"/>
         <source>Find:</source>
-        <translation>搜尋:</translation>
+        <translation>查找:</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="241"/>
         <source>Whole words only</source>
-        <translation>匹配所有</translation>
+        <translation>匹配全部</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="372"/>
         <source>Searching for:</source>
-        <translation>搜尋:</translation>
+        <translation>搜索:</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="145"/>
         <source>Supplied XML file is not a valid Contents document.</source>
-        <translation>所提供的 XML 檔案並非有效的目錄文檔.</translation>
+        <translation>所提供的 XML 文檔並非有效的目錄文檔.</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="437"/>
@@ -786,7 +786,7 @@
     <message>
         <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
         <source>Error opening help file: </source>
-        <translation>開啟幫助檔案時發生錯誤:</translation>
+        <translation>打開幫助文件時發生錯誤:</translation>
     </message>
 </context>
 <context>
@@ -799,7 +799,7 @@
     <message>
         <location filename="../control/logevent.cpp" line="69"/>
         <source>Info</source>
-        <translation>資訊</translation>
+        <translation>信息</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="70"/>
@@ -832,7 +832,7 @@
     <message>
         <location filename="../gui/mainwindow.ui" line="395"/>
         <source>Exit</source>
-        <translation>結束</translation>
+        <translation>退出</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="256"/>
@@ -842,7 +842,7 @@
     <message>
         <location filename="../gui/mainwindow.ui" line="269"/>
         <source>Message Log</source>
-        <translation>訊息日誌</translation>
+        <translation>消息日誌</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="319"/>
@@ -872,7 +872,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="367"/>
         <source>File</source>
-        <translation>檔案</translation>
+        <translation>文件</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="370"/>
@@ -882,7 +882,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="375"/>
         <source>View</source>
-        <translation>檢視</translation>
+        <translation>查看</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="384"/>
@@ -917,7 +917,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="623"/>
         <source>Server is Enabled</source>
-        <translation type="obsolete">伺服器模式被啟用</translation>
+        <translation type="obsolete">服務器模式被啟用</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="353"/>
@@ -929,19 +929,19 @@
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
-        <translation type="obsolete">當前正在執行為 Tor 伺服器模式.終止伺服器模式將會中斷任何客戶端連接.是否要關閉伺服器?</translation>
+        <translation type="obsolete">當前正在運行為 Tor 服務器模式.終止服務器模式將會中斷任何客戶端連接.是否要關閉服務器?</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="684"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
-        <translation>Vidalia 檢測到 Tor 的意外結束.請檢視訊息日誌中 Tor 意外結束的原因.</translation>
+        <translation>Vidalia 檢測到 Tor 的意外退出.請查看消息日誌中 Tor 意外退出的原因.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="548"/>
         <source>Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified.</source>
-        <translation>Vidalia 無法啟動 Tor.請檢查 Tor 可執行程式的路徑以及設定是否正確.</translation>
+        <translation>Vidalia 無法啟動 Tor.請檢查 Tor 可執行程序的路徑以及設定是否正確.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="270"/>
@@ -966,7 +966,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="954"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
-        <translation>所有建立連接將會不同於之前的連接.</translation>
+        <translation>所有新建連接將會不同於之前的連接.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="982"/>
@@ -976,220 +976,220 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="436"/>
         <source>Tor is running</source>
-        <translation>Tor 正在執行</translation>
+        <translation>Tor 正在運行</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="185"/>
         <source>Start Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>啟動 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="122"/>
         <source>Tor is not running</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 未運行</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="429"/>
         <source>Tor is shutting down</source>
-        <translation type="unfinished"></translation>
+        <translation>正在關閉 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="437"/>
         <source>Stop Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>停止 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="453"/>
         <source>Tor is starting up</source>
-        <translation type="unfinished"></translation>
+        <translation>正在啟動 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="38"/>
         <source>Vidalia Control Panel</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 控制面板</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="68"/>
         <source>Tor Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 狀態</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="170"/>
         <source>Vidalia Shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 快捷方式</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="195"/>
         <source>Setup Relaying</source>
-        <translation type="unfinished"></translation>
+        <translation>設置中繼服務器</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="198"/>
         <source>Set up a Tor relay and help the network grow</source>
-        <translation type="unfinished"></translation>
+        <translation>設置 Tor 中繼服務器並幫助網絡壯大</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="208"/>
         <source>View the Network</source>
-        <translation type="unfinished"></translation>
+        <translation>查看網絡地圖</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="211"/>
         <source>View a map of the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 網絡的分佈圖</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="224"/>
         <source>Use a New Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>更換身份</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="227"/>
         <source>Make subsequent connections appear new</source>
-        <translation type="unfinished"></translation>
+        <translation>創建一個新的網絡連接</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="259"/>
         <source>View Tor&apos;s bandwidth usage</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 的帶寬使用狀況</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="272"/>
         <source>View Tor&apos;s log message history</source>
-        <translation type="unfinished"></translation>
+        <translation>查看 Tor 的日誌</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="322"/>
         <source>View help documentation</source>
-        <translation type="unfinished"></translation>
+        <translation>查看幫助文檔</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="335"/>
         <source>Configure Tor and Vidalia</source>
-        <translation type="unfinished"></translation>
+        <translation>設置 Tor 和 Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="385"/>
         <source>View version and license information</source>
-        <translation type="unfinished"></translation>
+        <translation>查看版本和授權信息</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="398"/>
         <source>Exit Vidalia</source>
-        <translation type="unfinished"></translation>
+        <translation>退出 Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="450"/>
         <source>Show this window on startup</source>
-        <translation type="unfinished"></translation>
+        <translation>啟動時顯示此窗口</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="469"/>
         <source>Hide</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.ui" line="472"/>
         <source>Hide this window</source>
-        <translation type="unfinished"></translation>
+        <translation>隱藏此窗口</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="277"/>
         <source>Control Panel</source>
-        <translation type="unfinished"></translation>
+        <translation>控制面板</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="356"/>
         <source>Ctrl+P</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+P</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Stop Tor Now</source>
-        <translation type="unfinished"></translation>
+        <translation>停止 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="457"/>
         <source>Starting Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>正在啟動 Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="756"/>
         <source>Cookie Authentication Required</source>
-        <translation type="unfinished"></translation>
+        <translation>需要 Cookie 驗證</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="759"/>
         <source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 需要 Vidalia 發送的驗證 Cookie 內容,但是 Vidalia 無法找到此內容.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="761"/>
         <source>Would you like to browse for the file &apos;control_auth_cookie&apos; yourself?</source>
-        <translation type="unfinished"></translation>
+        <translation>你要自己瀏覽 &apos;control_auth_cookie&apos; 文件嗎?</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="768"/>
         <source>Tor Data Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 數據文件夾</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="770"/>
         <source>Tor Control Cookie (control_auth_cookie)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 控制 Cookie (control_auth_cookie)</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="812"/>
         <source>Error Registering for Events</source>
-        <translation type="unfinished"></translation>
+        <translation>事件記錄錯誤</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="814"/>
         <source>Vidalia was unable to register for Tor events. Many of Vidalia&apos;s features may be unavailable.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 無法記錄 Tor 的事件信息.因此 Vidalia 的很多功能將無法使用.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="833"/>
         <source>Password Authentication Required</source>
-        <translation type="unfinished"></translation>
+        <translation>需要密碼驗證</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="846"/>
         <source>Error Authenticating to Tor</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 驗證錯誤</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="848"/>
         <source>Vidalia was unable to authenticate to Tor. (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 無法驗證 Tor 信息. (%1)</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="850"/>
         <source>Please check your control port authentication settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>請檢查控制端口驗證設定.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="834"/>
         <source>Please enter your control password (not the hash):</source>
-        <translation type="unfinished"></translation>
+        <translation>請輸入你的控制密碼(並非 Hash 數值):</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="427"/>
         <source>Your Tor relay is shutting down.
 Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
-        <translation type="unfinished"></translation>
+        <translation>你的 Tor 中繼服務器正在關閉.再次點擊 &apos;停止 Tor&apos; 強制關閉 Tor.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="623"/>
         <source>Relaying is Enabled</source>
-        <translation type="unfinished"></translation>
+        <translation>中繼功能已啟用</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>You are currently running a Tor relay. Terminating your relay will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new relay?</source>
-        <translation type="unfinished"></translation>
+        <translation>你當前正在運行 Tor 中繼服務.終止你的中繼服務將會中斷所有客戶端的連接.你想要正常的關閉並且給用戶尋找其它中繼服務器的時間嗎?</translation>
     </message>
 </context>
 <context>
@@ -1197,7 +1197,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="24"/>
         <source>Message Log</source>
-        <translation>訊息日誌</translation>
+        <translation>消息日誌</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="71"/>
@@ -1222,7 +1222,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="165"/>
         <source>Saves the current Message Log settings</source>
-        <translation>保存當前訊息日誌設定</translation>
+        <translation>保存當前消息日誌設定</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="168"/>
@@ -1242,7 +1242,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="201"/>
         <source>Message Filter</source>
-        <translation>訊息過濾</translation>
+        <translation>消息過濾</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="222"/>
@@ -1262,7 +1262,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="270"/>
         <source>Info</source>
-        <translation>資訊</translation>
+        <translation>信息</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="286"/>
@@ -1272,12 +1272,12 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="462"/>
         <source>Message Filters...</source>
-        <translation>訊息過濾...</translation>
+        <translation>消息過濾...</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="465"/>
         <source>Set message filters</source>
-        <translation>設定訊息過濾條件</translation>
+        <translation>設定消息過濾條件</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="478"/>
@@ -1287,7 +1287,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="481"/>
         <source>Set maximum number of messages to display</source>
-        <translation>設定訊息最大顯示的條數</translation>
+        <translation>設定消息最大顯示的條數</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="497"/>
@@ -1297,7 +1297,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="500"/>
         <source>Clear all messages from the Message Log (Ctrl+E)</source>
-        <translation>清空訊息日誌中的所有內容(Ctrl+E)</translation>
+        <translation>清空消息日誌中的全部內容(Ctrl+E)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="508"/>
@@ -1312,7 +1312,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="525"/>
         <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-        <translation>複製選中訊息至剪貼板(Ctrl+C)</translation>
+        <translation>複製選中消息至剪貼板(Ctrl+C)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="533"/>
@@ -1322,12 +1322,12 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="544"/>
         <source>Select All</source>
-        <translation>選取所有</translation>
+        <translation>選擇全部</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="547"/>
         <source>Select all messages (Ctrl+A)</source>
-        <translation>選取所有訊息(Ctrl+A)</translation>
+        <translation>選擇全部消息(Ctrl+A)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="555"/>
@@ -1337,12 +1337,12 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="563"/>
         <source>Save All</source>
-        <translation>保存所有</translation>
+        <translation>保存全部</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="566"/>
         <source>Save all messages to a file</source>
-        <translation>保存所有訊息至檔案</translation>
+        <translation>保存全部消息至文件</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="579"/>
@@ -1352,7 +1352,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="582"/>
         <source>Save selected messages to a file</source>
-        <translation>保存所選訊息至檔案</translation>
+        <translation>保存所選消息至文件</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="636"/>
@@ -1362,7 +1362,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="639"/>
         <source>Close the Message Log</source>
-        <translation>關閉訊息日誌</translation>
+        <translation>關閉消息日誌</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="647"/>
@@ -1372,12 +1372,12 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="658"/>
         <source>Find</source>
-        <translation>查詢</translation>
+        <translation>查找</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="661"/>
         <source>Find all messages containing the search text (Ctrl+F)</source>
-        <translation>從訊息中查詢文字(Ctrl+F)</translation>
+        <translation>從消息中查找文字(Ctrl+F)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="669"/>
@@ -1388,7 +1388,7 @@
         <location filename="../gui/log/messagelog.cpp" line="148"/>
         <source>Messages that appear when something has 
 gone very wrong and Tor cannot proceed.</source>
-        <translation>Tor 發生嚴重錯誤或無法繼續執行的時候所顯示的信息.</translation>
+        <translation>Tor 發生嚴重錯誤或無法繼續運行的時候所顯示的信息.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="150"/>
@@ -1402,13 +1402,13 @@
 during normal Tor operation and are 
 not considered errors, but you may 
 care about.</source>
-        <translation>Tor 在正常執行時所顯示的信息,該信息可能並非錯誤,有時可忽略.</translation>
+        <translation>Tor 在正常運行時所顯示的信息,該信息可能並非錯誤,有時可忽略.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="156"/>
         <source>Messages that appear frequently 
 during normal Tor operation.</source>
-        <translation>Tor 在正常執行時所顯示的信息.</translation>
+        <translation>Tor 在正常運行時所顯示的信息.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="158"/>
@@ -1424,12 +1424,12 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="219"/>
         <source>Error Opening Log File</source>
-        <translation>開啟日誌檔案時發生錯誤</translation>
+        <translation>打開日誌文件時發生錯誤</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="294"/>
         <source>Select Log File</source>
-        <translation>請選取日誌檔案</translation>
+        <translation>請選擇日誌文件</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="311"/>
@@ -1444,12 +1444,12 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="374"/>
         <source>Find in Message Log</source>
-        <translation>查詢於訊息日誌</translation>
+        <translation>查找於消息日誌</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="375"/>
         <source>Find:</source>
-        <translation>查詢:</translation>
+        <translation>查找:</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="381"/>
@@ -1469,7 +1469,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="601"/>
         <source>Adjust Message Log Settings</source>
-        <translation>調整訊息日誌設定</translation>
+        <translation>調整消息日誌設定</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="609"/>
@@ -1496,17 +1496,17 @@
         <source>Cannot write file %1
 
 %2.</source>
-        <translation>無法寫入檔案 %1 %2.</translation>
+        <translation>無法寫入文件 %1 %2.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="220"/>
         <source>Vidalia was unable to open the specified log file.</source>
-        <translation>Vidalia 無法開啟指定的日誌檔案.</translation>
+        <translation>Vidalia 無法打開指定的日誌文件.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="314"/>
         <source>Text Files (*.txt)</source>
-        <translation>文本檔案 (*.txt)</translation>
+        <translation>文本文件 (*.txt)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="628"/>
@@ -1516,42 +1516,42 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="241"/>
         <source>Log Filename Required</source>
-        <translation>必須指定日誌檔案名</translation>
+        <translation>必須指定日誌文件名</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="243"/>
         <source>You must enter a filename to be able to save log messages to a file.</source>
-        <translation>必須指定保存訊息檔案的檔案名.</translation>
+        <translation>必須指定保存消息文件的文件名.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="302"/>
         <source>Message Log History</source>
-        <translation>日誌歷史紀錄</translation>
+        <translation>日誌歷史記錄</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="323"/>
         <source>Number of messages to display in the message log window</source>
-        <translation>在日誌窗口顯示的訊息條數</translation>
+        <translation>在日誌窗口顯示的消息條數</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="347"/>
         <source>messages</source>
-        <translation>訊息</translation>
+        <translation>消息</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="366"/>
         <source>Always Save New Log Messages</source>
-        <translation>總是保存新訊息</translation>
+        <translation>總是保存新消息</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="404"/>
         <source>Enable automatically saving all new log messages to a file</source>
-        <translation>啟用自動保存訊息內容至檔案</translation>
+        <translation>啟用自動保存消息內容至文件</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="407"/>
         <source>Automatically save new log messages to a file</source>
-        <translation>自動保存新的訊息內容至檔案</translation>
+        <translation>自動保存新的消息內容至文件</translation>
     </message>
 </context>
 <context>
@@ -1584,7 +1584,7 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="363"/>
         <source>Zoom To Fit</source>
-        <translation>符合圖像</translation>
+        <translation>適合圖像</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="267"/>
@@ -1654,12 +1654,12 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="32"/>
         <source>Tor Network Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 網絡地圖</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="259"/>
         <source>Refresh the list of Tor relays and connections</source>
-        <translation type="unfinished"></translation>
+        <translation>刷新 Tor 中繼服務器和連接信息</translation>
     </message>
 </context>
 <context>
@@ -1667,137 +1667,137 @@
     <message>
         <location filename="../gui/config/networkpage.cpp" line="45"/>
         <source>Network</source>
-        <translation type="unfinished"></translation>
+        <translation>網絡</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="178"/>
         <source>Invalid Bridge</source>
-        <translation type="unfinished"></translation>
+        <translation>無效網橋</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="179"/>
         <source>The specified bridge identifier is not valid.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定網橋識別無效</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="226"/>
         <source>Copy (Ctrl+C)</source>
-        <translation type="unfinished"></translation>
+        <translation>複製(Ctrl+C)</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="255"/>
         <source>You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必須指定 Tor 用於訪問網絡的 IP 地址或主機名,以及端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="261"/>
         <source>You must specify one or more ports to which your firewall allows you to connect.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必須指定一個或多個端口用於連接防火牆.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.cpp" line="297"/>
         <source>&apos;%1&apos; is not a valid port number.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos; 不是一個有效的端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="30"/>
         <source>Check to configure Tor to use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇此項將 Tor 座位訪問網絡的代理服務器</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="33"/>
         <source>I use a proxy to access the Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>我使用代理服務器連接到網絡</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="63"/>
         <source>Proxy Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>代理設定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="75"/>
         <source>HTTP Proxy:</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP 代理:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="85"/>
         <source>Username:</source>
-        <translation type="unfinished"></translation>
+        <translation>用戶名</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="95"/>
         <source>Use this proxy for HTTPS also</source>
-        <translation type="unfinished"></translation>
+        <translation>將此代理同樣應用於 HTTPS</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="113"/>
         <source>Password:</source>
-        <translation type="unfinished"></translation>
+        <translation>密碼:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="140"/>
         <source>Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="181"/>
         <source>Check to configure Tor to only connect to servers using ports allowed by your firewall</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇此項將只允許 Tor 連接防火牆所允許端口的服務器</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="184"/>
         <source>My firewall only lets me connect to certain ports</source>
-        <translation type="unfinished"></translation>
+        <translation>我的防火牆只允許我連接到指定端口</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="208"/>
         <source>Firewall Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>防火牆設定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="220"/>
         <source>Allowed Ports:</source>
-        <translation type="unfinished"></translation>
+        <translation>允許端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="230"/>
         <source>80, 443</source>
-        <translation type="unfinished">80, 443</translation>
+        <translation>80, 443</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="240"/>
         <source>Check to configure Tor to use bridge servers to access the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>選擇此項允許 Tor 使用橋接服務器訪問 Tor 網絡</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="243"/>
         <source>My ISP blocks connections to the Tor network</source>
-        <translation type="unfinished"></translation>
+        <translation>我的 ISP 阻擋了對 Tor 網絡的連接</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="267"/>
         <source>Tor Bridge Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor 網橋設定</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="279"/>
         <source>The Tor version you are currently running does not support bridges. &lt;br&gt;Tor will still try to encrypt its directory connections.</source>
-        <translation type="unfinished"></translation>
+        <translation>當前運行的 Tor 版本不支持網橋功能.&lt;br&gt;Tor 仍將繼續嘗試加密連接.</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="300"/>
         <source>Add a Bridge:</source>
-        <translation type="unfinished"></translation>
+        <translation>添加一個網橋:</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="372"/>
         <source>Remove the selected bridges from the list</source>
-        <translation type="unfinished"></translation>
+        <translation>從列表中移除選中的網橋</translation>
     </message>
     <message>
         <location filename="../gui/config/networkpage.ui" line="394"/>
         <source>Copy the selected bridges to the clipboard</source>
-        <translation type="unfinished"></translation>
+        <translation>複製選中的網橋至剪貼板</translation>
     </message>
 </context>
 <context>
@@ -1846,12 +1846,12 @@
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
         <source>Bandwidth:</source>
-        <translation>頻寬:</translation>
+        <translation>帶寬:</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
         <source>Uptime:</source>
-        <translation>連線時間</translation>
+        <translation>運行時間</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
@@ -1887,27 +1887,27 @@
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
         <source>Server</source>
-        <translation type="obsolete">伺服器</translation>
+        <translation type="obsolete">服務器</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
         <source>Zoom to Server</source>
-        <translation type="obsolete">縮放地圖至伺服器位置</translation>
+        <translation type="obsolete">縮放地圖至服務器位置</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
         <source>Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>中繼</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
         <source>Zoom to Relay</source>
-        <translation type="unfinished"></translation>
+        <translation>移動至中繼</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
         <source>%1 relays online (%2 total)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 個中繼在線(全部 %2 個中繼)</translation>
     </message>
 </context>
 <context>
@@ -1915,7 +1915,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="33"/>
         <source>Check to run as a Tor network server</source>
-        <translation type="obsolete">核取該項使 Tor 作為網絡中的伺服器</translation>
+        <translation type="obsolete">復選該項使 Tor 作為網絡服務器</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="37"/>
@@ -1925,12 +1925,12 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="214"/>
         <source>Directory Port:</source>
-        <translation>目錄埠口:</translation>
+        <translation>目錄端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="244"/>
         <source>Directory Port Number</source>
-        <translation>請指定目錄埠口</translation>
+        <translation>請指定目錄端口</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="114"/>
@@ -1940,32 +1940,32 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="273"/>
         <source>Name of your server</source>
-        <translation>伺服器名稱</translation>
+        <translation>服務器名稱</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="182"/>
         <source>Contact Info:</source>
-        <translation>訊息:</translation>
+        <translation>信息:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="131"/>
         <source>Server Port:</source>
-        <translation type="obsolete">埠口:</translation>
+        <translation type="obsolete">端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="167"/>
         <source>Port on which users and other servers can communicate with your server</source>
-        <translation type="obsolete">用於用戶和伺服器通訊的埠口</translation>
+        <translation type="obsolete">用於用戶和服務器通訊的端口</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="285"/>
         <source>Enable to mirror the server directory</source>
-        <translation type="obsolete">啟用映像伺服器目錄</translation>
+        <translation type="obsolete">啟用映像服務器目錄</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="288"/>
         <source>Mirror the Server Directory </source>
-        <translation type="obsolete">映像伺服器目錄</translation>
+        <translation type="obsolete">映像服務器目錄</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="710"/>
@@ -1980,19 +1980,19 @@
     <message>
         <location filename="../gui/config/serverpage.cpp" line="124"/>
         <source>You must specify at least a server nickname and port.</source>
-        <translation type="obsolete">必須指定伺服器名稱和埠口.</translation>
+        <translation type="obsolete">必須指定服務器名稱和端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="254"/>
         <source>Email address at which you may be reached if there is a
 problem with your server. You might also include your PGP or GPG
 fingerprint.</source>
-        <translation type="obsolete">當伺服器出現問題時的聯絡訊息,同樣可以包含 PGP 或 GPG 簽名訊息.</translation>
+        <translation type="obsolete">當服務器出現問題時的聯繫信息,同樣可以包含 PGP 或 GPG 簽名信息.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="566"/>
         <source>Long-term average bandwidth limit</source>
-        <translation>長期平均頻寬限制</translation>
+        <translation>長期平均帶寬限制</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="537"/>
@@ -2007,7 +2007,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="641"/>
         <source>Peak bandwidth rate limit</source>
-        <translation>峰值頻寬速率限制</translation>
+        <translation>峰值帶寬速率限制</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="612"/>
@@ -2017,7 +2017,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="448"/>
         <source>Show help topic on bandwidth rate limits</source>
-        <translation>顯示關於頻寬速率限制的相關幫助主題</translation>
+        <translation>顯示關於帶寬速率限制的相關幫助主題</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="73"/>
@@ -2027,52 +2027,52 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="326"/>
         <source>Bandwidth Limits</source>
-        <translation>頻寬限制</translation>
+        <translation>帶寬限制</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="361"/>
         <source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
-        <translation>如網路連接的下行速率較大,而上行速度較慢,請選擇適用的網路連接類型(主要適用於 DSL 用戶)</translation>
+        <translation>如網絡連接的下行速率較大,而上行速度較慢,請選擇適用的網絡連接類型(主要適用於 DSL 用戶)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="382"/>
         <source>Select the entry that most closely resembles your Internet connection</source>
-        <translation>請選取適合或接近的網絡連接類型</translation>
+        <translation>請選擇適合或接近的網絡連接類型</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="392"/>
         <source>Cable/DSL 256 Kbps</source>
-        <translation>寬頻/DSL 256 Kbps</translation>
+        <translation>寬帶/DSL 256 Kbps</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="397"/>
         <source>Cable/DSL 512 Kbps</source>
-        <translation>寬頻/DSL 512 Kbps</translation>
+        <translation>寬帶/DSL 512 Kbps</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="402"/>
         <source>Cable/DSL 768 Kbps</source>
-        <translation>寬頻/DSL 768 Kbps</translation>
+        <translation>寬帶/DSL 768 Kbps</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="407"/>
         <source>T1/Cable/DSL 1.5 Mbps</source>
-        <translation>T1/寬頻/DSL 1.5 Mbps</translation>
+        <translation>T1/寬帶/DSL 1.5 Mbps</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="412"/>
         <source>&gt; 1.5 Mbps</source>
-        <translation>頻寬大於 1.5 Mbps</translation>
+        <translation>帶寬大於 1.5 Mbps</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="417"/>
         <source>Custom</source>
-        <translation>定制頻寬</translation>
+        <translation>自定義</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="748"/>
         <source>Ports 6660 - 6669 and 6697</source>
-        <translation>埠口範圍: 6660-6669 和 6697</translation>
+        <translation>端口範圍: 6660-6669 和 6697</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="751"/>
@@ -2082,7 +2082,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="761"/>
         <source>Ports 110, 143, 993 and 995</source>
-        <translation>埠口範圍: 110,143,993 和 995</translation>
+        <translation>端口範圍: 110,143,993 和 995</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="764"/>
@@ -2092,7 +2092,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="774"/>
         <source>Ports unspecified by other checkboxes</source>
-        <translation>除以上指定埠口外的其它所有埠口</translation>
+        <translation>除以上指定端口外的其它所有端口</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="777"/>
@@ -2102,17 +2102,17 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="787"/>
         <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
-        <translation>埠口範圍: 706,1863,5050,5190,5222,8300 和 8888</translation>
+        <translation>端口範圍: 706,1863,5050,5190,5222,8300 和 8888</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="790"/>
         <source>Instant Messaging (IM)</source>
-        <translation>即時訊息服務(IM)</translation>
+        <translation>即時通訊服務(IM)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="800"/>
         <source>Port 443</source>
-        <translation>埠口: 443</translation>
+        <translation>端口: 443</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="803"/>
@@ -2122,7 +2122,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="813"/>
         <source>Port 80</source>
-        <translation>埠口: 80</translation>
+        <translation>端口: 80</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="816"/>
@@ -2132,73 +2132,73 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="929"/>
         <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
-        <translation>請選擇其他用戶可以通過此中繼伺服器所使用的網路服務.</translation>
+        <translation>請選擇其他用戶可以通過此網絡中繼服務器所使用的網絡服務.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="683"/>
         <source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
-        <translation type="unfinished"></translation>
+        <translation>你的最大帶寬速率必須大於或等於你的平均帶寬速率.兩個數值必須至少 20KB/s</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="78"/>
         <source>Server</source>
-        <translation type="unfinished">伺服器</translation>
+        <translation>服務器</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="136"/>
         <source>Bridge Support Unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>網橋功能不可用</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="139"/>
         <source>You have configured Tor to act as a bridge relay for censored users, but your version of Tor does not support bridges.</source>
-        <translation type="unfinished"></translation>
+        <translation>你已將 Tor 設定為網橋中繼服務器,然而你的 Tor 版本並不支持此功能.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="141"/>
         <source>Please upgrade your Tor software or configure Tor to act as a normal Tor relay.</source>
-        <translation type="unfinished"></translation>
+        <translation>請升級你的 Tor 軟件或者將 Tor 設定為普通中繼服務器.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="209"/>
         <source>You must specify at least a relay nickname and port.</source>
-        <translation type="unfinished"></translation>
+        <translation>你必須指定至少一個中繼名稱和端口.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="30"/>
         <source>Run Tor as a client only</source>
-        <translation type="unfinished"></translation>
+        <translation>僅將 Tor 作為客戶端運行</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="44"/>
         <source>Help censored users reach the Tor network (Tor 0.2.0.3-alpha or newer)</source>
-        <translation type="unfinished"></translation>
+        <translation>幫助用戶訪問 Tor 網絡(限於 Tor 0.2.0.3-alpha 或更高版本)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="136"/>
         <source>Relay Port:</source>
-        <translation type="unfinished"></translation>
+        <translation>中繼端口:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="172"/>
         <source>Port on which users and other servers can communicate with your relay</source>
-        <translation type="unfinished"></translation>
+        <translation>你的中繼服務器所使用的端口數值</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="259"/>
         <source>Email address at which you may be reached if there is a
 problem with your relay. You might also include your PGP or GPG fingerprint.</source>
-        <translation type="unfinished"></translation>
+        <translation>電子信箱地址,用於你的中繼服務器出現故障時的聯絡.你可以包含 PGP 或 GPG 指紋信息.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="289"/>
         <source>Enable to mirror the Tor relay directory</source>
-        <translation type="unfinished"></translation>
+        <translation>啟用 Tor 中繼服務器目錄鏡像功能</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="292"/>
         <source>Mirror the Relay Directory </source>
-        <translation type="unfinished"></translation>
+        <translation>中繼服務器目錄鏡像</translation>
     </message>
 </context>
 <context>
@@ -2206,7 +2206,7 @@
     <message>
         <location filename="../control/stream.cpp" line="129"/>
         <source>New</source>
-        <translation>建立</translation>
+        <translation>新建</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="131"/>
@@ -2221,7 +2221,7 @@
     <message>
         <location filename="../control/stream.cpp" line="133"/>
         <source>Open</source>
-        <translation>開啟</translation>
+        <translation>打開</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="134"/>
@@ -2246,7 +2246,7 @@
     <message>
         <location filename="../control/stream.cpp" line="137"/>
         <source>Remapped</source>
-        <translation type="unfinished"></translation>
+        <translation>重新映射</translation>
     </message>
 </context>
 <context>
@@ -2267,7 +2267,7 @@
     <message>
         <location filename="../control/torservice.cpp" line="173"/>
         <source>Unable to start the Tor service.</source>
-        <translation type="unfinished"></translation>
+        <translation>無法啟動 Tor 服務.</translation>
     </message>
 </context>
 <context>
@@ -2320,12 +2320,12 @@
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="97"/>
         <source>Quit</source>
-        <translation>結束</translation>
+        <translation>退出</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="98"/>
         <source>Browse</source>
-        <translation type="unfinished">瀏覽</translation>
+        <translation>瀏覽</translation>
     </message>
 </context>
 <context>
@@ -2333,84 +2333,84 @@
     <message>
         <location filename="../vidalia.cpp" line="249"/>
         <source>Invalid language code specified: </source>
-        <translation>指定語言編碼無效: </translation>
+        <translation>指定語言代碼無效: </translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="256"/>
         <source>Invalid GUI style specified: </source>
-        <translation>指定介面風格無效: </translation>
+        <translation>指定界面風格無效: </translation>
     </message>
     <message>
         <location filename="../main.cpp" line="99"/>
         <source>Vidalia is already running</source>
-        <translation>Vidalia 已經執行</translation>
+        <translation>Vidalia 已經運行</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="105"/>
         <source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
 
 Would you like to continue starting Vidalia?</source>
-        <translation>另一個 Vidalia 進程已經執行.如果確定無其它 Vidalia 進程正在執行,可以選擇繼續.確定要繼續執行 Vidalia 嗎?</translation>
+        <translation>另一個 Vidalia 進程已經運行.如果確定無其它 Vidalia 進程正在運行,可以選擇繼續.確定要繼續運行 Vidalia 嗎?</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="85"/>
         <source>Invalid Argument</source>
-        <translation type="unfinished"></translation>
+        <translation>無效參數</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="180"/>
         <source>Displays this usage message and exits.</source>
-        <translation type="unfinished"></translation>
+        <translation>顯示使用信息和退出</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="182"/>
         <source>Resets ALL stored Vidalia settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>復位所有儲存的 Vidalia 設定.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="184"/>
         <source>Sets the directory Vidalia uses for data files.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 數據保存位置.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="186"/>
         <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 進程文件的名稱和保存位置.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="188"/>
         <source>Sets the name and location of Vidalia&apos;s logfile.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 日誌文件的名稱和保存位置</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="191"/>
         <source>Sets the verbosity of Vidalia&apos;s logging.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 的日誌冗余.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="194"/>
         <source>Sets Vidalia&apos;s interface style.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 的界面樣式.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="197"/>
         <source>Sets Vidalia&apos;s language.</source>
-        <translation type="unfinished"></translation>
+        <translation>設定 Vidalia 的界面語言.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="201"/>
         <source>Vidalia Usage Information</source>
-        <translation type="unfinished"></translation>
+        <translation>Vidalia 使用信息</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="262"/>
         <source>Invalid log level specified: </source>
-        <translation type="unfinished"></translation>
+        <translation>指定日誌級別無效:</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="268"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
-        <translation type="unfinished"></translation>
+        <translation>無法打開日誌文件 &apos;%1&apos;: %2</translation>
     </message>
 </context>
 </TS>
Prev by Author: [vidalia-svn] r2109: Add a disclaimer note as suggested by Tor's trademark FAQ. (in trunk: . src/gui/res)
Next by Author: [vidalia-svn] r2114: "Server" is sooo last month. "Relay" is The New Thing. (www)
Previous by thread: [vidalia-svn] r2109: Add a disclaimer note as suggested by Tor's trademark FAQ. (in trunk: . src/gui/res)
Next by thread: [vidalia-svn] r2111: Update torbutton-dev version. Set Vidalia to automatically s (trunk/pkg/osx)
Index(es):
- Author
- Thread