X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=po%2Fzh_CN.po;h=d217f7e95d04af190428bfca49ab0df5c0819a00;hb=6719a40e3d5c2939d59ac76314d2e2ea6ea67764;hp=9878fd6e099d30063f864324074668c1a73535d0;hpb=b9ad54f7ff3ae13b2301f951a91ac7e75d424176;p=catta

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9878fd6..d217f7e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,246 +1,248 @@
 # translation of zh_CN.po to 简体中文
 # Copyright (C) 2008 Avahi contributors
 # This file is distributed under the same license as the Avahi package.
-# 
+#
 # Ni Hui <shuizhuyuanluo@126.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 07:29+0000\n"
-"PO-Revision-Date: 2008-04-11 21:22+0800\n"
-"Last-Translator: Ni Hui <shuizhuyuanluo@126.com>\n"
+"POT-Creation-Date: 2011-04-02 03:23+0200\n"
+"PO-Revision-Date: 2010-07-01 17:45+0700\n"
+"Last-Translator: 甘露(Gan Lu) <rhythm.gan@gmail.com>\n"
 "Language-Team: 简体中文 <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../avahi-common/error.c:32
+#: ../avahi-common/error.c:30
 msgid "OK"
 msgstr "确定"
 
-#: ../avahi-common/error.c:33
+#: ../avahi-common/error.c:31
 msgid "Operation failed"
 msgstr "操作失败"
 
-#: ../avahi-common/error.c:34
+#: ../avahi-common/error.c:32
 msgid "Bad state"
-msgstr "无效的状态"
+msgstr "错误状态"
 
-#: ../avahi-common/error.c:35
+#: ../avahi-common/error.c:33
 msgid "Invalid host name"
 msgstr "无效的主机名"
 
-#: ../avahi-common/error.c:36
+#: ../avahi-common/error.c:34
 msgid "Invalid domain name"
 msgstr "无效的域名"
 
-#: ../avahi-common/error.c:37
+#: ../avahi-common/error.c:35
 msgid "No suitable network protocol available"
 msgstr "没有适当的网络协议可用"
 
-#: ../avahi-common/error.c:38
+#: ../avahi-common/error.c:36
 msgid "Invalid DNS TTL"
 msgstr "无效的 DNS TTL"
 
-#: ../avahi-common/error.c:39
+#: ../avahi-common/error.c:37
 msgid "Resource record key is pattern"
 msgstr "资源记录密钥是样品"
 
-#: ../avahi-common/error.c:40
+#: ../avahi-common/error.c:38
 msgid "Local name collision"
 msgstr "本地名称冲突"
 
-#: ../avahi-common/error.c:41
+#: ../avahi-common/error.c:39
 msgid "Invalid record"
 msgstr "无效的记录"
 
-#: ../avahi-common/error.c:43
+#: ../avahi-common/error.c:41
 msgid "Invalid service name"
 msgstr "无效的服务名称"
 
-#: ../avahi-common/error.c:44
+#: ../avahi-common/error.c:42
 msgid "Invalid service type"
 msgstr "无效的服务类型"
 
-#: ../avahi-common/error.c:45
+#: ../avahi-common/error.c:43
 msgid "Invalid port number"
-msgstr "无效的端口数"
+msgstr "无效的端口号"
 
-#: ../avahi-common/error.c:46
+#: ../avahi-common/error.c:44
 msgid "Invalid record key"
 msgstr "无效的记录密钥"
 
-#: ../avahi-common/error.c:47
+#: ../avahi-common/error.c:45
 msgid "Invalid address"
 msgstr "无效的地址"
 
-#: ../avahi-common/error.c:48
+#: ../avahi-common/error.c:46
 msgid "Timeout reached"
 msgstr "已超时"
 
-#: ../avahi-common/error.c:49
+#: ../avahi-common/error.c:47
 msgid "Too many clients"
-msgstr "过多的客户端"
+msgstr "客户端太多"
 
-#: ../avahi-common/error.c:50
+#: ../avahi-common/error.c:48
 msgid "Too many objects"
-msgstr "过多的对象"
+msgstr "对象太多"
 
-#: ../avahi-common/error.c:51
+#: ../avahi-common/error.c:49
 msgid "Too many entries"
-msgstr "过多的条目"
+msgstr "条目太多"
 
-#: ../avahi-common/error.c:52
+#: ../avahi-common/error.c:50
 msgid "OS Error"
 msgstr "操作系统错误"
 
-#: ../avahi-common/error.c:54
+#: ../avahi-common/error.c:52
 msgid "Access denied"
 msgstr "访问被拒绝"
 
-#: ../avahi-common/error.c:55
+#: ../avahi-common/error.c:53
 msgid "Invalid operation"
 msgstr "无效的操作"
 
-#: ../avahi-common/error.c:56
+#: ../avahi-common/error.c:54
 msgid "An unexpected D-Bus error occured"
 msgstr "发生了一个未预期的 D-Bus 错误"
 
-#: ../avahi-common/error.c:57
+#: ../avahi-common/error.c:55
 msgid "Daemon connection failed"
 msgstr "Daemon 连接失败"
 
-#: ../avahi-common/error.c:58
+#: ../avahi-common/error.c:56
 msgid "Memory exhausted"
-msgstr "存储已用尽"
+msgstr "内存已用尽"
 
-#: ../avahi-common/error.c:59
+#: ../avahi-common/error.c:57
 msgid "The object passed in was not valid"
-msgstr "处理的对象无效"
+msgstr "传入的对象无效"
 
-#: ../avahi-common/error.c:60
+#: ../avahi-common/error.c:58
 msgid "Daemon not running"
 msgstr "Daemon 未运行"
 
-#: ../avahi-common/error.c:61
+#: ../avahi-common/error.c:59
 msgid "Invalid interface index"
-msgstr "无效的界面接口索引"
+msgstr "无效的接口索引"
 
-#: ../avahi-common/error.c:62
+#: ../avahi-common/error.c:60
 msgid "Invalid protocol specification"
 msgstr "无效的协议规范"
 
-#: ../avahi-common/error.c:63
+#: ../avahi-common/error.c:61
 msgid "Invalid flags"
 msgstr "无效的属性标志"
 
-#: ../avahi-common/error.c:65
+#: ../avahi-common/error.c:63
 msgid "Not found"
 msgstr "没有找到"
 
-#: ../avahi-common/error.c:66
+#: ../avahi-common/error.c:64
 msgid "Invalid configuration"
 msgstr "无效的配置"
 
-#: ../avahi-common/error.c:67
+#: ../avahi-common/error.c:65
 msgid "Version mismatch"
 msgstr "版本不匹配"
 
-#: ../avahi-common/error.c:68
+#: ../avahi-common/error.c:66
 msgid "Invalid service subtype"
 msgstr "无效的服务子类型"
 
-#: ../avahi-common/error.c:69
+#: ../avahi-common/error.c:67
 msgid "Invalid packet"
 msgstr "无效的数据包"
 
-#: ../avahi-common/error.c:70
+#: ../avahi-common/error.c:68
 msgid "Invalid DNS return code"
 msgstr "无效的 DNS 返回代码"
 
-#: ../avahi-common/error.c:71
+#: ../avahi-common/error.c:69
 msgid "DNS failure: FORMERR"
 msgstr "DNS 失败：FORMERR"
 
-#: ../avahi-common/error.c:72
+#: ../avahi-common/error.c:70
 msgid "DNS failure: SERVFAIL"
 msgstr "DNS 失败：SERVFAIL"
 
-#: ../avahi-common/error.c:73
+#: ../avahi-common/error.c:71
 msgid "DNS failure: NXDOMAIN"
 msgstr "DNS 失败：NXDOMAIN"
 
-#: ../avahi-common/error.c:74
+#: ../avahi-common/error.c:72
 msgid "DNS failure: NOTIMP"
 msgstr "DNS 失败：NOTIMP"
 
-#: ../avahi-common/error.c:76
+#: ../avahi-common/error.c:74
 msgid "DNS failure: REFUSED"
 msgstr "DNS 失败：REFUSED"
 
-#: ../avahi-common/error.c:77
+#: ../avahi-common/error.c:75
 msgid "DNS failure: YXDOMAIN"
 msgstr "DNS 失败：YXDOMAIN"
 
-#: ../avahi-common/error.c:78
+#: ../avahi-common/error.c:76
 msgid "DNS failure: YXRRSET"
 msgstr "DNS 失败：YXRRSET"
 
-#: ../avahi-common/error.c:79
+#: ../avahi-common/error.c:77
 msgid "DNS failure: NXRRSET"
 msgstr "DNS 失败：NXRRSET"
 
-#: ../avahi-common/error.c:80
+#: ../avahi-common/error.c:78
 msgid "DNS failure: NOTAUTH"
 msgstr "DNS 失败：NOTAUTH"
 
-#: ../avahi-common/error.c:81
+#: ../avahi-common/error.c:79
 msgid "DNS failure: NOTZONE"
 msgstr "DNS 失败：NOTZONE"
 
-#: ../avahi-common/error.c:82
+#: ../avahi-common/error.c:80
 msgid "Invalid RDATA"
 msgstr "无效的 RDATA"
 
-#: ../avahi-common/error.c:83
+#: ../avahi-common/error.c:81
 msgid "Invalid DNS type"
 msgstr "无效的 DNS 类型"
 
-#: ../avahi-common/error.c:84
+#: ../avahi-common/error.c:82
 msgid "Invalid DNS class"
 msgstr "无效的 DNS 类"
 
-#: ../avahi-common/error.c:85
+#: ../avahi-common/error.c:83
 msgid "Not supported"
 msgstr "不支持"
 
-#: ../avahi-common/error.c:87
+#: ../avahi-common/error.c:85
 msgid "Not permitted"
 msgstr "不允许"
 
-#: ../avahi-common/error.c:88
+#: ../avahi-common/error.c:86
 msgid "Invalid argument"
 msgstr "无效的参数"
 
-#: ../avahi-common/error.c:89
+#: ../avahi-common/error.c:87
 msgid "Is empty"
-msgstr "空"
+msgstr "为空"
 
-#: ../avahi-common/error.c:90
+#: ../avahi-common/error.c:88
 msgid "The requested operation is invalid because redundant"
 msgstr "请求的操作无效，因为过于冗长"
 
-#: ../avahi-common/error.c:96
+#: ../avahi-common/error.c:94
 msgid "Invalid Error Code"
 msgstr "无效的错误代码"
 
-#: ../avahi-discover-standalone/avahi-discover.glade.h:1
+#: ../avahi-discover-standalone/avahi-discover.ui.h:1
+#: ../avahi-python/avahi-discover/avahi-discover.py:76
 msgid "<i>No service currently selected.</i>"
 msgstr "<i>没有当前选定的服务。<i>"
 
-#: ../avahi-discover-standalone/avahi-discover.glade.h:2
+#: ../avahi-discover-standalone/avahi-discover.ui.h:2
 msgid "Avahi Discovery"
 msgstr "Avahi发现"
 
@@ -250,182 +252,222 @@ msgstr "Avahi Zero浏览器"
 
 #: ../avahi-python/avahi-discover/avahi-discover.desktop.in.in.h:2
 msgid "Browse for Zeroconf services available on your network"
-msgstr "浏览本地网络内的Zeroconf服务"
+msgstr "浏览网络内的Zeroconf服务"
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:224
+msgid "TXT"
+msgstr "TXT"
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:226
+msgid "TXT Data:"
+msgstr "TXT 数据："
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:226
+msgid "empty"
+msgstr "为空"
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:228
+msgid "Service Type:"
+msgstr "服务类型："
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:229
+msgid "Service Name:"
+msgstr "服务名称："
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:230
+msgid "Domain Name:"
+msgstr "域名称："
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:231
+msgid "Interface:"
+msgstr "接口："
+
+#: ../avahi-python/avahi-discover/avahi-discover.py:232
+msgid "Address:"
+msgstr "地址："
 
-#: ../avahi-ui/avahi-ui.c:188
+#: ../avahi-ui/avahi-ui.c:185
 msgid "Browse Service Types"
 msgstr "浏览服务类型"
 
-#: ../avahi-ui/avahi-ui.c:188
+#: ../avahi-ui/avahi-ui.c:185
 msgid "A NULL terminated list of service types to browse for"
 msgstr "以NULL结尾的服务类型列表用于浏览"
 
-#: ../avahi-ui/avahi-ui.c:193
+#: ../avahi-ui/avahi-ui.c:190
 msgid "Domain"
 msgstr "域"
 
-#: ../avahi-ui/avahi-ui.c:193
+#: ../avahi-ui/avahi-ui.c:190
 msgid "The domain to browse in, or NULL for the default domain"
 msgstr "要浏览的域，或NULL表示默认域"
 
-#: ../avahi-ui/avahi-ui.c:199
+#: ../avahi-ui/avahi-ui.c:196
 msgid "Service Type"
 msgstr "服务类型"
 
-#: ../avahi-ui/avahi-ui.c:199
+#: ../avahi-ui/avahi-ui.c:196
 msgid "The service type of the selected service"
 msgstr "选定服务的服务类型"
 
-#: ../avahi-ui/avahi-ui.c:205 ../avahi-ui/avahi-ui.c:1022
+#: ../avahi-ui/avahi-ui.c:202 ../avahi-ui/avahi-ui.c:1023
 msgid "Service Name"
 msgstr "服务名称"
 
-#: ../avahi-ui/avahi-ui.c:205
+#: ../avahi-ui/avahi-ui.c:202
 msgid "The service name of the selected service"
 msgstr "选定服务的服务名称"
 
-#: ../avahi-ui/avahi-ui.c:211
+#: ../avahi-ui/avahi-ui.c:208
 msgid "Address"
 msgstr "地址"
 
-#: ../avahi-ui/avahi-ui.c:211
+#: ../avahi-ui/avahi-ui.c:208
 msgid "The address of the resolved service"
 msgstr "已解析服务的地址"
 
-#: ../avahi-ui/avahi-ui.c:216
+#: ../avahi-ui/avahi-ui.c:213
 msgid "Port"
 msgstr "端口"
 
-#: ../avahi-ui/avahi-ui.c:216
+#: ../avahi-ui/avahi-ui.c:213
 msgid "The IP port number of the resolved service"
-msgstr "已解析服务在IP端口号"
+msgstr "已解析服务的IP端口号"
 
-#: ../avahi-ui/avahi-ui.c:222
+#: ../avahi-ui/avahi-ui.c:219
 msgid "Host Name"
 msgstr "主机名"
 
-#: ../avahi-ui/avahi-ui.c:222
+#: ../avahi-ui/avahi-ui.c:219
 msgid "The host name of the resolved service"
 msgstr "已解析服务的主机名"
 
-#: ../avahi-ui/avahi-ui.c:228
+#: ../avahi-ui/avahi-ui.c:225
 msgid "TXT Data"
 msgstr "TXT数据"
 
-#: ../avahi-ui/avahi-ui.c:228
+#: ../avahi-ui/avahi-ui.c:225
 msgid "The TXT data of the resolved service"
 msgstr "已解析服务的TXT数据"
 
-#: ../avahi-ui/avahi-ui.c:233
-msgid "Resolve service"
-msgstr "解析服务"
+#: ../avahi-ui/avahi-ui.c:230
+msgid "Resolve Service"
+msgstr "解析服务："
 
-#: ../avahi-ui/avahi-ui.c:239
-msgid "Resolve service host name"
-msgstr "解析服务主机名"
+#: ../avahi-ui/avahi-ui.c:230
+msgid "Resolve the selected service automatically before returning"
+msgstr "回转前自动解析选定的服务"
 
-#: ../avahi-ui/avahi-ui.c:245
+#: ../avahi-ui/avahi-ui.c:236
+msgid "Resolve Service Host Name"
+msgstr "解析服务主机名："
+
+#: ../avahi-ui/avahi-ui.c:236
+msgid ""
+"Resolve the host name of the selected service automatically before returning"
+msgstr "回转前自动解析选定服务的主机名"
+
+#: ../avahi-ui/avahi-ui.c:242
 msgid "Address family"
 msgstr "地址类别"
 
-#: ../avahi-ui/avahi-ui.c:245
+#: ../avahi-ui/avahi-ui.c:242
 msgid "The address family for host name resolution"
 msgstr "用于主机名称解析的地址类别"
 
-#: ../avahi-ui/avahi-ui.c:327
+#: ../avahi-ui/avahi-ui.c:326
 #, c-format
 msgid "Avahi client failure: %s"
 msgstr "Avahi 客户端失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:389
+#: ../avahi-ui/avahi-ui.c:388
 #, c-format
 msgid "Avahi resolver failure: %s"
-msgstr "Avahi 分解器失败：%s"
+msgstr "Avahi 解析器失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:519
+#: ../avahi-ui/avahi-ui.c:518
 #, c-format
 msgid "Browsing for service type %s in domain %s failed: %s"
 msgstr "浏览服务类型 %s 于域 %s 失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:520 ../avahi-utils/avahi-browse.c:157
-#: ../avahi-utils/avahi-browse.c:158 ../avahi-utils/avahi-browse.c:164
-#: ../avahi-utils/avahi-browse.c:165
+#: ../avahi-ui/avahi-ui.c:519 ../avahi-utils/avahi-browse.c:168
+#: ../avahi-utils/avahi-browse.c:169 ../avahi-utils/avahi-browse.c:178
+#: ../avahi-utils/avahi-browse.c:179
 msgid "n/a"
-msgstr "未知"
+msgstr "不可用"
 
-#: ../avahi-ui/avahi-ui.c:650
+#: ../avahi-ui/avahi-ui.c:649
 #, c-format
 msgid "Avahi domain browser failure: %s"
 msgstr "Avahi 域浏览器失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:685
+#: ../avahi-ui/avahi-ui.c:684
 #, c-format
 msgid "Failed to read Avahi domain: %s"
 msgstr "读取 Avahi 域失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:707
+#: ../avahi-ui/avahi-ui.c:706
 msgid "Browse service type list is empty!"
-msgstr ""
+msgstr "浏览服务类型列表为空！"
 
-#: ../avahi-ui/avahi-ui.c:718
+#: ../avahi-ui/avahi-ui.c:717
 #, c-format
 msgid "Failed to connect to Avahi server: %s"
 msgstr "连接到 Avahi 服务器失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:736
+#: ../avahi-ui/avahi-ui.c:735
 msgid "Browsing for services on <b>local network</b>:"
 msgstr "浏览服务于 <b>本地网络</b>："
 
-#: ../avahi-ui/avahi-ui.c:738
+#: ../avahi-ui/avahi-ui.c:737
 #, c-format
 msgid "Browsing for services in domain <b>%s</b>:"
 msgstr "浏览服务于域 <b>%s</b>："
 
-#: ../avahi-ui/avahi-ui.c:774
+#: ../avahi-ui/avahi-ui.c:773
 #, c-format
 msgid "Failed to create browser for %s: %s"
 msgstr "为 %s 创建浏览器失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:904
+#: ../avahi-ui/avahi-ui.c:903
 #, c-format
 msgid "Failed to create resolver for %s of type %s in domain %s: %s"
-msgstr "为类型 %s 的 %s 创建分解器于域 %s 失败：%s"
+msgstr "为类型 %s 的 %s 创建解析器于域 %s 失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:979
+#: ../avahi-ui/avahi-ui.c:978
 #, c-format
 msgid "Failed to create domain browser: %s"
 msgstr "创建域浏览器失败：%s"
 
-#: ../avahi-ui/avahi-ui.c:990
+#: ../avahi-ui/avahi-ui.c:989
 msgid "Change domain"
 msgstr "更改域"
 
-#: ../avahi-ui/avahi-ui.c:1030 ../avahi-ui/avahi-ui.c:1161
-#, fuzzy
+#: ../avahi-ui/avahi-ui.c:1031 ../avahi-ui/avahi-ui.c:1162
 msgid "Browsing..."
 msgstr "正在浏览..."
 
-#: ../avahi-ui/avahi-ui.c:1119
+#: ../avahi-ui/avahi-ui.c:1120
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../avahi-ui/avahi-ui.c:1143
+#: ../avahi-ui/avahi-ui.c:1144
 msgid "Location"
-msgstr ""
+msgstr "位置"
 
-#: ../avahi-ui/avahi-ui.c:1148 ../avahi-utils/avahi-browse.c:537
+#: ../avahi-ui/avahi-ui.c:1149 ../avahi-utils/avahi-browse.c:553
 msgid "Name"
 msgstr "名称"
 
-#: ../avahi-ui/avahi-ui.c:1153 ../avahi-utils/avahi-browse.c:537
+#: ../avahi-ui/avahi-ui.c:1154 ../avahi-utils/avahi-browse.c:553
 msgid "Type"
 msgstr "类型"
 
-#: ../avahi-ui/avahi-ui.c:1165
+#: ../avahi-ui/avahi-ui.c:1166
 msgid "_Domain..."
 msgstr "_域..."
 
-#: ../avahi-ui/bssh.c:58
+#: ../avahi-ui/bssh.c:55
 #, c-format
 msgid ""
 "%s [options]\n"
@@ -436,161 +478,168 @@ msgid ""
 "    -S --shell           Browse both SSH and VNC\n"
 "    -d --domain=DOMAIN   The domain to browse in\n"
 msgstr ""
+"%s [options]\n"
+"\n"
+"  -h --help 显示该帮助信息\n"
+" -s --ssh 浏览SSH服务器\n"
+" -v --vnc 浏览VNC服务器\n"
+" -S --shell 浏览SSH和VNC\n"
+" -d --domain=DOMAIN 要浏览的域名\n"
 
-#: ../avahi-ui/bssh.c:104 ../avahi-utils/avahi-browse.c:759
+#: ../avahi-ui/bssh.c:101 ../avahi-utils/avahi-browse.c:775
 #, c-format
 msgid "Too many arguments\n"
-msgstr "过多的参数\n"
+msgstr "参数太多\n"
 
-#: ../avahi-ui/bssh.c:152
+#: ../avahi-ui/bssh.c:149
 msgid "Choose Shell Server"
 msgstr "选择 Shell 服务器"
 
-#: ../avahi-ui/bssh.c:154
+#: ../avahi-ui/bssh.c:151
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../avahi-ui/bssh.c:155
+#: ../avahi-ui/bssh.c:152
 msgid "Terminal"
 msgstr "终端"
 
-#: ../avahi-ui/bssh.c:159
+#: ../avahi-ui/bssh.c:156
 msgid "Choose VNC server"
 msgstr "选择 VNC 服务器"
 
-#: ../avahi-ui/bssh.c:164
+#: ../avahi-ui/bssh.c:161
 msgid "Choose SSH server"
 msgstr "选择 SSH 服务器"
 
-#: ../avahi-ui/bssh.c:188
+#: ../avahi-ui/bssh.c:185
 #, c-format
 msgid "Connecting to '%s' ...\n"
-msgstr "正在连接到“%s”...\n"
+msgstr "正在连接“%s”...\n"
 
-#: ../avahi-ui/bssh.c:243
+#: ../avahi-ui/bssh.c:240
 #, c-format
 msgid "execlp() failed: %s\n"
 msgstr "execlp() 失败：%s\n"
 
-#: ../avahi-ui/bssh.c:253
+#: ../avahi-ui/bssh.c:250
 #, c-format
 msgid "Canceled.\n"
 msgstr "已取消。\n"
 
 #: ../avahi-ui/bssh.desktop.in.in.h:1
 msgid "Avahi SSH Server Browser"
-msgstr ""
+msgstr "Avahi SSH服务器浏览器"
 
 #: ../avahi-ui/bssh.desktop.in.in.h:2
 msgid "Browse for Zeroconf-enabled SSH Servers"
-msgstr ""
+msgstr "浏览具有Zeroconf功能的SSH服务器"
 
 #: ../avahi-ui/bvnc.desktop.in.in.h:1
 msgid "Avahi VNC Server Browser"
-msgstr ""
+msgstr "Avahi VNC服务器浏览器"
 
 #: ../avahi-ui/bvnc.desktop.in.in.h:2
 msgid "Browse for Zeroconf-enabled VNC Servers"
-msgstr ""
+msgstr "浏览具有Zeroconf功能的VNC服务器"
 
-#: ../avahi-utils/avahi-browse.c:108
+#: ../avahi-utils/avahi-browse.c:107
 #, c-format
 msgid ": All for now\n"
-msgstr "：所有暂停\n"
+msgstr "：当前所有\n"
 
-#: ../avahi-utils/avahi-browse.c:119
+#: ../avahi-utils/avahi-browse.c:118
 #, c-format
 msgid ": Cache exhausted\n"
 msgstr "：缓存用尽\n"
 
-#: ../avahi-utils/avahi-browse.c:223 ../avahi-utils/avahi-browse.c:245
+#: ../avahi-utils/avahi-browse.c:239 ../avahi-utils/avahi-browse.c:261
 #, c-format
 msgid "Failed to resolve service '%s' of type '%s' in domain '%s': %s\n"
-msgstr "分解类型“%s”的服务“%s”于域“%s”失败：%s\n"
+msgstr "解析类型“%s”的服务“%s”于域“%s”失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:324
+#: ../avahi-utils/avahi-browse.c:340
 #, c-format
 msgid "service_browser failed: %s\n"
 msgstr "service_browser 失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:362
+#: ../avahi-utils/avahi-browse.c:378
 #, c-format
 msgid "avahi_service_browser_new() failed: %s\n"
 msgstr "avahi_service_browser_new() 失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:398
+#: ../avahi-utils/avahi-browse.c:414
 #, c-format
 msgid "service_type_browser failed: %s\n"
 msgstr "service_type_browser 失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:428
+#: ../avahi-utils/avahi-browse.c:444
 #, c-format
 msgid "avahi_service_type_browser_new() failed: %s\n"
 msgstr "avahi_service_type_browser_new() 失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:503
+#: ../avahi-utils/avahi-browse.c:519
 #, c-format
 msgid "avahi_domain_browser_new() failed: %s\n"
 msgstr "avahi_domain_browser_new() 失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:519 ../avahi-utils/avahi-publish.c:391
-#: ../avahi-utils/avahi-resolve.c:282 ../avahi-utils/avahi-set-host-name.c:170
+#: ../avahi-utils/avahi-browse.c:535 ../avahi-utils/avahi-publish.c:394
+#: ../avahi-utils/avahi-resolve.c:280 ../avahi-utils/avahi-set-host-name.c:168
 #, c-format
 msgid "Failed to query version string: %s\n"
 msgstr "查询版本字符串失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:524 ../avahi-utils/avahi-publish.c:396
-#: ../avahi-utils/avahi-resolve.c:287 ../avahi-utils/avahi-set-host-name.c:175
-#: ../avahi-utils/avahi-set-host-name.c:191
+#: ../avahi-utils/avahi-browse.c:540 ../avahi-utils/avahi-publish.c:399
+#: ../avahi-utils/avahi-resolve.c:285 ../avahi-utils/avahi-set-host-name.c:173
+#: ../avahi-utils/avahi-set-host-name.c:189
 #, c-format
 msgid "Failed to query host name: %s\n"
 msgstr "查询主机名失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:528 ../avahi-utils/avahi-publish.c:400
-#: ../avahi-utils/avahi-resolve.c:291 ../avahi-utils/avahi-set-host-name.c:179
+#: ../avahi-utils/avahi-browse.c:544 ../avahi-utils/avahi-publish.c:403
+#: ../avahi-utils/avahi-resolve.c:289 ../avahi-utils/avahi-set-host-name.c:177
 #, c-format
 msgid "Server version: %s; Host name: %s\n"
 msgstr "服务器版本：%s；主机名：%s\n"
 
 #. Translators: This is a column heading with abbreviations for
 #. *   Event (+/-), Network Interface, Protocol (IPv4/v6), Domain
-#: ../avahi-utils/avahi-browse.c:533
+#: ../avahi-utils/avahi-browse.c:549
 #, c-format
 msgid "E Ifce Prot Domain\n"
 msgstr "E Ifce Prot 域\n"
 
 #. Translators: This is a column heading with abbreviations for
 #. *   Event (+/-), Network Interface, Protocol (IPv4/v6), Domain
-#: ../avahi-utils/avahi-browse.c:537
+#: ../avahi-utils/avahi-browse.c:553
 #, c-format
 msgid "E Ifce Prot %-*s %-20s Domain\n"
 msgstr "E Ifce Prot %-*s %-20s 域\n"
 
 #. We have been disconnected, so let reconnect
-#: ../avahi-utils/avahi-browse.c:569 ../avahi-utils/avahi-publish.c:165
+#: ../avahi-utils/avahi-browse.c:585 ../avahi-utils/avahi-publish.c:163
 #, c-format
 msgid "Disconnected, reconnecting ...\n"
 msgstr "已断开，正在重新连接 ...\n"
 
-#: ../avahi-utils/avahi-browse.c:583 ../avahi-utils/avahi-browse.c:813
-#: ../avahi-utils/avahi-publish.c:172 ../avahi-utils/avahi-publish.c:383
-#: ../avahi-utils/avahi-resolve.c:274 ../avahi-utils/avahi-set-host-name.c:162
+#: ../avahi-utils/avahi-browse.c:599 ../avahi-utils/avahi-browse.c:829
+#: ../avahi-utils/avahi-publish.c:170 ../avahi-utils/avahi-publish.c:386
+#: ../avahi-utils/avahi-resolve.c:272 ../avahi-utils/avahi-set-host-name.c:160
 #, c-format
 msgid "Failed to create client object: %s\n"
 msgstr "创建客户端对象失败：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:588 ../avahi-utils/avahi-publish.c:177
-#: ../avahi-utils/avahi-resolve.c:145 ../avahi-utils/avahi-set-host-name.c:61
+#: ../avahi-utils/avahi-browse.c:604 ../avahi-utils/avahi-publish.c:175
+#: ../avahi-utils/avahi-resolve.c:143 ../avahi-utils/avahi-set-host-name.c:59
 #, c-format
 msgid "Client failure, exiting: %s\n"
 msgstr "客户端失败，退出：%s\n"
 
-#: ../avahi-utils/avahi-browse.c:607 ../avahi-utils/avahi-publish.c:208
+#: ../avahi-utils/avahi-browse.c:623 ../avahi-utils/avahi-publish.c:206
 #, c-format
 msgid "Waiting for daemon ...\n"
 msgstr "正在等待 daemon ...\n"
 
-#: ../avahi-utils/avahi-browse.c:631
+#: ../avahi-utils/avahi-browse.c:647
 msgid ""
 "    -h --help            Show this help\n"
 "    -V --version         Show version\n"
@@ -598,7 +647,8 @@ msgid ""
 "    -a --all             Show all services, regardless of the type\n"
 "    -d --domain=DOMAIN   The domain to browse in\n"
 "    -v --verbose         Enable verbose mode\n"
-"    -t --terminate       Terminate after dumping a more or less complete list\n"
+"    -t --terminate       Terminate after dumping a more or less complete "
+"list\n"
 "    -c --cache           Terminate after dumping all entries from the cache\n"
 "    -l --ignore-local    Ignore local services\n"
 "    -r --resolve         Resolve services found\n"
@@ -611,73 +661,73 @@ msgstr ""
 "    -a --all             显示所有服务，忽略类型\n"
 "    -d --domain=DOMAIN   要浏览的域\n"
 "    -v --verbose         启用详述模式\n"
-"    -t --terminate       在转储一个或多或少完整列表后终止\n"
-"    -c --cache           在从缓存中转储所有条目后终止\n"
+"    -t --terminate       导出一个完整列表后终止\n"
+"    -c --cache           导出缓存中的所有条目后终止\n"
 "    -l --ignore-local    忽略本地服务\n"
-"    -r --resolve         找到的分解服务\n"
+"    -r --resolve         解析找到的服务\n"
 "    -f --no-fail         如果 daemon 不可用也不中断\n"
-"    -p --parsable        以可分析格式输出\n"
+"    -p --parsable        输出可解析格式\n"
 
-#: ../avahi-utils/avahi-browse.c:644
+#: ../avahi-utils/avahi-browse.c:660
 msgid ""
 "    -k --no-db-lookup    Don't lookup service types\n"
 "    -b --dump-db         Dump service type database\n"
 msgstr ""
-"    -k --no-db-lookup    检查服务类型\n"
-"    -b --dump-db         转储服务类型数据库\n"
+"    -k --no-db-lookup    不查询服务类型\n"
+"    -b --dump-db         导出服务类型数据库\n"
 
-#: ../avahi-utils/avahi-browse.c:750 ../avahi-utils/avahi-resolve.c:221
+#: ../avahi-utils/avahi-browse.c:766 ../avahi-utils/avahi-resolve.c:219
 #, c-format
 msgid "Too few arguments\n"
 msgstr "过少的参数\n"
 
-#: ../avahi-utils/avahi-browse.c:805 ../avahi-utils/avahi-publish.c:375
-#: ../avahi-utils/avahi-resolve.c:266 ../avahi-utils/avahi-set-host-name.c:154
+#: ../avahi-utils/avahi-browse.c:821 ../avahi-utils/avahi-publish.c:378
+#: ../avahi-utils/avahi-resolve.c:264 ../avahi-utils/avahi-set-host-name.c:152
 #, c-format
 msgid "Failed to create simple poll object.\n"
 msgstr "创建简单查询对象失败。\n"
 
-#: ../avahi-utils/avahi-publish.c:78
+#: ../avahi-utils/avahi-publish.c:76
 #, c-format
 msgid "Established under name '%s'\n"
 msgstr "已以名称“%s”建立\n"
 
-#: ../avahi-utils/avahi-publish.c:83
+#: ../avahi-utils/avahi-publish.c:81
 #, c-format
 msgid "Failed to register: %s\n"
 msgstr "注册失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:96
+#: ../avahi-utils/avahi-publish.c:94
 #, c-format
 msgid "Name collision, picking new name '%s'.\n"
 msgstr "名称冲突，挑选新名称“%s”。\n"
 
-#: ../avahi-utils/avahi-publish.c:116
+#: ../avahi-utils/avahi-publish.c:114
 #, c-format
 msgid "Failed to create entry group: %s\n"
 msgstr "创建条目组失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:126
+#: ../avahi-utils/avahi-publish.c:124
 #, c-format
 msgid "Failed to add address: %s\n"
 msgstr "添加地址失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:136
+#: ../avahi-utils/avahi-publish.c:134
 #, c-format
 msgid "Failed to add service: %s\n"
 msgstr "添加服务失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:142
+#: ../avahi-utils/avahi-publish.c:140
 #, c-format
 msgid "Failed to add subtype '%s': %s\n"
 msgstr "添加子类型“%s”失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:193
+#: ../avahi-utils/avahi-publish.c:191
 #, c-format
 msgid "Host name conflict\n"
 msgstr "主机名冲突\n"
 
-#: ../avahi-utils/avahi-publish.c:218
+#: ../avahi-utils/avahi-publish.c:216
 #, c-format
 msgid ""
 "%s [options] %s <name> <type> <port> [<txt ...>]\n"
@@ -690,7 +740,9 @@ msgid ""
 "    -v --verbose         Enable verbose mode\n"
 "    -d --domain=DOMAIN   Domain to publish service in\n"
 "    -H --host=DOMAIN     Host where service resides\n"
-"       --subtype=SUBTYPE An additional subtype to register this service with\n"
+"       --subtype=SUBTYPE An additional subtype to register this service "
+"with\n"
+"    -R --no-reverse      Do not publish reverse entry with address\n"
 "    -f --no-fail         Don't fail if the daemon is not available\n"
 msgstr ""
 "%s [选项] %s <名称> <类型> <端口> [<txt ...>]\n"
@@ -698,40 +750,41 @@ msgstr ""
 "\n"
 "    -h --help            显示本帮助\n"
 "    -V --version         显示版本\n"
-"    -s --service         公布服务\n"
-"    -a --address         公布地址\n"
+"    -s --service         发布服务\n"
+"    -a --address         发布地址\n"
 "    -v --verbose         启用详述模式\n"
-"    -d --domain=DOMAIN   要公布服务的域\n"
+"    -d --domain=DOMAIN   要发布服务的域\n"
 "    -H --host=DOMAIN     服务宿属的主机\n"
 "       --subtype=SUBTYPE 用于注册此服务的额外子类型\n"
-"    -f --no-fail         如果 daemon 不可用也不中断\n"
+"    -R --no-reverse      不发布带地址的反转条目    -f --no-fail         如果 "
+"daemon 不可用也不中断\n"
 
-#: ../avahi-utils/avahi-publish.c:300 ../avahi-utils/avahi-publish.c:315
+#: ../avahi-utils/avahi-publish.c:303 ../avahi-utils/avahi-publish.c:318
 #, c-format
 msgid "Bad number of arguments\n"
-msgstr "无效的参数数量\n"
+msgstr "无效的参数个数\n"
 
-#: ../avahi-utils/avahi-publish.c:326
+#: ../avahi-utils/avahi-publish.c:329
 #, c-format
 msgid "Failed to parse port number: %s\n"
-msgstr "分析端口数失败：%s\n"
+msgstr "解析端口号失败：%s\n"
 
-#: ../avahi-utils/avahi-publish.c:358 ../avahi-utils/avahi-resolve.c:248
+#: ../avahi-utils/avahi-publish.c:361 ../avahi-utils/avahi-resolve.c:246
 #, c-format
 msgid "No command specified.\n"
 msgstr "没有指定的命令。\n"
 
-#: ../avahi-utils/avahi-resolve.c:91
+#: ../avahi-utils/avahi-resolve.c:89
 #, c-format
 msgid "Failed to resolve host name '%s': %s\n"
-msgstr "分解主机名“%s”失败：%s\n"
+msgstr "解析主机名“%s”失败：%s\n"
 
-#: ../avahi-utils/avahi-resolve.c:128
+#: ../avahi-utils/avahi-resolve.c:126
 #, c-format
 msgid "Failed to resolve address '%s': %s\n"
-msgstr "分解地址“%s”失败：%s\n"
+msgstr "解析地址“%s”失败：%s\n"
 
-#: ../avahi-utils/avahi-resolve.c:159
+#: ../avahi-utils/avahi-resolve.c:157
 #, c-format
 msgid ""
 "%s [options] %s <host name ...>\n"
@@ -750,28 +803,28 @@ msgstr ""
 "\n"
 "    -h --help            显示本帮助\n"
 "    -V --version         显示版本\n"
-"    -n --name            分解主机名\n"
-"    -a --address         分解地址\n"
+"    -n --name            解析主机名\n"
+"    -a --address         解析地址\n"
 "    -v --verbose         启用详述模式\n"
 "    -6                   检查 IPv6 地址\n"
 "    -4                   检查 IPv4 地址\n"
 
-#: ../avahi-utils/avahi-resolve.c:301 ../avahi-utils/avahi-set-host-name.c:183
+#: ../avahi-utils/avahi-resolve.c:299 ../avahi-utils/avahi-set-host-name.c:181
 #, c-format
 msgid "Failed to create host name resolver: %s\n"
-msgstr "创建主机名分解器失败：%s\n"
+msgstr "创建主机名解析器失败：%s\n"
 
-#: ../avahi-utils/avahi-resolve.c:311
+#: ../avahi-utils/avahi-resolve.c:309
 #, c-format
 msgid "Failed to parse address '%s'\n"
 msgstr "分析地址“%s”失败\n"
 
-#: ../avahi-utils/avahi-resolve.c:316
+#: ../avahi-utils/avahi-resolve.c:314
 #, c-format
 msgid "Failed to create address resolver: %s\n"
-msgstr "创建地址分解器失败：%s\n"
+msgstr "创建地址解析器失败：%s\n"
 
-#: ../avahi-utils/avahi-set-host-name.c:75
+#: ../avahi-utils/avahi-set-host-name.c:73
 #, c-format
 msgid ""
 "%s [options] <new host name>\n"
@@ -786,12 +839,12 @@ msgstr ""
 "    -V --version         显示版本\n"
 "    -v --verbose         启用详述模式\n"
 
-#: ../avahi-utils/avahi-set-host-name.c:116
+#: ../avahi-utils/avahi-set-host-name.c:114
 #, c-format
 msgid "Invalid number of arguments, expecting exactly one.\n"
-msgstr "无效的参数数量，预期为一个。\n"
+msgstr "无效的参数个数，只接受一个参数。\n"
 
-#: ../avahi-utils/avahi-set-host-name.c:195
+#: ../avahi-utils/avahi-set-host-name.c:193
 #, c-format
 msgid "Host name successfully changed to %s\n"
 msgstr "主机名成功更改为 %s\n"