[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Updated subversion/po/zh_CN.po for trunk and branches/1.4.x (was: [l10n] Translation status for branches/1.4.x r21204)

From: Liu Yubao <yubao.liu_at_gmail.com>
Date: 2006-08-23 05:27:40 CEST

David Glasser wrote:
> On 8/22/06, Max Bowsher <maxb1@ukf.net> wrote:
>> Hmm, the previous format is rather long-winded. Here's a tabular form.
>>
>> Translation status report for revision 21204 (branches/1.4.x/)
>
> Note that a fair number of these are better on trunk (though the ones
> in need of the most work, de and zh_CN, are not yet).
>
> --dave
>
Sorry for finishing it so late, last weekend I prepared to start
translation, but I found I hadn't merged zh_CN.po with latest
subversion.pot and I couldn't connect to internet at home :-(

Yesterday I sent the nearly finised translation to some boards at
a BBS here, and I got very little feedback, it seems very few people
are interested in translation (indeed, it's not so interesting...).

I will send the po files to svn-users mail list, but I'm afraid they
can't be reviewed enough before 1.4.0 released, so I hope they can
be committed to repos first and then wait somebody to maintain them.
(If nobody stands out, I would like to do this job)

Note I have not reviewed all the old translated items, I think they
need be reviewed again.

I have run "make locale", it's ok.

Any suggestions or comments are welcomed.

BTW: Noritada, thank you again for your guide, I find Emacs with po mode
is really wonderful:-)

Best regards,

Liu Yubao

[[[
* subversion/po/zh_CN.po: finish all untranslated and fuzzy items,
                          remove all obsolete items.
]]]

diff -u msgmerged\zh_CN.po translated\zh_CN.po
--- msgmerged\zh_CN.po Wed Aug 23 10:59:56 2006
+++ translated\zh_CN.po Wed Aug 23 11:00:09 2006
@@ -1,13 +1,76 @@
 # Simplified Chinese translation for subversion package
-# Copyright (C) 2004 CollabNet.
+# Copyright (C) 2006 CollabNet.
 # This file is distributed under the same license as the subversion package.
 #
+#
+# 翻译工具:
+# Emacs + po-mode,后者在GNU gettext包中,使用文档参考gettext手册,windows版本下载地址:
+# http://ntemacs.sourceforge.net (推�Emacs 23)
+# http://gettext.sourceforge.net
+# http://unxutils.sourceforge.net (�是必须)
+#
+# �考http://svn.collab.net/repos/svn/trunk/TRANSLATING%e4%bb%a5%e8%8e%b7%e5%be%97subversion.pot,
+# 与zh_CN.po合并后再进行翻译。
+#
+# -----------------------> .emacs (Emacs 23 for windows)
+# ;; from GNU gettext manual
+# (setq auto-mode-alist
+# (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist))
+# (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+# (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\."
+# 'po-find-file-coding-system)
+# (autoload 'po-find-file-coding-system "po-mode")
+#
+# (setq w32-charset-info-alist
+# (cons '("gbk" w32-charset-gb2312 . 936) w32-charset-info-alist))
+#
+#
+# ;; from brep at newsmth.net
+# (setq default-frame-alist
+# (append
+# '((font . "fontset-gbk")) default-frame-alist))
+#
+# (create-fontset-from-fontset-spec
+# "-outline-Courier New-normal-r-normal-normal-13-97-96-96-c-*-fontset-gbk")
+# (set-fontset-font
+# "fontset-default" nil
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'kana
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'han
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'cjk-misc
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'symbol
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-default-font "fontset-gbk")
+#
+# -------------------------------
+#
+# 翻译术语表:
+# attribute 属性
+# 指XML文件中一个标记节点的属性
+# element 元素
+# 指XML文件中的一个标记节点
+# parse 解析
+# representation 修订版
+# 简写作rep,指每一个修订版在文件系统中的具体存储形式,翻译成“存储表示”
+# 并不清楚,便意译为“修订版”
+# repository 档案库
+# revision 修订版
+# scheme 方案
+# 指URL中的svn://, http://%e8%bf%99%e6%a0%b7%e7%9a%84%e9%83%a8%e5%88%86
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: subversion 1.2.0\n"
+"Project-Id-Version: subversion trunk\n"
 "Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
 "POT-Creation-Date: 2006-08-21 06:57-0400\n"
-"PO-Revision-Date: 2004-09-12 22:05+0800\n"
+"PO-Revision-Date: 2006-08-23 00:03+0800\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
@@ -230,14 +293,12 @@
 msgstr "无效的计划任务"
 
 #: include/svn_error_codes.h:387
-#, fuzzy
 msgid "Invalid relocation"
-msgstr "无效的锁定"
+msgstr "无效的重定位"
 
 #: include/svn_error_codes.h:392
-#, fuzzy
 msgid "Invalid switch"
-msgstr "无效的计划任务"
+msgstr "无效的切换"
 
 #: include/svn_error_codes.h:398
 msgid "General filesystem error"
@@ -277,7 +338,7 @@
 
 #: include/svn_error_codes.h:434
 msgid "Filesystem has no such representation"
-msgstr "文件系统没有这样的表现 (representation)"
+msgstr "文件系统中没有这个修订版"
 
 #: include/svn_error_codes.h:438
 msgid "Filesystem has no such string"
@@ -342,11 +403,11 @@
 # as-is
 #: include/svn_error_codes.h:498
 msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改变"
+msgstr "在读取时一个修订版消失或被改变"
 
 #: include/svn_error_codes.h:502
 msgid "Tried to change an immutable representation"
-msgstr "尝试变更一个不可改变的表现 (representation)"
+msgstr "尝试更改一个不可变的修订版"
 
 #: include/svn_error_codes.h:506
 msgid "Malformed skeleton data"
@@ -377,26 +438,22 @@
 msgstr "未知的 FS 类别"
 
 #: include/svn_error_codes.h:536
-#, fuzzy
 msgid "No user associated with filesystem"
 msgstr "没有用户与文件系统关联"
 
 #: include/svn_error_codes.h:541
-#, fuzzy
 msgid "Path is already locked"
-msgstr "路径“%s”已经被锁定"
+msgstr "路径已经被锁定"
 
 #: include/svn_error_codes.h:546 include/svn_error_codes.h:673
-#, fuzzy
 msgid "Path is not locked"
 msgstr "路径没有被锁定"
 
 #: include/svn_error_codes.h:551
 msgid "Lock token is incorrect"
-msgstr "锁定标记是不正确的"
+msgstr "锁定标记不正确"
 
 #: include/svn_error_codes.h:556
-#, fuzzy
 msgid "No lock token provided"
 msgstr "没有提供锁定标记"
 
@@ -405,7 +462,6 @@
 msgstr "用户名和锁定所有者不匹配"
 
 #: include/svn_error_codes.h:566
-#, fuzzy
 msgid "Filesystem has no such lock"
 msgstr "文件系统没有这样的锁"
 
@@ -414,14 +470,12 @@
 msgstr "锁过期"
 
 #: include/svn_error_codes.h:576
-#, fuzzy
 msgid "Item is out of date"
-msgstr "条目已过时"
+msgstr "条目已过期"
 
 #: include/svn_error_codes.h:588
-#, fuzzy
 msgid "Unsupported FS format"
-msgstr "不支持的 FS 格式"
+msgstr "不支持的文件系统格式"
 
 #: include/svn_error_codes.h:594
 msgid "The repository is locked, perhaps for db recovery"
@@ -456,12 +510,10 @@
 msgstr "执行 post-commit 外挂时发生错误"
 
 #: include/svn_error_codes.h:632
-#, fuzzy
 msgid "Error running post-lock hook"
 msgstr "执行 post-lock 外挂时发生错误"
 
 #: include/svn_error_codes.h:637
-#, fuzzy
 msgid "Error running post-unlock hook"
 msgstr "执行 post-unlock 外挂时发生错误"
 
@@ -526,7 +578,6 @@
 msgstr "找不到 HTTP 路径"
 
 #: include/svn_error_codes.h:712
-#, fuzzy
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "执行 WebDAV PROPPATCH 失败"
 
@@ -586,24 +637,20 @@
 msgstr "编辑的根目录读取拒绝"
 
 #: include/svn_error_codes.h:792
-#, fuzzy
 msgid "Item is not readable"
-msgstr "项目不能读。"
+msgstr "条目不可读"
 
 #: include/svn_error_codes.h:797
-#, fuzzy
 msgid "Item is partially readable"
-msgstr "项目部分可读。"
+msgstr "条目部分可读"
 
 #: include/svn_error_codes.h:801
-#, fuzzy
 msgid "Invalid authz configuration"
-msgstr "无效的配置值"
+msgstr "无效的authz配置"
 
 #: include/svn_error_codes.h:806
-#, fuzzy
 msgid "Item is not writable"
-msgstr "项目不能写。"
+msgstr "条目不可写"
 
 #: include/svn_error_codes.h:812
 msgid "Svndiff data has invalid header"
@@ -628,14 +675,12 @@
 msgstr "svndiff 数据意想不到地结束"
 
 #: include/svn_error_codes.h:832
-#, fuzzy
 msgid "Svndiff compressed data is invalid"
-msgstr "svndiff 数据包含了无效的档头"
+msgstr "Svndiff 压缩数据无效"
 
 #: include/svn_error_codes.h:838
-#, fuzzy
 msgid "Diff data source modified unexpectedly"
-msgstr "svndiff 数据意想不到地结束"
+msgstr "Diff数据源被意外修改"
 
 #: include/svn_error_codes.h:844
 msgid "Apache has no path to an SVN filesystem"
@@ -800,7 +845,7 @@
 
 #: include/svn_error_codes.h:1015
 msgid "Not enough arguments provided; try 'svn help' for more info"
-msgstr ""
+msgstr "参数不够,请用“svn help”获取帮助"
 
 #: include/svn_error_codes.h:1019
 msgid "Mutually exclusive arguments specified"
@@ -851,7 +896,7 @@
 
 #: libsvn_client/blame.c:522
 msgid "blame of the WORKING revision is not supported"
-msgstr ""
+msgstr "blame不支持工作修订版"
 
 #: libsvn_client/blame.c:535
 msgid "Start revision must precede end revision"
@@ -868,12 +913,12 @@
 msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
 
 #: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not under version control or doesn't exist"
 msgstr "“%s”尚未纳入版本控制或不存在"
 
 #: libsvn_client/cat.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' refers to a directory"
 msgstr "“%s”引用一个目录"
 
@@ -898,14 +943,13 @@
 msgstr "“%s”已是不同地址(URL)的工作拷贝"
 
 #: libsvn_client/checkout.c:171
-#, fuzzy
 msgid "; run 'svn update' to complete it"
 msgstr ";请执行“svn update”以完成目前的操作。"
 
 #: libsvn_client/checkout.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' already exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+msgstr "“%s”已存在且不是目录"
 
 #: libsvn_client/commit.c:198
 #, c-format
@@ -964,7 +1008,7 @@
 
 #: libsvn_client/commit.c:1407
 msgid "Are all the targets part of the same working copy?"
-msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+msgstr "是否所有的目标都是同一个工作拷贝的一部分?"
 
 #: libsvn_client/commit.c:1422
 msgid "Cannot non-recursively commit a directory deletion"
@@ -1043,7 +1087,7 @@
 "'%s' is not under version control and is not part of the commit, yet its "
 "child '%s' is part of the commit"
 msgstr ""
-"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
+"“%s”尚未纳入版本控制,也不是提交的一部分,但是它的子路径“%s”是提交的一部分"
 
 #: libsvn_client/commit_util.c:885
 #, c-format
@@ -1056,13 +1100,13 @@
 msgstr "提交项目“%s”有复制标志,但是修订版无效"
 
 #: libsvn_client/copy.c:95 libsvn_client/copy.c:768
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "“%s”不是目录"
+msgstr "路径“%s”不是目录"
 
 #: libsvn_client/copy.c:138
 msgid "Move will not be attempted unless forced"
-msgstr "除非强行操作,否则不会执行移动操作"
+msgstr "除非强制操作,否则不会执行移动操作"
 
 #: libsvn_client/copy.c:334
 #, c-format
@@ -1147,23 +1191,19 @@
 msgstr "名字:%s%s"
 
 #: libsvn_client/diff.c:203
-#, fuzzy, c-format
+#, c-format
 msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"s”与“%s”)"
+msgstr "地�(URL)中没有方案�(指svn://, http://, file://等)(“%s�与“%s�)"
 
 #: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, fuzzy, c-format
+#, c-format
 msgid "URL has no scheme: '%s'"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"s”"
+msgstr "地�(URL)中没有方案�(指svn://, http://, file://等)(“%s�)"
 
 #: libsvn_client/diff.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
+msgstr "尚不支持混合的存取方案 (“%s”与“%s”)"
 
 # as-is
 #: libsvn_client/diff.c:287
@@ -1216,9 +1256,8 @@
 msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
 
 #: libsvn_client/diff.c:1960
-#, fuzzy
 msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
+msgstr "抱歉,svn_client_diff3 尚不支持这种调用方式"
 
 #: libsvn_client/diff.c:1999
 msgid ""
@@ -1233,7 +1272,7 @@
 
 #: libsvn_client/diff.c:2351
 msgid "Summarizing diff can only compare repository to repository"
-msgstr ""
+msgstr "只能在档案库之间做摘要比较"
 
 #: libsvn_client/diff.c:2708 libsvn_client/diff.c:2714
 #: libsvn_client/diff.c:2847 libsvn_client/locking_commands.c:263
@@ -1268,14 +1307,14 @@
 msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
 
 #: libsvn_client/info.c:244
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot read entry for '%s'"
 msgstr "不能读“%s”的条目"
 
 #: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
-#, fuzzy, c-format
+#, c-format
 msgid "URL '%s' non-existent in revision %ld"
-msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
+msgstr "地址(URL)“%s”不存在于修订版“%ld”中"
 
 #: libsvn_client/list.c:225
 #, c-format
@@ -1291,12 +1330,12 @@
 msgstr "不能跨越多个档案库进行 锁定/解锁"
 
 #: libsvn_client/locking_commands.c:328
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "“%s”没有在工作拷贝中锁定"
 
 #: libsvn_client/locking_commands.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked"
 msgstr "“%s”没有被锁定"
 
@@ -1310,9 +1349,8 @@
 msgstr "未提供请求的修订版规格"
 
 #: libsvn_client/log.c:86
-#, fuzzy
 msgid "Revision type requires a working copy path, not a URL"
-msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+msgstr "修订版类型需要工作拷贝路径,不是URL"
 
 #: libsvn_client/log.c:139 libsvn_client/status.c:261
 #: libsvn_client/update.c:87
@@ -1321,7 +1359,6 @@
 msgstr "项目“%s”没有地址(URL)"
 
 #: libsvn_client/log.c:370
-#, fuzzy
 msgid "No commits in repository"
 msgstr "档案库中没有任何提交"
 
@@ -1336,7 +1373,7 @@
 msgstr "修订版属性“%s”在此上下文中并不允许"
 
 #: libsvn_client/prop_commands.c:166
-#, fuzzy, c-format
+#, c-format
 msgid "Setting property on non-local target '%s' is not supported"
 msgstr "设定非本地目标“%s”的属性尚不支持"
 
@@ -1350,7 +1387,7 @@
 msgstr "除非强迫为之,否则其值不会被设定"
 
 #: libsvn_client/prop_commands.c:466
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "路径“%s”不存在于修订版 %ld"
 
@@ -1398,9 +1435,9 @@
 "“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
 
 #: libsvn_client/relocate.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not the root of the repository"
-msgstr "”%s“没有在档案库中被锁定"
+msgstr "“%s”不是档案库的根目录"
 
 #: libsvn_client/relocate.c:108
 #, c-format
@@ -1408,9 +1445,9 @@
 msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
 
 #: libsvn_client/revisions.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' has no committed revision"
-msgstr "路径“%s”于 HEAD 修订版中找不到"
+msgstr "路径“%s”上没有提交的修订版"
 
 #: libsvn_client/revisions.c:109
 #, c-format
@@ -1419,15 +1456,15 @@
 
 #: libsvn_delta/svndiff.c:144
 msgid "Compression of svndiff data failed"
-msgstr ""
+msgstr "svndiff数据压缩失败"
 
 #: libsvn_delta/svndiff.c:407
 msgid "Decompression of svndiff data failed"
-msgstr ""
+msgstr "svndiff数据解压缩失败"
 
 #: libsvn_delta/svndiff.c:414
 msgid "Size of uncompressed data does not match stored original length"
-msgstr ""
+msgstr "解压缩后数据长度与原始长度不一致"
 
 #: libsvn_delta/svndiff.c:484
 #, c-format
@@ -1490,17 +1527,17 @@
 #: libsvn_diff/diff_file.c:593
 #, c-format
 msgid "The file '%s' changed unexpectedly during diff"
-msgstr ""
+msgstr "文件“%s”在比较期间被修改"
 
 #: libsvn_diff/diff_file.c:714
-#, fuzzy, c-format
+#, c-format
 msgid "Error parsing diff options"
-msgstr "分解“%s”时发生错误"
+msgstr "解析diff选项出错"
 
 #: libsvn_diff/diff_file.c:737
 #, c-format
 msgid "Invalid argument '%s' in diff options"
-msgstr ""
+msgstr "diff选项中的“%s”参数无效"
 
 #: libsvn_diff/diff_file.c:1019
 #, c-format
@@ -1519,9 +1556,9 @@
 msgstr "“%s”未定义 '%s()'"
 
 #: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%s”模块失败"
+msgstr "装载“%s”文件系统类型的模块失败"
 
 #: libsvn_fs/fs-loader.c:138
 #, c-format
@@ -1535,26 +1572,26 @@
 msgstr "未知的文件系统(FS)类别“%s”"
 
 #: libsvn_fs/fs-loader.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统(FS)互斥体"
+msgstr "不能分配文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:289
-#, fuzzy, c-format
+#, c-format
 msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统(FS)互斥体"
+msgstr "无法获取文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:295
 #, c-format
 msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统(FS)互斥体"
+msgstr "不能释放文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:901
 msgid "Negative expiration date passed to svn_fs_lock"
 msgstr "不能接受的有效期传递到 svn_fs_lock"
 
 #: libsvn_fs_base/bdb/bdb-err.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while %s:\n"
 msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
@@ -1585,7 +1622,7 @@
 
 #: libsvn_fs_base/bdb/changes-table.c:282
 #: libsvn_fs_base/bdb/changes-table.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading changes for key '%s'"
 msgstr "读关键字“%s”的更改时发生错误"
 
@@ -1600,7 +1637,6 @@
 msgstr "正在关闭更改指针"
 
 #: libsvn_fs_base/bdb/copies-table.c:85
-#, fuzzy
 msgid "storing copy record"
 msgstr "正在存储拷贝记录"
 
@@ -1618,7 +1654,6 @@
 
 # as-is
 #: libsvn_fs_base/bdb/copies-table.c:195
-#, fuzzy
 msgid "reading copy"
 msgstr "正在读取拷贝"
 
@@ -1631,7 +1666,7 @@
 msgstr "正在提取下一个节点 ID 关键字"
 
 #: libsvn_fs_base/bdb/nodes-table.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
 msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
 
@@ -1641,88 +1676,77 @@
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/nodes-table.c:218
-#, fuzzy
 msgid "reading node revision"
 msgstr "正在读取节点修订版"
 
 #: libsvn_fs_base/bdb/nodes-table.c:250
-#, fuzzy
 msgid "storing node revision"
 msgstr "正在存储节点修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "No such representation '%s'"
-msgstr "没有这样的请求 “%s”"
+msgstr "没有修订版“%s”"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/reps-table.c:96
-#, fuzzy
 msgid "reading representation"
-msgstr "正在读取请求"
+msgstr "正在读取修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:124
-#, fuzzy
 msgid "storing representation"
-msgstr "正在存储请求"
+msgstr "正在存储修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:154
 msgid "allocating new representation (getting next-key)"
-msgstr "正在分配新请求 (正在获取 next-key)"
+msgstr "正在分配新修订版(正在获取 next-key)"
 
 #: libsvn_fs_base/bdb/reps-table.c:175
-#, fuzzy
 msgid "bumping next representation key"
-msgstr "正在提取下一个请求关键字"
+msgstr "正在提取下一个修订版关键字"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/reps-table.c:203
-#, fuzzy
 msgid "deleting representation"
-msgstr "正在删除请求"
+msgstr "正在删除修订版"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/rev-table.c:87
-#, fuzzy
 msgid "reading filesystem revision"
-msgstr "正在读取文件系统修订版号"
+msgstr "正在读取文件系统修订版"
 
 #: libsvn_fs_base/bdb/strings-table.c:89
 msgid "creating cursor for reading a string"
 msgstr "正在为读取一个字符串创建指针"
 
 #: libsvn_fs_base/bdb/txn-table.c:92
-#, fuzzy
 msgid "storing transaction record"
 msgstr "正在存储事务记录"
 
 #: libsvn_fs_base/bdb/uuids-table.c:114
-#, fuzzy
 msgid "get repository uuid"
-msgstr "获取档案库唯一标记(uuid)"
+msgstr "获取档案库UUID"
 
 #: libsvn_fs_base/bdb/uuids-table.c:142
-#, fuzzy
 msgid "set repository uuid"
-msgstr "设置档案库唯一标记(uuid)"
+msgstr "设置档案库UUID"
 
 #: libsvn_fs_base/dag.c:217
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
 msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:225
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
+msgstr "损坏的数据库:初始的拷贝编号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:234
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
 msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:317
-#, fuzzy
 msgid "Attempted to create entry in non-directory parent"
 msgstr "企图在非目录的父节点创建条目"
 
@@ -1732,22 +1756,20 @@
 msgstr "企图用一个非法的名字“%s”创建节点"
 
 #: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:323
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to clone child of non-mutable node"
 msgstr "企图克隆非可变节点的子节点"
 
 #: libsvn_fs_base/dag.c:471
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to create entry that already exists"
 msgstr "企图创建已经存在的子条目"
 
 #: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:385
-#, fuzzy
 msgid "Attempted to set entry in non-directory node"
 msgstr "企图在非目录节点中设置条目"
 
 #: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:391
-#, fuzzy
 msgid "Attempted to set entry in immutable node"
 msgstr "企图在不可改变的节点设置条目"
 
@@ -1762,12 +1784,12 @@
 msgstr "企图以非法名字“%s”建立子克隆"
 
 #: libsvn_fs_base/dag.c:830
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to delete entry '%s' from *non*-directory node"
 msgstr "企图从非目录节点删除条目“%s”"
 
 #: libsvn_fs_base/dag.c:836
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to delete entry '%s' from immutable directory node"
 msgstr "企图从不可更改目录节点删除条目“%s”"
 
@@ -1777,12 +1799,12 @@
 msgstr "企图删除一个非法名字“%s”的节点"
 
 #: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
-#, fuzzy, c-format
+#, c-format
 msgid "Delete failed: directory has no entry '%s'"
 msgstr "删除失败:目录没有项目“%s”"
 
 #: libsvn_fs_base/dag.c:940
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted removal of immutable node"
 msgstr "企图删除不可改变的节点"
 
@@ -1802,25 +1824,25 @@
 msgstr "企图获取非文件节点的校验和"
 
 #: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "企图设置非文件节点文本内容"
+msgstr "企图设置非文件节点的文本内容"
 
 #: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to set textual contents of an immutable node"
-msgstr "企图设置不可改变节点文本内容"
+msgstr "企图设置不可改变节点的文本内容"
 
 #: libsvn_fs_base/dag.c:1235
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch, rep '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"校验和不匹配,报告“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"校验和不匹配,修订版“%s”:\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_base/dag.c:1290
 #, c-format
@@ -1887,32 +1909,32 @@
 msgstr "“%s”不是文件系统“%s”的目录"
 
 #: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgstr "“%s”不是文件系统“%s”的一个文件"
 
 #: libsvn_fs_base/err.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
 msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
 
 #: libsvn_fs_base/err.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
+msgstr "文件系统“%2$s”中的路径“%1$s”没有标识"
 
 #: libsvn_fs_base/err.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
+msgstr "文件系统“%2$s”中“%1$s”的 'locks' 表里锁损坏"
 
 #: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
 
 #: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
 
@@ -1922,12 +1944,12 @@
 msgstr "文件系统“%s”当前没有用户名关联"
 
 #: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
+msgstr "用户“%1$s”尝试使用文件系统“%3$s”中属于“%2$s”的锁"
 
 #: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
 
@@ -1942,24 +1964,23 @@
 msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
 
 #: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
-#, fuzzy
 msgid "Filesystem object already open"
 msgstr "文件系统对象已经打开"
 
 #: libsvn_fs_base/fs.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当关闭环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:539
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当创建环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:545
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当打开环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:281
 #, c-format
@@ -1967,32 +1988,28 @@
 msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
 
 #: libsvn_fs_base/fs.c:1094
-#, fuzzy
 msgid ""
 "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
 "may be interfering with the hotcopy algorithm. If \n"
 "the problem persists, try deactivating this feature \n"
 "in DB_CONFIG"
 msgstr ""
-"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
-"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
-"在 DB_CONFIG 中取消这个功能。"
+"复制logfile时发生错误;DB_LOG_AUTOREMOVE 特性可能干扰热拷贝算法。\n"
+"如果问题持续存在,请尝试在 DB_CONFIG 中取消这个特性。"
 
 #: libsvn_fs_base/fs.c:1113
-#, fuzzy
 msgid ""
 "Error running catastrophic recovery on hotcopy; the \n"
 "DB_LOG_AUTOREMOVE feature may be interfering with the \n"
 "hotcopy algorithm. If the problem persists, try deactivating \n"
 "this feature in DB_CONFIG"
 msgstr ""
-"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
-"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
-"尝试在 DB_CONFIG 中取消这个功能。"
+"对热拷贝执行灾后恢复时出错;DB_LOG_AUTOREMOVE 特性可能干扰热拷贝算法。\n"
+"如果问题持续存在,请尝试在 DB_CONFIG 中取消这个特性。"
 
 #: libsvn_fs_base/fs.c:1222
 msgid "Module for working with a Berkeley DB repository."
-msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
+msgstr "操作伯克利数据库(Berkeley DB)档案库的模块。"
 
 #: libsvn_fs_base/fs.c:1255
 #, c-format
@@ -2017,49 +2034,48 @@
 #. Helper macro that evaluates to an error message indicating that
 #. the representation referred to by X has an unknown node kind.
 #: libsvn_fs_base/reps-strings.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown node kind for representation '%s'"
-msgstr "“%s”为未知的节点类型"
+msgstr "修订版“%s”的节点类型未知"
 
 #: libsvn_fs_base/reps-strings.c:108
-#, fuzzy
 msgid "Representation is not of type 'delta'"
-msgstr "请求不是 “delta” 类型"
+msgstr "修订版不是 “delta” 类型"
 
 #: libsvn_fs_base/reps-strings.c:379
 msgid "Svndiff source length inconsistency"
-msgstr ""
+msgstr "Svndiff源长度不一致"
 
 #: libsvn_fs_base/reps-strings.c:506
 #, c-format
 msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%s”请求Diff 的版本冲突"
+msgstr "在“%s”修订版中 diff 的版本不一致"
 
 #: libsvn_fs_base/reps-strings.c:532
 #, c-format
 msgid ""
 "Corruption detected whilst reading delta chain from representation '%s' to '%"
 "s'"
-msgstr ""
+msgstr "从修订版“%s”到“%s”读取差异链时检测到损坏"
 
 #: libsvn_fs_base/reps-strings.c:780
 #, c-format
 msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,限制是 %s"
+msgstr "修订版内容太大: %s,最大只能 %s"
 
 #: libsvn_fs_base/reps-strings.c:796
-#, fuzzy, c-format
+#, c-format
 msgid "Failure reading rep '%s'"
-msgstr "读取报告“%s”失败"
+msgstr "读取修订版“%s”失败"
 
 #: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch on rep '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"报告“%s”的校验和不匹配:\n"
+"修订版“%s”的校验和不匹配:\n"
 " 预期: %s\n"
 " 实际: %s\n"
 
@@ -2068,14 +2084,14 @@
 msgstr "空的报告,偏移已经超过零值"
 
 #: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
-#, fuzzy, c-format
+#, c-format
 msgid "Rep '%s' is not mutable"
-msgstr "报告“%s”是不可变的"
+msgstr "修订版“%s”是不可变的"
 
 #: libsvn_fs_base/reps-strings.c:1040
 #, c-format
 msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s” 可变并且非全文本"
+msgstr "修订版“%s” 可变且非纯文本"
 
 #: libsvn_fs_base/reps-strings.c:1340
 msgid "Failed to get new string key"
@@ -2087,22 +2103,21 @@
 msgstr "企图 deltify “%s” 自身"
 
 #: libsvn_fs_base/reps-strings.c:1487
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%s”的MD5指纹失败"
+msgstr "计算“%s”的MD5摘要失败"
 
 #: libsvn_fs_base/revs-txns.c:65
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction is not dead: '%s'"
 msgstr "事务未结束:“%s”"
 
 #: libsvn_fs_base/revs-txns.c:68
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction is dead: '%s'"
 msgstr "事务已结束:“%s”"
 
 #: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
 msgid "Transaction aborted, but cleanup failed"
 msgstr "事务中止,但清除失败"
 
@@ -2110,7 +2125,7 @@
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT.
 #: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
+#, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "文件找不到:事务“%s” ,路径“%s”"
 
@@ -2121,7 +2136,7 @@
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
 
@@ -2131,32 +2146,30 @@
 msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
 
 #: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
-#, fuzzy
 msgid "Root object must be a transaction root"
-msgstr "根对象必须是一个事务的根对象"
+msgstr "根对象必须是一个根事务"
 
 #: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
+#, c-format
 msgid "Failure opening '%s'"
 msgstr "打开“%s”失败"
 
 #: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
-#, fuzzy
 msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个不同的文件系统之间比较属性值"
+msgstr "不能在两个不同的文件系统之间比较属性值"
 
 #: libsvn_fs_base/tree.c:1735
 msgid "Corrupt DB: faulty predecessor count"
 msgstr "无效的数据库:先前的数目不完整"
 
 #: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected immutable node at '%s'"
-msgstr "在“%s”有未知或意想不到的不可改变节点"
+msgstr "在“%s”不应有不可改变节点"
 
 # as-is
 #: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
+#, c-format
 msgid "Conflict at '%s'"
 msgstr "在“%s”冲突"
 
@@ -2171,67 +2184,64 @@
 msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
 
 #: libsvn_fs_base/tree.c:2373
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
+msgstr "关于修订版本“%2$s”的事务“%1$s”已经过期"
 
 #: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
-#, fuzzy
 msgid "The root directory cannot be deleted"
 msgstr "根目录不能删除"
 
 #: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy between two different filesystems ('%s' and '%s')"
-msgstr "在两个不同的文件系统之间比较属性值"
+msgstr "不能在两个不同的文件系统(“%s”和“%s”)之间比较属性值"
 
 #: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
 msgid "Copy from mutable tree not currently supported"
 msgstr "当前不支持从可变的树复制"
 
 #: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Base checksum mismatch on '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"基本校验和在“%s”不匹配:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"基校验和在“%s”不匹配:\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
-#, fuzzy
 msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个不同的文件系统询问内容的更改"
+msgstr "不能在两个不同的文件系统间比较文件内容"
 
 #: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
 #: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
 #: libsvn_repos/rev_hunt.c:605
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a file"
 msgstr "“%s”不是一个文件"
 
 #: libsvn_fs_fs/dag.c:367
-#, fuzzy
 msgid "Can't get entries of non-directory"
 msgstr "不能获取非目录的条目"
 
 #: libsvn_fs_fs/dag.c:914
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch, file '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
 "校验和不匹配,文件“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_fs/err.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
+msgstr "文件系统“%2$s”中路径“%1$s”的锁文件损坏"
 
 #: libsvn_fs_fs/fs.c:97
 #, c-format
@@ -2239,7 +2249,7 @@
 msgstr "不能获取文件系统(FSFS)互斥体"
 
 #: libsvn_fs_fs/fs.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create FSFS mutex"
 msgstr "无法创建文件系统(FSFS)互斥体"
 
@@ -2264,7 +2274,7 @@
 #: libsvn_fs_fs/fs_fs.c:591 libsvn_fs_fs/fs_fs.c:605 libsvn_fs_fs/fs_fs.c:612
 #: libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627 libsvn_fs_fs/fs_fs.c:635
 msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 中没有 text rep offset 列"
+msgstr "node-rev 中有畸形的文本表示偏移行"
 
 #: libsvn_fs_fs/fs_fs.c:704
 msgid "Missing kind field in node-rev"
@@ -2288,7 +2298,7 @@
 
 #: libsvn_fs_fs/fs_fs.c:975
 msgid "Malformed representation header"
-msgstr "畸形的描述文件头"
+msgstr "畸形的修订版文件头"
 
 #: libsvn_fs_fs/fs_fs.c:999
 msgid "Missing node-id in node-rev"
@@ -2320,12 +2330,12 @@
 
 #: libsvn_fs_fs/fs_fs.c:1224
 msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff 数据畸形"
+msgstr "修订版的svndiff 数据畸形"
 
 # as-is
 #: libsvn_fs_fs/fs_fs.c:1367 libsvn_fs_fs/fs_fs.c:1380
 msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "正在读取请求的一个 svndiff 窗口最末端"
+msgstr "读取一个svndiff窗口时超出了修订版的结尾"
 
 #: libsvn_fs_fs/fs_fs.c:1516
 msgid "svndiff data requested non-existent source"
@@ -2340,13 +2350,13 @@
 msgstr "svndiff 的窗格长度已毁损"
 
 #: libsvn_fs_fs/fs_fs.c:1610
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch while reading representation:\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"当读取请求时校验和不匹配:\n"
+"读取修订版时校验和不匹配:\n"
 " 预期: %s\n"
 " 实际: %s\n"
 
@@ -2378,16 +2388,15 @@
 msgstr "自事务进行复制是不被允许的"
 
 #: libsvn_fs_fs/fs_fs.c:2503
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
+msgstr "无法在“%s”中为修订版 %ld 创建事务目录"
 
 #: libsvn_fs_fs/fs_fs.c:2680 libsvn_fs_fs/fs_fs.c:2687
 msgid "next-id file corrupt"
 msgstr "next-id 文件损坏"
 
 #: libsvn_fs_fs/fs_fs.c:2772
-#, fuzzy
 msgid "Transaction cleanup failed"
 msgstr "事务清除失败"
 
@@ -2435,19 +2444,19 @@
 msgstr "无此事务"
 
 #: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "无法写入锁/条目的混杂文件“%s”"
+msgstr "无法写入锁-条目的哈希文件“%s”"
 
 #: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "不能分析锁/条目的混杂文件“%s“"
+msgstr "不能解析锁-条目的哈希文件“%s“"
 
 #: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%s”不存在于最新修订版中"
+msgstr "路径“%s”不存在于HEAD修订版中"
 
 #: libsvn_fs_fs/lock.c:741
 #, c-format
@@ -2455,31 +2464,25 @@
 msgstr "锁失败:新的版本“%s”已经存在"
 
 #: libsvn_ra/ra_loader.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+msgstr "“%s”的 RA 版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
 #: libsvn_ra/ra_loader.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+msgstr "无法识别“%s”中的URL方案"
 
 #: libsvn_ra/ra_loader.c:336
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' isn't in the same repository as '%s'"
-msgstr ""
-"“%s”\n"
-"与\n"
-"“%s”\n"
-"并不在同一个档案库中"
+msgstr "“%s”与“%s”并不在同一个档案库中"
 
 # as-is
 #: libsvn_ra/ra_loader.c:707
-#, fuzzy, c-format
+#, c-format
 msgid " - handles '%s' scheme\n"
-msgstr " - 处理“%s”规则\n"
+msgstr " - 处理“%s”方案\n"
 
 #: libsvn_ra/ra_loader.c:793
 #, c-format
@@ -2500,22 +2503,22 @@
 msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
 
 #: libsvn_ra_dav/commit.c:487
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create a CHECKOUT request (%s)"
 msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
 
 #: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
 #: libsvn_ra_serf/commit.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录”%s“或许已经过时"
+msgstr "您的文件或目录“%s”很可能已经过期"
 
 #: libsvn_ra_dav/commit.c:582
 msgid "The CHECKOUT response did not contain a 'Location:' header"
 msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
 
 #: libsvn_ra_dav/commit.c:881
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create a DELETE request (%s)"
 msgstr "无法产生一个删除(DELETE)请求 (%s)"
 
@@ -2544,9 +2547,9 @@
 msgstr "无法储存版本资源的地址(URL)"
 
 #: libsvn_ra_dav/fetch.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "Could not get content-type from response"
-msgstr "不能从回应中获得内容类型(content-type)"
+msgstr "不能从响应中获得内容类型(content-type)"
 
 #: libsvn_ra_dav/fetch.c:451
 #, c-format
@@ -2575,7 +2578,7 @@
 
 #: libsvn_ra_dav/fetch.c:1151
 msgid "Server response missing the expected deadprop-count property"
-msgstr ""
+msgstr "服务端响应丢失了deadprop-count属性"
 
 #: libsvn_ra_dav/fetch.c:1324
 msgid "Server does not support date-based operations"
@@ -2587,21 +2590,18 @@
 
 # as-is
 #: libsvn_ra_dav/fetch.c:1470
-#, fuzzy
 msgid "'get-locations' REPORT not implemented"
 msgstr "get-locations REPORT 未实现"
 
 #: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
 #: libsvn_ra_dav/session.c:1474
-#, fuzzy
 msgid "Incomplete lock data returned"
 msgstr "返回了不完全的锁数据"
 
 #: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
 #: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
-#, fuzzy
 msgid "Server does not support locking features"
-msgstr "服务器不支持锁定特性"
+msgstr "服务器不支持加锁"
 
 #: libsvn_ra_dav/fetch.c:1908
 msgid ""
@@ -2628,7 +2628,6 @@
 
 # as-is
 #: libsvn_ra_dav/file_revs.c:363
-#, fuzzy
 msgid "'get-file-revs' REPORT not implemented"
 msgstr "get-file-revs REPORT 未实现"
 
@@ -2694,12 +2693,12 @@
 
 #: libsvn_ra_dav/props.c:685
 msgid "The path was not part of a repository"
-msgstr "路径不是档案库的一部份"
+msgstr "路径不是档案库的一部分"
 
 #: libsvn_ra_dav/props.c:696
 #, c-format
 msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
+msgstr "路径“%s”的任何一部分在档案库 HEAD 中都找不到"
 
 #: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
 msgid "The VCC property was not found on the resource"
@@ -2722,55 +2721,52 @@
 msgstr "至少有一个属性变更失败;档案库未改变"
 
 #: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
-#, fuzzy
 msgid "Missing revision attr in target-revision element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "target-revision元素丢失了revision属性"
 
 #: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
-#, fuzzy
 msgid "Missing revision attr in open-root element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-root元素丢失了revisioin属性"
 
 #: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
 msgid "Missing name attr in delete-entry element"
-msgstr ""
+msgstr "delete-entry元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:176
 msgid "Missing rev attr in delete-entry element"
-msgstr ""
+msgstr "delete-entry元素丢失了rev属性"
 
 #: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
-#, fuzzy
 msgid "Missing name attr in open-directory element"
-msgstr "未提供属性名称与档案库路径参数"
+msgstr "open-directory元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
 #: libsvn_ra_serf/replay.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "Missing name attr in %s element"
-msgstr "未提供属性名称参数"
+msgstr "“%s”元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:288
 msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr ""
+msgstr "apply-textdelta元素之前没有add-file或者open-file元素"
 
 #: libsvn_ra_dav/replay.c:314
 msgid "Got close-file element without preceding add-file or open-file"
-msgstr ""
+msgstr "close-file元素之前没有add-file或者open-file元素"
 
 #: libsvn_ra_dav/replay.c:329
 msgid "Got close-directory element without ever opening a directory"
-msgstr ""
+msgstr "close-directory元素之前没有打开过目录"
 
 #: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing stream: unexpected EOF"
-msgstr "写入流时发生错误:意想不到的 EOF"
+msgstr "写入流时发生错误:提前到达文件末尾"
 
 #: libsvn_ra_dav/replay.c:463
 #, c-format
 msgid "Got cdata content for a prop delete"
-msgstr ""
+msgstr "删除属性时碰到cdata内容"
 
 #: libsvn_ra_dav/session.c:444
 msgid "Invalid URL: illegal character in proxy port number"
@@ -2829,34 +2825,30 @@
 msgstr "请将服务器升级至 0.19 或更新的版本"
 
 #: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
-#, fuzzy
 msgid "Failed to parse URI"
-msgstr "分析地址(URI)失败"
+msgstr "解析URI失败"
 
 #: libsvn_ra_dav/session.c:1183
-#, fuzzy
 msgid "Lock request failed"
 msgstr "锁请求失败"
 
 #: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked in the repository"
-msgstr "”%s“没有在档案库中被锁定"
+msgstr "档案库中的“%s”没有被锁定"
 
 #: libsvn_ra_dav/session.c:1349
-#, fuzzy
 msgid "Unlock request failed"
-msgstr "解除锁请求失败"
+msgstr "解锁请求失败"
 
 #: libsvn_ra_dav/session.c:1560
-#, fuzzy
 msgid "Failed to fetch lock information"
 msgstr "获取锁信息失败"
 
 #: libsvn_ra_dav/session.c:1633
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_dav RA加载器"
 
 #: libsvn_ra_dav/util.c:275
 msgid "authorization failed"
@@ -2933,9 +2925,9 @@
 
 # as-is
 #: libsvn_ra_local/ra_plugin.c:1340
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
+msgstr "不支持%d版本的ra_local RA 载入器"
 
 #: libsvn_ra_local/split_url.c:44
 #, c-format
@@ -2959,84 +2951,76 @@
 
 #: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
 #: libsvn_repos/commit.c:393
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' not present"
 msgstr "路径“%s”不存在"
 
 #: libsvn_ra_serf/commit.c:910
 #, c-format
 msgid "Failed writing updated file"
-msgstr ""
+msgstr "写更新文件失败"
 
 #: libsvn_ra_serf/getlocations.c:289
-#, fuzzy
 msgid "File doesn't exist on HEAD"
-msgstr "路径“%s”不存在于最新修订版中"
+msgstr "路径“%s”不存在于HEAD修订版中"
 
 #: libsvn_ra_serf/locks.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "Lock request failed: %d %s"
-msgstr "锁请求失败"
+msgstr "锁请求失败:%d %s"
 
 #: libsvn_ra_serf/locks.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "Unlock request failed: %d %s"
-msgstr "解除锁请求失败"
+msgstr "解锁请求失败:%d %s"
 
 #: libsvn_ra_serf/replay.c:204
-#, fuzzy
 msgid "Missing revision attr in delete-entry element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "delete-entry元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:230
-#, fuzzy
 msgid "Missing revision attr in open-directory element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-directory元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:250
-#, fuzzy
 msgid "Missing name attr in add-directory element"
-msgstr "未提供属性名称与档案库路径参数"
+msgstr "add-directory元素丢失了name属性"
 
 #: libsvn_ra_serf/replay.c:285
-#, fuzzy
 msgid "Missing name attr in open-file element"
-msgstr "未提供属性名称参数"
+msgstr "open-file元素丢失了name属性"
 
 #: libsvn_ra_serf/replay.c:291
-#, fuzzy
 msgid "Missing revision attr in open-file element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-file元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:311
-#, fuzzy
 msgid "Missing name attr in add-file element"
-msgstr "未提供属性名称参数"
+msgstr "add-file元素丢失了name属性"
 
-# as-is
+# serf是一个WebDAV库
 #: libsvn_ra_serf/serf.c:52
-#, fuzzy
 msgid "Access repository via WebDAV protocol through serf."
-msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
+msgstr "使用serf库通过WebDAV协议访问档案库。"
 
 #: libsvn_ra_serf/serf.c:155
 #, c-format
 msgid "Could not lookup hostname: %s://%s"
-msgstr ""
+msgstr "找�到主机:%s://%s"
 
 #: libsvn_ra_serf/serf.c:741
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_serf RA加载器"
 
 #: libsvn_ra_serf/update.c:2114
 #, c-format
 msgid "Error retrieving REPORT (%d)"
-msgstr ""
+msgstr "获取报告时出错(%d)"
 
 #: libsvn_ra_serf/util.c:743
 msgid "Premature EOF seen from server"
-msgstr ""
+msgstr "服务端发送的数据流提前终止"
 
 #: libsvn_ra_svn/client.c:115
 #, c-format
@@ -3119,7 +3103,7 @@
 
 #: libsvn_ra_svn/client.c:880
 msgid "Non-string as part of file contents"
-msgstr "文件内容的一部份不是字串"
+msgstr "文件内容的一部分不是字串"
 
 # as-is
 #: libsvn_ra_svn/client.c:979
@@ -3138,13 +3122,11 @@
 
 # as-is
 #: libsvn_ra_svn/client.c:1225
-#, fuzzy
 msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+msgstr "stat未实现"
 
 # as-is
 #: libsvn_ra_svn/client.c:1282
-#, fuzzy
 msgid "'get-locations' not implemented"
 msgstr "get-locations 未实现"
 
@@ -3155,7 +3137,6 @@
 
 # as-is
 #: libsvn_ra_svn/client.c:1344
-#, fuzzy
 msgid "'get-file-revs' not implemented"
 msgstr "get-file-revs 未实现"
 
@@ -3173,65 +3154,56 @@
 msgstr "get-file-revs 命令没有返回任何修订版"
 
 #: libsvn_ra_svn/client.c:1455
-#, fuzzy
 msgid "Server doesn't support the lock command"
-msgstr "服务器不支持锁命令"
+msgstr "服务器不支持加锁命令"
 
 #: libsvn_ra_svn/client.c:1519
-#, fuzzy
 msgid "Server doesn't support the unlock command"
-msgstr "服务器不支持解除锁命令"
+msgstr "服务器不支持解锁命令"
 
 # as-is
 #: libsvn_ra_svn/client.c:1616
-#, fuzzy
 msgid "Lock response not a list"
-msgstr "锁元素不是一个列表"
+msgstr "加锁响应不是一个列表"
 
 #: libsvn_ra_svn/client.c:1630
-#, fuzzy
 msgid "Unknown status for lock command"
-msgstr "未知的 svn 通讯协定命令"
+msgstr "加锁命令的状态未知"
 
 #: libsvn_ra_svn/client.c:1652
 msgid "Didn't receive end marker for lock responses"
-msgstr ""
+msgstr "加锁响应丢失了结尾标记"
 
 # as-is
 #: libsvn_ra_svn/client.c:1739
-#, fuzzy
 msgid "Unlock response not a list"
-msgstr "锁元素不是一个列表"
+msgstr "解锁响应不是一个列表"
 
 #: libsvn_ra_svn/client.c:1753
-#, fuzzy
 msgid "Unknown status for unlock command"
-msgstr "命令回应中的未知状态“%s”"
+msgstr "解锁命令的状态未知"
 
 #: libsvn_ra_svn/client.c:1774
 msgid "Didn't receive end marker for unlock responses"
-msgstr ""
+msgstr "解锁响应丢失了结束标记"
 
 #: libsvn_ra_svn/client.c:1798 libsvn_ra_svn/client.c:1826
-#, fuzzy
 msgid "Server doesn't support the get-lock command"
-msgstr "服务器不支持获取锁命令get-lock"
+msgstr "服务器不支持命令get-lock"
 
 # as-is
 #: libsvn_ra_svn/client.c:1839
-#, fuzzy
 msgid "Lock element not a list"
-msgstr "锁元素不是一个列表"
+msgstr "Lock元素不是一个列表"
 
 #: libsvn_ra_svn/client.c:1862
-#, fuzzy
 msgid "Server doesn't support the replay command"
-msgstr "服务器不支持锁命令"
+msgstr "服务器不支持replay命令"
 
 #: libsvn_ra_svn/client.c:1926
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_svn RA加载器"
 
 #: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
 #: libsvn_ra_svn/sasl_auth.c:302 libsvn_ra_svn/sasl_auth.c:357
@@ -3246,12 +3218,12 @@
 
 #: libsvn_ra_svn/editor.c:621
 msgid "Non-string as part of text delta"
-msgstr "文件差异的一部份不是字串"
+msgstr "文件差异的一部分不是字串"
 
 #: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
 #, c-format
 msgid "Command 'finish-replay' invalid outside of replays"
-msgstr ""
+msgstr "finish-replay命令只在重放时有效"
 
 # as-is
 #: libsvn_ra_svn/editorp.c:129
@@ -3319,7 +3291,7 @@
 
 #: libsvn_ra_svn/sasl_auth.c:155
 msgid "Could not initialize the SASL library"
-msgstr ""
+msgstr "初始化SASL库失败"
 
 #: libsvn_ra_svn/sasl_auth.c:215 libsvn_ra_svn/simple_auth.c:58
 #: libsvn_ra_svn/simple_auth.c:110
@@ -3329,7 +3301,7 @@
 
 #: libsvn_ra_svn/sasl_auth.c:232
 msgid "Unhandled SASL interaction"
-msgstr ""
+msgstr "未处理的SASL交互"
 
 #: libsvn_ra_svn/simple_auth.c:97 libsvn_subr/prompt.c:156
 #, c-format
@@ -3405,15 +3377,15 @@
 
 # as-is
 #: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+msgstr "* 已导出修订版 %ld。\n"
 
 # as-is
 #: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
+#, c-format
 msgid "* Verified revision %ld.\n"
-msgstr "* 校验修订版 %ld。\n"
+msgstr "* 已校验修订版 %ld。\n"
 
 #: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1211
 msgid "Commit succeeded, but post-commit hook failed"
@@ -3427,9 +3399,9 @@
 msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
 
 #: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
+msgstr "拒绝写入:未授权读取所有修订版 %ld。"
 
 #: libsvn_repos/fs-wrap.c:484
 #, c-format
@@ -3437,9 +3409,8 @@
 msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
 
 #: libsvn_repos/fs-wrap.c:498
-#, fuzzy
 msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
+msgstr "解锁成功,但是post-unlock外挂失败"
 
 #: libsvn_repos/hooks.c:71
 #, c-format
@@ -3447,14 +3418,14 @@
 msgstr "无法为外挂“%s”创建管道"
 
 #: libsvn_repos/hooks.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgstr "无法为“%s”外挂创建非继承的管道读句柄"
 
 #: libsvn_repos/hooks.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgstr "无法为“%s”外挂创建非继承的管道写句柄"
 
 #: libsvn_repos/hooks.c:98
 #, c-format
@@ -3467,7 +3438,7 @@
 msgstr "关闭标准错误管道末尾发生错误"
 
 #: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to start '%s' hook"
 msgstr "运行外挂“%s”失败"
 
@@ -3481,7 +3452,7 @@
 "%s"
 
 #: libsvn_repos/hooks.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' hook failed; no error output available"
 msgstr "外挂“%s”失败;没有可用的错误输出"
 
@@ -3518,12 +3489,12 @@
 #: libsvn_repos/load.c:173
 #, c-format
 msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr ""
+msgstr "导出流在“%.20s”包含错误头部(没有“:”)"
 
 #: libsvn_repos/load.c:186
 #, c-format
 msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr ""
+msgstr "导出流在“%.20s”包含错误头部(没有值)"
 
 #: libsvn_repos/load.c:273
 msgid "Incomplete or unterminated property block"
@@ -3591,7 +3562,6 @@
 msgstr "“%s”的节点种动作法辨识"
 
 #: libsvn_repos/load.c:1158
-#, fuzzy
 msgid " done.\n"
 msgstr "完成。\n"
 
@@ -3639,9 +3609,8 @@
 msgstr "未授权打开根进行编辑操作"
 
 #: libsvn_repos/reporter.c:842
-#, fuzzy
 msgid "Target path does not exist"
-msgstr "路径“%s”不存在"
+msgstr "目标路径不存在"
 
 #: libsvn_repos/reporter.c:849
 msgid "Cannot replace a directory from within"
@@ -3709,9 +3678,8 @@
 msgstr "正在创建 passwd 文件"
 
 #: libsvn_repos/repos.c:1527
-#, fuzzy
 msgid "Creating authz file"
-msgstr "正在创建 passwd 文件"
+msgstr "正在创建 authz 文件"
 
 #: libsvn_repos/repos.c:1560
 msgid "Could not create top-level directory"
@@ -3730,7 +3698,7 @@
 msgstr "档案库创建失败"
 
 #: libsvn_repos/repos.c:1756
-#, fuzzy, c-format
+#, c-format
 msgid "Expected format '%d' of repository; found format '%d'"
 msgstr "预期档案库格式“%d”;找到格式“%d”"
 
@@ -3750,14 +3718,13 @@
 msgstr "无效的结束修订版 %ld"
 
 #: libsvn_repos/rev_hunt.c:315
-#, fuzzy
 msgid "Unreadable path encountered; access denied"
-msgstr "遇到不能读的路径;访问拒绝。"
+msgstr "遇到不可读的路径;访问被拒绝"
 
 #: libsvn_subr/cmdline.c:481
 #, c-format
 msgid "Error initializing command line arguments"
-msgstr ""
+msgstr "初始化命令行参数出错"
 
 #: libsvn_subr/config.c:630
 #, c-format
@@ -3807,14 +3774,14 @@
 msgstr "无法明确时间"
 
 #: libsvn_subr/dso.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Can't grab DSO mutex"
-msgstr "无法获取文件系统(FS)互斥体"
+msgstr "无法获取动态共享对象(DSO)互斥体"
 
 #: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "Can't ungrab DSO mutex"
-msgstr "不能释放文件系统(FS)互斥体"
+msgstr "无法释放动态共享对象(DSO)互斥体"
 
 #: libsvn_subr/error.c:326
 msgid "Can't recode error string from APR"
@@ -3915,19 +3882,19 @@
 
 # as-is
 #: libsvn_subr/io.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open file at '%s'"
 msgstr "不能打开文件“%s”"
 
 #: libsvn_subr/io.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+msgstr "不能获取“%s”文件的权限(文件 stat 错误)"
 
 #: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
-#, fuzzy, c-format
+#, c-format
 msgid "Can't change perms of file '%s'"
-msgstr "不能改变文件“%s”为可读写权限"
+msgstr "不能改变文件“%s”的权限"
 
 #: libsvn_subr/io.c:1370
 #, c-format
@@ -3998,7 +3965,7 @@
 #: libsvn_subr/io.c:1811
 #, c-format
 msgid "Can't rewind directory '%s'"
-msgstr "无法返回目录“%s”"
+msgstr "无法回绕目录“%s”"
 
 #: libsvn_subr/io.c:2003
 #, c-format
@@ -4013,32 +3980,32 @@
 #: libsvn_subr/io.c:2021
 #, c-format
 msgid "Can't set process '%s' directory"
-msgstr "无法设定进程“%s”目录"
+msgstr "无法设定进程“%s”的目录"
 
 #: libsvn_subr/io.c:2034
 #, c-format
 msgid "Can't set process '%s' child input"
-msgstr "无法设置子进程“%s”输入"
+msgstr "无法设置进程“%s”的子输入"
 
 #: libsvn_subr/io.c:2041
 #, c-format
 msgid "Can't set process '%s' child outfile"
-msgstr "无法设置子进程“%s”输出文件"
+msgstr "无法设置进程“%s”的子输出文件"
 
 #: libsvn_subr/io.c:2048
 #, c-format
 msgid "Can't set process '%s' child errfile"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的子错误文件"
 
 #: libsvn_subr/io.c:2055
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set process '%s' child errfile for error handler"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的子错误输出文件"
 
 #: libsvn_subr/io.c:2061
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set process '%s' error handler"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的错误处理函数"
 
 # as-is
 #: libsvn_subr/io.c:2084
@@ -4145,12 +4112,11 @@
 
 # as-is
 #: libsvn_subr/io.c:2639
-#, fuzzy, c-format
+#, c-format
 msgid "Can't read length line in file '%s'"
 msgstr "不能从文件“%s”读取长度行"
 
 #: libsvn_subr/io.c:2643
-#, fuzzy
 msgid "Can't read length line in stream"
 msgstr "无法从数据流读取长度行"
 
@@ -4210,12 +4176,11 @@
 msgstr "“%s”的第一行包含了非阿拉伯数字"
 
 #: libsvn_subr/nls.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string to UCS-2: '%s'"
 msgstr "不能把字符串转换为UCS-2:“%s”。"
 
 #: libsvn_subr/nls.c:86
-#, fuzzy
 msgid "Can't get module file name"
 msgstr "无法获取模块文件名"
 
@@ -4278,7 +4243,6 @@
 
 # as-is
 #: libsvn_subr/opt.c:957
-#, fuzzy
 msgid ""
 "Copyright (C) 2000-2006 CollabNet.\n"
 "Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4286,8 +4250,8 @@
 "Net/).\n"
 "\n"
 msgstr ""
-"版权所有 (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
+"版权所有 (C) 2000-2006 CollabNet.\n"
+"Subversion 是开放�代�软件,请�考 http://subversion.tigris.org/\n"
 "此产å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
 "\n"
 
@@ -4312,9 +4276,9 @@
 msgstr "不能确定本地路径编码"
 
 #: libsvn_subr/path.c:1253
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
+msgstr "在路径“%2$s”存在无效的控制字符“0x%1$02x”"
 
 #: libsvn_subr/prompt.c:97 svnserve/main.c:490
 #, c-format
@@ -4402,9 +4366,9 @@
 msgstr "“%s”的密码:"
 
 #: libsvn_subr/subst.c:1559
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has unsupported special file type '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgstr "“%s”存在不支持的特殊文件类型“%s”"
 
 #: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
 #, c-format
@@ -4420,51 +4384,51 @@
 msgstr "不能解锁字符转换互斥体"
 
 #: libsvn_subr/utf.c:271
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from native encoding to '%s'"
 msgstr "不能创建从本地编码到“%s”的字符转换器"
 
 #: libsvn_subr/utf.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%s' to native encoding"
 msgstr "不能创建从“%s”到本地编码的字符转换器"
 
 #: libsvn_subr/utf.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%s' to '%s'"
 msgstr "不能创建从“%s”到“%s”的字符转换器"
 
 #: libsvn_subr/utf.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%i' to '%i'"
-msgstr "不能创建从“%s”到“%s”的字符转换器"
+msgstr "不能创建从“%i”到“%i”的字符转换器"
 
 #: libsvn_subr/utf.c:513
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from native encoding to '%s':"
-msgstr "不能把字符串从本地编码转换为”%s“编码。"
+msgstr "不能把字符串从本地编码转换为“%s”编码:"
 
 #: libsvn_subr/utf.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from '%s' to native encoding:"
-msgstr "不能把字符串从”%s“编码转换为本地编码。"
+msgstr "不能把字符串从“%s”编码转换为本地编码:"
 
 #: libsvn_subr/utf.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from '%s' to '%s':"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
+msgstr "不能把字符串从“%s”编码转换为“%s”编码:"
 
 #: libsvn_subr/utf.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
+msgstr "不能把字符串从CCSID“%i”转换为CCSID“%i”:"
 
 #: libsvn_subr/utf.c:572
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
 "UTF-8"
-msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
+msgstr "安全数据“%s”是后接非ASCII字节%d:不能转换到/自 UTF-8"
 
 #: libsvn_subr/utf.c:580
 #, c-format
@@ -4524,9 +4488,9 @@
 msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
 
 #: libsvn_wc/adm_files.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid administrative directory name"
-msgstr "“%s”不是文件名也不是目录名"
+msgstr "“%s”不是一个有效的管理目录名"
 
 # plz leave this as-is
 #: libsvn_wc/adm_files.c:260
@@ -4594,11 +4558,11 @@
 msgstr "“%s”已纳入版本控制"
 
 #: libsvn_wc/adm_ops.c:1128
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't replace '%s' with a node of a differing type; the deletion must be "
 "committed and the parent updated before adding '%s'"
-msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
+msgstr "无法以不同类型节点来替换“%s”;在新增“%s”前必须提交删除操作并更新父目录"
 
 #: libsvn_wc/adm_ops.c:1145
 #, c-format
@@ -4611,14 +4575,14 @@
 msgstr "无法新增“%s”至已预定要删除的父目录"
 
 #: libsvn_wc/adm_ops.c:1166
-#, fuzzy, c-format
+#, c-format
 msgid "The URL '%s' has a different repository root than its parent"
-msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
+msgstr "地址(URL)“%s”与其前一修订版的档案库根目录不同"
 
 #: libsvn_wc/adm_ops.c:1495
 #, c-format
 msgid "Error restoring text for '%s'"
-msgstr "还原“%s”文字时发生错误"
+msgstr "还原“%s”文本时出错"
 
 #: libsvn_wc/adm_ops.c:1626
 #, c-format
@@ -4681,9 +4645,9 @@
 msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
 #: libsvn_wc/copy.c:578
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
+msgstr "无法复制到“%s”,因为它不是来自于档案库“%s”而是“%s”"
 
 #: libsvn_wc/copy.c:585
 #, c-format
@@ -4697,25 +4661,22 @@
 msgstr "项目“%s”有无效的“%s”值"
 
 #: libsvn_wc/entries.c:111
-#, fuzzy
 msgid "Invalid escape sequence"
-msgstr "无效的计划任务"
+msgstr "无效的转义序列"
 
 #: libsvn_wc/entries.c:118
-#, fuzzy
 msgid "Invalid escaped character"
-msgstr "无效的变更类型"
+msgstr "无效的转义字符"
 
 #: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
 #: libsvn_wc/entries.c:203
-#, fuzzy
 msgid "Unexpected end of entry"
-msgstr "找到一个意料之外的节点种类"
+msgstr "条目提前终止"
 
 #: libsvn_wc/entries.c:225
 #, c-format
 msgid "Invalid value for field '%s'"
-msgstr ""
+msgstr "“%s”域的值无效"
 
 #: libsvn_wc/entries.c:307 libsvn_wc/entries.c:537
 #, c-format
@@ -4723,9 +4684,9 @@
 msgstr "项目“%s”有无效的节点种类"
 
 #: libsvn_wc/entries.c:328 libsvn_wc/entries.c:514
-#, fuzzy, c-format
+#, c-format
 msgid "Entry for '%s' has invalid repository root"
-msgstr "“%s”的入口档案库根目录无效"
+msgstr "“%s”条目的档案库根目录无效"
 
 #: libsvn_wc/entries.c:944
 #, c-format
@@ -4745,24 +4706,22 @@
 msgstr "默认项目没有地址(URL)"
 
 #: libsvn_wc/entries.c:1089
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid version line in entries file of '%s'"
-msgstr "写入“%s”的项目文件时发生错误"
+msgstr "“%s”条目文件中的版本行无效"
 
 #: libsvn_wc/entries.c:1106
-#, fuzzy
 msgid "Missing entry terminator"
-msgstr "丢失默认项目"
+msgstr "条目终结符丢失"
 
 #: libsvn_wc/entries.c:1109
-#, fuzzy
 msgid "Invalid entry terminator"
-msgstr "无效的目标路径"
+msgstr "无效的条目终止符"
 
 #: libsvn_wc/entries.c:1113
-#, fuzzy, c-format
+#, c-format
 msgid "Error at entry %d in entries file for '%s':"
-msgstr "写入“%s”的项目文件时发生错误"
+msgstr "“%2$s”条目文件中的%1$d条目出错"
 
 #: libsvn_wc/entries.c:1209
 #, c-format
@@ -4877,39 +4836,39 @@
 msgstr "路径“%s”以“%s”结束,本操作不支持"
 
 #: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to check path existence for '%s'"
-msgstr "不能使用名字“%s”"
+msgstr "无法检查路径“%s”是否存在"
 
 #: libsvn_wc/lock.c:937
 #, c-format
 msgid "Expected '%s' to be a directory but found a file"
-msgstr ""
+msgstr "期望“%s”是一个目录,但它是一个文件"
 
 #: libsvn_wc/lock.c:944
-#, fuzzy, c-format
+#, c-format
 msgid "Expected '%s' to be a file but found a directory"
-msgstr "地址(URL)“%s”指向一个文件,而非目录"
+msgstr "期望“%s”是一个文件,但它是一个目录"
 
 #: libsvn_wc/lock.c:963
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' is missing"
-msgstr "目录“%s”没有地址(URL)"
+msgstr "目录“%s”丢失"
 
 #: libsvn_wc/lock.c:968
 #, c-format
 msgid "Directory '%s' containing working copy admin area is missing"
-msgstr ""
+msgstr "包含工作拷贝管理区的目录“%s”丢失了"
 
 #: libsvn_wc/lock.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock '%s'"
-msgstr "无法打开编辑"
+msgstr "无法锁定“%s”"
 
 #: libsvn_wc/lock.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Working copy '%s' is not locked"
-msgstr "工作拷贝“%s”被锁定了"
+msgstr "工作拷贝“%s”未被锁定"
 
 #: libsvn_wc/lock.c:1371
 #, c-format
@@ -4966,14 +4925,14 @@
 msgstr "修改“%s”的项目时发生错误"
 
 #: libsvn_wc/log.c:857
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing lock from entry for '%s'"
 msgstr "移除条目“%s”的锁时发生错误"
 
 #: libsvn_wc/log.c:880
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing changelist from entry '%s'"
-msgstr "读关键字“%s”的更改时发生错误"
+msgstr "删去“%s”条目上的更改列表时发生错误"
 
 #: libsvn_wc/log.c:1010
 #, c-format
@@ -5016,9 +4975,8 @@
 msgstr "修改“%s”的项目时发生错误"
 
 #: libsvn_wc/log.c:1514
-#, fuzzy
 msgid "Invalid 'format' attribute"
-msgstr "无效的配置值"
+msgstr "无效的format属性"
 
 #: libsvn_wc/log.c:1549
 #, c-format
@@ -5088,12 +5046,10 @@
 "但是属性并不存在。"
 
 #: libsvn_wc/props.c:679
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Trying to delete property '%s' but value has been modified from '%s' to '%s'."
-msgstr ""
-"尝试添加新属性“%s”的值为“%s”,\n"
-"但是属性已经存在,值为“%s”。"
+msgstr "尝试删除属性“%s”,但是其值已从“%s”修改为“%s”。"
 
 #: libsvn_wc/props.c:697
 #, c-format
@@ -5105,9 +5061,9 @@
 "但是属性的值已经是“%s”了。"
 
 #: libsvn_wc/props.c:880
-#, fuzzy, c-format
+#, c-format
 msgid "Missing end of line in wcprops file for '%s'"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "wcprops文件“%s”丢失了行终止符"
 
 #: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
 #: libsvn_wc/props.c:1626
@@ -5183,7 +5139,7 @@
 
 #: libsvn_wc/relocate.c:69
 msgid "Relocate can only change the repository part of an URL"
-msgstr ""
+msgstr "Relocate只能改变URL中的档案库部分"
 
 #: libsvn_wc/update_editor.c:390
 #, c-format
@@ -5201,18 +5157,18 @@
 msgstr "写入“%s”的日志文件时发生错误"
 
 #: libsvn_wc/update_editor.c:1078
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to add directory '%s': a non-directory object of the same name "
 "already exists"
-msgstr "无法新增目录“%s”:同名物件已存在"
+msgstr "无法新增目录“%s”:档案库中已存在同名非目录对象"
 
 #: libsvn_wc/update_editor.c:1108
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to forcibly add directory '%s': a versioned directory of the same "
 "name already exists"
-msgstr "无法新增目录“%s”:同名物件已存在"
+msgstr "无法强制新增目录“%s”:档案库中已存在同名的目录"
 
 #: libsvn_wc/update_editor.c:1121
 #, c-format
@@ -5250,10 +5206,10 @@
 msgstr "无法将“%s”标记为不存在:同名项目已加入新增调度"
 
 #: libsvn_wc/update_editor.c:1534
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Failed to add file '%s': a non-file object of the same name already exists"
-msgstr "无法新增文件“%s”:同名物件已存在"
+msgstr "无法新增文件“%s”:档案库中已存在同名非文件对象"
 
 #: libsvn_wc/update_editor.c:1545
 #, c-format
@@ -5283,7 +5239,7 @@
 msgstr "“%s”没有演进历程信息"
 
 #: libsvn_wc/update_editor.c:3014
-#, fuzzy, c-format
+#, c-format
 msgid "Copyfrom-url '%s' has different repository root than '%s'"
 msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
 
@@ -5325,9 +5281,8 @@
 msgstr "无法打开标准错误 (stderr)"
 
 #: svn/diff-cmd.c:184
-#, fuzzy
 msgid "'--new' option only valid with '--old' option"
-msgstr "只有在XML模式“增加”选项才有效"
+msgstr "--new选项只有和--old选项一同使用时才有效"
 
 #: svn/diff-cmd.c:214
 #, c-format
@@ -5341,7 +5296,7 @@
 msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
 
 #: svn/help-cmd.c:45
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: svn <subcommand> [options] [args]\n"
 "Subversion command-line client, version %s.\n"
@@ -5357,10 +5312,12 @@
 msgstr ""
 "用法:svn <subcommand> [options] [args]\n"
 "Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
-"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
-"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
-"行递归存取。\n"
+"使用“svn help <subcommand>”显示特定子命令帮助。\n"
+"使用“svn --version”查看程序以及RA模块的版本号,或者\n"
+"使用“svn --version --quiet”仅查看程序版本号。\n"
+"\n"
+"大多数的子命令可接受文件或目录参数,对目录进行递归处理,如没有指定参数,则默认\n"
+"对当前目录(包含当前目录)递归处理。\n"
 "\n"
 "可用的子命令:\n"
 
@@ -5394,9 +5351,9 @@
 msgstr "无效地址(URL)“%s”"
 
 #: svn/info-cmd.c:111
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has invalid revision"
-msgstr "项目“%s”有无效的节点种类"
+msgstr "“%s”有无效的修订版"
 
 #: svn/info-cmd.c:267 svnadmin/main.c:1046
 #, c-format
@@ -5415,7 +5372,7 @@
 msgstr "地址(URL):%s\n"
 
 #: svn/info-cmd.c:280
-#, fuzzy, c-format
+#, c-format
 msgid "Repository Root: %s\n"
 msgstr "档案库根路径:%s\n"
 
@@ -5563,14 +5520,14 @@
 "%s\n"
 
 #: svn/info-cmd.c:425
-#, fuzzy, c-format
+#, c-format
 msgid "Changelist: %s\n"
-msgstr "校验和:%s\n"
+msgstr "更改列表: %s\n"
 
 #: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, fuzzy, c-format
+#, c-format
 msgid "no such changelist '%s'"
-msgstr "没有这样的项目:“%s”"
+msgstr "没有“%s”这样的更改列表"
 
 #: svn/info-cmd.c:539
 #, c-format
@@ -5582,7 +5539,7 @@
 "\n"
 
 #: svn/info-cmd.c:548
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: (Not a valid URL)\n"
 "\n"
@@ -5591,9 +5548,8 @@
 "\n"
 
 #: svn/lock-cmd.c:52
-#, fuzzy
 msgid "Lock comment contains a zero byte"
-msgstr "锁定的注释中有一个零字节"
+msgstr "加锁注释中有一个零字节"
 
 #: svn/log-cmd.c:162
 msgid "(no author)"
@@ -5636,9 +5592,8 @@
 msgstr "显示子命令帮助"
 
 #: svn/main.c:65
-#, fuzzy
 msgid "specify log message ARG"
-msgstr "指定提交信息ARG"
+msgstr "指定日志消息ARG"
 
 #: svn/main.c:66
 msgid "print as little as possible"
@@ -5657,9 +5612,10 @@
 "the change made by revision ARG (like -r ARG-1:ARG)\n"
 " If ARG is negative this is like -r ARG:ARG-1"
 msgstr ""
+"在ARG修订版(如同 -r ARG-1:ARG)作的修改\n"
+" 如果ARG为负数则等价于 -r ARG:ARG-1"
 
 #: svn/main.c:74
-#, fuzzy
 msgid ""
 "ARG (some commands also take ARG1:ARG2 range)\n"
 " A revision argument can be one of:\n"
@@ -5671,19 +5627,18 @@
 " 'COMMITTED' last commit at or before BASE\n"
 " 'PREV' revision just before COMMITTED"
 msgstr ""
-"ARG (一些命令需要 ARG1:ARG2 )\n"
+"ARG (一些命令也接受ARG1:ARG2范围)\n"
 " 修订版参数可以是:\n"
-" 数字 修订版号\n"
-" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作条目 \n"
-" \"COMMITTED\" 最后提交或基线之前\n"
-" \"PREV\" 修订版提交之前"
+" NUMBER 修订版号\n"
+" '{' DATE '}' 在指定时间以后的修订版\n"
+" 'HEAD' 档案库中的最新修订版\n"
+" 'BASE' 工作拷贝的基线版本\n"
+" 'COMMITTED' 最后一次提交的修订版\n"
+" 'PREV' COMMITTED的前一修订版"
 
 #: svn/main.c:84
-#, fuzzy
 msgid "read log message from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件ARG读取日志消息"
 
 #: svn/main.c:86
 msgid "give output suitable for concatenation"
@@ -5696,9 +5651,8 @@
 #: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
 #: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
 #: svnversion/main.c:125
-#, fuzzy
 msgid "show program version information"
-msgstr "显示版本信息"
+msgstr "显示程序版本信息"
 
 #: svn/main.c:93
 msgid "print extra information"
@@ -5737,6 +5691,17 @@
 " --ignore-eol-style:\n"
 " Ignore changes in EOL style"
 msgstr ""
+"缺省:“-u”。当Subversion调用一个外部diff程序时,\n"
+" ARG直接传给这个程序。但是当Subversion使用缺省的\n"
+" 内部diff实现或者正显示blame评注时,ARG可以是:\n"
+" -u (--unified):\n"
+" 输出三行统一上下文。\n"
+" -b (--ignore-space-change):\n"
+" 忽略空白数量的更改。\n"
+" -w (--ignore-all-space):\n"
+" 忽略所有的空白。\n"
+" --ignore-eol-style:\n"
+" 忽略EOL样式的更改。"
 
 #: svn/main.c:130
 msgid "pass contents of file ARG as additional args"
@@ -5772,7 +5737,7 @@
 
 #: svn/main.c:144 svnlook/main.c:111
 msgid "do not print differences for deleted files"
-msgstr "不要打印已删除文件的不同处"
+msgstr "不要输出删除文件造成的差异"
 
 #: svn/main.c:146
 msgid "notice ancestry when calculating differences"
@@ -5827,16 +5792,14 @@
 msgstr "使自动属性无效"
 
 #: svn/main.c:174
-#, fuzzy
 msgid ""
 "use a different EOL marker than the standard\n"
 " system marker for files with the svn:eol-style\n"
 " property set to 'native'.\n"
 " ARG may be one of 'LF', 'CR', 'CRLF'"
 msgstr ""
-"使用一个与标准不同的 EOL 标记\n"
-" 系统为文件标记 svn:eol-style 属性为 'native'。\n"
-" ARG 可以是以下之一 'LF','CR','CRLF'"
+"设置svn:eol-style为“native”以在文件中使用非系统默认的行结束标记。\n"
+" ARG 可以是以下之一:'LF','CR','CRLF'"
 
 #: svn/main.c:182
 msgid "maximum number of log entries"
@@ -5848,19 +5811,19 @@
 
 #: svn/main.c:186
 msgid "show a summary of the results"
-msgstr ""
+msgstr "显示结果的摘要"
 
 #: svn/main.c:188
 msgid "remove changelist association"
-msgstr ""
+msgstr "删除更改列表关联"
 
 #: svn/main.c:190
 msgid "operate only on members of changelist ARG"
-msgstr ""
+msgstr "仅用于更改列表ARG的成员"
 
 #: svn/main.c:192
 msgid "don't delete changelist after commit"
-msgstr ""
+msgstr "不要在提交后删除更改列表"
 
 #: svn/main.c:231
 msgid ""
@@ -5908,6 +5871,9 @@
 "usage: 1. changelist CLNAME TARGET...\n"
 " 2. changelist --clear TARGET...\n"
 msgstr ""
+"在本地路径和更改列表CLNAME之间建立关联(或者取消关联)。\n"
+"用法:1. changelist CLNAME 目标...\n"
+" 2. changelist --clear 目标...\n"
 
 #: svn/main.c:263
 msgid ""
@@ -5933,6 +5899,18 @@
 " to the working copy. All properties from the repository are applied\n"
 " to the obstructing path.\n"
 msgstr ""
+"从档案库签出一份工作拷贝。\n"
+"用法:checkout URL[@修订版]... [路径]\n"
+"\n"
+" 如果指定修订版参数,则从这个修订版开始查找URL。\n"
+"\n"
+" 如果忽略路径参数,则URL最末尾的目录名作为目标目录名。如果指定多个URL,则依次将\n"
+" 其签出到路径参数指定的目录的子目录中,子目录名字就是URL最末尾的目录名。\n"
+"\n"
+" 如果使用了--force选项,那么目标目录中的未受版本管理的同名路径不会自动使签出失败。\n"
+" 如果这个路径的类型(文件或者目录)与档案库中对应路径一样,则这个路径被纳入版本管理,\n"
+" 并且不修改其原有内容,如果它跟档案库中相应文件内容不一致,则看作是本地修改。档案库\n"
+" 中此路径拥有的属性会全部应用到这个同名路径上。\n"
 
 #: svn/main.c:288
 msgid ""
@@ -5940,12 +5918,11 @@
 "unfinished operations, etc.\n"
 "usage: cleanup [PATH...]\n"
 msgstr ""
-"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
+"递归清理工作拷贝,去除锁,继续未完成操作,等等。\n"
 "\n"
 "用法:cleanup [路径...]\n"
 
 #: svn/main.c:295
-#, fuzzy
 msgid ""
 "Send changes from your working copy to the repository.\n"
 "usage: commit [PATH...]\n"
@@ -5955,16 +5932,14 @@
 " If any targets are (or contain) locked items, those will be\n"
 " unlocked after a successful commit.\n"
 msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
+"把更改从工作拷贝发送到档案库。\n"
 "用法:commit [路径...]\n"
 "\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+" 必须提供日志消息,但它可以是空的。如果没有指定 --message 或 --file 选项,\n"
+" 则会启动一个编辑器。如果任何目标是锁定的或者包含锁定条目,则在成功提交后它\n"
+" 们都会被解锁。\n"
 
 #: svn/main.c:303
-#, fuzzy
 msgid ""
 "Send changes from your working copy to the repository.\n"
 "usage: commit [PATH...]\n"
@@ -5975,13 +5950,12 @@
 " (or contain) locked items, those will be unlocked after a\n"
 " successful commit.\n"
 msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
+"把更改从工作拷贝发送到档案库。\n"
 "用法:commit [路径...]\n"
 "\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+" 必须提供日志消息,但它可以是空的。OS400不支持启动编辑器,因此必须指定--message\n"
+" 或 --file 选项。如果任何目标是锁定的或者包含锁定条目,则在成功提交后它们都会被\n"
+" 解锁。\n"
 
 #: svn/main.c:318
 msgid ""
@@ -6032,7 +6006,6 @@
 " \n"
 
 #: svn/main.c:346
-#, fuzzy
 msgid ""
 "Display the differences between two revisions or paths.\n"
 "usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6060,31 +6033,29 @@
 "\n"
 " Use just 'svn diff' to display local modifications in a working copy.\n"
 msgstr ""
-"显示两个路径中的差异。\n"
+"显示两个路径或者两个修订版的差异。\n"
 "用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
-" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
+" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
+" [路径...]\n"
+" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
 "\n"
-" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
-" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
+" 1、显示修订版REV中“目标”在两个不同的修订版N、M之间的差异。“目标”要么全是工作拷贝\n"
+" 路径,要么全是地址(URL)。\n"
 "\n"
-" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
-" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
-" HEAD。\n"
-"\n"
-" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
-" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
-" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
-" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
-" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
-" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
-"法。\n"
+" 如果“目标”是工作拷贝路径,N 默认为 BASE,M 指工作拷贝;\n"
+" 如果“目标”是URL,N 必须指定, M 默认是HEAD。\n"
+" \n"
+" “-c M”等价与“-r M-1:M”,“-c -M”等价与“-r M:M-1”。\n"
+"\n"
+" 2、显示新旧修订版中对应目标的差异。“路径”是相对于新旧目标的相对路径,它限制只输出这些\n"
+" 路径上的差异。新旧目标可以是工作拷贝路径或地址URL[@REV]。新目标默认与旧目标相同,\n"
+" OLDREV 默认为 N,NEWREV 默认为 M。\n"
 "\n"
-" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
+" 3、“svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]”的简写。\n"
+"\n"
+" 不加参数使用“svn diff”显示工作拷贝中的本地修改。\n"
 
 #: svn/main.c:376
-#, fuzzy
 msgid ""
 "Create an unversioned copy of a tree.\n"
 "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6106,20 +6077,19 @@
 " looked up.\n"
 msgstr ""
 "产生一个无版本控制的目录树拷贝。\n"
-"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
+"用法: 1、export [-r REV] URL[@PEGREV] [PATH]\n"
 " 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
 "\n"
-" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
-" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
-" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
-"\n"
-" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
-" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
-" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
-" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
-" 版本控制的文件不会被复制。\n"
+" 1、从 URL 指定的档案库导出一个干净的目录树到 PATH。REV缺省为HEAD。如果省略PATH,\n"
+" 地址(URL)的最后部分会被当成目标目录名。\n"
+"\n"
+" 2、从PATH1指定的工作拷贝导出一个干净的目录树到 PATH2,REV缺省为工作版本。\n"
+" 如果省略PATH2,PATH1 的最后部分会被用来当成目标目录名。如果省略REV,\n"
+" 所有的本地修改都会被导出。没有纳入版本控制的文件不会被拷贝。\n"
+" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入版本控制\n"
+" 的文件不会被复制。\n"
 "\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+" 如果指定了PEGREV ,则从此修订版开始查找目标。\n"
 "\n"
 
 #: svn/main.c:399
@@ -6131,7 +6101,6 @@
 "用法:help [子命令...]\n"
 
 #: svn/main.c:405
-#, fuzzy
 msgid ""
 "Commit an unversioned file or tree into the repository.\n"
 "usage: import [PATH] URL\n"
@@ -6142,14 +6111,14 @@
 " If PATH is a directory, the contents of the directory are added\n"
 " directly under URL.\n"
 msgstr ""
-"提交未纳入版本控制的文件或目录树至档案库。\n"
+"将未纳入版本控制的文件或目录树导入档案库。\n"
 "用法:import [PATH] URL\n"
 "\n"
-" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
-" 依需要于档案库内建立。\n"
+" 递归地提交 PATH 的拷贝至地址(URL),PATH默认为 '.'。\n"
+" 父目录会依需要于档案库内建立。如果 PATH是一个目录,则其下的内容直接加入到\n"
+" URL指定的位置下。\n"
 
 #: svn/main.c:418
-#, fuzzy
 msgid ""
 "Display information about a local or remote item.\n"
 "usage: info [TARGET[@REV]...]\n"
@@ -6161,11 +6130,11 @@
 "显示本地或远端条目的信息。\n"
 "用法:info [TARGET...]\n"
 "\n"
-" 显示每个 TARGET 的信息 (默认:'.')。\n"
-" TARGET 可以是工作目录或地址(URL)。\n"
+" 显示每个 TARGET 的信息 (默认是'.')。\n"
+" TARGET 可以是工作拷贝中的路径或档案库中的地址(URL)。REV指定在哪一个\n"
+" 修订版中查找目标。\n"
 
 #: svn/main.c:428
-#, fuzzy
 msgid ""
 "List directory entries in the repository.\n"
 "usage: list [TARGET[@REV]...]\n"
@@ -6186,25 +6155,23 @@
 " Size (in bytes)\n"
 " Date and time of the last commit\n"
 msgstr ""
-"列出档案库中的目录项目。\n"
+"列出档案库中的目录内容。\n"
 "用法:list [TARGET[@REV]...]\n"
 "\n"
-" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 显示档案库中文件和子目录列表。如果 TARGET 是工作拷贝路径,那么操作对应的档案库地址\n"
+" (URL)上的TARGET。REV指定从在哪个修订版查找TARGET。\n"
 "\n"
-" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
+" TARGET默认是'.',表示当前工作目录对应的档案库地址(URL)。\n"
 "\n"
-" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
+" 加上 --verbose 的话,每个条目会显示以下额外信息:\n"
 "\n"
-" 前次提交的修订版号码\n"
-" 前次提交的作者\n"
+" 最后一次提交的修订版号码\n"
+" 最后一次提交的作者\n"
 " 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
 " 大小 (以字节为单位)\n"
-" 前次提交的日期与时间\n"
+" 最后一次提交的日期与时间\n"
 
 #: svn/main.c:450
-#, fuzzy
 msgid ""
 "Lock working copy paths or URLs in the repository, so that\n"
 "no other user can commit changes to them.\n"
@@ -6212,24 +6179,20 @@
 "\n"
 " Use --force to steal the lock from another user or working copy.\n"
 msgstr ""
-"在档案库中锁定工作目录或地址(URL),\n"
-"使得其他用户不能向它提交修改。\n"
+"锁定档案库中中的路径,使得其他用户不能向其提交修改。\n"
 "用法:lock TARGET...\n"
 "\n"
-" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
+" 使用 --force 选项可以从其他用户或工作拷贝窃取到锁。\n"
 
 #: svn/main.c:458
-#, fuzzy
 msgid "read lock comment from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件 ARG 读取加锁注释"
 
 #: svn/main.c:459
-#, fuzzy
 msgid "specify lock comment ARG"
-msgstr "指定提交信息ARG"
+msgstr "指定加锁注释ARG"
 
 #: svn/main.c:462
-#, fuzzy
 msgid ""
 "Show the log messages for a set of revision(s) and/or file(s).\n"
 "usage: 1. log [PATH]\n"
@@ -6259,20 +6222,19 @@
 msgstr ""
 "显示一组修订版与/或文件的提交日志信息。\n"
 "用法:1、log [PATH]\n"
-" 2、log URL [PATH...]\n"
+" 2、log URL[@REV] [PATH...]\n"
 "\n"
 " 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
 " BASE:1。\n"
 "\n"
-" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" HEAD:1。\n"
+" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。REV指定从哪一个修订版开始查找\n"
+" URL。默认的修订版范围为 HEAD:1。\n"
 "\n"
-" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
+" 使用 -v 时,在日志信息中显示受影响的路径名。\n"
 " 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v å¹¶å­˜)。\n"
 "\n"
-" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
-" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
-" 个功能,这在找出分支点的很方便。\n"
+" 每一条日志信息只会显示一次,即使指定某一个更改中涉及到的多个文件。默认log信息会\n"
+" 追溯复制历史;使用 --stop-on-copy 可以关闭这种行为,这便于找出分支点。\n"
 "\n"
 " 范例:\n"
 " svn log\n"
@@ -6281,7 +6243,6 @@
 " svn log http://www.example.com/repo/project foo.c bar.c\n"
 
 #: svn/main.c:492
-#, fuzzy
 msgid ""
 "Apply the differences between two sources to a working copy path.\n"
 "usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6311,22 +6272,17 @@
 "将两个来源之间的差异应用至工作拷贝路径。\n"
 "用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
 " 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
+" 3、merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
 "\n"
-" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
-" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
+" 1、第一种形式中,源 URL 的修订版 N 与 M作为比较的来源。如果没有指定修订版,默认为 HEAD。\n"
 "\n"
-" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
-" 进行比较的来源。这里必须指定修订版。\n"
+" 2、在第二种形式中,两个源工作拷贝路径对应的档案库中的URL作为比较的来源。这里必须指定修订版。\n"
 "\n"
-" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
-" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
-"作\n"
-" 比较。如果未指定 REV,就会假设为 HEAD。\n"
-"\n"
-" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
-" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝中的路径,后者会使用档案库中对应的地址(URL)。\n"
+" 比较源就是REV修订版中的地址(URL) 在修订版 N 和 M时的状态。REV默认为HEAD。\n"
+"\n"
+" WCPATH 是接收更改的工作拷贝路径。如果省略 WCPATH 的话,默认值为'.',除非来源中有与当前目录\n"
+" 中同名的文件,这时更改会直接应用至该文件去。\n"
 
 #: svn/main.c:521
 msgid ""
@@ -6358,7 +6314,6 @@
 " 在这两个情况下,所有的中间目录都必须事先存在。\n"
 
 #: svn/main.c:538
-#, fuzzy
 msgid ""
 "Move and/or rename something in working copy or repository.\n"
 "usage: move SRC DST\n"
@@ -6370,17 +6325,17 @@
 " WC -> WC: move and schedule for addition (with history)\n"
 " URL -> URL: complete server-side rename.\n"
 msgstr ""
-"移动或更名工作拷贝或档案库里的东西。\n"
+"移动或更名工作拷贝或档案库里的文件或目录。\n"
 "用法:move SRC DST\n"
 "\n"
-" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
+" 注意:本子命令等同于 'copy' 然后 'delete'。\n"
+" 注意:此命令不能使用--revision选项。\n"
 "\n"
 " SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
 " WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
 " URL -> URL : 完全是服务器端的更名。\n"
 
 #: svn/main.c:551
-#, fuzzy
 msgid ""
 "Remove a property from files, dirs, or revisions.\n"
 "usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6390,15 +6345,15 @@
 " 2. Removes unversioned remote prop on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"移除目录,文件,或修订版的属性。\n"
+"移除目录、文件或修订版的属性。\n"
 "用法:1、propdel PROPNAME [PATH...]\n"
 " 2、propdel PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、移除纳入版本控制的工作拷贝属性。\n"
-" 2、移除无版本控制的远端档案库修订版属性。\n"
+" 1、移除工作拷贝中纳入版本管理的文件或目录上的属性。\n"
+" 2、移除档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:563
-#, fuzzy
 msgid ""
 "Edit a property with an external editor.\n"
 "usage: 1. propedit PROPNAME PATH...\n"
@@ -6408,15 +6363,15 @@
 " 2. Edits unversioned remote prop on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"以外部编辑器编辑目标的属性 PROPNAME。\n"
-"用法:1、propedit PROPNAME PATH...\n"
+"启动外部编辑器编辑属性。\n"
+"用法:1、propedit PROPNAME [PATH...]\n"
 " 2、propedit PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、编辑纳入版本控制的工作拷贝属性。\n"
-" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
+" 1、编辑工作拷贝中纳入版本管理的文件或目录上的属性。\n"
+" 2、编辑档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:576
-#, fuzzy
 msgid ""
 "Print the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6434,21 +6389,19 @@
 " the --strict option to disable these beautifications (useful,\n"
 " for example, when redirecting binary property values to a file).\n"
 msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
+"显示目录、文件或修订版的一个属性。\n"
 "用法:1、propget PROPNAME [TARGET[@REV]...]\n"
 " 2、propget PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、显示纳入版本控制的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、显示无版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
-" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
-" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
-" 将二进制属性内容重导至一个文件时就很有用)。\n"
+" 1、显示目标上的属性。REV指定从哪一个修订版开始查找目标。\n"
+" 2、显示档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
+"\n"
+" 本子命令默认会在属性内容加上额外的换行符,如此可得到较美观的输出。另外,当同时\n"
+" 处理多个路径时,每一个属性内容会在开头添加上它所对应的路径。使用 --strict 选项\n"
+" 以关闭这项美化行为 (这样做利于将二进制属性内容重定向至一个文件时)。\n"
 
 #: svn/main.c:595
-#, fuzzy
 msgid ""
 "List all properties on files, dirs, or revisions.\n"
 "usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6459,16 +6412,15 @@
 " 2. Lists unversioned remote props on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
+"列出目录、文件或修订版上的所有属性。\n"
 "用法:1、proplist [TARGET[@REV]...]\n"
-" 2、proplist --revprop -r REV [URL]\n"
+" 2、proplist --revprop -r REV [TARGET]\n"
 "\n"
-" 1、列出纳入版本管理的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、列出无版本控制的远端档案库修订版属性改变。\n"
+" 1、列出纳入版本管理的工作拷贝属性。REV指定从哪一个修订版开始查找目标。\n"
+" 2、列出档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:607
-#, fuzzy
 msgid ""
 "Set the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6512,43 +6464,44 @@
 " attempt will fail, and a recursive attempt will set the property\n"
 " only on the file children of the directory.\n"
 msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
-" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
-"\n"
-" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
-" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
-" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
-" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
-" Rev, Revision, - 本物件最后一次改变的修订版。\n"
-" LastChangedRevision\n"
-" Id - 前四个关键字的压缩摘要。\n"
-" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
-" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
-" 下的文件子项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
-" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文字,其它则为二进制数据。\n"
-" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
-" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
+"设定目录、文件或修订版的属性。\n"
+"用法:1、propset PROPNAME PROPVAL PATH...\n"
+" 2、propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1、在工作拷贝中创建或者修改一个属性。\n"
+" 2、在档案库中REV修订版上创建或者修改一个属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
+"\n"
+" 如果没有PROPVAL参数,则必须提供--file选项。\n"
+"\n"
+" 注意:svn 除了能存储任意属性外,还识别以下特殊版本控制属性:\n"
+" svn:ignore - 以换行符隔开的忽略文件模式列表。\n"
+" svn:keywords - 将被展开的关键字。有效的关键字为。\n"
+" URL, HeadURL - 此对象HEAD版本的地址(URL)。\n"
+" Author, LastChangedBy - 最后一次修改文件的人。\n"
+" Date, LastChangedDate - 此对象最近一次更改的日期。\n"
+" Rev, Revision, - 此对象最后一次更改的修订版。\n"
+" LastChangedRevision\n"
+" Id - 前四个关键字的紧凑摘要。\n"
+" svn:executable - 如果存在此属性则设置文件为可执行的。\n"
+" svn:eol-style - 'native','LF','CR','CRLF'之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
+" 以及Apache如何处理它。mime类别以 'text/' (或是没有指定 mime 类别)\n"
+" 开头的文件会被视为纯文本文件,否则就是二进制数据。\n"
+" svn:externals - 以换行符隔开的模块说明列表,每一条说明都由一个相对路径、\n"
+" 可选的修订版标志、一个URL组成。例如:\n"
 " foo http://example.com/repos/zig\n"
 " foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
-"锁定,把工作拷贝文件设置为只读。\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
-"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
-"作只会在目录下的文件设置属性。\n"
+" svn:needs-lock - 如果存在此属性则表明此文件在修改前应被加锁,如果没有被加锁\n"
+" 则此文件在工作拷贝中应被设为只读。\n"
+"\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及\n"
+" svn:needs-lock 属性不能设置在一个目录上。不能在设置这些属性时使用非递归选项\n"
+" (-N),递归操作时只会作用于指定目录下的文件上。\n"
 
 #: svn/main.c:649
-#, fuzzy
 msgid "read property value from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件 ARG 读取属性值"
 
 #: svn/main.c:652
 msgid ""
@@ -6573,14 +6526,13 @@
 " Note: this subcommand does not require network access, and resolves\n"
 " any conflicted states. However, it does not restore removed directories.\n"
 msgstr ""
-"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
+"恢复原始未改变的工作拷贝文件 (恢复大部分的本地修改)。\n"
 "用法:revert PATH...\n"
 "\n"
 " 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
 " 被删除的目录\n"
 
 #: svn/main.c:670
-#, fuzzy
 msgid ""
 "Print the status of working copy files and directories.\n"
 "usage: status [PATH...]\n"
@@ -6654,15 +6606,15 @@
 " 965 687 joe wc/zig.c\n"
 " Status against revision: 981\n"
 msgstr ""
-"显示工作拷贝目录与文件的状态。\n"
+"显示工作拷贝中目录与文件的状态。\n"
 "用法:status [PATH...]\n"
 "\n"
-" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
-" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
-" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
+" 未指定参数时,只显示本地修改的条目 (没有网络的存取操作)。\n"
+" 使用 -u 时,加上工作修订版与针对服务器上版本是否过期的信息。\n"
+" 使用 -v 时,显示每一个条目的完整修订版信息。\n"
 "\n"
-" 输出的前五个栏位各为一个字符宽:\n"
-" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
+" 输出的前六栏各占一个字符宽度:\n"
+" 第一栏:表示一个项目是新增、删除,还是修改的\n"
 " ' ' 无修改\n"
 " 'A' 新增\n"
 " 'C' 冲突\n"
@@ -6672,40 +6624,41 @@
 " 'M' 改变\n"
 " 'R' 替换\n"
 " 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
+" '?' 未纳入版本控制\n"
 " '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
-" '~' 版本控制下的项目被不同类型的所替换\n"
+" '~' 版本控制下的项目与其它类型的项目重名\n"
 " 第二栏:显示目录或文件的属性状态\n"
 " ' ' 无修改\n"
 " 'C' 冲突\n"
 " 'M' 改变\n"
-" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
+" 第三栏:工作拷贝目录是否被锁定\n"
 " ' ' 未锁定\n"
 " 'L' 锁定\n"
-" 第四栏:预定要连同历史记录被新增\n"
-" ' ' 预定的提交并不包含历史记录\n"
-" '+' 预定的提交包含历史记录\n"
-" 第五栏:该项目相对其父目录是否已被切换\n"
+" 第四栏:已调度的提交是否包含拷贝历史(区分是svn add还是svn copy引起的add)\n"
+" ' ' 不包含\n"
+" '+' 包含\n"
+" 第五栏:该条目相对其父目录是否已切换(有无svn switch操作)\n"
 " ' ' 正常\n"
-" 'S' 被切换\n"
-" 第六栏:档案库锁定标记 (没有 -u)\n"
+" 'S' 已切换\n"
+" 第六栏:档案库锁定标记\n"
+" (没有 -u时)\n"
 " ' ' 没有锁定标记\n"
 " 'K' 存在锁定标记\n"
-" (有 -u)\n"
+" (有 -u时)\n"
 " ' ' 没有在档案库中锁定,没有锁定标记\n"
 " 'K' 在档案库中被锁定,存在锁定标记\n"
 " 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
 " 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
 " 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
 "\n"
-" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
+" 是否过期的信息出现的位置是第八栏 (与 -u 并用时):\n"
 " '*' 服务器上有更新修订版\n"
 " ' ' 工作拷贝是最新版的\n"
 "\n"
 " 剩余的栏位皆为变动宽度,并以空白隔开:\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
+" 工作修订版号 (与 -u 或 -v 并用时)\n"
 " 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
-" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
+" 工作拷贝路径总是最后一栏,所以它可以包含空白字符。\n"
 "\n"
 " 范例输出:\n"
 " svn status wc\n"
@@ -6726,7 +6679,6 @@
 " Status against revision: 981\n"
 
 #: svn/main.c:746
-#, fuzzy
 msgid ""
 "Update the working copy to a different URL.\n"
 "usage: 1. switch URL [PATH]\n"
@@ -6756,15 +6708,20 @@
 "用法:1、switch URL [PATH]\n"
 " 2、switch --relocate FROM TO [PATH...]\n"
 "\n"
-" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
-" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
-"\n"
-" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
-" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
-" 档案库的同一目录时用之。\n"
+" 1、更新你的工作拷贝,映射到一个新的地址(URL),其行为跟“svn update”很像,也会将\n"
+" 服务器上文件与本地文件合并。这是将工作拷贝对应到同一档案库中某个分支或者标记的\n"
+" 方法。\n"
+"\n"
+" 2、改写工作拷贝的URL元数据,以反映单纯的URL上的改变。当档案库的根地址(URL)变动 \n"
+" (比如方案名或是主机名称变动),但是工作拷贝仍旧对映到同一档案库的同一目录时使用\n"
+" 这个命令更新工作拷贝与档案库的对应关系。\n"
+"\n"
+" 如果使用了--force选项,那么目标目录中的未受版本管理的同名路径不会自动使切换失败。\n"
+" 如果这个路径的类型(文件或者目录)与档案库中对应路径一样,则这个路径被纳入版本管理,\n"
+" 并且不修改其原有内容,如果它跟档案库中相应文件内容不一致,则看作是本地修改。档案库\n"
+" 中此路径拥有的属性会全部应用到这个同名路径上。 \n"
 
 #: svn/main.c:773
-#, fuzzy
 msgid ""
 "Unlock working copy paths or URLs.\n"
 "usage: unlock TARGET...\n"
@@ -6774,10 +6731,9 @@
 "解除工作拷贝或地址(URL)的锁定。\n"
 "用法:unlock TARGET...\n"
 "\n"
-" 使用 -force 中止锁定。\n"
+" 使用 --force 中止锁定。\n"
 
 #: svn/main.c:781
-#, fuzzy
 msgid ""
 "Bring changes from the repository into the working copy.\n"
 "usage: update [PATH...]\n"
@@ -6812,24 +6768,28 @@
 " are applied to the obstructing path. Obstructing paths are reported\n"
 " in the first column with code 'E'.\n"
 msgstr ""
-"将档案库的改变反应至工作拷贝。\n"
+"将档案库的更改合并到工作拷贝中。\n"
 "用法:update [PATH...]\n"
 "\n"
-" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
-" 不然的话,同步至 -r 选项所指定的修订版。\n"
+" 如果没有指定修订版,则将工作拷贝更新至 HEAD 修订版。否则同步至 -r 选项所指定的修订版。\n"
 "\n"
-" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
-" 这些字符代表如下:\n"
+" 每更新一个条目就输出一行信息,这行的第一个字符表示所采取的动作,这些字符含义如下:\n"
 "\n"
-" A 新增\n"
-" D 删除\n"
-" U æ›´æ–°\n"
-" C 冲突\n"
-" G 合并\n"
-"\n"
-" 第一栏的字符表示实际文件的更新,\n"
-" 第二栏显示被操作的文件。\n"
-" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
+" A 已添加\n"
+" D 已删除\n"
+" U 已更新\n"
+" C 有冲突\n"
+" G 合并成功\n"
+" E 已存在\n"
+"\n"
+" 第一栏的字符表示实际文件上的更新,第二栏的字符表示文件上属性的更新,第三栏上的字母\n"
+" “B”表示此文件上的锁被中止或窃取。\n"
+"\n"
+" 如果使用了--force选项,那么目标目录中的未受版本管理的同名路径不会自动使更新失败。\n"
+" 如果这个路径的类型(文件或者目录)与档案库中对应路径一样,则这个路径被纳入版本管理,\n"
+" 并且不修改其原有内容,如果它跟档案库中相应文件内容不一致,则看作是本地修改。档案库\n"
+" 中此路径拥有的属性会全部应用到这个同名路径上。输出信息第一栏中的“E”表示发现同名\n"
+" 路径已存在。\n"
 
 #: svn/main.c:857 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
 msgid "Caught signal"
@@ -6841,35 +6801,31 @@
 
 #: svn/main.c:975
 msgid "Argument to --limit must be positive"
-msgstr ""
+msgstr "--limit选项的参数必须是正数"
 
 #: svn/main.c:995
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; can't specify -c twice, or both -c "
 "and -r"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;不能指定 -c 两次或者同时使用 -c 和 -r"
 
 #: svn/main.c:1003 svn/main.c:1194
 msgid "Can't specify -c with --old"
-msgstr ""
+msgstr "不能同时指定-c和--old"
 
 #: svn/main.c:1010
-#, fuzzy
 msgid "Non-numeric change argument given to -c"
-msgstr "给了非数字的参数"
+msgstr "-c选项的参数不是数字"
 
 #: svn/main.c:1016
-#, fuzzy
 msgid "There is no change 0"
-msgstr "正在创建更改"
+msgstr "没有 0 修订版"
 
 #: svn/main.c:1043
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
 "N:M' instead of '-r N -r M'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;不能同时指定 -r 和 -c,请使用“-r N:M”而非“-r N -r M”"
 
 #: svn/main.c:1056 svnadmin/main.c:1244
 #, c-format
@@ -6910,24 +6866,20 @@
 msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
 
 #: svn/main.c:1405
-#, fuzzy
 msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+msgstr "锁注释文件是一个版本控制中的文件;请使用 '--force-log' 强制覆盖"
 
 #: svn/main.c:1426
 msgid ""
 "The log message is a pathname (was -F intended?); use '--force-log' to "
 "override"
-msgstr ""
-"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
+msgstr "日志信息是一个路径名称 (本是想用 -F 选项的吗?);请使用 '--force-log' 以强制覆盖"
 
 #: svn/main.c:1433
-#, fuzzy
 msgid ""
 "The lock comment is a pathname (was -F intended?); use '--force-log' to "
 "override"
-msgstr ""
-"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
+msgstr "锁注释是一个路径名称 (本是想用-F 选项的吗?);请使用 '--force-log' 强制覆盖"
 
 #: svn/main.c:1558
 msgid ""
@@ -6941,9 +6893,8 @@
 msgstr "需要第二个修订版"
 
 #: svn/merge-cmd.c:73 svn/merge-cmd.c:96
-#, fuzzy
 msgid "Too many arguments given"
-msgstr "导入命令有太多参数"
+msgstr "参数过多"
 
 #: svn/merge-cmd.c:117
 msgid "A working copy merge source needs an explicit revision"
@@ -7137,9 +7088,9 @@
 msgstr "属性“%s”自“%s”删除。\n"
 
 #: svn/propedit-cmd.c:60
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid Subversion property name"
-msgstr "“%s”不是一个有效的 EOL 值"
+msgstr "“%s”不是一个有效Subversion属性名"
 
 #: svn/propedit-cmd.c:105 svn/propedit-cmd.c:229 svn/propset-cmd.c:85
 msgid "Bad encoding option: prop value not stored as UTF8"
@@ -7190,19 +7141,17 @@
 msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
 
 #: svn/proplist-cmd.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "Properties on '%s':\n"
-msgstr "属性“%s”设定于“%s”\n"
+msgstr "“%s”上的属性:\n"
 
 #: svn/props.c:51
-#, fuzzy
 msgid ""
 "Must specify the revision as a number, a date or 'HEAD' when operating on a "
 "revision property"
-msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
+msgstr "操作修订版属性时,必须指定数字、日期形式的修订版号或“HEAD”"
 
 #: svn/props.c:58
-#, fuzzy
 msgid "Wrong number of targets specified"
 msgstr "指定了错误数目的目标"
 
@@ -7236,16 +7185,15 @@
 msgstr "属性“%s”设定于“%s”\n"
 
 #: svn/revert-cmd.c:86
-#, fuzzy
 msgid "Try 'svn revert --recursive' instead?"
-msgstr "尝试用 “svn revert -recursive” 代替?"
+msgstr "用“svn revert --recursive”看看?"
 
 #: svn/status-cmd.c:317
 #, c-format
 msgid ""
 "\n"
 "--- Changelist '%s':\n"
-msgstr ""
+msgstr "\n--- 更改列表“%s”:\n"
 
 #: svn/status.c:263
 #, c-format
@@ -7267,11 +7215,11 @@
 "提交后的修订版为 %ld。\n"
 
 #: svn/util.c:68
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Warning: %s\n"
-msgstr "%s警告:%s\n"
+msgstr "\n警告:%s\n"
 
 #: svn/util.c:136
 msgid ""
@@ -7320,13 +7268,12 @@
 msgstr "--此行及以下内容将会被忽略--"
 
 #: svn/util.c:510
-#, fuzzy
 msgid ""
 "Use of an external editor to fetch log message is not supported on OS400; "
 "consider using the --message (-m) or --file (-F) options"
 msgstr ""
-"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
-"message (-m) 或 --file (-F) 选项"
+"OS400上不支持通过外部外部编辑器获得日志信息;请使用 --message (-m) 或\n"
+"--file (-F) 选项"
 
 #: svn/util.c:592
 msgid "Cannot invoke editor to get log message when non-interactive"
@@ -7398,7 +7345,6 @@
 msgstr "如果有的话,以流中的数值来设定档案库的 UUID"
 
 #: svnadmin/main.c:257
-#, fuzzy
 msgid "type of repository: 'fsfs' (default) or 'bdb'"
 msgstr "档案库类型:“fsfs”(默认)或“bdb”"
 
@@ -7415,11 +7361,10 @@
 msgstr "关闭日志文件自动移除 [Berkeley DB]"
 
 #: svnadmin/main.c:272
-#, fuzzy
 msgid ""
 "remove redundant Berkeley DB log files\n"
 " from source repository [Berkeley DB]"
-msgstr "自来源档案库移除多余的日志文件"
+msgstr "删除源档案库中多余的Berkely DB日志文件"
 
 #: svnadmin/main.c:276
 msgid "call pre-commit hook before committing revisions"
@@ -7441,7 +7386,7 @@
 msgid ""
 "disallow use of SVNDIFF1 in on-disk storage,\n"
 " for backwards compatibility"
-msgstr ""
+msgstr "不允许因向后兼容而在磁盘存储里使用SVNDIFF1"
 
 #: svnadmin/main.c:299
 msgid ""
@@ -7450,6 +7395,10 @@
 "Open the repository at REPOS_PATH, then abort, thus simulating\n"
 "a process that crashes while holding an open repository handle.\n"
 msgstr ""
+"用法:svnadmin crashtest REPOS_PATH\n"
+"\n"
+"打开REPOS_PATH上的档案库,然后中断,从而模拟一个进程在持有打开的档案库句柄时\n"
+"崩溃的情形。\n"
 
 #: svnadmin/main.c:305
 msgid ""
@@ -7559,7 +7508,6 @@
 "进度报告会送至标准输出。\n"
 
 #: svnadmin/main.c:362
-#, fuzzy
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH\n"
 "\n"
@@ -7567,7 +7515,7 @@
 msgstr ""
 "用法:svnadmin lslocks REPOS_PATH\n"
 "\n"
-"显示所有锁的相信信息。\n"
+"显示所有锁的描述。\n"
 
 #: svnadmin/main.c:367
 msgid ""
@@ -7653,14 +7601,13 @@
 "校验储存于档案库的数据。\n"
 
 #: svnadmin/main.c:456
-#, fuzzy
 msgid "Invalid revision specifier"
-msgstr "指定了无效的修订版本"
+msgstr "无效的修订版描述"
 
 #: svnadmin/main.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
-msgstr "修订版必须不能大于最新的修订版号(%ld)"
+msgstr "修订版号不能大于最新的修订版号(%ld)"
 
 #: svnadmin/main.c:534 svnadmin/main.c:629
 msgid "First revision cannot be higher than second"
@@ -7677,7 +7624,6 @@
 msgstr "完成。\n"
 
 #: svnadmin/main.c:654
-#, fuzzy
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -7686,18 +7632,16 @@
 "Available subcommands:\n"
 msgstr ""
 "一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnadmin --version”已查看程序版本号以及可用的文件系统模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
-#, fuzzy
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
 "\n"
-msgstr ""
-"以下的档案库后台(FS) 模块可用:\n"
-"\n"
+msgstr "以下的档案库后端(FS) 模块可用:\n\n"
 
 #: svnadmin/main.c:738
 #, c-format
@@ -7762,12 +7706,12 @@
 
 # this points to filename according to sunny256
 #: svnadmin/main.c:1048 svnlook/main.c:1729
-#, fuzzy, c-format
+#, c-format
 msgid "Owner: %s\n"
 msgstr "所有者:%s\n"
 
 #: svnadmin/main.c:1049 svnlook/main.c:1730
-#, fuzzy, c-format
+#, c-format
 msgid "Created: %s\n"
 msgstr "创建于:%s\n"
 
@@ -7799,20 +7743,19 @@
 "\n"
 
 #: svnadmin/main.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr "路径“%s”没有被锁定。\n"
 
 #: svnadmin/main.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr "删除“%s”上的锁。\n"
 
 #: svnadmin/main.c:1230
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;请使用“-r N:M”而非“-r M -r N”"
 
 #: svnadmin/main.c:1349
 #, c-format
@@ -7851,7 +7794,7 @@
 #: svndumpfilter/main.c:558
 #, c-format
 msgid "No valid copyfrom revision in filtered stream"
-msgstr ""
+msgstr "在被过滤的流中没有有效的copyfrom修订版"
 
 #: svndumpfilter/main.c:663
 msgid "Delta property block detected - not supported by svndumpfilter"
@@ -7898,7 +7841,6 @@
 "用法:svndumpfilter help [SUBCOMMAND...]\n"
 
 #: svndumpfilter/main.c:888
-#, fuzzy
 msgid ""
 "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
 "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -7907,7 +7849,8 @@
 "Available subcommands:\n"
 msgstr ""
 "一般用法:svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
-"请使用 “svndumpfilter help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svndumpfilter help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svndumpfilter --version”以查看程序版本号。\n"
 "\n"
 "可用的子命令:\n"
 
@@ -7964,7 +7907,7 @@
 "错误:没有提供前置字首,\n"
 
 #: svndumpfilter/main.c:1289
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svndumpfilter help %s' for usage.\n"
@@ -7989,18 +7932,16 @@
 msgstr "为每个路径显示节点修订版编号"
 
 #: svnlook/main.c:114
-#, fuzzy
 msgid "do not print differences for added files"
-msgstr "不要打印已新加文件的不同处"
+msgstr "不要输出新加文件造成的差异"
 
 #: svnlook/main.c:117
 msgid "print differences against the copy source"
 msgstr "显示差异并对照原始内容"
 
 #: svnlook/main.c:120
-#, fuzzy
 msgid "operate on a revision property (use with -r or -t)"
-msgstr "在修订版属性上作操作(使用-r参数)"
+msgstr "操作修订版上的属性(使用-r或-t选项)"
 
 #: svnlook/main.c:123
 msgid "show full paths instead of indenting them"
@@ -8008,7 +7949,7 @@
 
 #: svnlook/main.c:126
 msgid "show details for copies"
-msgstr ""
+msgstr "显示各个拷贝的详细信息"
 
 #: svnlook/main.c:138
 msgid ""
@@ -8103,7 +8044,6 @@
 "显示作者,日期戳,日志信息大小,以及日志信息。\n"
 
 #: svnlook/main.c:186
-#, fuzzy
 msgid ""
 "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
 "\n"
@@ -8111,7 +8051,7 @@
 msgstr ""
 "用法:svnlook lock REPOS_PATH PATH_IN_REPOS\n"
 "\n"
-"如果档案库路径已经存在锁,描述它。\n"
+"如果档案库指定路径上存在锁,则描述它。\n"
 
 #: svnlook/main.c:191
 msgid ""
@@ -8124,7 +8064,6 @@
 "显示日志信息。\n"
 
 #: svnlook/main.c:196
-#, fuzzy
 msgid ""
 "usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
 "\n"
@@ -8133,11 +8072,10 @@
 msgstr ""
 "用法:svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
 "\n"
-"显示档案库中,某个路径的属性的原始内容。\n"
-"加上 --revprop, 显示修订版属性的原始值。\n"
+"显示档案库中某个路径上属性的原始值。\n"
+"用--revprop选项显示修订版上属性的原始值。\n"
 
 #: svnlook/main.c:202
-#, fuzzy
 msgid ""
 "usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -8147,9 +8085,9 @@
 msgstr ""
 "用法:svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
-"列出档案库中,某个路径的属性。\n"
-"加上 --revprop 选项, 修订版属性。\n"
-"加上 -v 的话,一并显示属性内容。\n"
+"列出档案库中某个路径的属性。\n"
+"使用 --revprop 选项列出修订版的属性。\n"
+"使用 -v 选项一并显示属性的内容。\n"
 
 #: svnlook/main.c:209
 msgid ""
@@ -8243,18 +8181,18 @@
 "REVISION PATH\n"
 "-------- ----\n"
 msgstr ""
-"修 订 版 路径\n"
+"修 订 版 路径\n"
 "-------- ----\n"
 
 #: svnlook/main.c:1419
-#, fuzzy, c-format
+#, c-format
 msgid "Property '%s' not found on revision %ld"
 msgstr "属性“%s”在修订版 %ld 中找不到"
 
 #: svnlook/main.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "Property '%s' not found on path '%s' in revision %ld"
-msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”中找不到"
+msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”上找不到"
 
 #: svnlook/main.c:1592 svnlook/main.c:1807
 #, c-format
@@ -8262,7 +8200,6 @@
 msgstr "未提供档案库路径参数"
 
 #: svnlook/main.c:1653
-#, fuzzy
 msgid ""
 "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8275,15 +8212,15 @@
 msgstr ""
 "一般用法:svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "注意:任何接受 “--revision”与 “--transaction”选项的子命令,在没有\n"
-" 指定两者其一的情况下使用,会直接作用在档案库最新的修订版。\n"
-"请使用 “svnlook help <subcommand>”以取得特定子命令的帮助信息。\n"
+" 指定两者其一的情况下会直接作用在档案库最新的修订版上。\n"
+"请使用“svnlook help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svnlook --version”以查看程序的版本以及可用的文件系统模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnlook/main.c:1709
-#, fuzzy
 msgid "Missing path argument"
-msgstr "未提供档案库路径参数"
+msgstr "丢失路径参数"
 
 #: svnlook/main.c:1734
 #, c-format
@@ -8304,9 +8241,9 @@
 "%s\n"
 
 #: svnlook/main.c:1781
-#, fuzzy, c-format
+#, c-format
 msgid "Missing propname argument"
-msgstr "未提供属性名称参数"
+msgstr "丢失属性名参数"
 
 #: svnlook/main.c:1782
 #, c-format
@@ -8327,9 +8264,9 @@
 msgstr "'--transaction' (-t) 与 '--revision' (-r) 参数不能同时存在"
 
 #: svnlook/main.c:2089
-#, fuzzy, c-format
+#, c-format
 msgid "Repository argument required\n"
-msgstr "需有档案库参数"
+msgstr "需有档案库参数\n"
 
 #: svnlook/main.c:2098
 #, c-format
@@ -8337,12 +8274,12 @@
 msgstr "“%s”是地址(URL),但是应该是路径\n"
 
 #: svnlook/main.c:2149
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svnlook help %s' for usage.\n"
 msgstr ""
-"子命令“%s”并不接受选项“%s”\n"
+"子命令“%s”不接受选项“%s”\n"
 "请使用“svnlook help %s”以了解用法。\n"
 
 #: svnserve/main.c:140
@@ -8374,9 +8311,8 @@
 msgstr "服务根目录"
 
 #: svnserve/main.c:153
-#, fuzzy
 msgid "force read only, overriding repository config file"
-msgstr "不赞成;使用档案库配置文件"
+msgstr "强制只读成;优先于档案库配置文件"
 
 #: svnserve/main.c:154
 msgid "tunnel mode"
@@ -8396,30 +8332,28 @@
 
 #: svnserve/main.c:162
 msgid "write server process ID to file arg"
-msgstr ""
+msgstr "将服务进程的ID写入文件ARG中"
 
 #: svnserve/main.c:165
 msgid "run as a windows service (SCM only)"
-msgstr ""
+msgstr "以Windows服务方式运行(仅对服务控制管理器有效)"
 
 #: svnserve/main.c:177
 #, c-format
 msgid "Type '%s --help' for usage.\n"
-msgstr "请使用“%s help”以得到用法和帮助。\n"
+msgstr "请使用“%s --help”以得到用法和帮助。\n"
 
 #: svnserve/main.c:186
-#, fuzzy
 msgid ""
 "usage: svnserve [options]\n"
 "\n"
 "Valid options:\n"
 msgstr ""
-"用户:svnserve [选项]\n"
+"用法:svnserve [选项]\n"
 "\n"
 "有效选项:\n"
 
 #: svnserve/main.c:468
-#, fuzzy
 msgid "You must specify exactly one of -d, -i, -t or -X.\n"
 msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
 
@@ -8433,65 +8367,65 @@
 msgid ""
 "svnserve: The --service flag is only valid if the process is started by the "
 "Service Control Manager.\n"
-msgstr ""
+msgstr "svnserve: 只有被服务控制管理器启动时--service选项才有效\n"
 
 #: svnserve/main.c:583
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get address info"
-msgstr "不能获取地址信息:“%s”\n"
+msgstr "不能获取地址信息"
 
 #: svnserve/main.c:599
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create server socket"
-msgstr "无法创建服务器套接字:%s\n"
+msgstr "无法创建服务端套接字"
 
 #: svnserve/main.c:612
-#, fuzzy, c-format
+#, c-format
 msgid "Can't bind server socket"
-msgstr "不能绑定服务器套接字:“%s”\n"
+msgstr "不能绑定服务端套接字"
 
 #: svnserve/main.c:680
-#, fuzzy, c-format
+#, c-format
 msgid "Can't accept client connection"
-msgstr "无法接受客户连接:%s\n"
+msgstr "无法接受客户端连接"
 
 #: svnserve/main.c:734
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create threadattr"
-msgstr "无法创建线程属性:“%s”\n"
+msgstr "无法创建线程属性"
 
 # as-is
 #: svnserve/main.c:742
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set detached state"
-msgstr "不能设置分离的状态:“%s”\n"
+msgstr "不能设置分离状态"
 
 #: svnserve/main.c:755
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create thread"
-msgstr "无法创建线程:%s\n"
+msgstr "无法创建线程"
 
 #: svnserve/winservice.c:341
 #, c-format
 msgid "Failed to create winservice_start_event"
-msgstr ""
+msgstr "创建windows服务启动事件失败"
 
 #: svnserve/winservice.c:352
 #, c-format
 msgid "The service failed to start"
-msgstr ""
+msgstr "服务启动失败"
 
 #: svnserve/winservice.c:400
 #, c-format
 msgid "Failed to connect to Service Control Manager"
-msgstr ""
+msgstr "连接服务控制管理器失败"
 
 #: svnserve/winservice.c:411
 #, c-format
 msgid ""
 "The service failed to start; an internal error occurred while starting the "
 "service"
-msgstr ""
+msgstr "发生内部错误,服务启动失败"
 
 #: svnsync/main.c:56
 msgid ""
@@ -8509,6 +8443,15 @@
 "In other words, the destination repository should be a read-only\n"
 "mirror of the source repository.\n"
 msgstr ""
+"用法:svnsync initialize 目标URL 源URL\n"
+"\n"
+"初始化一个目标档案库以从另一个档案库同步。\n"
+"\n"
+"目标URL必须指向一个档案库的根目录,这个档案库必须没有提交过的修订版并且允许\n"
+"更改修订版属性。\n"
+"\n"
+"除了svnsync外,你不应该在目标档案库中提交或者更改修订版属性。也就是说,目标\n"
+"档案库应该是源档案库的只读镜像。\n"
 
 #: svnsync/main.c:71
 msgid ""
@@ -8516,6 +8459,9 @@
 "\n"
 "Transfer all pending revisions from source to destination.\n"
 msgstr ""
+"用法: svnsync synchronize 目标URL\n"
+"\n"
+"从源档案库传送修订版到目标档案库。\n"
 
 #: svnsync/main.c:76
 msgid ""
@@ -8524,73 +8470,73 @@
 "Copy all revision properties for revision REV from source to\n"
 "destination.\n"
 msgstr ""
+"用法:svnsync copy-revprops 目标URL 修订版\n"
+"\n"
+"从源档案库拷贝所有指定修订版上的属性到目标档案库。\n"
 
 #: svnsync/main.c:82
-#, fuzzy
 msgid ""
 "usage: svnsync help [SUBCOMMAND...]\n"
 "\n"
 "Describe the usage of this program or its subcommands.\n"
 msgstr ""
-"用法:svnadmin help [SUBCOMMAND...]\n"
+"用法:svnsync help [SUBCOMMAND...]\n"
 "\n"
 "显示本程序或其子命令的用法。\n"
 
 #: svnsync/main.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get local hostname"
-msgstr "无法获取文件名"
+msgstr "无法获取本地主机名"
 
 #: svnsync/main.c:206
 #, c-format
 msgid "Failed to get lock on destination repos, currently held by '%s'\n"
-msgstr ""
+msgstr "对目标档案库加锁失败,当前被“%s”锁定中\n"
 
 #: svnsync/main.c:301
 #, c-format
 msgid "Session is rooted at '%s' but the repos root is '%s'"
-msgstr ""
+msgstr "会话的根目录在“%s”但档案库的根目录是“%s”"
 
 #: svnsync/main.c:341
 #, c-format
 msgid "Copied properties for revision %ld (%s* properties skipped).\n"
-msgstr ""
+msgstr "修订版%ld的属性拷贝完毕(%s* 属性被跳过)\n"
 
 #: svnsync/main.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "Copied properties for revision %ld.\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgstr "拷贝了修订版%ld上的属性。\n"
 
 #: svnsync/main.c:387
 msgid "Cannot initialize a repository with content in it"
-msgstr ""
+msgstr "档案库非空,初始化失败"
 
 #: svnsync/main.c:398
 #, c-format
 msgid "Destination repository is already synchronizing from '%s'"
-msgstr ""
+msgstr "目标档案库已经在与“%s”同步"
 
 #: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
 #: svnsync/main.c:1200
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is not a URL"
-msgstr "路径“%s”不是文件"
+msgstr "路径“%s”不是URL"
 
 #: svnsync/main.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Committed revision %ld.\n"
-msgstr ""
-"\n"
-"提交后的修订版为 %ld。\n"
+msgstr "提交后的修订版为 %ld。\n"
 
 #: svnsync/main.c:877
 msgid "Destination repository has not been initialized"
-msgstr ""
+msgstr "目标档案库尚未被初始化"
 
 #: svnsync/main.c:892
 #, c-format
 msgid "UUID of source repository (%s) does not match expected UUID (%s)"
-msgstr ""
+msgstr "源档案库(%s)的UUID与期望的UUID(%s)不匹配"
 
 #: svnsync/main.c:954
 #, c-format
@@ -8599,6 +8545,8 @@
 "destination HEAD (%ld) are inconsistent; have you committed to the "
 "destination without using svnsync?"
 msgstr ""
+"当前正被拷贝的修订版(%ld)、最后合并的修订版(%ld)以及目标档案库的HEAD(%ld)\n"
+"不一致;你是否用svnsync之外的办法向目标档案库提交过?"
 
 #: svnsync/main.c:992
 #, c-format
@@ -8606,23 +8554,23 @@
 "Destination HEAD (%ld) is not the last merged revision (%ld); have you "
 "committed to the destination without using svnsync?"
 msgstr ""
+"目标档案库的HEAD(%ld)不是最后合并的修订版(%ld);你是否用svnsync之外的办法向目标\n"
+"档案库提交过?"
 
 #: svnsync/main.c:1069
 #, c-format
 msgid "Commit created rev %ld but should have created %ld"
-msgstr ""
+msgstr "提交创建了修订版%ld 但本应创建%ld"
 
 #: svnsync/main.c:1171
 msgid "Cannot copy revprops for a revision that has not been synchronized yet"
-msgstr ""
+msgstr "不能拷贝尚未同步的修订版的修订属性"
 
 #: svnsync/main.c:1203
-#, fuzzy
 msgid "Invalid revision number"
-msgstr "提供了无效的版本号码"
+msgstr "无效的修订版号"
 
 #: svnsync/main.c:1239
-#, fuzzy
 msgid ""
 "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
 "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8630,31 +8578,32 @@
 "\n"
 "Available subcommands:\n"
 msgstr ""
-"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"一般用法:svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"请使用“svnsync help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnsync --version”查看程序版本以及可用的RA模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnsync/main.c:1429
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svnsync help %s' for usage.\n"
 msgstr ""
 "子命令“%s”不接受选项“%s”\n"
-"请输入“svn help %s”以取得用法。\n"
+"请输入“svnsync help %s”以取得用法。\n"
 
 #: svnsync/main.c:1490
 msgid "Not enough arguments provided; try 'svnsync help' for more info"
-msgstr ""
+msgstr "参数不够;请用“svnsync help”获取更多帮助"
 
 #: svnversion/main.c:39
-#, fuzzy, c-format
+#, c-format
 msgid "Type 'svnversion --help' for usage.\n"
-msgstr "请使用“svnversion --help”以得到用法和帮助。\n"
+msgstr "请使用“svnversion --help”以得到帮助。\n"
 
 #: svnversion/main.c:50
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
@@ -8686,25 +8635,26 @@
 msgstr ""
 "用法:svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
-" 为工作拷贝路径 WC_PATH 产生简洁的 “版本号码”。 TRAIL_URL 是\n"
-" URL 的结尾部份,用以决定 WC_PATH 是否已被切换 (WC_PATH 内的切换\n"
-" 侦测并不倚赖 TRAIL_URL)。版本号码会写至标准输出。举例说明:\n"
+" 为工作拷贝路径 WC_PATH 产生紧凑的 “版本号”。 TRAIL_URL 是\n"
+" URL 的结尾部分,用以判断 WC_PATH 是否已切换过 (探测WC_PATH\n"
+" 内的切换并不依靠 TRAIL_URL)。版本号码会写至标准输出。举例说明:\n"
 "\n"
 " $ svnversion . /repos/svn/trunk \n"
 " 4168\n"
 "\n"
-" 如果工作拷贝是单一版本,未经修改,未被切换,而且其地址(URL)符合\n"
-" TRAIL_URL 参数,那么版本号码将会是单一号码。如果工作拷贝内不\n"
-" 太单纯的话,那么版本号码就会复杂地多:\n"
+" 如果工作拷贝是单一版本,未经修改,未经切换,而且其地址(URL)符合\n"
+" TRAIL_URL 参数,那么版本号码将会是单一数字。如果工作拷贝不普通,\n"
+" 那么版本号就会复杂得多:\n"
 "\n"
 " 4123:4168 混合修订版的工作拷贝\n"
 " 4168M 有修改的工作拷贝\n"
 " 4123S 切换了的工作拷贝\n"
-" 4123:4168MS 混合修订版,有修改,切换了的工作拷贝\n"
+" 4123:4168MS 混合修订版,有修改,工作拷贝切换过\n"
+"\n"
+" 如果使用在非工作拷贝的目录上,例如导出的目录,那么它会输出“已导出”。\n"
+"\n"
+" 如果调用时没有参数则WC_PATH默认为当前目录。\n"
 "\n"
-" 如果在非工作拷贝的目录中,例如导出的目录执行的话,那么\n"
-" 这个程序会输出“已导出”。\n"
-" 如果调用时没有参数 WC_PATH 会使用当前目录。\n"
 "有效选项:\n"
 
 #: svnversion/main.c:121
@@ -8725,236 +8675,3 @@
 msgid "'%s' not versioned, and not exported\n"
 msgstr "“%s”未纳入版本控制,并未导出\n"
 
-#~ msgid "Finished"
-#~ msgstr "完成"
-
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
-
-#, fuzzy
-#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
-
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%s”已是文件/其它的东西"
-
-#~ msgid "No URL target available"
-#~ msgstr "没有提供 URL 目标"
-
-#~ msgid "repository argument required\n"
-#~ msgstr "需有档案库参数\n"
-
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%s”\n"
-
-#~ msgid "Can't recode string"
-#~ msgstr "无法重新编码字符串"
-
-#~ msgid "native"
-#~ msgstr "本地"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
-#~ msgstr "不支持ra_dav的 RA 插件 ABI 版本 (%d)"
-
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
-
-#~ msgid "Working copy not locked"
-#~ msgstr "工作拷贝未锁定"
-
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信息\n"
-
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0的提交。\n"
-
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "无法清除“%s”:不是一个目录"
-
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
-
-#~ msgid "print client version info"
-#~ msgstr "打印客户端版本信息"
-
-#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
-#~ msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
-
-#, fuzzy
-#~ msgid ""
-#~ "Check out a working copy from a repository.\n"
-#~ "usage: checkout URL[@REV]... [PATH]\n"
-#~ "\n"
-#~ " If specified, REV determines in which revision the URL is first\n"
-#~ " looked up.\n"
-#~ "\n"
-#~ " If PATH is omitted, the basename of the URL will be used as\n"
-#~ " the destination. If multiple URLs are given each will be checked\n"
-#~ " out into a sub-directory of PATH, with the name of the sub-directory\n"
-#~ " being the basename of the URL.\n"
-#~ msgstr ""
-#~ "从档案库签出工作拷贝。\n"
-#~ "用法:checkout 地址[@版本]... [路径]\n"
-#~ "\n"
-#~ " 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
-#~ " 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
-#~ " 以地址(URL)最末目录名为名字的子目录中。\n"
-#~ "\n"
-
-#~ msgid "Wrong number of paths given"
-#~ msgstr "指定了错误数目的路径"
-
-#~ msgid "Not enough args provided"
-#~ msgstr "未提供足够的参数"
-
-# as-is
-#~ msgid "Can't seek in '%s'"
-#~ msgstr "不能在“%s”定位"
-
-#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-#~ msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
-
-#~ msgid "Unrecognized node kind of '%s'"
-#~ msgstr "“%s”的节点种类无法辨识"
-
-#~ msgid "'%s' is in the way"
-#~ msgstr "“%s”挡在中间"
-
-#~ msgid "'%s' is not supported"
-#~ msgstr "“%s”不支持"
-
-#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-#~ msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
-
-#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-#~ msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
-
-#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-#~ msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
-
-#~ msgid "Search for malformed path '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for reading"
-#~ msgstr "不能打开文件“%s”进行读取"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for writing"
-#~ msgstr "不能打开文件“%s”进行写入"
-
-#, fuzzy
-#~ msgid "Error reading file '%s'"
-#~ msgstr "读取文件“%s”时发生错误"
-
-#, fuzzy
-#~ msgid "Error writing file '%s'"
-#~ msgstr "写入文件“%s”时发生错误"
-
-#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
-
-#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-#~ msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
-
-#~ msgid "Found malformed header block in dumpfile stream"
-#~ msgstr "在导出文件流中找到有畸形的文件头"
-
-# as-is
-#~ msgid "Creating readme file"
-#~ msgstr "正在创建 readme 文件"
-
-# as-is
-#~ msgid "Can't open config file '%s'"
-#~ msgstr "不能打开配置文件“%s”"
-
-# as-is
-#~ msgid "Can't find config file '%s'"
-#~ msgstr "找不到配置文件“%s”"
-
-#~ msgid "Can't change executability of file '%s'"
-#~ msgstr "不能改变文件“%s”为可执行"
-
-#~ msgid "Can't stat new directory '%s'"
-#~ msgstr "无法获取新目录“%s”的状态"
-
-#~ msgid "Too few arguments"
-#~ msgstr "参数太少"
-
-#~ msgid ""
-#~ "The entry '%s' is no longer a directory; remove the entry before updating"
-#~ msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
-
-#~ msgid "Error restoring props for '%s'"
-#~ msgstr "还原“%s”的属性时发生错误"
-
-#~ msgid "Error removing props for '%s'"
-#~ msgstr "移除“%s”的属性时发生错误"
-
-#~ msgid ""
-#~ "'%s' is scheduled for deletion; it must be committed before being "
-#~ "overwritten"
-#~ msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
-
-#, fuzzy
-#~ msgid "Working copy '%s' is missing or not locked"
-#~ msgstr "工作拷贝“%s”丢失或并未锁定"
-
-#~ msgid "Error checking path '%s'"
-#~ msgstr "检查路径“%s”时发生错误"
-
-#~ msgid "Unable to delete temporary file"
-#~ msgstr "无法删除暂存文件"
-
-#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
-
-#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-#~ msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
-
-#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
-
-#~ msgid "Unknown node kind: '%s'"
-#~ msgstr "未知的节点类型:“%s”"
-
-#~ msgid "'%s' has unknown value for svn:eol-style property"
-#~ msgstr "“%s”的 svn:eol-style 属性有不明的数值"
-
-#~ msgid "Move failed"
-#~ msgstr "移动失败"
-
-#~ msgid "Node with dropped parent sneaked in"
-#~ msgstr "其父节点已舍弃的节点偷跑进来"
-
-#, fuzzy
-#~ msgid "Error creating dir '%s' (path exists)"
-#~ msgstr "创建目录“%s”时发生错误(路径已经存在)"
-
-#~ msgid "Can't create temporary directory"
-#~ msgstr "无法建立临时目录"
-
-#~ msgid ""
-#~ "Warning: -R is deprecated.\n"
-#~ "Anonymous access is now read-only by default.\n"
-#~ "To change, use conf/svnserve.conf in repos:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (default read)\n"
-#~ " auth-access = read|write|none (default write)\n"
-#~ "Forcing all access to read-only for now\n"
-#~ msgstr ""
-#~ "警告:-R 不赞成使用。\n"
-#~ "匿名访问默认只读。Anonymous access is now read-only by default.\n"
-#~ "修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (默认 read)\n"
-#~ " auth-access = read|write|none (默认 write)\n"
-#~ "强制所有访问为只读\n"

[[[
* subversion/po/zh_CN.po: finish all untranslated and fuzzy items,
                          remove all obsolete items.
]]]

diff -u msgmerged\zh_CN.po translated\zh_CN.po
--- msgmerged\zh_CN.po Wed Aug 23 11:00:59 2006
+++ translated\zh_CN.po Wed Aug 23 11:01:19 2006
@@ -1,13 +1,76 @@
 # Simplified Chinese translation for subversion package
-# Copyright (C) 2004 CollabNet.
+# Copyright (C) 2006 CollabNet.
 # This file is distributed under the same license as the subversion package.
 #
+#
+# 翻译工具:
+# Emacs + po-mode,后者在GNU gettext包中,使用文档参考gettext手册,windows版本下载地址:
+# http://ntemacs.sourceforge.net (推�Emacs 23)
+# http://gettext.sourceforge.net
+# http://unxutils.sourceforge.net (�是必须)
+#
+# �考http://svn.collab.net/repos/svn/trunk/TRANSLATING%e4%bb%a5%e8%8e%b7%e5%be%97subversion.pot,
+# 与zh_CN.po合并后再进行翻译。
+#
+# -----------------------> .emacs (Emacs 23 for windows)
+# ;; from GNU gettext manual
+# (setq auto-mode-alist
+# (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist))
+# (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+# (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\."
+# 'po-find-file-coding-system)
+# (autoload 'po-find-file-coding-system "po-mode")
+#
+# (setq w32-charset-info-alist
+# (cons '("gbk" w32-charset-gb2312 . 936) w32-charset-info-alist))
+#
+#
+# ;; from brep at newsmth.net
+# (setq default-frame-alist
+# (append
+# '((font . "fontset-gbk")) default-frame-alist))
+#
+# (create-fontset-from-fontset-spec
+# "-outline-Courier New-normal-r-normal-normal-13-97-96-96-c-*-fontset-gbk")
+# (set-fontset-font
+# "fontset-default" nil
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'kana
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'han
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'cjk-misc
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'symbol
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-default-font "fontset-gbk")
+#
+# -------------------------------
+#
+# 翻译术语表:
+# attribute 属性
+# 指XML文件中一个标记节点的属性
+# element 元素
+# 指XML文件中的一个标记节点
+# parse 解析
+# representation 修订版
+# 简写作rep,指每一个修订版在文件系统中的具体存储形式,翻译成“存储表示”
+# 并不清楚,便意译为“修订版”
+# repository 档案库
+# revision 修订版
+# scheme 方案
+# 指URL中的svn://, http://%e8%bf%99%e6%a0%b7%e7%9a%84%e9%83%a8%e5%88%86
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: subversion 1.2.0\n"
+"Project-Id-Version: subversion 1.4.x\n"
 "Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
 "POT-Creation-Date: 2006-08-21 10:21-0400\n"
-"PO-Revision-Date: 2004-09-12 22:05+0800\n"
+"PO-Revision-Date: 2006-08-23 10:53+0800\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
@@ -230,14 +293,12 @@
 msgstr "无效的计划任务"
 
 #: include/svn_error_codes.h:387
-#, fuzzy
 msgid "Invalid relocation"
-msgstr "无效的锁定"
+msgstr "无效的重定位"
 
 #: include/svn_error_codes.h:392
-#, fuzzy
 msgid "Invalid switch"
-msgstr "无效的计划任务"
+msgstr "无效的切换"
 
 #: include/svn_error_codes.h:398
 msgid "General filesystem error"
@@ -277,7 +338,7 @@
 
 #: include/svn_error_codes.h:434
 msgid "Filesystem has no such representation"
-msgstr "文件系统没有这样的表现 (representation)"
+msgstr "文件系统中没有这个修订版"
 
 #: include/svn_error_codes.h:438
 msgid "Filesystem has no such string"
@@ -342,11 +403,11 @@
 # as-is
 #: include/svn_error_codes.h:498
 msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改变"
+msgstr "在读取时一个修订版消失或被改变"
 
 #: include/svn_error_codes.h:502
 msgid "Tried to change an immutable representation"
-msgstr "尝试变更一个不可改变的表现 (representation)"
+msgstr "尝试更改一个不可变的修订版"
 
 #: include/svn_error_codes.h:506
 msgid "Malformed skeleton data"
@@ -377,26 +438,22 @@
 msgstr "未知的 FS 类别"
 
 #: include/svn_error_codes.h:536
-#, fuzzy
 msgid "No user associated with filesystem"
 msgstr "没有用户与文件系统关联"
 
 #: include/svn_error_codes.h:541
-#, fuzzy
 msgid "Path is already locked"
-msgstr "路径“%s”已经被锁定"
+msgstr "路径已经被锁定"
 
 #: include/svn_error_codes.h:546 include/svn_error_codes.h:673
-#, fuzzy
 msgid "Path is not locked"
 msgstr "路径没有被锁定"
 
 #: include/svn_error_codes.h:551
 msgid "Lock token is incorrect"
-msgstr "锁定标记是不正确的"
+msgstr "锁定标记不正确"
 
 #: include/svn_error_codes.h:556
-#, fuzzy
 msgid "No lock token provided"
 msgstr "没有提供锁定标记"
 
@@ -405,7 +462,6 @@
 msgstr "用户名和锁定所有者不匹配"
 
 #: include/svn_error_codes.h:566
-#, fuzzy
 msgid "Filesystem has no such lock"
 msgstr "文件系统没有这样的锁"
 
@@ -414,14 +470,12 @@
 msgstr "锁过期"
 
 #: include/svn_error_codes.h:576
-#, fuzzy
 msgid "Item is out of date"
-msgstr "条目已过时"
+msgstr "条目已过期"
 
 #: include/svn_error_codes.h:588
-#, fuzzy
 msgid "Unsupported FS format"
-msgstr "不支持的 FS 格式"
+msgstr "不支持的文件系统格式"
 
 #: include/svn_error_codes.h:594
 msgid "The repository is locked, perhaps for db recovery"
@@ -456,12 +510,10 @@
 msgstr "执行 post-commit 外挂时发生错误"
 
 #: include/svn_error_codes.h:632
-#, fuzzy
 msgid "Error running post-lock hook"
 msgstr "执行 post-lock 外挂时发生错误"
 
 #: include/svn_error_codes.h:637
-#, fuzzy
 msgid "Error running post-unlock hook"
 msgstr "执行 post-unlock 外挂时发生错误"
 
@@ -526,7 +578,6 @@
 msgstr "找不到 HTTP 路径"
 
 #: include/svn_error_codes.h:712
-#, fuzzy
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "执行 WebDAV PROPPATCH 失败"
 
@@ -586,24 +637,20 @@
 msgstr "编辑的根目录读取拒绝"
 
 #: include/svn_error_codes.h:792
-#, fuzzy
 msgid "Item is not readable"
-msgstr "项目不能读。"
+msgstr "条目不可读"
 
 #: include/svn_error_codes.h:797
-#, fuzzy
 msgid "Item is partially readable"
-msgstr "项目部分可读。"
+msgstr "条目部分可读"
 
 #: include/svn_error_codes.h:801
-#, fuzzy
 msgid "Invalid authz configuration"
-msgstr "无效的配置值"
+msgstr "无效的authz配置"
 
 #: include/svn_error_codes.h:806
-#, fuzzy
 msgid "Item is not writable"
-msgstr "项目不能写。"
+msgstr "条目不可写"
 
 #: include/svn_error_codes.h:812
 msgid "Svndiff data has invalid header"
@@ -628,14 +675,12 @@
 msgstr "svndiff 数据意想不到地结束"
 
 #: include/svn_error_codes.h:832
-#, fuzzy
 msgid "Svndiff compressed data is invalid"
-msgstr "svndiff 数据包含了无效的档头"
+msgstr "Svndiff 压缩数据无效"
 
 #: include/svn_error_codes.h:838
-#, fuzzy
 msgid "Diff data source modified unexpectedly"
-msgstr "svndiff 数据意想不到地结束"
+msgstr "Diff数据源被意外修改"
 
 #: include/svn_error_codes.h:844
 msgid "Apache has no path to an SVN filesystem"
@@ -800,7 +845,7 @@
 
 #: include/svn_error_codes.h:1015
 msgid "Not enough arguments provided; try 'svn help' for more info"
-msgstr ""
+msgstr "参数不够,请用“svn help”获取帮助"
 
 #: include/svn_error_codes.h:1019
 msgid "Mutually exclusive arguments specified"
@@ -851,7 +896,7 @@
 
 #: libsvn_client/blame.c:522
 msgid "blame of the WORKING revision is not supported"
-msgstr ""
+msgstr "blame不支持工作修订版"
 
 #: libsvn_client/blame.c:535
 msgid "Start revision must precede end revision"
@@ -868,12 +913,12 @@
 msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
 
 #: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not under version control or doesn't exist"
 msgstr "“%s”尚未纳入版本控制或不存在"
 
 #: libsvn_client/cat.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' refers to a directory"
 msgstr "“%s”引用一个目录"
 
@@ -898,14 +943,13 @@
 msgstr "“%s”已是不同地址(URL)的工作拷贝"
 
 #: libsvn_client/checkout.c:167
-#, fuzzy
 msgid "; run 'svn update' to complete it"
 msgstr ";请执行“svn update”以完成目前的操作。"
 
 #: libsvn_client/checkout.c:177
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' already exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+msgstr "“%s”已存在且不是目录"
 
 #: libsvn_client/commit.c:198
 #, c-format
@@ -964,7 +1008,7 @@
 
 #: libsvn_client/commit.c:1404
 msgid "Are all the targets part of the same working copy?"
-msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+msgstr "是否所有的目标都是同一个工作拷贝的一部分?"
 
 #: libsvn_client/commit.c:1419
 msgid "Cannot non-recursively commit a directory deletion"
@@ -1042,7 +1086,7 @@
 "'%s' is not under version control and is not part of the commit, yet its "
 "child '%s' is part of the commit"
 msgstr ""
-"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
+"“%s”尚未纳入版本控制,也不是提交的一部分,但是它的子路径“%s”是提交的一部分"
 
 #: libsvn_client/commit_util.c:865
 #, c-format
@@ -1055,13 +1099,13 @@
 msgstr "提交项目“%s”有复制标志,但是修订版无效"
 
 #: libsvn_client/copy.c:95 libsvn_client/copy.c:769
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is not a directory"
-msgstr "“%s”不是目录"
+msgstr "路径“%s”不是目录"
 
 #: libsvn_client/copy.c:138
 msgid "Move will not be attempted unless forced"
-msgstr "除非强行操作,否则不会执行移动操作"
+msgstr "除非强制操作,否则不会执行移动操作"
 
 #: libsvn_client/copy.c:334
 #, c-format
@@ -1146,23 +1190,19 @@
 msgstr "名字:%s%s"
 
 #: libsvn_client/diff.c:203
-#, fuzzy, c-format
+#, c-format
 msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"s”与“%s”)"
+msgstr "地�(URL)中没有方案�(指svn://, http://, file://等)(“%s�与“%s�)"
 
 #: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, fuzzy, c-format
+#, c-format
 msgid "URL has no scheme: '%s'"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"s”"
+msgstr "地�(URL)中没有方案�(指svn://, http://, file://等)(“%s�)"
 
 #: libsvn_client/diff.c:222
-#, fuzzy, c-format
+#, c-format
 msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
+msgstr "尚不支持混合的存取方案 (“%s”与“%s”)"
 
 # as-is
 #: libsvn_client/diff.c:287
@@ -1214,9 +1254,8 @@
 msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
 
 #: libsvn_client/diff.c:1961
-#, fuzzy
 msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
+msgstr "抱歉,svn_client_diff3 尚不支持这种调用方式"
 
 #: libsvn_client/diff.c:2000
 msgid ""
@@ -1231,7 +1270,7 @@
 
 #: libsvn_client/diff.c:2352
 msgid "Summarizing diff can only compare repository to repository"
-msgstr ""
+msgstr "只能在档案库之间做摘要比较"
 
 #: libsvn_client/diff.c:2709 libsvn_client/diff.c:2715
 #: libsvn_client/diff.c:2850 libsvn_client/locking_commands.c:263
@@ -1266,12 +1305,12 @@
 msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
 
 #: libsvn_client/info.c:243
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot read entry for '%s'"
 msgstr "不能读“%s”的条目"
 
 #: libsvn_client/info.c:379 libsvn_client/info.c:404 libsvn_client/info.c:414
-#, fuzzy, c-format
+#, c-format
 msgid "URL '%s' non-existent in revision '%ld'"
 msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
 
@@ -1289,12 +1328,12 @@
 msgstr "不能跨越多个档案库进行 锁定/解锁"
 
 #: libsvn_client/locking_commands.c:328
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "“%s”没有在工作拷贝中锁定"
 
 #: libsvn_client/locking_commands.c:376
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked"
 msgstr "“%s”没有被锁定"
 
@@ -1308,9 +1347,8 @@
 msgstr "未提供请求的修订版规格"
 
 #: libsvn_client/log.c:86
-#, fuzzy
 msgid "Revision type requires a working copy path, not a URL"
-msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+msgstr "修订版类型需要工作拷贝路径,不是URL"
 
 #: libsvn_client/log.c:139 libsvn_client/status.c:261
 #: libsvn_client/update.c:86
@@ -1319,7 +1357,6 @@
 msgstr "项目“%s”没有地址(URL)"
 
 #: libsvn_client/log.c:370
-#, fuzzy
 msgid "No commits in repository"
 msgstr "档案库中没有任何提交"
 
@@ -1334,7 +1371,7 @@
 msgstr "修订版属性“%s”在此上下文中并不允许"
 
 #: libsvn_client/prop_commands.c:199
-#, fuzzy, c-format
+#, c-format
 msgid "Setting property on non-local target '%s' is not supported"
 msgstr "设定非本地目标“%s”的属性尚不支持"
 
@@ -1348,9 +1385,9 @@
 msgstr "除非强迫为之,否则其值不会被设定"
 
 #: libsvn_client/prop_commands.c:499
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not exist in revision '%ld'"
-msgstr "路径“%s”不存在于修订版 %ld"
+msgstr "“%s”不存在于修订版%ld中"
 
 #: libsvn_client/prop_commands.c:506 libsvn_client/prop_commands.c:765
 #, c-format
@@ -1396,9 +1433,9 @@
 "“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
 
 #: libsvn_client/relocate.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not the root of the repository"
-msgstr "”%s“没有在档案库中被锁定"
+msgstr "“%s”不是档案库的根目录"
 
 #: libsvn_client/relocate.c:108
 #, c-format
@@ -1406,9 +1443,9 @@
 msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
 
 #: libsvn_client/revisions.c:99
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' has no committed revision"
-msgstr "路径“%s”于 HEAD 修订版中找不到"
+msgstr "路径“%s”上没有提交的修订版"
 
 #: libsvn_client/revisions.c:109
 #, c-format
@@ -1417,15 +1454,15 @@
 
 #: libsvn_delta/svndiff.c:144
 msgid "Compression of svndiff data failed"
-msgstr ""
+msgstr "svndiff数据压缩失败"
 
 #: libsvn_delta/svndiff.c:407
 msgid "Decompression of svndiff data failed"
-msgstr ""
+msgstr "svndiff数据解压缩失败"
 
 #: libsvn_delta/svndiff.c:414
 msgid "Size of uncompressed data does not match stored original length"
-msgstr ""
+msgstr "解压缩后数据长度与原始长度不一致"
 
 #: libsvn_delta/svndiff.c:484
 #, c-format
@@ -1488,17 +1525,17 @@
 #: libsvn_diff/diff_file.c:593
 #, c-format
 msgid "The file '%s' changed unexpectedly during diff"
-msgstr ""
+msgstr "文件“%s”在比较期间被修改"
 
 #: libsvn_diff/diff_file.c:714
-#, fuzzy, c-format
+#, c-format
 msgid "Error parsing diff options"
-msgstr "分解“%s”时发生错误"
+msgstr "解析diff选项出错"
 
 #: libsvn_diff/diff_file.c:737
 #, c-format
 msgid "Invalid argument '%s' in diff options"
-msgstr ""
+msgstr "diff选项中的“%s”参数无效"
 
 #: libsvn_diff/diff_file.c:1019
 #, c-format
@@ -1517,9 +1554,9 @@
 msgstr "“%s”未定义 '%s()'"
 
 #: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%s”模块失败"
+msgstr "装载“%s”文件系统类型的模块失败"
 
 #: libsvn_fs/fs-loader.c:138
 #, c-format
@@ -1533,26 +1570,26 @@
 msgstr "未知的文件系统(FS)类别“%s”"
 
 #: libsvn_fs/fs-loader.c:253
-#, fuzzy, c-format
+#, c-format
 msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统(FS)互斥体"
+msgstr "不能分配文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:289
-#, fuzzy, c-format
+#, c-format
 msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统(FS)互斥体"
+msgstr "无法获取文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:295
 #, c-format
 msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统(FS)互斥体"
+msgstr "不能释放文件系统互斥体"
 
 #: libsvn_fs/fs-loader.c:901
 msgid "Negative expiration date passed to svn_fs_lock"
 msgstr "不能接受的有效期传递到 svn_fs_lock"
 
 #: libsvn_fs_base/bdb/bdb-err.c:101
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while %s:\n"
 msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
@@ -1583,7 +1620,7 @@
 
 #: libsvn_fs_base/bdb/changes-table.c:282
 #: libsvn_fs_base/bdb/changes-table.c:401
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading changes for key '%s'"
 msgstr "读关键字“%s”的更改时发生错误"
 
@@ -1598,7 +1635,6 @@
 msgstr "正在关闭更改指针"
 
 #: libsvn_fs_base/bdb/copies-table.c:85
-#, fuzzy
 msgid "storing copy record"
 msgstr "正在存储拷贝记录"
 
@@ -1616,7 +1652,6 @@
 
 # as-is
 #: libsvn_fs_base/bdb/copies-table.c:195
-#, fuzzy
 msgid "reading copy"
 msgstr "正在读取拷贝"
 
@@ -1629,7 +1664,7 @@
 msgstr "正在提取下一个节点 ID 关键字"
 
 #: libsvn_fs_base/bdb/nodes-table.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
 msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
 
@@ -1639,88 +1674,77 @@
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/nodes-table.c:218
-#, fuzzy
 msgid "reading node revision"
 msgstr "正在读取节点修订版"
 
 #: libsvn_fs_base/bdb/nodes-table.c:250
-#, fuzzy
 msgid "storing node revision"
 msgstr "正在存储节点修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "No such representation '%s'"
-msgstr "没有这样的请求 “%s”"
+msgstr "没有修订版“%s”"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/reps-table.c:96
-#, fuzzy
 msgid "reading representation"
-msgstr "正在读取请求"
+msgstr "正在读取修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:124
-#, fuzzy
 msgid "storing representation"
-msgstr "正在存储请求"
+msgstr "正在存储修订版"
 
 #: libsvn_fs_base/bdb/reps-table.c:154
 msgid "allocating new representation (getting next-key)"
-msgstr "正在分配新请求 (正在获取 next-key)"
+msgstr "正在分配新修订版(正在获取 next-key)"
 
 #: libsvn_fs_base/bdb/reps-table.c:175
-#, fuzzy
 msgid "bumping next representation key"
-msgstr "正在提取下一个请求关键字"
+msgstr "正在提取下一个修订版关键字"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/reps-table.c:203
-#, fuzzy
 msgid "deleting representation"
-msgstr "正在删除请求"
+msgstr "正在删除修订版"
 
 #. Handle any other error conditions.
 #: libsvn_fs_base/bdb/rev-table.c:87
-#, fuzzy
 msgid "reading filesystem revision"
-msgstr "正在读取文件系统修订版号"
+msgstr "正在读取文件系统修订版"
 
 #: libsvn_fs_base/bdb/strings-table.c:89
 msgid "creating cursor for reading a string"
 msgstr "正在为读取一个字符串创建指针"
 
 #: libsvn_fs_base/bdb/txn-table.c:92
-#, fuzzy
 msgid "storing transaction record"
 msgstr "正在存储事务记录"
 
 #: libsvn_fs_base/bdb/uuids-table.c:114
-#, fuzzy
 msgid "get repository uuid"
-msgstr "获取档案库唯一标记(uuid)"
+msgstr "获取档案库UUID"
 
 #: libsvn_fs_base/bdb/uuids-table.c:142
-#, fuzzy
 msgid "set repository uuid"
-msgstr "设置档案库唯一标记(uuid)"
+msgstr "设置档案库UUID"
 
 #: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
 msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:247
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
+msgstr "损坏的数据库:初始的拷贝编号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
 msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
 
 #: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:317
-#, fuzzy
 msgid "Attempted to create entry in non-directory parent"
 msgstr "企图在非目录的父节点创建条目"
 
@@ -1730,22 +1754,20 @@
 msgstr "企图用一个非法的名字“%s”创建节点"
 
 #: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:323
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to clone child of non-mutable node"
 msgstr "企图克隆非可变节点的子节点"
 
 #: libsvn_fs_base/dag.c:494
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to create entry that already exists"
 msgstr "企图创建已经存在的子条目"
 
 #: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:385
-#, fuzzy
 msgid "Attempted to set entry in non-directory node"
 msgstr "企图在非目录节点中设置条目"
 
 #: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:391
-#, fuzzy
 msgid "Attempted to set entry in immutable node"
 msgstr "企图在不可改变的节点设置条目"
 
@@ -1760,12 +1782,12 @@
 msgstr "企图以非法名字“%s”建立子克隆"
 
 #: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to delete entry '%s' from *non*-directory node"
 msgstr "企图从非目录节点删除条目“%s”"
 
 #: libsvn_fs_base/dag.c:858
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to delete entry '%s' from immutable directory node"
 msgstr "企图从不可更改目录节点删除条目“%s”"
 
@@ -1775,12 +1797,12 @@
 msgstr "企图删除一个非法名字“%s”的节点"
 
 #: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
-#, fuzzy, c-format
+#, c-format
 msgid "Delete failed: directory has no entry '%s'"
 msgstr "删除失败:目录没有项目“%s”"
 
 #: libsvn_fs_base/dag.c:962
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted removal of immutable node"
 msgstr "企图删除不可改变的节点"
 
@@ -1800,25 +1822,25 @@
 msgstr "企图获取非文件节点的校验和"
 
 #: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "企图设置非文件节点文本内容"
+msgstr "企图设置非文件节点的文本内容"
 
 #: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
-#, fuzzy, c-format
+#, c-format
 msgid "Attempted to set textual contents of an immutable node"
-msgstr "企图设置不可改变节点文本内容"
+msgstr "企图设置不可改变节点的文本内容"
 
 #: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch, rep '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"校验和不匹配,报告“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"校验和不匹配,修订版“%s”:\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_base/dag.c:1312
 #, c-format
@@ -1885,32 +1907,32 @@
 msgstr "“%s”不是文件系统“%s”的目录"
 
 #: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgstr "“%s”不是文件系统“%s”的一个文件"
 
 #: libsvn_fs_base/err.c:171
-#, fuzzy, c-format
+#, c-format
 msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
 msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
 
 #: libsvn_fs_base/err.c:181
-#, fuzzy, c-format
+#, c-format
 msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
+msgstr "文件系统“%2$s”中的路径“%1$s”没有标识"
 
 #: libsvn_fs_base/err.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
+msgstr "文件系统“%2$s”中“%1$s”的 'locks' 表里锁损坏"
 
 #: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
-#, fuzzy, c-format
+#, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
 
 #: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
-#, fuzzy, c-format
+#, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
 
@@ -1920,12 +1942,12 @@
 msgstr "文件系统“%s”当前没有用户名关联"
 
 #: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
-#, fuzzy, c-format
+#, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
+msgstr "用户“%1$s”尝试使用文件系统“%3$s”中属于“%2$s”的锁"
 
 #: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
 
@@ -1940,24 +1962,23 @@
 msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
 
 #: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
-#, fuzzy
 msgid "Filesystem object already open"
 msgstr "文件系统对象已经打开"
 
 #: libsvn_fs_base/fs.c:189
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当关闭环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:539
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当创建环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:545
-#, fuzzy, c-format
+#, c-format
 msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+msgstr "当打开环境时文件系统 %s 上的伯克利数据库(Berkeley DB)出错:\n"
 
 #: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:277
 #, c-format
@@ -1965,32 +1986,28 @@
 msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
 
 #: libsvn_fs_base/fs.c:1094
-#, fuzzy
 msgid ""
 "Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
 "may be interfering with the hotcopy algorithm. If \n"
 "the problem persists, try deactivating this feature \n"
 "in DB_CONFIG"
 msgstr ""
-"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
-"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
-"在 DB_CONFIG 中取消这个功能。"
+"复制logfile时发生错误;DB_LOG_AUTOREMOVE 特性可能干扰热拷贝算法。\n"
+"如果问题持续存在,请尝试在 DB_CONFIG 中取消这个特性。"
 
 #: libsvn_fs_base/fs.c:1113
-#, fuzzy
 msgid ""
 "Error running catastrophic recovery on hotcopy; the \n"
 "DB_LOG_AUTOREMOVE feature may be interfering with the \n"
 "hotcopy algorithm. If the problem persists, try deactivating \n"
 "this feature in DB_CONFIG"
 msgstr ""
-"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
-"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
-"尝试在 DB_CONFIG 中取消这个功能。"
+"对热拷贝执行灾后恢复时出错;DB_LOG_AUTOREMOVE 特性可能干扰热拷贝算法。\n"
+"如果问题持续存在,请尝试在 DB_CONFIG 中取消这个特性。"
 
 #: libsvn_fs_base/fs.c:1222
 msgid "Module for working with a Berkeley DB repository."
-msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
+msgstr "操作伯克利数据库(Berkeley DB)档案库的模块。"
 
 #: libsvn_fs_base/fs.c:1255
 #, c-format
@@ -2015,49 +2032,48 @@
 #. Helper macro that evaluates to an error message indicating that
 #. the representation referred to by X has an unknown node kind.
 #: libsvn_fs_base/reps-strings.c:57
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown node kind for representation '%s'"
-msgstr "“%s”为未知的节点类型"
+msgstr "修订版“%s”的节点类型未知"
 
 #: libsvn_fs_base/reps-strings.c:108
-#, fuzzy
 msgid "Representation is not of type 'delta'"
-msgstr "请求不是 “delta” 类型"
+msgstr "修订版不是 “delta” 类型"
 
 #: libsvn_fs_base/reps-strings.c:379
 msgid "Svndiff source length inconsistency"
-msgstr ""
+msgstr "Svndiff源长度不一致"
 
 #: libsvn_fs_base/reps-strings.c:506
 #, c-format
 msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%s”请求Diff 的版本冲突"
+msgstr "在“%s”修订版中 diff 的版本不一致"
 
 #: libsvn_fs_base/reps-strings.c:532
 #, c-format
 msgid ""
 "Corruption detected whilst reading delta chain from representation '%s' to '%"
 "s'"
-msgstr ""
+msgstr "从修订版“%s”到“%s”读取差异链时检测到损坏"
 
 #: libsvn_fs_base/reps-strings.c:780
 #, c-format
 msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,限制是 %s"
+msgstr "修订版内容太大: %s,最大只能 %s"
 
 #: libsvn_fs_base/reps-strings.c:796
-#, fuzzy, c-format
+#, c-format
 msgid "Failure reading rep '%s'"
-msgstr "读取报告“%s”失败"
+msgstr "读取修订版“%s”失败"
 
 #: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch on rep '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"报告“%s”的校验和不匹配:\n"
+"修订版“%s”的校验和不匹配:\n"
 " 预期: %s\n"
 " 实际: %s\n"
 
@@ -2066,14 +2082,14 @@
 msgstr "空的报告,偏移已经超过零值"
 
 #: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
-#, fuzzy, c-format
+#, c-format
 msgid "Rep '%s' is not mutable"
-msgstr "报告“%s”是不可变的"
+msgstr "修订版“%s”是不可变的"
 
 #: libsvn_fs_base/reps-strings.c:1040
 #, c-format
 msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s” 可变并且非全文本"
+msgstr "修订版“%s” 可变且非纯文本"
 
 #: libsvn_fs_base/reps-strings.c:1340
 msgid "Failed to get new string key"
@@ -2085,22 +2101,21 @@
 msgstr "企图 deltify “%s” 自身"
 
 #: libsvn_fs_base/reps-strings.c:1487
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%s”的MD5指纹失败"
+msgstr "计算“%s”的MD5摘要失败"
 
 #: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction is not dead: '%s'"
 msgstr "事务未结束:“%s”"
 
 #: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction is dead: '%s'"
 msgstr "事务已结束:“%s”"
 
 #: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
 msgid "Transaction aborted, but cleanup failed"
 msgstr "事务中止,但清除失败"
 
@@ -2108,7 +2123,7 @@
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT.
 #: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
+#, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "文件找不到:事务“%s” ,路径“%s”"
 
@@ -2119,7 +2134,7 @@
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
+#, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
 
@@ -2129,32 +2144,30 @@
 msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
 
 #: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
-#, fuzzy
 msgid "Root object must be a transaction root"
-msgstr "根对象必须是一个事务的根对象"
+msgstr "根对象必须是一个根事务"
 
 #: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
+#, c-format
 msgid "Failure opening '%s'"
 msgstr "打开“%s”失败"
 
 #: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
-#, fuzzy
 msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个不同的文件系统之间比较属性值"
+msgstr "不能在两个不同的文件系统之间比较属性值"
 
 #: libsvn_fs_base/tree.c:1735
 msgid "Corrupt DB: faulty predecessor count"
 msgstr "无效的数据库:先前的数目不完整"
 
 #: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected immutable node at '%s'"
-msgstr "在“%s”有未知或意想不到的不可改变节点"
+msgstr "在“%s”不应有不可改变节点"
 
 # as-is
 #: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
+#, c-format
 msgid "Conflict at '%s'"
 msgstr "在“%s”冲突"
 
@@ -2169,67 +2182,64 @@
 msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
 
 #: libsvn_fs_base/tree.c:2373
-#, fuzzy, c-format
+#, c-format
 msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
+msgstr "关于修订版本“%2$s”的事务“%1$s”已经过期"
 
 #: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
-#, fuzzy
 msgid "The root directory cannot be deleted"
 msgstr "根目录不能删除"
 
 #: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy between two different filesystems ('%s' and '%s')"
-msgstr "在两个不同的文件系统之间比较属性值"
+msgstr "不能在两个不同的文件系统(“%s”和“%s”)之间比较属性值"
 
 #: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
 msgid "Copy from mutable tree not currently supported"
 msgstr "当前不支持从可变的树复制"
 
 #: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Base checksum mismatch on '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"基本校验和在“%s”不匹配:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"基校验和在“%s”不匹配:\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
-#, fuzzy
 msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个不同的文件系统询问内容的更改"
+msgstr "不能在两个不同的文件系统间比较文件内容"
 
 #: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
 #: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
 #: libsvn_repos/rev_hunt.c:605
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a file"
 msgstr "“%s”不是一个文件"
 
 #: libsvn_fs_fs/dag.c:367
-#, fuzzy
 msgid "Can't get entries of non-directory"
 msgstr "不能获取非目录的条目"
 
 #: libsvn_fs_fs/dag.c:914
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch, file '%s':\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
 "校验和不匹配,文件“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+" 预期:%s\n"
+" 实际:%s\n"
 
 #: libsvn_fs_fs/err.c:107
-#, fuzzy, c-format
+#, c-format
 msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
+msgstr "文件系统“%2$s”中路径“%1$s”的锁文件损坏"
 
 #: libsvn_fs_fs/fs.c:97
 #, c-format
@@ -2237,7 +2247,7 @@
 msgstr "不能获取文件系统(FSFS)互斥体"
 
 #: libsvn_fs_fs/fs.c:104
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create FSFS mutex"
 msgstr "无法创建文件系统(FSFS)互斥体"
 
@@ -2262,7 +2272,7 @@
 #: libsvn_fs_fs/fs_fs.c:583 libsvn_fs_fs/fs_fs.c:597 libsvn_fs_fs/fs_fs.c:604
 #: libsvn_fs_fs/fs_fs.c:611 libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627
 msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 中没有 text rep offset 列"
+msgstr "node-rev 中有畸形的文本表示偏移行"
 
 #: libsvn_fs_fs/fs_fs.c:696
 msgid "Missing kind field in node-rev"
@@ -2286,7 +2296,7 @@
 
 #: libsvn_fs_fs/fs_fs.c:967
 msgid "Malformed representation header"
-msgstr "畸形的描述文件头"
+msgstr "畸形的修订版文件头"
 
 #: libsvn_fs_fs/fs_fs.c:991
 msgid "Missing node-id in node-rev"
@@ -2318,12 +2328,12 @@
 
 #: libsvn_fs_fs/fs_fs.c:1216
 msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff 数据畸形"
+msgstr "修订版的svndiff 数据畸形"
 
 # as-is
 #: libsvn_fs_fs/fs_fs.c:1359 libsvn_fs_fs/fs_fs.c:1372
 msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "正在读取请求的一个 svndiff 窗口最末端"
+msgstr "读取一个svndiff窗口时超出了修订版的结尾"
 
 #: libsvn_fs_fs/fs_fs.c:1508
 msgid "svndiff data requested non-existent source"
@@ -2338,13 +2348,13 @@
 msgstr "svndiff 的窗格长度已毁损"
 
 #: libsvn_fs_fs/fs_fs.c:1602
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Checksum mismatch while reading representation:\n"
 " expected: %s\n"
 " actual: %s\n"
 msgstr ""
-"当读取请求时校验和不匹配:\n"
+"读取修订版时校验和不匹配:\n"
 " 预期: %s\n"
 " 实际: %s\n"
 
@@ -2376,16 +2386,15 @@
 msgstr "自事务进行复制是不被允许的"
 
 #: libsvn_fs_fs/fs_fs.c:2492
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
+msgstr "无法在“%s”中为修订版 %ld 创建事务目录"
 
 #: libsvn_fs_fs/fs_fs.c:2671 libsvn_fs_fs/fs_fs.c:2678
 msgid "next-id file corrupt"
 msgstr "next-id 文件损坏"
 
 #: libsvn_fs_fs/fs_fs.c:2763
-#, fuzzy
 msgid "Transaction cleanup failed"
 msgstr "事务清除失败"
 
@@ -2433,19 +2442,19 @@
 msgstr "无此事务"
 
 #: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "无法写入锁/条目的混杂文件“%s”"
+msgstr "无法写入锁-条目的哈希文件“%s”"
 
 #: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
+#, c-format
 msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "不能分析锁/条目的混杂文件“%s“"
+msgstr "不能解析锁-条目的哈希文件“%s“"
 
 #: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%s”不存在于最新修订版中"
+msgstr "路径“%s”不存在于HEAD修订版中"
 
 #: libsvn_fs_fs/lock.c:741
 #, c-format
@@ -2453,31 +2462,25 @@
 msgstr "锁失败:新的版本“%s”已经存在"
 
 #: libsvn_ra/ra_loader.c:213
-#, fuzzy, c-format
+#, c-format
 msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+msgstr "“%s”的 RA 版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
 #: libsvn_ra/ra_loader.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+msgstr "无法识别“%s”中的URL方案"
 
 #: libsvn_ra/ra_loader.c:336
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' isn't in the same repository as '%s'"
-msgstr ""
-"“%s”\n"
-"与\n"
-"“%s”\n"
-"并不在同一个档案库中"
+msgstr "“%s”与“%s”并不在同一个档案库中"
 
 # as-is
 #: libsvn_ra/ra_loader.c:707
-#, fuzzy, c-format
+#, c-format
 msgid " - handles '%s' scheme\n"
-msgstr " - 处理“%s”规则\n"
+msgstr " - 处理“%s”方案\n"
 
 #: libsvn_ra/ra_loader.c:793
 #, c-format
@@ -2498,22 +2501,22 @@
 msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
 
 #: libsvn_ra_dav/commit.c:487
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create a CHECKOUT request (%s)"
 msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
 
 #: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
 #: libsvn_ra_serf/commit.c:436
-#, fuzzy, c-format
+#, c-format
 msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录”%s“或许已经过时"
+msgstr "您的文件或目录“%s”很可能已经过期"
 
 #: libsvn_ra_dav/commit.c:582
 msgid "The CHECKOUT response did not contain a 'Location:' header"
 msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
 
 #: libsvn_ra_dav/commit.c:881
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create a DELETE request (%s)"
 msgstr "无法产生一个删除(DELETE)请求 (%s)"
 
@@ -2542,9 +2545,9 @@
 msgstr "无法储存版本资源的地址(URL)"
 
 #: libsvn_ra_dav/fetch.c:406
-#, fuzzy, c-format
+#, c-format
 msgid "Could not get content-type from response"
-msgstr "不能从回应中获得内容类型(content-type)"
+msgstr "不能从响应中获得内容类型(content-type)"
 
 #: libsvn_ra_dav/fetch.c:451
 #, c-format
@@ -2573,7 +2576,7 @@
 
 #: libsvn_ra_dav/fetch.c:1151
 msgid "Server response missing the expected deadprop-count property"
-msgstr ""
+msgstr "服务端响应丢失了deadprop-count属性"
 
 #: libsvn_ra_dav/fetch.c:1324
 msgid "Server does not support date-based operations"
@@ -2585,21 +2588,18 @@
 
 # as-is
 #: libsvn_ra_dav/fetch.c:1470
-#, fuzzy
 msgid "'get-locations' REPORT not implemented"
 msgstr "get-locations REPORT 未实现"
 
 #: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
 #: libsvn_ra_dav/session.c:1474
-#, fuzzy
 msgid "Incomplete lock data returned"
 msgstr "返回了不完全的锁数据"
 
 #: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
 #: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
-#, fuzzy
 msgid "Server does not support locking features"
-msgstr "服务器不支持锁定特性"
+msgstr "服务器不支持加锁"
 
 #: libsvn_ra_dav/fetch.c:1908
 msgid ""
@@ -2626,7 +2626,6 @@
 
 # as-is
 #: libsvn_ra_dav/file_revs.c:363
-#, fuzzy
 msgid "'get-file-revs' REPORT not implemented"
 msgstr "get-file-revs REPORT 未实现"
 
@@ -2692,12 +2691,12 @@
 
 #: libsvn_ra_dav/props.c:685
 msgid "The path was not part of a repository"
-msgstr "路径不是档案库的一部份"
+msgstr "路径不是档案库的一部分"
 
 #: libsvn_ra_dav/props.c:696
 #, c-format
 msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
+msgstr "路径“%s”的任何一部分在档案库 HEAD 中都找不到"
 
 #: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
 msgid "The VCC property was not found on the resource"
@@ -2720,55 +2719,52 @@
 msgstr "至少有一个属性变更失败;档案库未改变"
 
 #: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
-#, fuzzy
 msgid "Missing revision attr in target-revision element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "target-revision元素丢失了revision属性"
 
 #: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
-#, fuzzy
 msgid "Missing revision attr in open-root element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-root元素丢失了revisioin属性"
 
 #: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
 msgid "Missing name attr in delete-entry element"
-msgstr ""
+msgstr "delete-entry元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:176
 msgid "Missing rev attr in delete-entry element"
-msgstr ""
+msgstr "delete-entry元素丢失了rev属性"
 
 #: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
-#, fuzzy
 msgid "Missing name attr in open-directory element"
-msgstr "未提供属性名称与档案库路径参数"
+msgstr "open-directory元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
 #: libsvn_ra_serf/replay.c:371
-#, fuzzy, c-format
+#, c-format
 msgid "Missing name attr in %s element"
-msgstr "未提供属性名称参数"
+msgstr "“%s”元素丢失了name属性"
 
 #: libsvn_ra_dav/replay.c:288
 msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr ""
+msgstr "apply-textdelta元素之前没有add-file或者open-file元素"
 
 #: libsvn_ra_dav/replay.c:314
 msgid "Got close-file element without preceding add-file or open-file"
-msgstr ""
+msgstr "close-file元素之前没有add-file或者open-file元素"
 
 #: libsvn_ra_dav/replay.c:329
 msgid "Got close-directory element without ever opening a directory"
-msgstr ""
+msgstr "close-directory元素之前没有打开过目录"
 
 #: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
-#, fuzzy, c-format
+#, c-format
 msgid "Error writing stream: unexpected EOF"
-msgstr "写入流时发生错误:意想不到的 EOF"
+msgstr "写入流时发生错误:提前到达文件末尾"
 
 #: libsvn_ra_dav/replay.c:463
 #, c-format
 msgid "Got cdata content for a prop delete"
-msgstr ""
+msgstr "删除属性时碰到cdata内容"
 
 #: libsvn_ra_dav/session.c:444
 msgid "Invalid URL: illegal character in proxy port number"
@@ -2827,34 +2823,30 @@
 msgstr "请将服务器升级至 0.19 或更新的版本"
 
 #: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
-#, fuzzy
 msgid "Failed to parse URI"
-msgstr "分析地址(URI)失败"
+msgstr "解析URI失败"
 
 #: libsvn_ra_dav/session.c:1183
-#, fuzzy
 msgid "Lock request failed"
 msgstr "锁请求失败"
 
 #: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not locked in the repository"
-msgstr "”%s“没有在档案库中被锁定"
+msgstr "档案库中的“%s”没有被锁定"
 
 #: libsvn_ra_dav/session.c:1349
-#, fuzzy
 msgid "Unlock request failed"
-msgstr "解除锁请求失败"
+msgstr "解锁请求失败"
 
 #: libsvn_ra_dav/session.c:1560
-#, fuzzy
 msgid "Failed to fetch lock information"
 msgstr "获取锁信息失败"
 
 #: libsvn_ra_dav/session.c:1633
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_dav RA加载器"
 
 #: libsvn_ra_dav/util.c:275
 msgid "authorization failed"
@@ -2931,9 +2923,9 @@
 
 # as-is
 #: libsvn_ra_local/ra_plugin.c:1340
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
+msgstr "不支持%d版本的ra_local RA 载入器"
 
 #: libsvn_ra_local/split_url.c:44
 #, c-format
@@ -2957,84 +2949,76 @@
 
 #: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
 #: libsvn_repos/commit.c:393
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' not present"
 msgstr "路径“%s”不存在"
 
 #: libsvn_ra_serf/commit.c:910
 #, c-format
 msgid "Failed writing updated file"
-msgstr ""
+msgstr "写更新文件失败"
 
 #: libsvn_ra_serf/getlocations.c:289
-#, fuzzy
 msgid "File doesn't exist on HEAD"
-msgstr "路径“%s”不存在于最新修订版中"
+msgstr "路径“%s”不存在于HEAD修订版中"
 
 #: libsvn_ra_serf/locks.c:354
-#, fuzzy, c-format
+#, c-format
 msgid "Lock request failed: %d %s"
-msgstr "锁请求失败"
+msgstr "锁请求失败:%d %s"
 
 #: libsvn_ra_serf/locks.c:703
-#, fuzzy, c-format
+#, c-format
 msgid "Unlock request failed: %d %s"
-msgstr "解除锁请求失败"
+msgstr "解锁请求失败:%d %s"
 
 #: libsvn_ra_serf/replay.c:204
-#, fuzzy
 msgid "Missing revision attr in delete-entry element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "delete-entry元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:230
-#, fuzzy
 msgid "Missing revision attr in open-directory element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-directory元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:250
-#, fuzzy
 msgid "Missing name attr in add-directory element"
-msgstr "未提供属性名称与档案库路径参数"
+msgstr "add-directory元素丢失了name属性"
 
 #: libsvn_ra_serf/replay.c:285
-#, fuzzy
 msgid "Missing name attr in open-file element"
-msgstr "未提供属性名称参数"
+msgstr "open-file元素丢失了name属性"
 
 #: libsvn_ra_serf/replay.c:291
-#, fuzzy
 msgid "Missing revision attr in open-file element"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "open-file元素丢失了revision属性"
 
 #: libsvn_ra_serf/replay.c:311
-#, fuzzy
 msgid "Missing name attr in add-file element"
-msgstr "未提供属性名称参数"
+msgstr "add-file元素丢失了name属性"
 
 # as-is
 #: libsvn_ra_serf/serf.c:52
-#, fuzzy
 msgid "Access repository via WebDAV protocol through serf."
-msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
+msgstr "使用serf库通过WebDAV协议访问档案库。"
 
 #: libsvn_ra_serf/serf.c:155
 #, c-format
 msgid "Could not lookup hostname: %s://%s"
-msgstr ""
+msgstr "找�到主机:%s://%s"
 
 #: libsvn_ra_serf/serf.c:741
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_serf RA加载器"
 
 #: libsvn_ra_serf/update.c:2112
 #, c-format
 msgid "Error retrieving REPORT (%d)"
-msgstr ""
+msgstr "获取报告时出错(%d)"
 
 #: libsvn_ra_serf/util.c:743
 msgid "Premature EOF seen from server"
-msgstr ""
+msgstr "服务端发送的数据流提前终止"
 
 #: libsvn_ra_svn/client.c:127
 #, c-format
@@ -3136,7 +3120,7 @@
 
 #: libsvn_ra_svn/client.c:982
 msgid "Non-string as part of file contents"
-msgstr "文件内容的一部份不是字串"
+msgstr "文件内容的一部分不是字串"
 
 # as-is
 #: libsvn_ra_svn/client.c:1081
@@ -3155,13 +3139,11 @@
 
 # as-is
 #: libsvn_ra_svn/client.c:1327
-#, fuzzy
 msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+msgstr "stat未实现"
 
 # as-is
 #: libsvn_ra_svn/client.c:1384
-#, fuzzy
 msgid "'get-locations' not implemented"
 msgstr "get-locations 未实现"
 
@@ -3172,7 +3154,6 @@
 
 # as-is
 #: libsvn_ra_svn/client.c:1446
-#, fuzzy
 msgid "'get-file-revs' not implemented"
 msgstr "get-file-revs 未实现"
 
@@ -3190,65 +3171,56 @@
 msgstr "get-file-revs 命令没有返回任何修订版"
 
 #: libsvn_ra_svn/client.c:1557
-#, fuzzy
 msgid "Server doesn't support the lock command"
-msgstr "服务器不支持锁命令"
+msgstr "服务器不支持加锁命令"
 
 #: libsvn_ra_svn/client.c:1621
-#, fuzzy
 msgid "Server doesn't support the unlock command"
-msgstr "服务器不支持解除锁命令"
+msgstr "服务器不支持解锁命令"
 
 # as-is
 #: libsvn_ra_svn/client.c:1718
-#, fuzzy
 msgid "Lock response not a list"
-msgstr "锁元素不是一个列表"
+msgstr "加锁响应不是一个列表"
 
 #: libsvn_ra_svn/client.c:1732
-#, fuzzy
 msgid "Unknown status for lock command"
-msgstr "未知的 svn 通讯协定命令"
+msgstr "加锁命令的状态未知"
 
 #: libsvn_ra_svn/client.c:1754
 msgid "Didn't receive end marker for lock responses"
-msgstr ""
+msgstr "加锁响应丢失了结尾标记"
 
 # as-is
 #: libsvn_ra_svn/client.c:1841
-#, fuzzy
 msgid "Unlock response not a list"
-msgstr "锁元素不是一个列表"
+msgstr "解锁响应不是一个列表"
 
 #: libsvn_ra_svn/client.c:1855
-#, fuzzy
 msgid "Unknown status for unlock command"
-msgstr "命令回应中的未知状态“%s”"
+msgstr "解锁命令的状态未知"
 
 #: libsvn_ra_svn/client.c:1876
 msgid "Didn't receive end marker for unlock responses"
-msgstr ""
+msgstr "解锁响应丢失了结束标记"
 
 #: libsvn_ra_svn/client.c:1900 libsvn_ra_svn/client.c:1928
-#, fuzzy
 msgid "Server doesn't support the get-lock command"
-msgstr "服务器不支持获取锁命令get-lock"
+msgstr "服务器不支持命令get-lock"
 
 # as-is
 #: libsvn_ra_svn/client.c:1941
-#, fuzzy
 msgid "Lock element not a list"
-msgstr "锁元素不是一个列表"
+msgstr "Lock元素不是一个列表"
 
 #: libsvn_ra_svn/client.c:1964
-#, fuzzy
 msgid "Server doesn't support the replay command"
-msgstr "服务器不支持锁命令"
+msgstr "服务器不支持replay命令"
 
 #: libsvn_ra_svn/client.c:2028
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
+msgstr "不支持%d版本的ra_svn RA加载器"
 
 # as-is
 #: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
@@ -3257,12 +3229,12 @@
 
 #: libsvn_ra_svn/editor.c:621
 msgid "Non-string as part of text delta"
-msgstr "文件差异的一部份不是字串"
+msgstr "文件差异的一部分不是字串"
 
 #: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
 #, c-format
 msgid "Command 'finish-replay' invalid outside of replays"
-msgstr ""
+msgstr "finish-replay命令只在重放时有效"
 
 # as-is
 #: libsvn_ra_svn/editorp.c:129
@@ -3393,15 +3365,15 @@
 
 # as-is
 #: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
+#, c-format
 msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+msgstr "* 已导出修订版 %ld。\n"
 
 # as-is
 #: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
+#, c-format
 msgid "* Verified revision %ld.\n"
-msgstr "* 校验修订版 %ld。\n"
+msgstr "* 已校验修订版 %ld。\n"
 
 #: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1207
 msgid "Commit succeeded, but post-commit hook failed"
@@ -3415,9 +3387,9 @@
 msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
 
 #: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
+#, c-format
 msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
+msgstr "拒绝写入:未授权读取所有修订版 %ld。"
 
 #: libsvn_repos/fs-wrap.c:484
 #, c-format
@@ -3425,9 +3397,8 @@
 msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
 
 #: libsvn_repos/fs-wrap.c:498
-#, fuzzy
 msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
+msgstr "解锁成功,但是post-unlock外挂失败"
 
 #: libsvn_repos/hooks.c:71
 #, c-format
@@ -3435,14 +3406,14 @@
 msgstr "无法为外挂“%s”创建管道"
 
 #: libsvn_repos/hooks.c:83
-#, fuzzy, c-format
+#, c-format
 msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgstr "无法为“%s”外挂创建非继承的管道读句柄"
 
 #: libsvn_repos/hooks.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgstr "无法为“%s”外挂创建非继承的管道写句柄"
 
 #: libsvn_repos/hooks.c:98
 #, c-format
@@ -3455,7 +3426,7 @@
 msgstr "关闭标准错误管道末尾发生错误"
 
 #: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to start '%s' hook"
 msgstr "运行外挂“%s”失败"
 
@@ -3469,7 +3440,7 @@
 "%s"
 
 #: libsvn_repos/hooks.c:144
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' hook failed; no error output available"
 msgstr "外挂“%s”失败;没有可用的错误输出"
 
@@ -3506,12 +3477,12 @@
 #: libsvn_repos/load.c:173
 #, c-format
 msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr ""
+msgstr "导出流在“%.20s”包含错误头部(没有“:”)"
 
 #: libsvn_repos/load.c:186
 #, c-format
 msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr ""
+msgstr "导出流在“%.20s”包含错误头部(没有值)"
 
 #: libsvn_repos/load.c:270
 msgid "Incomplete or unterminated property block"
@@ -3579,7 +3550,6 @@
 msgstr "“%s”的节点种动作法辨识"
 
 #: libsvn_repos/load.c:1154
-#, fuzzy
 msgid " done.\n"
 msgstr "完成。\n"
 
@@ -3627,9 +3597,8 @@
 msgstr "未授权打开根进行编辑操作"
 
 #: libsvn_repos/reporter.c:843
-#, fuzzy
 msgid "Target path does not exist"
-msgstr "路径“%s”不存在"
+msgstr "目标路径不存在"
 
 #: libsvn_repos/reporter.c:850
 msgid "Cannot replace a directory from within"
@@ -3697,9 +3666,8 @@
 msgstr "正在创建 passwd 文件"
 
 #: libsvn_repos/repos.c:1527
-#, fuzzy
 msgid "Creating authz file"
-msgstr "正在创建 passwd 文件"
+msgstr "正在创建 authz 文件"
 
 #: libsvn_repos/repos.c:1560
 msgid "Could not create top-level directory"
@@ -3718,9 +3686,9 @@
 msgstr "档案库创建失败"
 
 #: libsvn_repos/repos.c:1763
-#, fuzzy, c-format
+#, c-format
 msgid "Expected repository format '%d' or '%d'; found format '%d'"
-msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
+msgstr "期待档案库格式是“%d”或“%d”;但发现是格式“%d”"
 
 #: libsvn_repos/rev_hunt.c:64
 #, c-format
@@ -3738,14 +3706,13 @@
 msgstr "无效的结束修订版 %ld"
 
 #: libsvn_repos/rev_hunt.c:315
-#, fuzzy
 msgid "Unreadable path encountered; access denied"
-msgstr "遇到不能读的路径;访问拒绝。"
+msgstr "遇到不可读的路径;访问被拒绝"
 
 #: libsvn_subr/cmdline.c:481
 #, c-format
 msgid "Error initializing command line arguments"
-msgstr ""
+msgstr "初始化命令行参数出错"
 
 #: libsvn_subr/config.c:630
 #, c-format
@@ -3795,14 +3762,14 @@
 msgstr "无法明确时间"
 
 #: libsvn_subr/dso.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Can't grab DSO mutex"
-msgstr "无法获取文件系统(FS)互斥体"
+msgstr "无法获取动态共享对象(DSO)互斥体"
 
 #: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
-#, fuzzy, c-format
+#, c-format
 msgid "Can't ungrab DSO mutex"
-msgstr "不能释放文件系统(FS)互斥体"
+msgstr "无法释放动态共享对象(DSO)互斥体"
 
 #: libsvn_subr/error.c:326
 msgid "Can't recode error string from APR"
@@ -3903,19 +3870,19 @@
 
 # as-is
 #: libsvn_subr/io.c:1192
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open file at '%s'"
 msgstr "不能打开文件“%s”"
 
 #: libsvn_subr/io.c:1196
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+msgstr "不能获取“%s”文件的权限(文件 stat 错误)"
 
 #: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
-#, fuzzy, c-format
+#, c-format
 msgid "Can't change perms of file '%s'"
-msgstr "不能改变文件“%s”为可读写权限"
+msgstr "不能改变文件“%s”的权限"
 
 #: libsvn_subr/io.c:1370
 #, c-format
@@ -3976,7 +3943,7 @@
 #: libsvn_subr/io.c:1731
 #, c-format
 msgid "Can't rewind directory '%s'"
-msgstr "无法返回目录“%s”"
+msgstr "无法回绕目录“%s”"
 
 #: libsvn_subr/io.c:1766 libsvn_subr/io.c:2833 libsvn_subr/io.c:2919
 #, c-format
@@ -4001,32 +3968,32 @@
 #: libsvn_subr/io.c:2017
 #, c-format
 msgid "Can't set process '%s' directory"
-msgstr "无法设定进程“%s”目录"
+msgstr "无法设定进程“%s”的目录"
 
 #: libsvn_subr/io.c:2030
 #, c-format
 msgid "Can't set process '%s' child input"
-msgstr "无法设置子进程“%s”输入"
+msgstr "无法设置进程“%s”的子输入"
 
 #: libsvn_subr/io.c:2037
 #, c-format
 msgid "Can't set process '%s' child outfile"
-msgstr "无法设置子进程“%s”输出文件"
+msgstr "无法设置进程“%s”的子输出文件"
 
 #: libsvn_subr/io.c:2044
 #, c-format
 msgid "Can't set process '%s' child errfile"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的子错误文件"
 
 #: libsvn_subr/io.c:2051
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set process '%s' child errfile for error handler"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的子错误输出文件"
 
 #: libsvn_subr/io.c:2057
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set process '%s' error handler"
-msgstr "无法设置子进程“%s”错误输出文件"
+msgstr "无法设置进程“%s”的错误处理函数"
 
 # as-is
 #: libsvn_subr/io.c:2080
@@ -4133,12 +4100,11 @@
 
 # as-is
 #: libsvn_subr/io.c:2635
-#, fuzzy, c-format
+#, c-format
 msgid "Can't read length line in file '%s'"
 msgstr "不能从文件“%s”读取长度行"
 
 #: libsvn_subr/io.c:2639
-#, fuzzy
 msgid "Can't read length line in stream"
 msgstr "无法从数据流读取长度行"
 
@@ -4198,12 +4164,11 @@
 msgstr "“%s”的第一行包含了非阿拉伯数字"
 
 #: libsvn_subr/nls.c:79
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string to UCS-2: '%s'"
 msgstr "不能把字符串转换为UCS-2:“%s”。"
 
 #: libsvn_subr/nls.c:86
-#, fuzzy
 msgid "Can't get module file name"
 msgstr "无法获取模块文件名"
 
@@ -4266,7 +4231,6 @@
 
 # as-is
 #: libsvn_subr/opt.c:957
-#, fuzzy
 msgid ""
 "Copyright (C) 2000-2006 CollabNet.\n"
 "Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4274,8 +4238,8 @@
 "Net/).\n"
 "\n"
 msgstr ""
-"版权所有 (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
+"版权所有 (C) 2000-2006 CollabNet.\n"
+"Subversion 是开放�代�软件,请�考 http://subversion.tigris.org/\n"
 "此产å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
 "\n"
 
@@ -4300,9 +4264,9 @@
 msgstr "不能确定本地路径编码"
 
 #: libsvn_subr/path.c:1253
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
+msgstr "在路径“%2$s”存在无效的控制字符“0x%1$02x”"
 
 #: libsvn_subr/prompt.c:97 svnserve/main.c:475
 #, c-format
@@ -4390,9 +4354,9 @@
 msgstr "“%s”的密码:"
 
 #: libsvn_subr/subst.c:1559
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has unsupported special file type '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgstr "“%s”存在不支持的特殊文件类型“%s”"
 
 #: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
 #, c-format
@@ -4408,51 +4372,51 @@
 msgstr "不能解锁字符转换互斥体"
 
 #: libsvn_subr/utf.c:271
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from native encoding to '%s'"
 msgstr "不能创建从本地编码到“%s”的字符转换器"
 
 #: libsvn_subr/utf.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%s' to native encoding"
 msgstr "不能创建从“%s”到本地编码的字符转换器"
 
 #: libsvn_subr/utf.c:279
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%s' to '%s'"
 msgstr "不能创建从“%s”到“%s”的字符转换器"
 
 #: libsvn_subr/utf.c:285
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create a character converter from '%i' to '%i'"
-msgstr "不能创建从“%s”到“%s”的字符转换器"
+msgstr "不能创建从“%i”到“%i”的字符转换器"
 
 #: libsvn_subr/utf.c:513
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from native encoding to '%s':"
-msgstr "不能把字符串从本地编码转换为”%s“编码。"
+msgstr "不能把字符串从本地编码转换为“%s”编码:"
 
 #: libsvn_subr/utf.c:517
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from '%s' to native encoding:"
-msgstr "不能把字符串从”%s“编码转换为本地编码。"
+msgstr "不能把字符串从“%s”编码转换为本地编码:"
 
 #: libsvn_subr/utf.c:521
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from '%s' to '%s':"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
+msgstr "不能把字符串从“%s”编码转换为“%s”编码:"
 
 #: libsvn_subr/utf.c:527
-#, fuzzy, c-format
+#, c-format
 msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
+msgstr "不能把字符串从CCSID“%i”转换为CCSID“%i”:"
 
 #: libsvn_subr/utf.c:572
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
 "UTF-8"
-msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
+msgstr "安全数据“%s”是后接非ASCII字节%d:不能转换到/自 UTF-8"
 
 #: libsvn_subr/utf.c:580
 #, c-format
@@ -4512,9 +4476,9 @@
 msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
 
 #: libsvn_wc/adm_files.c:100
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid administrative directory name"
-msgstr "“%s”不是文件名也不是目录名"
+msgstr "“%s”不是一个有效的管理目录名"
 
 # plz leave this as-is
 #: libsvn_wc/adm_files.c:260
@@ -4582,11 +4546,11 @@
 msgstr "“%s”已纳入版本控制"
 
 #: libsvn_wc/adm_ops.c:1105
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't replace '%s' with a node of a differing type; the deletion must be "
 "committed and the parent updated before adding '%s'"
-msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
+msgstr "无法以不同类型节点来替换“%s”;在新增“%s”前必须提交删除操作并更新父目录"
 
 #: libsvn_wc/adm_ops.c:1122
 #, c-format
@@ -4599,14 +4563,14 @@
 msgstr "无法新增“%s”至已预定要删除的父目录"
 
 #: libsvn_wc/adm_ops.c:1143
-#, fuzzy, c-format
+#, c-format
 msgid "The URL '%s' has a different repository root than its parent"
-msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
+msgstr "地址(URL)“%s”与其前一修订版的档案库根目录不同"
 
 #: libsvn_wc/adm_ops.c:1472
 #, c-format
 msgid "Error restoring text for '%s'"
-msgstr "还原“%s”文字时发生错误"
+msgstr "还原“%s”文本时出错"
 
 #: libsvn_wc/adm_ops.c:1603
 #, c-format
@@ -4669,9 +4633,9 @@
 msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
 #: libsvn_wc/copy.c:444
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
+msgstr "无法复制到“%s”,因为它不是来自于档案库“%s”而是“%s”"
 
 #: libsvn_wc/copy.c:451
 #, c-format
@@ -4685,25 +4649,22 @@
 msgstr "项目“%s”有无效的“%s”值"
 
 #: libsvn_wc/entries.c:111
-#, fuzzy
 msgid "Invalid escape sequence"
-msgstr "无效的计划任务"
+msgstr "无效的转义序列"
 
 #: libsvn_wc/entries.c:118
-#, fuzzy
 msgid "Invalid escaped character"
-msgstr "无效的变更类型"
+msgstr "无效的转义字符"
 
 #: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
 #: libsvn_wc/entries.c:203
-#, fuzzy
 msgid "Unexpected end of entry"
-msgstr "找到一个意料之外的节点种类"
+msgstr "条目提前终止"
 
 #: libsvn_wc/entries.c:225
 #, c-format
 msgid "Invalid value for field '%s'"
-msgstr ""
+msgstr "“%s”域的值无效"
 
 #: libsvn_wc/entries.c:307 libsvn_wc/entries.c:533
 #, c-format
@@ -4711,9 +4672,9 @@
 msgstr "项目“%s”有无效的节点种类"
 
 #: libsvn_wc/entries.c:328 libsvn_wc/entries.c:510
-#, fuzzy, c-format
+#, c-format
 msgid "Entry for '%s' has invalid repository root"
-msgstr "“%s”的入口档案库根目录无效"
+msgstr "“%s”条目的档案库根目录无效"
 
 #: libsvn_wc/entries.c:931
 #, c-format
@@ -4733,24 +4694,22 @@
 msgstr "默认项目没有地址(URL)"
 
 #: libsvn_wc/entries.c:1076
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid version line in entries file of '%s'"
-msgstr "写入“%s”的项目文件时发生错误"
+msgstr "“%s”条目文件中的版本行无效"
 
 #: libsvn_wc/entries.c:1093
-#, fuzzy
 msgid "Missing entry terminator"
-msgstr "丢失默认项目"
+msgstr "条目终结符丢失"
 
 #: libsvn_wc/entries.c:1096
-#, fuzzy
 msgid "Invalid entry terminator"
-msgstr "无效的目标路径"
+msgstr "无效的条目终止符"
 
 #: libsvn_wc/entries.c:1100
-#, fuzzy, c-format
+#, c-format
 msgid "Error at entry %d in entries file for '%s':"
-msgstr "写入“%s”的项目文件时发生错误"
+msgstr "“%2$s”条目文件中的%1$d条目出错"
 
 #: libsvn_wc/entries.c:1196
 #, c-format
@@ -4865,39 +4824,39 @@
 msgstr "路径“%s”以“%s”结束,本操作不支持"
 
 #: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to check path existence for '%s'"
-msgstr "不能使用名字“%s”"
+msgstr "无法检查路径“%s”是否存在"
 
 #: libsvn_wc/lock.c:937
 #, c-format
 msgid "Expected '%s' to be a directory but found a file"
-msgstr ""
+msgstr "期望“%s”是一个目录,但它是一个文件"
 
 #: libsvn_wc/lock.c:944
-#, fuzzy, c-format
+#, c-format
 msgid "Expected '%s' to be a file but found a directory"
-msgstr "地址(URL)“%s”指向一个文件,而非目录"
+msgstr "期望“%s”是一个文件,但它是一个目录"
 
 #: libsvn_wc/lock.c:963
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' is missing"
-msgstr "目录“%s”没有地址(URL)"
+msgstr "目录“%s”丢失"
 
 #: libsvn_wc/lock.c:968
 #, c-format
 msgid "Directory '%s' containing working copy admin area is missing"
-msgstr ""
+msgstr "包含工作拷贝管理区的目录“%s”丢失了"
 
 #: libsvn_wc/lock.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to lock '%s'"
-msgstr "无法打开编辑"
+msgstr "无法锁定“%s”"
 
 #: libsvn_wc/lock.c:978
-#, fuzzy, c-format
+#, c-format
 msgid "Working copy '%s' is not locked"
-msgstr "工作拷贝“%s”被锁定了"
+msgstr "工作拷贝“%s”未被锁定"
 
 #: libsvn_wc/lock.c:1371
 #, c-format
@@ -4954,7 +4913,7 @@
 msgstr "修改“%s”的项目时发生错误"
 
 #: libsvn_wc/log.c:852
-#, fuzzy, c-format
+#, c-format
 msgid "Error removing lock from entry for '%s'"
 msgstr "移除条目“%s”的锁时发生错误"
 
@@ -4999,9 +4958,8 @@
 msgstr "修改“%s”的项目时发生错误"
 
 #: libsvn_wc/log.c:1486
-#, fuzzy
 msgid "Invalid 'format' attribute"
-msgstr "无效的配置值"
+msgstr "无效的format属性"
 
 #: libsvn_wc/log.c:1521
 #, c-format
@@ -5071,12 +5029,10 @@
 "但是属性并不存在。"
 
 #: libsvn_wc/props.c:679
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Trying to delete property '%s' but value has been modified from '%s' to '%s'."
-msgstr ""
-"尝试添加新属性“%s”的值为“%s”,\n"
-"但是属性已经存在,值为“%s”。"
+msgstr "尝试删除属性“%s”,但是其值已从“%s”修改为“%s”。"
 
 #: libsvn_wc/props.c:697
 #, c-format
@@ -5088,9 +5044,9 @@
 "但是属性的值已经是“%s”了。"
 
 #: libsvn_wc/props.c:880
-#, fuzzy, c-format
+#, c-format
 msgid "Missing end of line in wcprops file for '%s'"
-msgstr "“%s”丢失了 'revision' 属性"
+msgstr "wcprops文件“%s”丢失了行终止符"
 
 #: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
 #: libsvn_wc/props.c:1626
@@ -5166,7 +5122,7 @@
 
 #: libsvn_wc/relocate.c:69
 msgid "Relocate can only change the repository part of an URL"
-msgstr ""
+msgstr "Relocate只能改变URL中的档案库部分"
 
 #: libsvn_wc/update_editor.c:387
 #, c-format
@@ -5246,7 +5202,7 @@
 msgstr "“%s”没有演进历程信息"
 
 #: libsvn_wc/update_editor.c:2849
-#, fuzzy, c-format
+#, c-format
 msgid "Copyfrom-url '%s' has different repository root than '%s'"
 msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
 
@@ -5288,9 +5244,8 @@
 msgstr "无法打开标准错误 (stderr)"
 
 #: svn/diff-cmd.c:184
-#, fuzzy
 msgid "'--new' option only valid with '--old' option"
-msgstr "只有在XML模式“增加”选项才有效"
+msgstr "--new选项只有和--old选项一同使用时才有效"
 
 #: svn/diff-cmd.c:214
 #, c-format
@@ -5304,7 +5259,7 @@
 msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
 
 #: svn/help-cmd.c:45
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: svn <subcommand> [options] [args]\n"
 "Subversion command-line client, version %s.\n"
@@ -5320,10 +5275,12 @@
 msgstr ""
 "用法:svn <subcommand> [options] [args]\n"
 "Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
-"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
-"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
-"行递归存取。\n"
+"使用“svn help <subcommand>”显示特定子命令帮助。\n"
+"使用“svn --version”查看程序以及RA模块的版本号,或者\n"
+"使用“svn --version --quiet”仅查看程序版本号。\n"
+"\n"
+"大多数的子命令可接受文件或目录参数,对目录进行递归处理,如没有指定参数,则默认\n"
+"对当前目录(包含当前目录)递归处理。\n"
 "\n"
 "可用的子命令:\n"
 
@@ -5357,9 +5314,9 @@
 msgstr "无效地址(URL)“%s”"
 
 #: svn/info-cmd.c:111
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' has invalid revision"
-msgstr "项目“%s”有无效的节点种类"
+msgstr "“%s”有无效的修订版"
 
 #: svn/info-cmd.c:263 svnadmin/main.c:1046
 #, c-format
@@ -5378,7 +5335,7 @@
 msgstr "地址(URL):%s\n"
 
 #: svn/info-cmd.c:276
-#, fuzzy, c-format
+#, c-format
 msgid "Repository Root: %s\n"
 msgstr "档案库根路径:%s\n"
 
@@ -5535,7 +5492,7 @@
 "\n"
 
 #: svn/info-cmd.c:514
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: (Not a valid URL)\n"
 "\n"
@@ -5544,9 +5501,8 @@
 "\n"
 
 #: svn/lock-cmd.c:52
-#, fuzzy
 msgid "Lock comment contains a zero byte"
-msgstr "锁定的注释中有一个零字节"
+msgstr "加锁注释中有一个零字节"
 
 #: svn/log-cmd.c:162
 msgid "(no author)"
@@ -5589,9 +5545,8 @@
 msgstr "显示子命令帮助"
 
 #: svn/main.c:65
-#, fuzzy
 msgid "specify log message ARG"
-msgstr "指定提交信息ARG"
+msgstr "指定日志消息ARG"
 
 #: svn/main.c:66
 msgid "print as little as possible"
@@ -5610,9 +5565,10 @@
 "the change made by revision ARG (like -r ARG-1:ARG)\n"
 " If ARG is negative this is like -r ARG:ARG-1"
 msgstr ""
+"在ARG修订版(如同 -r ARG-1:ARG)作的修改\n"
+" 如果ARG为负数则等价于 -r ARG:ARG-1"
 
 #: svn/main.c:74
-#, fuzzy
 msgid ""
 "ARG (some commands also take ARG1:ARG2 range)\n"
 " A revision argument can be one of:\n"
@@ -5624,19 +5580,18 @@
 " 'COMMITTED' last commit at or before BASE\n"
 " 'PREV' revision just before COMMITTED"
 msgstr ""
-"ARG (一些命令需要 ARG1:ARG2 )\n"
+"ARG (一些命令也接受ARG1:ARG2范围)\n"
 " 修订版参数可以是:\n"
-" 数字 修订版号\n"
-" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作条目 \n"
-" \"COMMITTED\" 最后提交或基线之前\n"
-" \"PREV\" 修订版提交之前"
+" NUMBER 修订版号\n"
+" '{' DATE '}' 在指定时间以后的修订版\n"
+" 'HEAD' 档案库中的最新修订版\n"
+" 'BASE' 工作拷贝的基线版本\n"
+" 'COMMITTED' 最后一次提交的修订版\n"
+" 'PREV' COMMITTED的前一修订版"
 
 #: svn/main.c:84
-#, fuzzy
 msgid "read log message from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件ARG读取日志消息"
 
 #: svn/main.c:86
 msgid "give output suitable for concatenation"
@@ -5649,9 +5604,8 @@
 #: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
 #: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
 #: svnversion/main.c:125
-#, fuzzy
 msgid "show program version information"
-msgstr "显示版本信息"
+msgstr "显示程序版本信息"
 
 #: svn/main.c:93
 msgid "print extra information"
@@ -5690,6 +5644,17 @@
 " --ignore-eol-style:\n"
 " Ignore changes in EOL style"
 msgstr ""
+"缺省:“-u”。当Subversion调用一个外部diff程序时,\n"
+" ARG直接传给这个程序。但是当Subversion使用缺省的\n"
+" 内部diff实现或者正显示blame评注时,ARG可以是:\n"
+" -u (--unified):\n"
+" 输出三行统一上下文。\n"
+" -b (--ignore-space-change):\n"
+" 忽略空白数量的更改。\n"
+" -w (--ignore-all-space):\n"
+" 忽略所有的空白。\n"
+" --ignore-eol-style:\n"
+" 忽略EOL样式的更改。"
 
 #: svn/main.c:130
 msgid "pass contents of file ARG as additional args"
@@ -5725,7 +5690,7 @@
 
 #: svn/main.c:144 svnlook/main.c:111
 msgid "do not print differences for deleted files"
-msgstr "不要打印已删除文件的不同处"
+msgstr "不要输出删除文件造成的差异"
 
 #: svn/main.c:146
 msgid "notice ancestry when calculating differences"
@@ -5780,16 +5745,14 @@
 msgstr "使自动属性无效"
 
 #: svn/main.c:174
-#, fuzzy
 msgid ""
 "use a different EOL marker than the standard\n"
 " system marker for files with the svn:eol-style\n"
 " property set to 'native'.\n"
 " ARG may be one of 'LF', 'CR', 'CRLF'"
 msgstr ""
-"使用一个与标准不同的 EOL 标记\n"
-" 系统为文件标记 svn:eol-style 属性为 'native'。\n"
-" ARG 可以是以下之一 'LF','CR','CRLF'"
+"设置svn:eol-style为“native”以在文件中使用非系统默认的行结束标记。\n"
+" ARG 可以是以下之一:'LF','CR','CRLF'"
 
 #: svn/main.c:182
 msgid "maximum number of log entries"
@@ -5801,7 +5764,7 @@
 
 #: svn/main.c:186
 msgid "show a summary of the results"
-msgstr ""
+msgstr "显示结果的摘要"
 
 #: svn/main.c:225
 msgid ""
@@ -5844,7 +5807,6 @@
 " \n"
 
 #: svn/main.c:251
-#, fuzzy
 msgid ""
 "Check out a working copy from a repository.\n"
 "usage: checkout URL[@REV]... [PATH]\n"
@@ -5860,9 +5822,11 @@
 "从档案库签出工作拷贝。\n"
 "用法:checkout 地址[@版本]... [路径]\n"
 "\n"
-" 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
-" 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
-" 以地址(URL)最末目录名为名字的子目录中。\n"
+" “版本”指定从哪一个修订版开始查找URL。\n"
+"\n"
+" 如果路径忽略路径,地址(URL)最末目录名作为目标目录。\n"
+" 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
+" 以地址(URL)最末目录名为名字的子目录中。\n"
 "\n"
 
 #: svn/main.c:265
@@ -5871,12 +5835,11 @@
 "unfinished operations, etc.\n"
 "usage: cleanup [PATH...]\n"
 msgstr ""
-"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
+"递归清理工作拷贝,去除锁,继续未完成操作,等等。\n"
 "\n"
 "用法:cleanup [路径...]\n"
 
 #: svn/main.c:272
-#, fuzzy
 msgid ""
 "Send changes from your working copy to the repository.\n"
 "usage: commit [PATH...]\n"
@@ -5886,16 +5849,14 @@
 " If any targets are (or contain) locked items, those will be\n"
 " unlocked after a successful commit.\n"
 msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
+"把更改从工作拷贝发送到档案库。\n"
 "用法:commit [路径...]\n"
 "\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+" 必须提供日志消息,但它可以是空的。如果没有指定 --message 或 --file 选项,\n"
+" 则会启动一个编辑器。如果任何目标是锁定的或者包含锁定条目,则在成功提交后它\n"
+" 们都会被解锁。\n"
 
 #: svn/main.c:280
-#, fuzzy
 msgid ""
 "Send changes from your working copy to the repository.\n"
 "usage: commit [PATH...]\n"
@@ -5906,13 +5867,12 @@
 " (or contain) locked items, those will be unlocked after a\n"
 " successful commit.\n"
 msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
+"把更改从工作拷贝发送到档案库。\n"
 "用法:commit [路径...]\n"
 "\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+" 必须提供日志消息,但它可以是空的。OS400不支持启动编辑器,因此必须指定--message\n"
+" 或 --file 选项。如果任何目标是锁定的或者包含锁定条目,则在成功提交后它们都会被\n"
+" 解锁。\n"
 
 #: svn/main.c:293
 msgid ""
@@ -5963,7 +5923,6 @@
 " \n"
 
 #: svn/main.c:321
-#, fuzzy
 msgid ""
 "Display the differences between two revisions or paths.\n"
 "usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -5991,31 +5950,29 @@
 "\n"
 " Use just 'svn diff' to display local modifications in a working copy.\n"
 msgstr ""
-"显示两个路径中的差异。\n"
+"显示两个路径或者两个修订版的差异。\n"
 "用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
-" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
+" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
+" [路径...]\n"
+" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
 "\n"
-" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
-" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
+" 1、显示修订版REV中“目标”在两个不同的修订版N、M之间的差异。“目标”要么全是工作拷贝\n"
+" 路径,要么全是地址(URL)。\n"
 "\n"
-" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
-" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
-" HEAD。\n"
-"\n"
-" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
-" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
-" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
-" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
-" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
-" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
-"法。\n"
+" 如果“目标”是工作拷贝路径,N 默认为 BASE,M 指工作拷贝;\n"
+" 如果“目标”是URL,N 必须指定, M 默认是HEAD。\n"
+" \n"
+" “-c M”等价与“-r M-1:M”,“-c -M”等价与“-r M:M-1”。\n"
+"\n"
+" 2、显示新旧修订版中对应目标的差异。“路径”是相对于新旧目标的相对路径,它限制只输出这些\n"
+" 路径上的差异。新旧目标可以是工作拷贝路径或地址URL[@REV]。新目标默认与旧目标相同,\n"
+" OLDREV 默认为 N,NEWREV 默认为 M。\n"
+"\n"
+" 3、“svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]”的简写。\n"
 "\n"
-" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
+" 不加参数使用“svn diff”显示工作拷贝中的本地修改。\n"
 
 #: svn/main.c:351
-#, fuzzy
 msgid ""
 "Create an unversioned copy of a tree.\n"
 "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6037,20 +5994,19 @@
 " looked up.\n"
 msgstr ""
 "产生一个无版本控制的目录树拷贝。\n"
-"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
+"用法: 1、export [-r REV] URL[@PEGREV] [PATH]\n"
 " 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
 "\n"
-" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
-" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
-" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
-"\n"
-" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
-" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
-" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
-" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
-" 版本控制的文件不会被复制。\n"
+" 1、从 URL 指定的档案库导出一个干净的目录树到 PATH。REV缺省为HEAD。如果省略PATH,\n"
+" 地址(URL)的最后部分会被当成目标目录名。\n"
 "\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+" 2、从PATH1指定的工作拷贝导出一个干净的目录树到 PATH2,REV缺省为工作版本。\n"
+" 如果省略PATH2,PATH1 的最后部分会被用来当成目标目录名。如果省略REV,\n"
+" 所有的本地修改都会被导出。没有纳入版本控制的文件不会被拷贝。\n"
+" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入版本控制\n"
+" 的文件不会被复制。\n"
+"\n"
+" 如果指定了PEGREV ,则从此修订版开始查找目标。\n"
 "\n"
 
 #: svn/main.c:374
@@ -6062,7 +6018,6 @@
 "用法:help [子命令...]\n"
 
 #: svn/main.c:380
-#, fuzzy
 msgid ""
 "Commit an unversioned file or tree into the repository.\n"
 "usage: import [PATH] URL\n"
@@ -6073,14 +6028,14 @@
 " If PATH is a directory, the contents of the directory are added\n"
 " directly under URL.\n"
 msgstr ""
-"提交未纳入版本控制的文件或目录树至档案库。\n"
+"将未纳入版本控制的文件或目录树导入档案库。\n"
 "用法:import [PATH] URL\n"
 "\n"
-" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
-" 依需要于档案库内建立。\n"
+" 递归地提交 PATH 的拷贝至地址(URL),PATH默认为 '.'。\n"
+" 父目录会依需要于档案库内建立。如果 PATH是一个目录,则其下的内容直接加入到\n"
+" URL指定的位置下。\n"
 
 #: svn/main.c:393
-#, fuzzy
 msgid ""
 "Display information about a local or remote item.\n"
 "usage: info [TARGET[@REV]...]\n"
@@ -6092,11 +6047,11 @@
 "显示本地或远端条目的信息。\n"
 "用法:info [TARGET...]\n"
 "\n"
-" 显示每个 TARGET 的信息 (默认:'.')。\n"
-" TARGET 可以是工作目录或地址(URL)。\n"
+" 显示每个 TARGET 的信息 (默认是'.')。\n"
+" TARGET 可以是工作拷贝中的路径或档案库中的地址(URL)。REV指定在哪一个\n"
+" 修订版中查找目标。\n"
 
 #: svn/main.c:403
-#, fuzzy
 msgid ""
 "List directory entries in the repository.\n"
 "usage: list [TARGET[@REV]...]\n"
@@ -6117,25 +6072,23 @@
 " Size (in bytes)\n"
 " Date and time of the last commit\n"
 msgstr ""
-"列出档案库中的目录项目。\n"
+"列出档案库中的目录内容。\n"
 "用法:list [TARGET[@REV]...]\n"
 "\n"
-" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 显示档案库中文件和子目录列表。如果 TARGET 是工作拷贝路径,那么操作对应的档案库地址\n"
+" (URL)上的TARGET。REV指定从在哪个修订版查找TARGET。\n"
 "\n"
-" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
+" TARGET默认是'.',表示当前工作目录对应的档案库地址(URL)。\n"
 "\n"
-" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
+" 加上 --verbose 的话,每个条目会显示以下额外信息:\n"
 "\n"
-" 前次提交的修订版号码\n"
-" 前次提交的作者\n"
+" 最后一次提交的修订版号码\n"
+" 最后一次提交的作者\n"
 " 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
 " 大小 (以字节为单位)\n"
-" 前次提交的日期与时间\n"
+" 最后一次提交的日期与时间\n"
 
 #: svn/main.c:425
-#, fuzzy
 msgid ""
 "Lock working copy paths or URLs in the repository, so that\n"
 "no other user can commit changes to them.\n"
@@ -6143,24 +6096,20 @@
 "\n"
 " Use --force to steal the lock from another user or working copy.\n"
 msgstr ""
-"在档案库中锁定工作目录或地址(URL),\n"
-"使得其他用户不能向它提交修改。\n"
+"锁定档案库中中的路径,使得其他用户不能向其提交修改。\n"
 "用法:lock TARGET...\n"
 "\n"
-" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
+" 使用 --force 选项可以从其他用户或工作拷贝窃取到锁。\n"
 
 #: svn/main.c:433
-#, fuzzy
 msgid "read lock comment from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件 ARG 读取加锁注释"
 
 #: svn/main.c:434
-#, fuzzy
 msgid "specify lock comment ARG"
-msgstr "指定提交信息ARG"
+msgstr "指定加锁注释ARG"
 
 #: svn/main.c:437
-#, fuzzy
 msgid ""
 "Show the log messages for a set of revision(s) and/or file(s).\n"
 "usage: 1. log [PATH]\n"
@@ -6190,20 +6139,19 @@
 msgstr ""
 "显示一组修订版与/或文件的提交日志信息。\n"
 "用法:1、log [PATH]\n"
-" 2、log URL [PATH...]\n"
+" 2、log URL[@REV] [PATH...]\n"
 "\n"
 " 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
 " BASE:1。\n"
 "\n"
-" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" HEAD:1。\n"
+" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。REV指定从哪一个修订版开始查找\n"
+" URL。默认的修订版范围为 HEAD:1。\n"
 "\n"
-" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
+" 使用 -v 时,在日志信息中显示受影响的路径名。\n"
 " 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v å¹¶å­˜)。\n"
 "\n"
-" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
-" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
-" 个功能,这在找出分支点的很方便。\n"
+" 每一条日志信息只会显示一次,即使指定某一个更改中涉及到的多个文件。默认log信息会\n"
+" 追溯复制历史;使用 --stop-on-copy 可以关闭这种行为,这便于找出分支点。\n"
 "\n"
 " 范例:\n"
 " svn log\n"
@@ -6212,7 +6160,6 @@
 " svn log http://www.example.com/repo/project foo.c bar.c\n"
 
 #: svn/main.c:467
-#, fuzzy
 msgid ""
 "Apply the differences between two sources to a working copy path.\n"
 "usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6242,22 +6189,17 @@
 "将两个来源之间的差异应用至工作拷贝路径。\n"
 "用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
 " 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
+" 3、merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1、第一种形式中,源 URL 的修订版 N 与 M作为比较的来源。如果没有指定修订版,默认为 HEAD。\n"
 "\n"
-" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
-" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
+" 2、在第二种形式中,两个源工作拷贝路径对应的档案库中的URL作为比较的来源。这里必须指定修订版。\n"
 "\n"
-" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
-" 进行比较的来源。这里必须指定修订版。\n"
+" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝中的路径,后者会使用档案库中对应的地址(URL)。\n"
+" 比较源就是REV修订版中的地址(URL) 在修订版 N 和 M时的状态。REV默认为HEAD。\n"
 "\n"
-" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
-" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
-"作\n"
-" 比较。如果未指定 REV,就会假设为 HEAD。\n"
-"\n"
-" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
-" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+" WCPATH 是接收更改的工作拷贝路径。如果省略 WCPATH 的话,默认值为'.',除非来源中有与当前目录\n"
+" 中同名的文件,这时更改会直接应用至该文件去。\n"
 
 #: svn/main.c:496
 msgid ""
@@ -6289,7 +6231,6 @@
 " 在这两个情况下,所有的中间目录都必须事先存在。\n"
 
 #: svn/main.c:513
-#, fuzzy
 msgid ""
 "Move and/or rename something in working copy or repository.\n"
 "usage: move SRC DST\n"
@@ -6301,17 +6242,17 @@
 " WC -> WC: move and schedule for addition (with history)\n"
 " URL -> URL: complete server-side rename.\n"
 msgstr ""
-"移动或更名工作拷贝或档案库里的东西。\n"
+"移动或更名工作拷贝或档案库里的文件或目录。\n"
 "用法:move SRC DST\n"
 "\n"
-" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
+" 注意:本子命令等同于 'copy' 然后 'delete'。\n"
+" 注意:此命令不能使用--revision选项。\n"
 "\n"
 " SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
 " WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
 " URL -> URL : 完全是服务器端的更名。\n"
 
 #: svn/main.c:526
-#, fuzzy
 msgid ""
 "Remove a property from files, dirs, or revisions.\n"
 "usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6321,15 +6262,15 @@
 " 2. Removes unversioned remote prop on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"移除目录,文件,或修订版的属性。\n"
+"移除目录、文件或修订版的属性。\n"
 "用法:1、propdel PROPNAME [PATH...]\n"
 " 2、propdel PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、移除纳入版本控制的工作拷贝属性。\n"
-" 2、移除无版本控制的远端档案库修订版属性。\n"
+" 1、移除工作拷贝中纳入版本管理的文件或目录上的属性。\n"
+" 2、移除档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:538
-#, fuzzy
 msgid ""
 "Edit a property with an external editor.\n"
 "usage: 1. propedit PROPNAME PATH...\n"
@@ -6339,15 +6280,15 @@
 " 2. Edits unversioned remote prop on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"以外部编辑器编辑目标的属性 PROPNAME。\n"
-"用法:1、propedit PROPNAME PATH...\n"
+"启动外部编辑器编辑属性。\n"
+"用法:1、propedit PROPNAME [PATH...]\n"
 " 2、propedit PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、编辑纳入版本控制的工作拷贝属性。\n"
-" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
+" 1、编辑工作拷贝中纳入版本管理的文件或目录上的属性。\n"
+" 2、编辑档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:551
-#, fuzzy
 msgid ""
 "Print the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6365,21 +6306,19 @@
 " the --strict option to disable these beautifications (useful,\n"
 " for example, when redirecting binary property values to a file).\n"
 msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
+"显示目录、文件或修订版的一个属性。\n"
 "用法:1、propget PROPNAME [TARGET[@REV]...]\n"
 " 2、propget PROPNAME --revprop -r REV [URL]\n"
 "\n"
-" 1、显示纳入版本控制的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、显示无版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
-" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
-" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
-" 将二进制属性内容重导至一个文件时就很有用)。\n"
+" 1、显示目标上的属性。REV指定从哪一个修订版开始查找目标。\n"
+" 2、显示档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
+"\n"
+" 本子命令默认会在属性内容加上额外的换行符,如此可得到较美观的输出。另外,当同时\n"
+" 处理多个路径时,每一个属性内容会在开头添加上它所对应的路径。使用 --strict 选项\n"
+" 以关闭这项美化行为 (这样做利于将二进制属性内容重定向至一个文件时)。\n"
 
 #: svn/main.c:570
-#, fuzzy
 msgid ""
 "List all properties on files, dirs, or revisions.\n"
 "usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6390,16 +6329,15 @@
 " 2. Lists unversioned remote props on repos revision.\n"
 " TARGET only determines which repository to access.\n"
 msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
+"列出目录、文件或修订版上的所有属性。\n"
 "用法:1、proplist [TARGET[@REV]...]\n"
-" 2、proplist --revprop -r REV [URL]\n"
+" 2、proplist --revprop -r REV [TARGET]\n"
 "\n"
-" 1、列出纳入版本管理的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、列出无版本控制的远端档案库修订版属性改变。\n"
+" 1、列出纳入版本管理的工作拷贝属性。REV指定从哪一个修订版开始查找目标。\n"
+" 2、列出档案库中修订版上的属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
 
 #: svn/main.c:582
-#, fuzzy
 msgid ""
 "Set the value of a property on files, dirs, or revisions.\n"
 "usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6443,43 +6381,44 @@
 " attempt will fail, and a recursive attempt will set the property\n"
 " only on the file children of the directory.\n"
 msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
-" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
-"\n"
-" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
-" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
-" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
-" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
-" Rev, Revision, - 本物件最后一次改变的修订版。\n"
-" LastChangedRevision\n"
-" Id - 前四个关键字的压缩摘要。\n"
-" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
-" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
-" 下的文件子项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
-" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文字,其它则为二进制数据。\n"
-" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
-" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
+"设定目录、文件或修订版的属性。\n"
+"用法:1、propset PROPNAME PROPVAL PATH...\n"
+" 2、propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1、在工作拷贝中创建或者修改一个属性。\n"
+" 2、在档案库中REV修订版上创建或者修改一个属性。\n"
+" TARGET只用来判断访问哪一个档案库。\n"
+"\n"
+" 如果没有PROPVAL参数,则必须提供--file选项。\n"
+"\n"
+" 注意:svn 除了能存储任意属性外,还识别以下特殊版本控制属性:\n"
+" svn:ignore - 以换行符隔开的忽略文件模式列表。\n"
+" svn:keywords - 将被展开的关键字。有效的关键字为。\n"
+" URL, HeadURL - 此对象HEAD版本的地址(URL)。\n"
+" Author, LastChangedBy - 最后一次修改文件的人。\n"
+" Date, LastChangedDate - 此对象最近一次更改的日期。\n"
+" Rev, Revision, - 此对象最后一次更改的修订版。\n"
+" LastChangedRevision\n"
+" Id - 前四个关键字的紧凑摘要。\n"
+" svn:executable - 如果存在此属性则设置文件为可执行的。\n"
+" svn:eol-style - 'native','LF','CR','CRLF'之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
+" 以及Apache如何处理它。mime类别以 'text/' (或是没有指定 mime 类别)\n"
+" 开头的文件会被视为纯文本文件,否则就是二进制数据。\n"
+" svn:externals - 以换行符隔开的模块说明列表,每一条说明都由一个相对路径、\n"
+" 可选的修订版标志、一个URL组成。例如:\n"
 " foo http://example.com/repos/zig\n"
 " foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
-"锁定,把工作拷贝文件设置为只读。\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
-"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
-"作只会在目录下的文件设置属性。\n"
+" svn:needs-lock - 如果存在此属性则表明此文件在修改前应被加锁,如果没有被加锁\n"
+" 则此文件在工作拷贝中应被设为只读。\n"
+"\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及\n"
+" svn:needs-lock 属性不能设置在一个目录上。不能在设置这些属性时使用非递归选项\n"
+" (-N),递归操作时只会作用于指定目录下的文件上。\n"
 
 #: svn/main.c:624
-#, fuzzy
 msgid "read property value from file ARG"
-msgstr "从文件 ARG 读取数据"
+msgstr "从文件 ARG 读取属性值"
 
 #: svn/main.c:627
 msgid ""
@@ -6504,14 +6443,13 @@
 " Note: this subcommand does not require network access, and resolves\n"
 " any conflicted states. However, it does not restore removed directories.\n"
 msgstr ""
-"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
+"恢复原始未改变的工作拷贝文件 (恢复大部分的本地修改)。\n"
 "用法:revert PATH...\n"
 "\n"
 " 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
 " 被删除的目录\n"
 
 #: svn/main.c:644
-#, fuzzy
 msgid ""
 "Print the status of working copy files and directories.\n"
 "usage: status [PATH...]\n"
@@ -6585,15 +6523,15 @@
 " 965 687 joe wc/zig.c\n"
 " Status against revision: 981\n"
 msgstr ""
-"显示工作拷贝目录与文件的状态。\n"
+"显示工作拷贝中目录与文件的状态。\n"
 "用法:status [PATH...]\n"
 "\n"
-" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
-" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
-" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
+" 未指定参数时,只显示本地修改的条目 (没有网络的存取操作)。\n"
+" 使用 -u 时,加上工作修订版与针对服务器上版本是否过期的信息。\n"
+" 使用 -v 时,显示每一个条目的完整修订版信息。\n"
 "\n"
-" 输出的前五个栏位各为一个字符宽:\n"
-" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
+" 输出的前六栏各占一个字符宽度:\n"
+" 第一栏:表示一个项目是新增、删除,还是修改的\n"
 " ' ' 无修改\n"
 " 'A' 新增\n"
 " 'C' 冲突\n"
@@ -6603,40 +6541,41 @@
 " 'M' 改变\n"
 " 'R' 替换\n"
 " 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
+" '?' 未纳入版本控制\n"
 " '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
-" '~' 版本控制下的项目被不同类型的所替换\n"
+" '~' 版本控制下的项目与其它类型的项目重名\n"
 " 第二栏:显示目录或文件的属性状态\n"
 " ' ' 无修改\n"
 " 'C' 冲突\n"
 " 'M' 改变\n"
-" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
+" 第三栏:工作拷贝目录是否被锁定\n"
 " ' ' 未锁定\n"
 " 'L' 锁定\n"
-" 第四栏:预定要连同历史记录被新增\n"
-" ' ' 预定的提交并不包含历史记录\n"
-" '+' 预定的提交包含历史记录\n"
-" 第五栏:该项目相对其父目录是否已被切换\n"
+" 第四栏:已调度的提交是否包含拷贝历史(区分是svn add还是svn copy引起的add)\n"
+" ' ' 不包含\n"
+" '+' 包含\n"
+" 第五栏:该条目相对其父目录是否已切换(有无svn switch操作)\n"
 " ' ' 正常\n"
-" 'S' 被切换\n"
-" 第六栏:档案库锁定标记 (没有 -u)\n"
+" 'S' 已切换\n"
+" 第六栏:档案库锁定标记\n"
+" (没有 -u时)\n"
 " ' ' 没有锁定标记\n"
 " 'K' 存在锁定标记\n"
-" (有 -u)\n"
+" (有 -u时)\n"
 " ' ' 没有在档案库中锁定,没有锁定标记\n"
 " 'K' 在档案库中被锁定,存在锁定标记\n"
 " 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
 " 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
 " 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
 "\n"
-" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
+" 是否过期的信息出现的位置是第八栏 (与 -u 并用时):\n"
 " '*' 服务器上有更新修订版\n"
 " ' ' 工作拷贝是最新版的\n"
 "\n"
 " 剩余的栏位皆为变动宽度,并以空白隔开:\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
+" 工作修订版号 (与 -u 或 -v 并用时)\n"
 " 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
-" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
+" 工作拷贝路径总是最后一栏,所以它可以包含空白字符。\n"
 "\n"
 " 范例输出:\n"
 " svn status wc\n"
@@ -6657,7 +6596,6 @@
 " Status against revision: 981\n"
 
 #: svn/main.c:720
-#, fuzzy
 msgid ""
 "Update the working copy to a different URL.\n"
 "usage: 1. switch URL [PATH]\n"
@@ -6676,15 +6614,15 @@
 "用法:1、switch URL [PATH]\n"
 " 2、switch --relocate FROM TO [PATH...]\n"
 "\n"
-" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
-" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
-"\n"
-" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
-" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
-" 档案库的同一目录时用之。\n"
+" 1、更新你的工作拷贝,映射到一个新的地址(URL),其行为跟“svn update”很像,也会将\n"
+" 服务器上文件与本地文件合并。这是将工作拷贝对应到同一档案库中某个分支或者标记的\n"
+" 方法。\n"
+"\n"
+" 2、改写工作拷贝的URL元数据,以反映单纯的URL上的改变。当档案库的根地址(URL)变动 \n"
+" (比如方案名或是主机名称变动),但是工作拷贝仍旧对映到同一档案库的同一目录时使用\n"
+" 这个命令更新工作拷贝与档案库的对应关系。\n"
 
 #: svn/main.c:736
-#, fuzzy
 msgid ""
 "Unlock working copy paths or URLs.\n"
 "usage: unlock TARGET...\n"
@@ -6694,10 +6632,9 @@
 "解除工作拷贝或地址(URL)的锁定。\n"
 "用法:unlock TARGET...\n"
 "\n"
-" 使用 -force 中止锁定。\n"
+" 使用 --force 中止锁定。\n"
 
 #: svn/main.c:744
-#, fuzzy
 msgid ""
 "Bring changes from the repository into the working copy.\n"
 "usage: update [PATH...]\n"
@@ -6719,24 +6656,21 @@
 " A 'B' in the third column signifies that the lock for the file has\n"
 " been broken or stolen.\n"
 msgstr ""
-"将档案库的改变反应至工作拷贝。\n"
+"将档案库的更改合并到工作拷贝中。\n"
 "用法:update [PATH...]\n"
 "\n"
-" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
-" 不然的话,同步至 -r 选项所指定的修订版。\n"
+" 如果没有指定修订版,则将工作拷贝更新至 HEAD 修订版。否则同步至 -r 选项所指定的修订版。\n"
 "\n"
-" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
-" 这些字符代表如下:\n"
+" 每更新一个条目就输出一行信息,这行的第一个字符表示所采取的动作,这些字符含义如下:\n"
 "\n"
-" A 新增\n"
-" D 删除\n"
-" U æ›´æ–°\n"
-" C 冲突\n"
-" G 合并\n"
-"\n"
-" 第一栏的字符表示实际文件的更新,\n"
-" 第二栏显示被操作的文件。\n"
-" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
+" A 已添加\n"
+" D 已删除\n"
+" U 已更新\n"
+" C 有冲突\n"
+" G 合并成功\n"
+"\n"
+" 第一栏的字符表示实际文件上的更新,第二栏的字符表示文件上属性的更新,第三栏上的字母\n"
+" “B”表示此文件上的锁被中止或窃取。\n"
 
 #: svn/main.c:806 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
 msgid "Caught signal"
@@ -6748,35 +6682,31 @@
 
 #: svn/main.c:924
 msgid "Argument to --limit must be positive"
-msgstr ""
+msgstr "--limit选项的参数必须是正数"
 
 #: svn/main.c:944
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; can't specify -c twice, or both -c "
 "and -r"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;不能指定 -c 两次或者同时使用 -c 和 -r"
 
 #: svn/main.c:952 svn/main.c:1143
 msgid "Can't specify -c with --old"
-msgstr ""
+msgstr "不能同时指定-c和--old"
 
 #: svn/main.c:959
-#, fuzzy
 msgid "Non-numeric change argument given to -c"
-msgstr "给了非数字的参数"
+msgstr "-c选项的参数不是数字"
 
 #: svn/main.c:965
-#, fuzzy
 msgid "There is no change 0"
-msgstr "正在创建更改"
+msgstr "没有 0 修订版"
 
 #: svn/main.c:992
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
 "N:M' instead of '-r N -r M'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;不能同时指定 -r 和 -c,请使用“-r N:M”而非“-r N -r M”"
 
 #: svn/main.c:1005 svnadmin/main.c:1244
 #, c-format
@@ -6817,24 +6747,20 @@
 msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
 
 #: svn/main.c:1345
-#, fuzzy
 msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+msgstr "锁注释文件是一个版本控制中的文件;请使用 '--force-log' 强制覆盖"
 
 #: svn/main.c:1366
 msgid ""
 "The log message is a pathname (was -F intended?); use '--force-log' to "
 "override"
-msgstr ""
-"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
+msgstr "日志信息是一个路径名称 (本是想用 -F 选项的吗?);请使用 '--force-log' 以强制覆盖"
 
 #: svn/main.c:1373
-#, fuzzy
 msgid ""
 "The lock comment is a pathname (was -F intended?); use '--force-log' to "
 "override"
-msgstr ""
-"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
+msgstr "锁注释是一个路径名称 (本是想用-F 选项的吗?);请使用 '--force-log' 强制覆盖"
 
 #: svn/main.c:1498
 msgid ""
@@ -6848,9 +6774,8 @@
 msgstr "需要第二个修订版"
 
 #: svn/merge-cmd.c:73 svn/merge-cmd.c:96
-#, fuzzy
 msgid "Too many arguments given"
-msgstr "导入命令有太多参数"
+msgstr "参数过多"
 
 #: svn/merge-cmd.c:117
 msgid "A working copy merge source needs an explicit revision"
@@ -7092,19 +7017,17 @@
 msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
 
 #: svn/proplist-cmd.c:119
-#, fuzzy, c-format
+#, c-format
 msgid "Properties on '%s':\n"
-msgstr "属性“%s”设定于“%s”\n"
+msgstr "“%s”上的属性:\n"
 
 #: svn/props.c:51
-#, fuzzy
 msgid ""
 "Must specify the revision as a number, a date or 'HEAD' when operating on a "
 "revision property"
-msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
+msgstr "操作修订版属性时,必须指定数字、日期形式的修订版号或“HEAD”"
 
 #: svn/props.c:58
-#, fuzzy
 msgid "Wrong number of targets specified"
 msgstr "指定了错误数目的目标"
 
@@ -7138,9 +7061,8 @@
 msgstr "属性“%s”设定于“%s”\n"
 
 #: svn/revert-cmd.c:61
-#, fuzzy
 msgid "Try 'svn revert --recursive' instead?"
-msgstr "尝试用 “svn revert -recursive” 代替?"
+msgstr "用“svn revert --recursive”看看?"
 
 #: svn/status.c:263
 #, c-format
@@ -7162,11 +7084,11 @@
 "提交后的修订版为 %ld。\n"
 
 #: svn/util.c:68
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Warning: %s\n"
-msgstr "%s警告:%s\n"
+msgstr "\n警告:%s\n"
 
 #: svn/util.c:136
 msgid ""
@@ -7215,13 +7137,12 @@
 msgstr "--此行及以下内容将会被忽略--"
 
 #: svn/util.c:510
-#, fuzzy
 msgid ""
 "Use of an external editor to fetch log message is not supported on OS400; "
 "consider using the --message (-m) or --file (-F) options"
 msgstr ""
-"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
-"message (-m) 或 --file (-F) 选项"
+"OS400上不支持通过外部外部编辑器获得日志信息;请使用 --message (-m) 或\n"
+"--file (-F) 选项"
 
 #: svn/util.c:592
 msgid "Cannot invoke editor to get log message when non-interactive"
@@ -7293,7 +7214,6 @@
 msgstr "如果有的话,以流中的数值来设定档案库的 UUID"
 
 #: svnadmin/main.c:257
-#, fuzzy
 msgid "type of repository: 'fsfs' (default) or 'bdb'"
 msgstr "档案库类型:“fsfs”(默认)或“bdb”"
 
@@ -7310,11 +7230,10 @@
 msgstr "关闭日志文件自动移除 [Berkeley DB]"
 
 #: svnadmin/main.c:272
-#, fuzzy
 msgid ""
 "remove redundant Berkeley DB log files\n"
 " from source repository [Berkeley DB]"
-msgstr "自来源档案库移除多余的日志文件"
+msgstr "删除源档案库中多余的Berkely DB日志文件"
 
 #: svnadmin/main.c:276
 msgid "call pre-commit hook before committing revisions"
@@ -7336,7 +7255,7 @@
 msgid ""
 "disallow use of SVNDIFF1 in on-disk storage,\n"
 " for backwards compatibility"
-msgstr ""
+msgstr "不允许因向后兼容而在磁盘存储里使用SVNDIFF1"
 
 #: svnadmin/main.c:299
 msgid ""
@@ -7345,6 +7264,10 @@
 "Open the repository at REPOS_PATH, then abort, thus simulating\n"
 "a process that crashes while holding an open repository handle.\n"
 msgstr ""
+"用法:svnadmin crashtest REPOS_PATH\n"
+"\n"
+"打开REPOS_PATH上的档案库,然后中断,从而模拟一个进程在持有打开的档案库句柄时\n"
+"崩溃的情形。\n"
 
 #: svnadmin/main.c:305
 msgid ""
@@ -7454,7 +7377,6 @@
 "进度报告会送至标准输出。\n"
 
 #: svnadmin/main.c:362
-#, fuzzy
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH\n"
 "\n"
@@ -7462,7 +7384,7 @@
 msgstr ""
 "用法:svnadmin lslocks REPOS_PATH\n"
 "\n"
-"显示所有锁的相信信息。\n"
+"显示所有锁的描述。\n"
 
 #: svnadmin/main.c:367
 msgid ""
@@ -7548,14 +7470,13 @@
 "校验储存于档案库的数据。\n"
 
 #: svnadmin/main.c:456
-#, fuzzy
 msgid "Invalid revision specifier"
-msgstr "指定了无效的修订版本"
+msgstr "无效的修订版描述"
 
 #: svnadmin/main.c:461
-#, fuzzy, c-format
+#, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
-msgstr "修订版必须不能大于最新的修订版号(%ld)"
+msgstr "修订版号不能大于最新的修订版号(%ld)"
 
 #: svnadmin/main.c:534 svnadmin/main.c:629
 msgid "First revision cannot be higher than second"
@@ -7572,7 +7493,6 @@
 msgstr "完成。\n"
 
 #: svnadmin/main.c:654
-#, fuzzy
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -7581,18 +7501,16 @@
 "Available subcommands:\n"
 msgstr ""
 "一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnadmin --version”已查看程序版本号以及可用的文件系统模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
-#, fuzzy
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
 "\n"
-msgstr ""
-"以下的档案库后台(FS) 模块可用:\n"
-"\n"
+msgstr "以下的档案库后端(FS) 模块可用:\n\n"
 
 #: svnadmin/main.c:738
 #, c-format
@@ -7657,12 +7575,12 @@
 
 # this points to filename according to sunny256
 #: svnadmin/main.c:1048 svnlook/main.c:1729
-#, fuzzy, c-format
+#, c-format
 msgid "Owner: %s\n"
 msgstr "所有者:%s\n"
 
 #: svnadmin/main.c:1049 svnlook/main.c:1730
-#, fuzzy, c-format
+#, c-format
 msgid "Created: %s\n"
 msgstr "创建于:%s\n"
 
@@ -7694,20 +7612,19 @@
 "\n"
 
 #: svnadmin/main.c:1110
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr "路径“%s”没有被锁定。\n"
 
 #: svnadmin/main.c:1122
-#, fuzzy, c-format
+#, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr "删除“%s”上的锁。\n"
 
 #: svnadmin/main.c:1230
-#, fuzzy
 msgid ""
 "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+msgstr "遇到了多个修订版参数;请使用“-r N:M”而非“-r M -r N”"
 
 #: svnadmin/main.c:1349
 #, c-format
@@ -7746,7 +7663,7 @@
 #: svndumpfilter/main.c:558
 #, c-format
 msgid "No valid copyfrom revision in filtered stream"
-msgstr ""
+msgstr "在被过滤的流中没有有效的copyfrom修订版"
 
 #: svndumpfilter/main.c:663
 msgid "Delta property block detected - not supported by svndumpfilter"
@@ -7793,7 +7710,6 @@
 "用法:svndumpfilter help [SUBCOMMAND...]\n"
 
 #: svndumpfilter/main.c:888
-#, fuzzy
 msgid ""
 "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
 "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -7802,7 +7718,8 @@
 "Available subcommands:\n"
 msgstr ""
 "一般用法:svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
-"请使用 “svndumpfilter help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svndumpfilter help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svndumpfilter --version”以查看程序版本号。\n"
 "\n"
 "可用的子命令:\n"
 
@@ -7859,7 +7776,7 @@
 "错误:没有提供前置字首,\n"
 
 #: svndumpfilter/main.c:1289
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svndumpfilter help %s' for usage.\n"
@@ -7884,18 +7801,16 @@
 msgstr "为每个路径显示节点修订版编号"
 
 #: svnlook/main.c:114
-#, fuzzy
 msgid "do not print differences for added files"
-msgstr "不要打印已新加文件的不同处"
+msgstr "不要输出新加文件造成的差异"
 
 #: svnlook/main.c:117
 msgid "print differences against the copy source"
 msgstr "显示差异并对照原始内容"
 
 #: svnlook/main.c:120
-#, fuzzy
 msgid "operate on a revision property (use with -r or -t)"
-msgstr "在修订版属性上作操作(使用-r参数)"
+msgstr "操作修订版上的属性(使用-r或-t选项)"
 
 #: svnlook/main.c:123
 msgid "show full paths instead of indenting them"
@@ -7903,7 +7818,7 @@
 
 #: svnlook/main.c:126
 msgid "show details for copies"
-msgstr ""
+msgstr "显示各个拷贝的详细信息"
 
 #: svnlook/main.c:138
 msgid ""
@@ -7998,7 +7913,6 @@
 "显示作者,日期戳,日志信息大小,以及日志信息。\n"
 
 #: svnlook/main.c:186
-#, fuzzy
 msgid ""
 "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
 "\n"
@@ -8006,7 +7920,7 @@
 msgstr ""
 "用法:svnlook lock REPOS_PATH PATH_IN_REPOS\n"
 "\n"
-"如果档案库路径已经存在锁,描述它。\n"
+"如果档案库指定路径上存在锁,则描述它。\n"
 
 #: svnlook/main.c:191
 msgid ""
@@ -8019,7 +7933,6 @@
 "显示日志信息。\n"
 
 #: svnlook/main.c:196
-#, fuzzy
 msgid ""
 "usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
 "\n"
@@ -8028,11 +7941,10 @@
 msgstr ""
 "用法:svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
 "\n"
-"显示档案库中,某个路径的属性的原始内容。\n"
-"加上 --revprop, 显示修订版属性的原始值。\n"
+"显示档案库中某个路径上属性的原始值。\n"
+"用--revprop选项显示修订版上属性的原始值。\n"
 
 #: svnlook/main.c:202
-#, fuzzy
 msgid ""
 "usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -8042,9 +7954,9 @@
 msgstr ""
 "用法:svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
-"列出档案库中,某个路径的属性。\n"
-"加上 --revprop 选项, 修订版属性。\n"
-"加上 -v 的话,一并显示属性内容。\n"
+"列出档案库中某个路径的属性。\n"
+"使用 --revprop 选项列出修订版的属性。\n"
+"使用 -v 选项一并显示属性的内容。\n"
 
 #: svnlook/main.c:209
 msgid ""
@@ -8138,18 +8050,18 @@
 "REVISION PATH\n"
 "-------- ----\n"
 msgstr ""
-"修 订 版 路径\n"
+"修 订 版 路径\n"
 "-------- ----\n"
 
 #: svnlook/main.c:1419
-#, fuzzy, c-format
+#, c-format
 msgid "Property '%s' not found on revision %ld"
 msgstr "属性“%s”在修订版 %ld 中找不到"
 
 #: svnlook/main.c:1423
-#, fuzzy, c-format
+#, c-format
 msgid "Property '%s' not found on path '%s' in revision %ld"
-msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”中找不到"
+msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”上找不到"
 
 #: svnlook/main.c:1592 svnlook/main.c:1807
 #, c-format
@@ -8157,7 +8069,6 @@
 msgstr "未提供档案库路径参数"
 
 #: svnlook/main.c:1653
-#, fuzzy
 msgid ""
 "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8170,15 +8081,15 @@
 msgstr ""
 "一般用法:svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "注意:任何接受 “--revision”与 “--transaction”选项的子命令,在没有\n"
-" 指定两者其一的情况下使用,会直接作用在档案库最新的修订版。\n"
-"请使用 “svnlook help <subcommand>”以取得特定子命令的帮助信息。\n"
+" 指定两者其一的情况下会直接作用在档案库最新的修订版上。\n"
+"请使用“svnlook help <subcommand>”以取得特定子命令的帮助信息。\n"
+"请使用“svnlook --version”以查看程序的版本以及可用的文件系统模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnlook/main.c:1709
-#, fuzzy
 msgid "Missing path argument"
-msgstr "未提供档案库路径参数"
+msgstr "丢失路径参数"
 
 #: svnlook/main.c:1734
 #, c-format
@@ -8199,9 +8110,9 @@
 "%s\n"
 
 #: svnlook/main.c:1781
-#, fuzzy, c-format
+#, c-format
 msgid "Missing propname argument"
-msgstr "未提供属性名称参数"
+msgstr "丢失属性名参数"
 
 #: svnlook/main.c:1782
 #, c-format
@@ -8222,9 +8133,9 @@
 msgstr "'--transaction' (-t) 与 '--revision' (-r) 参数不能同时存在"
 
 #: svnlook/main.c:2089
-#, fuzzy, c-format
+#, c-format
 msgid "Repository argument required\n"
-msgstr "需有档案库参数"
+msgstr "需有档案库参数\n"
 
 #: svnlook/main.c:2098
 #, c-format
@@ -8232,12 +8143,12 @@
 msgstr "“%s”是地址(URL),但是应该是路径\n"
 
 #: svnlook/main.c:2149
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svnlook help %s' for usage.\n"
 msgstr ""
-"子命令“%s”并不接受选项“%s”\n"
+"子命令“%s”不接受选项“%s”\n"
 "请使用“svnlook help %s”以了解用法。\n"
 
 #: svnserve/main.c:140
@@ -8269,9 +8180,8 @@
 msgstr "服务根目录"
 
 #: svnserve/main.c:153
-#, fuzzy
 msgid "force read only, overriding repository config file"
-msgstr "不赞成;使用档案库配置文件"
+msgstr "强制只读成;优先于档案库配置文件"
 
 #: svnserve/main.c:154
 msgid "tunnel mode"
@@ -8291,30 +8201,28 @@
 
 #: svnserve/main.c:162
 msgid "write server process ID to file arg"
-msgstr ""
+msgstr "将服务进程的ID写入文件ARG中"
 
 #: svnserve/main.c:165
 msgid "run as a windows service (SCM only)"
-msgstr ""
+msgstr "以Windows服务方式运行(仅对服务控制管理器有效)"
 
 #: svnserve/main.c:177
 #, c-format
 msgid "Type '%s --help' for usage.\n"
-msgstr "请使用“%s help”以得到用法和帮助。\n"
+msgstr "请使用“%s --help”以得到用法和帮助。\n"
 
 #: svnserve/main.c:186
-#, fuzzy
 msgid ""
 "usage: svnserve [options]\n"
 "\n"
 "Valid options:\n"
 msgstr ""
-"用户:svnserve [选项]\n"
+"用法:svnserve [选项]\n"
 "\n"
 "有效选项:\n"
 
 #: svnserve/main.c:453
-#, fuzzy
 msgid "You must specify exactly one of -d, -i, -t or -X.\n"
 msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
 
@@ -8328,65 +8236,65 @@
 msgid ""
 "svnserve: The --service flag is only valid if the process is started by the "
 "Service Control Manager.\n"
-msgstr ""
+msgstr "svnserve: 只有被服务控制管理器启动时--service选项才有效\n"
 
 #: svnserve/main.c:568
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get address info"
-msgstr "不能获取地址信息:“%s”\n"
+msgstr "不能获取地址信息"
 
 #: svnserve/main.c:584
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create server socket"
-msgstr "无法创建服务器套接字:%s\n"
+msgstr "无法创建服务端套接字"
 
 #: svnserve/main.c:597
-#, fuzzy, c-format
+#, c-format
 msgid "Can't bind server socket"
-msgstr "不能绑定服务器套接字:“%s”\n"
+msgstr "不能绑定服务端套接字"
 
 #: svnserve/main.c:665
-#, fuzzy, c-format
+#, c-format
 msgid "Can't accept client connection"
-msgstr "无法接受客户连接:%s\n"
+msgstr "无法接受客户端连接"
 
 #: svnserve/main.c:719
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create threadattr"
-msgstr "无法创建线程属性:“%s”\n"
+msgstr "无法创建线程属性"
 
 # as-is
 #: svnserve/main.c:727
-#, fuzzy, c-format
+#, c-format
 msgid "Can't set detached state"
-msgstr "不能设置分离的状态:“%s”\n"
+msgstr "不能设置分离状态"
 
 #: svnserve/main.c:740
-#, fuzzy, c-format
+#, c-format
 msgid "Can't create thread"
-msgstr "无法创建线程:%s\n"
+msgstr "无法创建线程"
 
 #: svnserve/winservice.c:341
 #, c-format
 msgid "Failed to create winservice_start_event"
-msgstr ""
+msgstr "创建windows服务启动事件失败"
 
 #: svnserve/winservice.c:352
 #, c-format
 msgid "The service failed to start"
-msgstr ""
+msgstr "服务启动失败"
 
 #: svnserve/winservice.c:400
 #, c-format
 msgid "Failed to connect to Service Control Manager"
-msgstr ""
+msgstr "连接服务控制管理器失败"
 
 #: svnserve/winservice.c:411
 #, c-format
 msgid ""
 "The service failed to start; an internal error occurred while starting the "
 "service"
-msgstr ""
+msgstr "发生内部错误,服务启动失败"
 
 #: svnsync/main.c:56
 msgid ""
@@ -8404,6 +8312,15 @@
 "In other words, the destination repository should be a read-only\n"
 "mirror of the source repository.\n"
 msgstr ""
+"用法:svnsync initialize 目标URL 源URL\n"
+"\n"
+"初始化一个目标档案库以从另一个档案库同步。\n"
+"\n"
+"目标URL必须指向一个档案库的根目录,这个档案库必须没有提交过的修订版并且允许\n"
+"更改修订版属性。\n"
+"\n"
+"除了svnsync外,你不应该在目标档案库中提交或者更改修订版属性。也就是说,目标\n"
+"档案库应该是源档案库的只读镜像。\n"
 
 #: svnsync/main.c:71
 msgid ""
@@ -8411,6 +8328,9 @@
 "\n"
 "Transfer all pending revisions from source to destination.\n"
 msgstr ""
+"用法: svnsync synchronize 目标URL\n"
+"\n"
+"从源档案库传送修订版到目标档案库。\n"
 
 #: svnsync/main.c:76
 msgid ""
@@ -8419,73 +8339,73 @@
 "Copy all revision properties for revision REV from source to\n"
 "destination.\n"
 msgstr ""
+"用法:svnsync copy-revprops 目标URL 修订版\n"
+"\n"
+"从源档案库拷贝所有指定修订版上的属性到目标档案库。\n"
 
 #: svnsync/main.c:82
-#, fuzzy
 msgid ""
 "usage: svnsync help [SUBCOMMAND...]\n"
 "\n"
 "Describe the usage of this program or its subcommands.\n"
 msgstr ""
-"用法:svnadmin help [SUBCOMMAND...]\n"
+"用法:svnsync help [SUBCOMMAND...]\n"
 "\n"
 "显示本程序或其子命令的用法。\n"
 
 #: svnsync/main.c:184
-#, fuzzy, c-format
+#, c-format
 msgid "Can't get local hostname"
-msgstr "无法获取文件名"
+msgstr "无法获取本地主机名"
 
 #: svnsync/main.c:206
 #, c-format
 msgid "Failed to get lock on destination repos, currently held by '%s'\n"
-msgstr ""
+msgstr "对目标档案库加锁失败,当前被“%s”锁定中\n"
 
 #: svnsync/main.c:301
 #, c-format
 msgid "Session is rooted at '%s' but the repos root is '%s'"
-msgstr ""
+msgstr "会话的根目录在“%s”但档案库的根目录是“%s”"
 
 #: svnsync/main.c:341
 #, c-format
 msgid "Copied properties for revision %ld (%s* properties skipped).\n"
-msgstr ""
+msgstr "修订版%ld的属性拷贝完毕(%s* 属性被跳过)\n"
 
 #: svnsync/main.c:346
-#, fuzzy, c-format
+#, c-format
 msgid "Copied properties for revision %ld.\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgstr "拷贝了修订版%ld上的属性。\n"
 
 #: svnsync/main.c:387
 msgid "Cannot initialize a repository with content in it"
-msgstr ""
+msgstr "档案库非空,初始化失败"
 
 #: svnsync/main.c:398
 #, c-format
 msgid "Destination repository is already synchronizing from '%s'"
-msgstr ""
+msgstr "目标档案库已经在与“%s”同步"
 
 #: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
 #: svnsync/main.c:1200
-#, fuzzy, c-format
+#, c-format
 msgid "Path '%s' is not a URL"
-msgstr "路径“%s”不是文件"
+msgstr "路径“%s”不是URL"
 
 #: svnsync/main.c:838
-#, fuzzy, c-format
+#, c-format
 msgid "Committed revision %ld.\n"
-msgstr ""
-"\n"
-"提交后的修订版为 %ld。\n"
+msgstr "提交后的修订版为 %ld。\n"
 
 #: svnsync/main.c:877
 msgid "Destination repository has not been initialized"
-msgstr ""
+msgstr "目标档案库尚未被初始化"
 
 #: svnsync/main.c:892
 #, c-format
 msgid "UUID of source repository (%s) does not match expected UUID (%s)"
-msgstr ""
+msgstr "源档案库(%s)的UUID与期望的UUID(%s)不匹配"
 
 #: svnsync/main.c:954
 #, c-format
@@ -8494,6 +8414,8 @@
 "destination HEAD (%ld) are inconsistent; have you committed to the "
 "destination without using svnsync?"
 msgstr ""
+"当前正被拷贝的修订版(%ld)、最后合并的修订版(%ld)以及目标档案库的HEAD(%ld)\n"
+"不一致;你是否用svnsync之外的办法向目标档案库提交过?"
 
 #: svnsync/main.c:992
 #, c-format
@@ -8501,23 +8423,23 @@
 "Destination HEAD (%ld) is not the last merged revision (%ld); have you "
 "committed to the destination without using svnsync?"
 msgstr ""
+"目标档案库的HEAD(%ld)不是最后合并的修订版(%ld);你是否用svnsync之外的办法向目标\n"
+"档案库提交过?"
 
 #: svnsync/main.c:1069
 #, c-format
 msgid "Commit created rev %ld but should have created %ld"
-msgstr ""
+msgstr "提交创建了修订版%ld 但本应创建%ld"
 
 #: svnsync/main.c:1171
 msgid "Cannot copy revprops for a revision that has not been synchronized yet"
-msgstr ""
+msgstr "不能拷贝尚未同步的修订版的修订属性"
 
 #: svnsync/main.c:1203
-#, fuzzy
 msgid "Invalid revision number"
-msgstr "提供了无效的版本号码"
+msgstr "无效的修订版号"
 
 #: svnsync/main.c:1239
-#, fuzzy
 msgid ""
 "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
 "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8525,31 +8447,32 @@
 "\n"
 "Available subcommands:\n"
 msgstr ""
-"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"一般用法:svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"请使用“svnsync help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"请使用“svnsync --version”查看程序版本以及可用的RA模块。\n"
 "\n"
 "可用的子命令:\n"
 
 #: svnsync/main.c:1429
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "subcommand '%s' doesn't accept option '%s'\n"
 "Type 'svnsync help %s' for usage.\n"
 msgstr ""
 "子命令“%s”不接受选项“%s”\n"
-"请输入“svn help %s”以取得用法。\n"
+"请输入“svnsync help %s”以取得用法。\n"
 
 #: svnsync/main.c:1490
 msgid "Not enough arguments provided; try 'svnsync help' for more info"
-msgstr ""
+msgstr "参数不够;请用“svnsync help”获取更多帮助"
 
 #: svnversion/main.c:39
-#, fuzzy, c-format
+#, c-format
 msgid "Type 'svnversion --help' for usage.\n"
-msgstr "请使用“svnversion --help”以得到用法和帮助。\n"
+msgstr "请使用“svnversion --help”以得到帮助。\n"
 
 #: svnversion/main.c:50
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
@@ -8581,25 +8504,26 @@
 msgstr ""
 "用法:svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
-" 为工作拷贝路径 WC_PATH 产生简洁的 “版本号码”。 TRAIL_URL 是\n"
-" URL 的结尾部份,用以决定 WC_PATH 是否已被切换 (WC_PATH 内的切换\n"
-" 侦测并不倚赖 TRAIL_URL)。版本号码会写至标准输出。举例说明:\n"
+" 为工作拷贝路径 WC_PATH 产生紧凑的 “版本号”。 TRAIL_URL 是\n"
+" URL 的结尾部分,用以判断 WC_PATH 是否已切换过 (探测WC_PATH\n"
+" 内的切换并不依靠 TRAIL_URL)。版本号码会写至标准输出。举例说明:\n"
 "\n"
 " $ svnversion . /repos/svn/trunk \n"
 " 4168\n"
 "\n"
-" 如果工作拷贝是单一版本,未经修改,未被切换,而且其地址(URL)符合\n"
-" TRAIL_URL 参数,那么版本号码将会是单一号码。如果工作拷贝内不\n"
-" 太单纯的话,那么版本号码就会复杂地多:\n"
+" 如果工作拷贝是单一版本,未经修改,未经切换,而且其地址(URL)符合\n"
+" TRAIL_URL 参数,那么版本号码将会是单一数字。如果工作拷贝不普通,\n"
+" 那么版本号就会复杂得多:\n"
 "\n"
 " 4123:4168 混合修订版的工作拷贝\n"
 " 4168M 有修改的工作拷贝\n"
 " 4123S 切换了的工作拷贝\n"
-" 4123:4168MS 混合修订版,有修改,切换了的工作拷贝\n"
+" 4123:4168MS 混合修订版,有修改,工作拷贝切换过\n"
+"\n"
+" 如果使用在非工作拷贝的目录上,例如导出的目录,那么它会输出“已导出”。\n"
+"\n"
+" 如果调用时没有参数则WC_PATH默认为当前目录。\n"
 "\n"
-" 如果在非工作拷贝的目录中,例如导出的目录执行的话,那么\n"
-" 这个程序会输出“已导出”。\n"
-" 如果调用时没有参数 WC_PATH 会使用当前目录。\n"
 "有效选项:\n"
 
 #: svnversion/main.c:121
@@ -8620,219 +8544,3 @@
 msgid "'%s' not versioned, and not exported\n"
 msgstr "“%s”未纳入版本控制,并未导出\n"
 
-#~ msgid "Finished"
-#~ msgstr "完成"
-
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
-
-#, fuzzy
-#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
-
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%s”已是文件/其它的东西"
-
-#~ msgid "No URL target available"
-#~ msgstr "没有提供 URL 目标"
-
-#~ msgid "repository argument required\n"
-#~ msgstr "需有档案库参数\n"
-
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%s”\n"
-
-#~ msgid "Can't recode string"
-#~ msgstr "无法重新编码字符串"
-
-#~ msgid "native"
-#~ msgstr "本地"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
-#~ msgstr "不支持ra_dav的 RA 插件 ABI 版本 (%d)"
-
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
-
-#~ msgid "Working copy not locked"
-#~ msgstr "工作拷贝未锁定"
-
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信息\n"
-
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0的提交。\n"
-
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "无法清除“%s”:不是一个目录"
-
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
-
-#~ msgid "print client version info"
-#~ msgstr "打印客户端版本信息"
-
-#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
-#~ msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
-
-#~ msgid "Wrong number of paths given"
-#~ msgstr "指定了错误数目的路径"
-
-#~ msgid "Not enough args provided"
-#~ msgstr "未提供足够的参数"
-
-# as-is
-#~ msgid "Can't seek in '%s'"
-#~ msgstr "不能在“%s”定位"
-
-#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-#~ msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
-
-#~ msgid "Unrecognized node kind of '%s'"
-#~ msgstr "“%s”的节点种类无法辨识"
-
-#~ msgid "'%s' is in the way"
-#~ msgstr "“%s”挡在中间"
-
-#~ msgid "'%s' is not supported"
-#~ msgstr "“%s”不支持"
-
-#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-#~ msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
-
-#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-#~ msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
-
-#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-#~ msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
-
-#~ msgid "Search for malformed path '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for reading"
-#~ msgstr "不能打开文件“%s”进行读取"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for writing"
-#~ msgstr "不能打开文件“%s”进行写入"
-
-#, fuzzy
-#~ msgid "Error reading file '%s'"
-#~ msgstr "读取文件“%s”时发生错误"
-
-#, fuzzy
-#~ msgid "Error writing file '%s'"
-#~ msgstr "写入文件“%s”时发生错误"
-
-#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
-
-#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-#~ msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
-
-#~ msgid "Found malformed header block in dumpfile stream"
-#~ msgstr "在导出文件流中找到有畸形的文件头"
-
-# as-is
-#~ msgid "Creating readme file"
-#~ msgstr "正在创建 readme 文件"
-
-#, fuzzy
-#~ msgid "Expected format '%d' of repository; found format '%d'"
-#~ msgstr "预期档案库格式“%d”;找到格式“%d”"
-
-# as-is
-#~ msgid "Can't open config file '%s'"
-#~ msgstr "不能打开配置文件“%s”"
-
-# as-is
-#~ msgid "Can't find config file '%s'"
-#~ msgstr "找不到配置文件“%s”"
-
-#~ msgid "Can't change executability of file '%s'"
-#~ msgstr "不能改变文件“%s”为可执行"
-
-#~ msgid "Can't stat new directory '%s'"
-#~ msgstr "无法获取新目录“%s”的状态"
-
-#~ msgid "Too few arguments"
-#~ msgstr "参数太少"
-
-#~ msgid ""
-#~ "The entry '%s' is no longer a directory; remove the entry before updating"
-#~ msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
-
-#~ msgid "Error restoring props for '%s'"
-#~ msgstr "还原“%s”的属性时发生错误"
-
-#~ msgid "Error removing props for '%s'"
-#~ msgstr "移除“%s”的属性时发生错误"
-
-#~ msgid ""
-#~ "'%s' is scheduled for deletion; it must be committed before being "
-#~ "overwritten"
-#~ msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
-
-#, fuzzy
-#~ msgid "Working copy '%s' is missing or not locked"
-#~ msgstr "工作拷贝“%s”丢失或并未锁定"
-
-#~ msgid "Error checking path '%s'"
-#~ msgstr "检查路径“%s”时发生错误"
-
-#~ msgid "Unable to delete temporary file"
-#~ msgstr "无法删除暂存文件"
-
-#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
-
-#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-#~ msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
-
-#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
-
-#~ msgid "Unknown node kind: '%s'"
-#~ msgstr "未知的节点类型:“%s”"
-
-#~ msgid "'%s' has unknown value for svn:eol-style property"
-#~ msgstr "“%s”的 svn:eol-style 属性有不明的数值"
-
-#~ msgid "Move failed"
-#~ msgstr "移动失败"
-
-#~ msgid "Node with dropped parent sneaked in"
-#~ msgstr "其父节点已舍弃的节点偷跑进来"
-
-#, fuzzy
-#~ msgid "Error creating dir '%s' (path exists)"
-#~ msgstr "创建目录“%s”时发生错误(路径已经存在)"
-
-#~ msgid "Can't create temporary directory"
-#~ msgstr "无法建立临时目录"
-
-#~ msgid ""
-#~ "Warning: -R is deprecated.\n"
-#~ "Anonymous access is now read-only by default.\n"
-#~ "To change, use conf/svnserve.conf in repos:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (default read)\n"
-#~ " auth-access = read|write|none (default write)\n"
-#~ "Forcing all access to read-only for now\n"
-#~ msgstr ""
-#~ "警告:-R 不赞成使用。\n"
-#~ "匿名访问默认只读。Anonymous access is now read-only by default.\n"
-#~ "修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (默认 read)\n"
-#~ " auth-access = read|write|none (默认 write)\n"
-#~ "强制所有访问为只读\n"

[[[
* subversion/po/zh_CN.po: msgmerge with latest subversion.pot in trunk
                          untranslated yet.
]]]

diff -u origin\zh_CN.po msgmerged\zh_CN.po
--- origin\zh_CN.po Wed Aug 23 10:59:38 2006
+++ msgmerged\zh_CN.po Wed Aug 23 10:59:56 2006
@@ -5,6763 +5,7370 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.2.0\n"
-"POT-Creation-Date: 2005-08-16 16:28+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
+"POT-Creation-Date: 2006-08-21 06:57-0400\n"
 "PO-Revision-Date: 2004-09-12 22:05+0800\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
 
-#: clients/cmdline/blame-cmd.c:236 clients/cmdline/ls-cmd.c:316
-msgid "'verbose' option invalid in XML mode"
-msgstr "在XML模式中“详细”选项无效"
+# as-is
+#: include/svn_error_codes.h:154
+msgid "Bad parent pool passed to svn_make_pool()"
+msgstr "无效的内存池(pool)传递到 svn_make_pool()"
 
-#: clients/cmdline/blame-cmd.c:248 clients/cmdline/ls-cmd.c:328
-#: clients/cmdline/status-cmd.c:192
-msgid "'incremental' option only valid in XML mode"
-msgstr "只有在XML模式“增加”选项才有效"
+#: include/svn_error_codes.h:158
+msgid "Bogus filename"
+msgstr "有问题的文件名"
 
-#: clients/cmdline/blame-cmd.c:307
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "跳过二进制文件:“%s”\n"
+#: include/svn_error_codes.h:162
+msgid "Bogus URL"
+msgstr "有问题的地址(URL)"
 
-#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125
-#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "“%s”不像是地址(URL)"
+#: include/svn_error_codes.h:166
+msgid "Bogus date"
+msgstr "有问题的日期"
 
-#: clients/cmdline/copy-cmd.c:106 clients/cmdline/delete-cmd.c:64
-#: clients/cmdline/mkdir-cmd.c:66
-msgid "Local, non-commit operations do not take a log message"
-msgstr "本地操作,非提交的操作不能获取日志信息"
+#: include/svn_error_codes.h:170
+msgid "Bogus mime-type"
+msgstr "有问题的 mime-type"
 
-#: clients/cmdline/diff-cmd.c:65
-msgid "Can't open stdout"
-msgstr "无法打开标准输出 (stdout)"
+#: include/svn_error_codes.h:176
+msgid "Version file format not correct"
+msgstr "版本文件格式不正确"
 
-#: clients/cmdline/diff-cmd.c:67
-msgid "Can't open stderr"
-msgstr "无法打开标准错误 (stderr)"
+#: include/svn_error_codes.h:182
+msgid "No such XML tag attribute"
+msgstr "没有这样的 XML 标签属性"
 
-#: clients/cmdline/diff-cmd.c:156
-msgid "Target lists to diff may not contain both working copy paths and URLs"
-msgstr "差异比较目标不可同时包含工作拷贝路径与地址(URL)"
+#: include/svn_error_codes.h:186
+msgid "<delta-pkg> is missing ancestry"
+msgstr "<delta-pkg> 没有演进历程"
 
-#: clients/cmdline/export-cmd.c:82
-msgid ""
-"Destination directory exists; please remove the directory or use --force to "
-"overwrite"
-msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
+#: include/svn_error_codes.h:190
+msgid "Unrecognized binary data encoding; can't decode"
+msgstr "无法辨识的二进制数据编码:无法解译"
 
-#: clients/cmdline/help-cmd.c:45
-#, c-format
-msgid ""
-"usage: svn <subcommand> [options] [args]\n"
-"Subversion command-line client, version %s.\n"
-"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
-"\n"
-"Most subcommands take file and/or directory arguments, recursing\n"
-"on the directories. If no arguments are supplied to such a\n"
-"command, it recurses on the current directory (inclusive) by default.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"用法:svn <subcommand> [options] [args]\n"
-"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
-"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
-"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
-"行递归存取。\n"
-"\n"
-"可用的子命令:\n"
+#: include/svn_error_codes.h:194
+msgid "XML data was not well-formed"
+msgstr "XML 的数据不合语法"
 
-#: clients/cmdline/help-cmd.c:56
-msgid ""
-"Subversion is a tool for version control.\n"
-"For additional information, see http://subversion.tigris.org/\n"
-msgstr ""
-"Subversion 是个版本控制系统的工具。\n"
-"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+#: include/svn_error_codes.h:198
+msgid "Data cannot be safely XML-escaped"
+msgstr "XML 数据不能正确地解码"
 
-#: clients/cmdline/help-cmd.c:63
-msgid ""
-"The following repository access (RA) modules are available:\n"
-"\n"
-msgstr ""
-"可使用以下的档案库存取 (RA) 模块:\n"
-"\n"
+#: include/svn_error_codes.h:204
+msgid "Inconsistent line ending style"
+msgstr "不一致的行结束样式"
 
-#: clients/cmdline/import-cmd.c:82
-msgid "Repository URL required when importing"
-msgstr "导入时必须提供档案库的地址(URL)"
+#: include/svn_error_codes.h:208
+msgid "Unrecognized line ending style"
+msgstr "无法辨识的行结束样式"
 
-#: clients/cmdline/import-cmd.c:86
-msgid "Too many arguments to import command"
-msgstr "导入命令有太多参数"
+#: include/svn_error_codes.h:213
+msgid "Line endings other than expected"
+msgstr "一行以意料之外的方式结束"
 
-#: clients/cmdline/import-cmd.c:101
-#, c-format
-msgid "Invalid URL '%s'"
-msgstr "无效地址(URL)“%s”"
+#: include/svn_error_codes.h:217
+msgid "Ran out of unique names"
+msgstr "已用完不重复的名称"
 
-#: clients/cmdline/info-cmd.c:56 svnadmin/main.c:1028
-#, c-format
-msgid "Path: %s\n"
-msgstr "路径:%s\n"
+# as-is
+#: include/svn_error_codes.h:222
+msgid "Framing error in pipe protocol"
+msgstr "管道协议帧错误"
 
-# this points to filename according to sunny256
-#: clients/cmdline/info-cmd.c:62 svnlook/main.c:782
-#, c-format
-msgid "Name: %s\n"
-msgstr "文件名:%s\n"
+#: include/svn_error_codes.h:227
+msgid "Read error in pipe"
+msgstr "管道发生读取错误"
 
-#: clients/cmdline/info-cmd.c:66
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
+#: libsvn_subr/cmdline.c:308 svn/util.c:716
 #, c-format
-msgid "URL: %s\n"
-msgstr "地址(URL):%s\n"
+msgid "Write error"
+msgstr "写入错误"
 
-#: clients/cmdline/info-cmd.c:69
-#, fuzzy, c-format
-msgid "Repository Root: %s\n"
-msgstr "档案库根路径:%s\n"
+#: include/svn_error_codes.h:237
+msgid "Unexpected EOF on stream"
+msgstr "流中有意料之外的结束符"
 
-#: clients/cmdline/info-cmd.c:73
-#, c-format
-msgid "Repository UUID: %s\n"
-msgstr "档案库 UUID:%s\n"
+#: include/svn_error_codes.h:241
+msgid "Malformed stream data"
+msgstr "畸形的流数据"
 
-#: clients/cmdline/info-cmd.c:77
-#, c-format
-msgid "Revision: %ld\n"
-msgstr "修订版:%ld\n"
+#: include/svn_error_codes.h:245
+msgid "Unrecognized stream data"
+msgstr "无法辨识的流数据"
 
-#: clients/cmdline/info-cmd.c:82
-msgid "Node Kind: file\n"
-msgstr "节点种类:文件\n"
+#: include/svn_error_codes.h:251
+msgid "Unknown svn_node_kind"
+msgstr "未知的 svn_node_kind"
 
-#: clients/cmdline/info-cmd.c:86
-msgid "Node Kind: directory\n"
-msgstr "节点种类:目录\n"
+#: include/svn_error_codes.h:255
+msgid "Unexpected node kind found"
+msgstr "找到一个意料之外的节点种类"
 
-#: clients/cmdline/info-cmd.c:90
-msgid "Node Kind: none\n"
-msgstr "节点种类:无\n"
+#: include/svn_error_codes.h:261
+msgid "Can't find an entry"
+msgstr "无法找到一个项目"
 
-#: clients/cmdline/info-cmd.c:95
-msgid "Node Kind: unknown\n"
-msgstr "节点种类:未知\n"
+#: include/svn_error_codes.h:267
+msgid "Entry already exists"
+msgstr "项目已存在"
 
-#: clients/cmdline/info-cmd.c:104
-msgid "Schedule: normal\n"
-msgstr "调度:正常\n"
+#: include/svn_error_codes.h:271
+msgid "Entry has no revision"
+msgstr "项目没有修订版"
 
-#: clients/cmdline/info-cmd.c:108
-msgid "Schedule: add\n"
-msgstr "调度:新增\n"
+#: include/svn_error_codes.h:275
+msgid "Entry has no URL"
+msgstr "项目没有地址(URL)"
 
-#: clients/cmdline/info-cmd.c:112
-msgid "Schedule: delete\n"
-msgstr "调度:删除\n"
+#: include/svn_error_codes.h:279
+msgid "Entry has an invalid attribute"
+msgstr "项目有无效的属性"
 
-#: clients/cmdline/info-cmd.c:116
-msgid "Schedule: replace\n"
-msgstr "调度:替换\n"
+#: include/svn_error_codes.h:285
+msgid "Obstructed update"
+msgstr "塞住的更新"
 
-#: clients/cmdline/info-cmd.c:124
-#, c-format
-msgid "Copied From URL: %s\n"
-msgstr "复制自地址(URL):%s\n"
+# as-is
+#: include/svn_error_codes.h:290
+msgid "Mismatch popping the WC unwind stack"
+msgstr "不匹配的弹出工作拷贝(WC)展开堆栈"
 
-#: clients/cmdline/info-cmd.c:128
-#, c-format
-msgid "Copied From Rev: %ld\n"
-msgstr "复制自修订版:%ld\n"
+# as-is
+#: include/svn_error_codes.h:295
+msgid "Attempt to pop empty WC unwind stack"
+msgstr "尝试弹出空的工作拷贝(WC)展开堆栈"
 
-#: clients/cmdline/info-cmd.c:133
-#, c-format
-msgid "Last Changed Author: %s\n"
-msgstr "最后修改的作者:%s\n"
+# as-is
+#: include/svn_error_codes.h:300
+msgid "Attempt to unlock with non-empty unwind stack"
+msgstr "尝试解锁非空展开堆栈"
 
-#: clients/cmdline/info-cmd.c:137
-#, c-format
-msgid "Last Changed Rev: %ld\n"
-msgstr "最后修改的修订版:%ld\n"
+#: include/svn_error_codes.h:304
+msgid "Attempted to lock an already-locked dir"
+msgstr "尝试要锁定一个已锁定的目录"
 
-#: clients/cmdline/info-cmd.c:142
-msgid "Last Changed Date"
-msgstr "最后修改的时间"
+#: include/svn_error_codes.h:308
+msgid "Working copy not locked; this is probably a bug, please report"
+msgstr "工作目录没有被锁定;这可能是一个漏洞,请报告开发者"
 
-#: clients/cmdline/info-cmd.c:148
-msgid "Text Last Updated"
-msgstr "文本最后更新"
+#: include/svn_error_codes.h:313
+msgid "Invalid lock"
+msgstr "无效的锁定"
 
-#: clients/cmdline/info-cmd.c:152
-msgid "Properties Last Updated"
-msgstr "属性最后更新"
+#: include/svn_error_codes.h:317
+msgid "Path is not a working copy directory"
+msgstr "路径不是工作拷贝目录"
 
-#: clients/cmdline/info-cmd.c:155
-#, c-format
-msgid "Checksum: %s\n"
-msgstr "校验和:%s\n"
+#: include/svn_error_codes.h:321
+msgid "Path is not a working copy file"
+msgstr "路径不是工作拷贝文件"
 
-#: clients/cmdline/info-cmd.c:160
-#, c-format
-msgid "Conflict Previous Base File: %s\n"
-msgstr "冲突之前的文件:%s\n"
+#: include/svn_error_codes.h:325
+msgid "Problem running log"
+msgstr "无法执行日志"
 
-#: clients/cmdline/info-cmd.c:166
-#, c-format
-msgid "Conflict Previous Working File: %s\n"
-msgstr "冲突之前的工作文件:%s\n"
+#: include/svn_error_codes.h:329
+msgid "Can't find a working copy path"
+msgstr "找不到工作拷贝路径"
 
-#: clients/cmdline/info-cmd.c:171
-#, c-format
-msgid "Conflict Current Base File: %s\n"
-msgstr "冲突之前的当前文件:%s\n"
+#: include/svn_error_codes.h:333
+msgid "Working copy is not up-to-date"
+msgstr "工作拷贝未更新至最新版"
 
-#: clients/cmdline/info-cmd.c:176
-#, c-format
-msgid "Conflict Properties File: %s\n"
-msgstr "冲突的属性文件:%s\n"
+#: include/svn_error_codes.h:337
+msgid "Left locally modified or unversioned files"
+msgstr "保留本地修改或未纳入版本管理的文件"
 
-#: clients/cmdline/info-cmd.c:184
-#, c-format
-msgid "Lock Token: %s\n"
-msgstr "锁定记号:%s\n"
+#: include/svn_error_codes.h:341
+msgid "Unmergeable scheduling requested on an entry"
+msgstr "该项目有一个无法合并的调度请求"
 
-#: clients/cmdline/info-cmd.c:188
-#, c-format
-msgid "Lock Owner: %s\n"
-msgstr "锁定所有者:%s\n"
+#: include/svn_error_codes.h:345
+msgid "Found a working copy path"
+msgstr "找到一个工作拷贝路径"
 
-#: clients/cmdline/info-cmd.c:193
-msgid "Lock Created"
-msgstr "锁定已创建的"
+#: include/svn_error_codes.h:349
+msgid "A conflict in the working copy obstructs the current operation"
+msgstr "工作拷贝中的冲突阻碍了目前的操作"
 
-#: clients/cmdline/info-cmd.c:197
-msgid "Lock Expires"
-msgstr "锁定过期的"
+#: include/svn_error_codes.h:353
+msgid "Working copy is corrupt"
+msgstr "工作拷贝已损坏"
 
-#: clients/cmdline/info-cmd.c:206
-#, c-format
-msgid ""
-"Lock Comment (%i lines):\n"
-"%s\n"
-msgstr ""
-"锁定注释(%i 行):\n"
-"%s\n"
+#: include/svn_error_codes.h:357
+msgid "Working copy text base is corrupt"
+msgstr "工作拷贝的文件参考基础已损坏"
 
-#: clients/cmdline/info-cmd.c:207
-#, c-format
-msgid ""
-"Lock Comment (%i line):\n"
-"%s\n"
-msgstr ""
-"锁定注释(%i line):\n"
-"%s\n"
+#: include/svn_error_codes.h:361
+msgid "Cannot change node kind"
+msgstr "无法更改节点种类"
 
-#: clients/cmdline/info-cmd.c:281
-#, c-format
-msgid ""
-"%s: (Not a versioned resource)\n"
-"\n"
-msgstr ""
-"%s:(不是受版本控制的资源)\n"
-"\n"
-
-#: clients/cmdline/info-cmd.c:290
-#, fuzzy, c-format
-msgid ""
-"%s: (Not a valid URL)\n"
-"\n"
-msgstr ""
-"%s:(不是有效的地址(URL))\n"
-"\n"
+#: include/svn_error_codes.h:365
+msgid "Invalid operation on the current working directory"
+msgstr "这个操作对目前的工作拷贝目录无效"
 
-#: clients/cmdline/lock-cmd.c:52
-#, fuzzy
-msgid "Lock comment contains a zero byte"
-msgstr "锁定的注释中有一个零字节"
+#: include/svn_error_codes.h:369
+msgid "Problem on first log entry in a working copy"
+msgstr "操作于工作拷贝的第一个日志项目时发生问题"
 
-#: clients/cmdline/log-cmd.c:162
-msgid "(no author)"
-msgstr "(没有作者信息)"
+#: include/svn_error_codes.h:373
+msgid "Unsupported working copy format"
+msgstr "不支持的工作拷贝格式"
 
-#: clients/cmdline/log-cmd.c:173
-msgid "(no date)"
-msgstr "(没有时间)"
+#: include/svn_error_codes.h:377
+msgid "Path syntax not supported in this context"
+msgstr "路径语法在此上下文中并不支持"
 
-#: clients/cmdline/log-cmd.c:203
-msgid "Changed paths:\n"
-msgstr "改变的路径:\n"
+#: include/svn_error_codes.h:382
+msgid "Invalid schedule"
+msgstr "无效的计划任务"
 
-#: clients/cmdline/log-cmd.c:218
-#, c-format
-msgid " (from %s:%ld)"
-msgstr " (从 %s:%ld)"
+#: include/svn_error_codes.h:387
+#, fuzzy
+msgid "Invalid relocation"
+msgstr "无效的锁定"
 
-#: clients/cmdline/log-cmd.c:437
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "当指定工作拷贝路径,只有一个目标会被指定"
+#: include/svn_error_codes.h:392
+#, fuzzy
+msgid "Invalid switch"
+msgstr "无效的计划任务"
 
-#: clients/cmdline/log-cmd.c:449
-msgid "Only relative paths can be specified after a URL"
-msgstr "地址(URL)后只能指定相对路径"
+#: include/svn_error_codes.h:398
+msgid "General filesystem error"
+msgstr "一般性文件系统错误"
 
-#: clients/cmdline/main.c:63
-msgid "force operation to run"
-msgstr "强制操作运行"
+#: include/svn_error_codes.h:402
+msgid "Error closing filesystem"
+msgstr "关闭文件系统发生错误"
 
-#: clients/cmdline/main.c:65
-msgid "force validity of log message source"
-msgstr "强制校验日志信息资源"
+#: include/svn_error_codes.h:406
+msgid "Filesystem is already open"
+msgstr "文件系统已打开"
 
-#: clients/cmdline/main.c:66 clients/cmdline/main.c:67 svnadmin/main.c:227
-#: svnadmin/main.c:230 svndumpfilter/main.c:756 svndumpfilter/main.c:759
-#: svnlook/main.c:92 svnlook/main.c:95
-msgid "show help on a subcommand"
-msgstr "显示子命令帮助"
+#: include/svn_error_codes.h:410
+msgid "Filesystem is not open"
+msgstr "文件系档未打开"
 
-#: clients/cmdline/main.c:68
-msgid "specify commit message ARG"
-msgstr "指定提交信息ARG"
+#: include/svn_error_codes.h:414
+msgid "Filesystem is corrupt"
+msgstr "文件系统损坏"
 
-#: clients/cmdline/main.c:69
-msgid "print as little as possible"
-msgstr "打印尽可能少"
+#: include/svn_error_codes.h:418
+msgid "Invalid filesystem path syntax"
+msgstr "无效的文件系统路径语法"
 
-#: clients/cmdline/main.c:70
-msgid "descend recursively"
-msgstr "向下递归"
+#: include/svn_error_codes.h:422
+msgid "Invalid filesystem revision number"
+msgstr "无效的文件系统修订版号"
 
-#: clients/cmdline/main.c:71
-msgid "operate on single directory only"
-msgstr "只在单个目录操作"
+#: include/svn_error_codes.h:426
+msgid "Invalid filesystem transaction name"
+msgstr "无效的文件系统事务名称"
 
-#: clients/cmdline/main.c:73
-msgid ""
-"ARG (some commands also take ARG1:ARG2 range)\n"
-" A revision argument can be one of:\n"
-" NUMBER revision number\n"
-" \"{\" DATE \"}\" revision at start of the "
-"date\n"
-" \"HEAD\" latest in repository\n"
-" \"BASE\" base rev of item's working "
-"copy\n"
-" \"COMMITTED\" last commit at or before "
-"BASE\n"
-" \"PREV\" revision just before COMMITTED"
-msgstr ""
-"ARG (一些命令需要 ARG1:ARG2 )\n"
-" 修订版参数可以是:\n"
-" 数字 修订版号\n"
-" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作条目 \n"
-" \"COMMITTED\" 最后提交或基线之前\n"
-" \"PREV\" 修订版提交之前"
+#: include/svn_error_codes.h:430
+msgid "Filesystem directory has no such entry"
+msgstr "文件系统目录没有这样的项目"
 
-#: clients/cmdline/main.c:87
-msgid "read data from file ARG"
-msgstr "从文件 ARG 读取数据"
+#: include/svn_error_codes.h:434
+msgid "Filesystem has no such representation"
+msgstr "文件系统没有这样的表现 (representation)"
 
-#: clients/cmdline/main.c:89
-msgid "give output suitable for concatenation"
-msgstr "给予适合输出的"
+#: include/svn_error_codes.h:438
+msgid "Filesystem has no such string"
+msgstr "文件系统没有这样的字串"
 
-#: clients/cmdline/main.c:91
-msgid "treat value as being in charset encoding ARG"
-msgstr "指定的值 ARG 为字符编码"
+#: include/svn_error_codes.h:442
+msgid "Filesystem has no such copy"
+msgstr "文件系统没有这样的拷贝"
 
-#: clients/cmdline/main.c:92
-msgid "print client version info"
-msgstr "打印客户端版本信息"
+#: include/svn_error_codes.h:446
+msgid "The specified transaction is not mutable"
+msgstr "指定的事务不可改变"
 
-#: clients/cmdline/main.c:93
-msgid "print extra information"
-msgstr "打印附加信息"
+#: include/svn_error_codes.h:450
+msgid "Filesystem has no item"
+msgstr "文件系统没有项目"
 
-#: clients/cmdline/main.c:94
-msgid "display update information"
-msgstr "显示更新信息"
+#: include/svn_error_codes.h:454
+msgid "Filesystem has no such node-rev-id"
+msgstr "文件系统没有这样的 node-rev-id"
 
-#: clients/cmdline/main.c:96
-msgid "specify a username ARG"
-msgstr "指定用户 ARG"
+#: include/svn_error_codes.h:458
+msgid "String does not represent a node or node-rev-id"
+msgstr "字串并未表示一个节点或 node-rev-id"
 
-#: clients/cmdline/main.c:98
-msgid "specify a password ARG"
-msgstr "指定密码 ARG"
+#: include/svn_error_codes.h:462
+msgid "Name does not refer to a filesystem directory"
+msgstr "名称没有指向文件系统目录"
 
-#: clients/cmdline/main.c:99
-msgid "pass ARG to --diff-cmd as options (default: '-u')"
-msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
+#: include/svn_error_codes.h:466
+msgid "Name does not refer to a filesystem file"
+msgstr "名称没有指向文件系统文件"
 
-#: clients/cmdline/main.c:101
-msgid "pass contents of file ARG as additional args"
-msgstr "传递文件 ARG 内容为附件参数"
+#: include/svn_error_codes.h:470
+msgid "Name is not a single path component"
+msgstr "名称不是一个单一路径"
 
-#: clients/cmdline/main.c:102
-msgid "output in XML"
-msgstr "输出为 XML"
+#: include/svn_error_codes.h:474
+msgid "Attempt to change immutable filesystem node"
+msgstr "尝试要修改不可改变的文件系统节点"
 
-#: clients/cmdline/main.c:103
-msgid "use strict semantics"
-msgstr "使用严格的语法"
+#: include/svn_error_codes.h:478
+msgid "Item already exists in filesystem"
+msgstr "该项目已存在于文件系统中"
 
-#: clients/cmdline/main.c:105
-msgid "do not cross copies while traversing history"
-msgstr "查看历史不要跨越不同的拷贝"
+#: include/svn_error_codes.h:482
+msgid "Attempt to remove or recreate fs root dir"
+msgstr "尝试要移除或再次建立文件系统的根目录"
 
-#: clients/cmdline/main.c:107
-msgid "disregard default and svn:ignore property ignores"
-msgstr "忽略默认值和 svn:ignore 属性"
+#: include/svn_error_codes.h:486
+msgid "Object is not a transaction root"
+msgstr "物件不是一个事务的根物件"
 
-#: clients/cmdline/main.c:109
-msgid "do not cache authentication tokens"
-msgstr "不要缓冲用户验证"
+#: include/svn_error_codes.h:490
+msgid "Object is not a revision root"
+msgstr "物件不是一个修订版的根物件"
 
-#: clients/cmdline/main.c:111
-msgid "do no interactive prompting"
-msgstr "不要交互提示"
+#: include/svn_error_codes.h:494
+msgid "Merge conflict during commit"
+msgstr "提交时发生合并冲突"
 
-#: clients/cmdline/main.c:113
-msgid "try operation but make no changes"
-msgstr "尝试操作但不修改"
+# as-is
+#: include/svn_error_codes.h:498
+msgid "A representation vanished or changed between reads"
+msgstr "表现消失或读时被改变"
 
-#: clients/cmdline/main.c:115 svnlook/main.c:113
-msgid "do not print differences for deleted files"
-msgstr "不要打印已删除文件的不同处"
+#: include/svn_error_codes.h:502
+msgid "Tried to change an immutable representation"
+msgstr "尝试变更一个不可改变的表现 (representation)"
 
-#: clients/cmdline/main.c:117
-msgid "notice ancestry when calculating differences"
-msgstr "比较差异时提示原始信息"
+#: include/svn_error_codes.h:506
+msgid "Malformed skeleton data"
+msgstr "畸形的框架数据"
 
-#: clients/cmdline/main.c:119
-msgid "ignore ancestry when calculating merges"
-msgstr "合并时忽略原始信息"
+#: include/svn_error_codes.h:510
+msgid "Transaction is out of date"
+msgstr "事务已过时"
 
-#: clients/cmdline/main.c:121
-msgid "ignore externals definitions"
-msgstr "忽略外部定义"
+#: include/svn_error_codes.h:514
+msgid "Berkeley DB error"
+msgstr "Berkeley DB 错误"
 
-#: clients/cmdline/main.c:123
-msgid "use ARG as diff command"
-msgstr "使用 ARG 作为差异比较命令"
+#: include/svn_error_codes.h:518
+msgid "Berkeley DB deadlock error"
+msgstr "Berkeley DB 发生死锁错误"
 
-#: clients/cmdline/main.c:125
-msgid "use ARG as merge command"
-msgstr "使用 ARG 作为合并命令"
+#: include/svn_error_codes.h:522
+msgid "Transaction is dead"
+msgstr "事务已结束"
 
-#: clients/cmdline/main.c:127
-msgid "use ARG as external editor"
-msgstr "使用 ARG 作为外部编辑器"
+#: include/svn_error_codes.h:526
+msgid "Transaction is not dead"
+msgstr "事务未结束"
 
-#: clients/cmdline/main.c:129
-msgid "use ARG as the older target"
-msgstr "使用 ARG 作为旧目标"
+#: include/svn_error_codes.h:531
+msgid "Unknown FS type"
+msgstr "未知的 FS 类别"
 
-#: clients/cmdline/main.c:131
-msgid "use ARG as the newer target"
-msgstr "使用 ARG 作为新目标"
+#: include/svn_error_codes.h:536
+#, fuzzy
+msgid "No user associated with filesystem"
+msgstr "没有用户与文件系统关联"
 
-#: clients/cmdline/main.c:133
-msgid "operate on a revision property (use with -r)"
-msgstr "在修订版属性上作操作(使用-r参数)"
+#: include/svn_error_codes.h:541
+#, fuzzy
+msgid "Path is already locked"
+msgstr "路径“%s”已经被锁定"
 
-#: clients/cmdline/main.c:135
-msgid "relocate via URL-rewriting"
-msgstr "通过URL改写重新部署"
+#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
+#, fuzzy
+msgid "Path is not locked"
+msgstr "路径没有被锁定"
 
-#: clients/cmdline/main.c:137 svnadmin/main.c:269
-msgid "read user configuration files from directory ARG"
-msgstr "从目录 ARG 读取用户配置文件"
+#: include/svn_error_codes.h:551
+msgid "Lock token is incorrect"
+msgstr "锁定标记是不正确的"
 
-#: clients/cmdline/main.c:139
-msgid "enable automatic properties"
-msgstr "使自动属性有效"
+#: include/svn_error_codes.h:556
+#, fuzzy
+msgid "No lock token provided"
+msgstr "没有提供锁定标记"
 
-#: clients/cmdline/main.c:141
-msgid "disable automatic properties"
-msgstr "使自动属性无效"
+#: include/svn_error_codes.h:561
+msgid "Username does not match lock owner"
+msgstr "用户名和锁定所有者不匹配"
 
-#: clients/cmdline/main.c:143
+#: include/svn_error_codes.h:566
 #, fuzzy
-msgid ""
-"use a different EOL marker than the standard\n"
-" system marker for files with the svn:eol-style\n"
-" property set to 'native'.\n"
-" ARG may be one of 'LF', 'CR', 'CRLF'"
-msgstr ""
-"使用一个与标准不同的 EOL 标记\n"
-" 系统为文件标记 svn:eol-style 属"
-"性为 'native'。\n"
-" ARG 可以是以下之一 'LF','CR','CRLF'"
+msgid "Filesystem has no such lock"
+msgstr "文件系统没有这样的锁"
 
-#: clients/cmdline/main.c:151
-msgid "maximum number of log entries"
-msgstr "日值项最大值"
+#: include/svn_error_codes.h:571
+msgid "Lock has expired"
+msgstr "锁过期"
 
-#: clients/cmdline/main.c:153
-msgid "don't unlock the targets"
-msgstr "不要锁定目标"
+#: include/svn_error_codes.h:576
+#, fuzzy
+msgid "Item is out of date"
+msgstr "条目已过时"
 
-#: clients/cmdline/main.c:192
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository. They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"把文件和目录放入版本控制中,\n"
-"通过调度加到档案库。它们会在下一次提交时加入。\n"
-"用法:add 路径...\n"
+#: include/svn_error_codes.h:588
+#, fuzzy
+msgid "Unsupported FS format"
+msgstr "不支持的 FS 格式"
 
-#: clients/cmdline/main.c:200
-msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地址(URL)的内容,每行包含修订版和作者信息。\n"
-"\n"
-"用法:blame 目标[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:594
+msgid "The repository is locked, perhaps for db recovery"
+msgstr "档案库被锁定,也许正在作数据库修复"
 
-#: clients/cmdline/main.c:210
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地址(URL)的内容。\n"
-"用法:cat 目标[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:598
+msgid "A repository hook failed"
+msgstr "档案库外挂错误"
 
-#: clients/cmdline/main.c:218
-#, fuzzy
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-" If specified, REV determines in which revision the URL is first\n"
-" looked up.\n"
-"\n"
-" If PATH is omitted, the basename of the URL will be used as\n"
-" the destination. If multiple URLs are given each will be checked\n"
-" out into a sub-directory of PATH, with the name of the sub-directory\n"
-" being the basename of the URL.\n"
-msgstr ""
-"从档案库签出工作拷贝。\n"
-"用法:checkout 地址[@版本]... [路径]\n"
-"\n"
-" 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
-" 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
-" 以地址(URL)最末目录名为名字的子目录中。\n"
-"\n"
+#: include/svn_error_codes.h:602
+msgid "Incorrect arguments supplied"
+msgstr "使用不正确的参数"
 
-#: clients/cmdline/main.c:232
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [PATH...]\n"
-msgstr ""
-"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
-"\n"
-"用法:cleanup [路径...]\n"
+#: include/svn_error_codes.h:606
+msgid "A report cannot be generated because no data was supplied"
+msgstr "无法产生报告,因为没有提供任何数据"
 
-#: clients/cmdline/main.c:238
-#, fuzzy
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-" A log message must be provided, but it can be empty. If it is not\n"
-" given by a --message or --file option, an editor will be started.\n"
-" If any targets are (or contain) locked items, those will be\n"
-" unlocked after a successful commit.\n"
-msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
-"用法:commit [路径...]\n"
-"\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+#: include/svn_error_codes.h:610
+msgid "Bogus revision report"
+msgstr "有问题的修订版报告"
 
-#: clients/cmdline/main.c:249
-msgid ""
-"Duplicate something in working copy or repository, remembering history.\n"
-"usage: copy SRC DST\n"
-"\n"
-" SRC and DST can each be either a working copy (WC) path or URL:\n"
-" WC -> WC: copy and schedule for addition (with history)\n"
-" WC -> URL: immediately commit a copy of WC to URL\n"
-" URL -> WC: check out URL into WC, schedule for addition\n"
-" URL -> URL: complete server-side copy; used to branch & tag\n"
-msgstr ""
-"在工作拷贝或档案库中复制数据,恢复历史。\n"
-"用法:copy 起源 目的\n"
-"\n"
-" 起源 和 目的 可以是工作拷贝路径或地址(URL):\n"
-" 工作拷贝 -> 工作拷贝 : 复制和通过调度进行增加(包含历史)\n"
-" 工作拷贝 -> 地址(URL) : 马上提交一个工作拷贝到地址(URL)\n"
-" 地址(URL) -> 工作拷贝 : 签出地址(URL)到工作目录,通过调度进行增加\n"
-" 地址(URL) -> 地址(URL) : 完全服务器端复制;一般用于分支和标签\n"
+#: include/svn_error_codes.h:619
+msgid "Unsupported repository version"
+msgstr "不支持的档案库版本"
 
-#: clients/cmdline/main.c:262
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. Each item specified by a PATH is scheduled for deletion upon\n"
-" the next commit. Files, and directories that have not been\n"
-" committed, are immediately removed from the working copy.\n"
-" PATHs that are, or contain, unversioned or modified items will\n"
-" not be removed unless the --force option is given.\n"
-"\n"
-" 2. Each item specified by a URL is deleted from the repository\n"
-" via an immediate commit.\n"
-msgstr ""
-"从版本控制中删除文件和目录。\n"
-"用法:1、delete 路径...\n"
-" 2、delete 地址...\n"
-"\n"
-" 1、每一个通过路径指定的项目会被进行调度删除,下次提交时被真正删除。\n"
-" 文件和目录若未改变将马上从工作拷贝中删除。\n"
-" 路径本身或包含不受版本控制或已修改项目,\n"
-" 不会被删除,除非指定了 --force 选项。\n"
-" \n"
-"\n"
-" 2、每一个地址(URL)指定的项目会被马上从档案库中删除,并提交。\n"
-" \n"
+#: include/svn_error_codes.h:623
+msgid "Disabled repository feature"
+msgstr "关闭了的档案库功能"
 
-#: clients/cmdline/main.c:278
-msgid ""
-"Display the differences between two paths.\n"
-"usage: 1. diff [-r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
-"\\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. Display the changes made to TARGETs as they are seen in REV between\n"
-" two revisions. TARGETs may be working copy paths or URLs.\n"
-"\n"
-" N defaults to BASE if any TARGET is a working copy path, otherwise it\n"
-" must be specified. M defaults to the current working version if any\n"
-" TARGET is a working copy path, otherwise it defaults to HEAD.\n"
-"\n"
-" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
-" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
-"default\n"
-" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-" Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"显示两个路径中的差异。\n"
-"用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
-" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
-"\n"
-" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
-" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
-"\n"
-" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
-" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
-" HEAD。\n"
-"\n"
-" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
-" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
-" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
-" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
-" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
-" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
-"法。\n"
-"\n"
-" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
+#: include/svn_error_codes.h:627
+msgid "Error running post-commit hook"
+msgstr "执行 post-commit 外挂时发生错误"
 
-#: clients/cmdline/main.c:318
+#: include/svn_error_codes.h:632
 #, fuzzy
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. Exports a clean directory tree from the repository specified by\n"
-" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
-"\n"
-" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
-"\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"产生一个无版本控制的目录树拷贝。\n"
-"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
-" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
-" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
-"\n"
-" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
-" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
-" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
-" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
-" 版本控制的文件不会被复制。\n"
-"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
-"\n"
-
-#: clients/cmdline/main.c:347
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"描述本程序或其子命令的用法。\n"
-"用法:help [子命令...]\n"
+msgid "Error running post-lock hook"
+msgstr "执行 post-lock 外挂时发生错误"
 
-#: clients/cmdline/main.c:356
+#: include/svn_error_codes.h:637
 #, fuzzy
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-" Recursively commit a copy of PATH to URL.\n"
-" If PATH is omitted '.' is assumed.\n"
-" Parent directories are created as necessary in the repository.\n"
-" If PATH is a directory, the contents of the directory are added\n"
-" directly under URL.\n"
-msgstr ""
-"提交未纳入版本控制的文件或目录树至档案库。\n"
-"用法:import [PATH] URL\n"
-"\n"
-" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
-" 依需要于档案库内建立。\n"
+msgid "Error running post-unlock hook"
+msgstr "执行 post-unlock 外挂时发生错误"
 
-#: clients/cmdline/main.c:369
-#, fuzzy
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET...]\n"
-"\n"
-" Print information about each TARGET (default: '.')\n"
-" TARGET may be either a working-copy path or URL.\n"
-msgstr ""
-"显示本地或远端条目的信息。\n"
-"用法:info [TARGET...]\n"
-"\n"
-" 显示每个 TARGET 的信息 (默认:'.')。\n"
-" TARGET 可以是工作目录或地址(URL)。\n"
+#: include/svn_error_codes.h:644
+msgid "Bad URL passed to RA layer"
+msgstr "传递至 RA 层的地址(URL)有问题"
 
-#: clients/cmdline/main.c:378
-#, fuzzy
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-" List each TARGET file and the contents of each TARGET directory as\n"
-" they exist in the repository. If TARGET is a working copy path, the\n"
-" corresponding repository URL will be used. If specified, REV determines\n"
-" in which revision the target is first looked up.\n"
-"\n"
-" The default TARGET is '.', meaning the repository URL of the current\n"
-" working directory.\n"
-"\n"
-" With --verbose, the following fields will be shown for each item:\n"
-"\n"
-" Revision number of the last commit\n"
-" Author of the last commit\n"
-" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
-" Size (in bytes)\n"
-" Date and time of the last commit\n"
-msgstr ""
-"列出档案库中的目录项目。\n"
-"用法:list [TARGET[@REV]...]\n"
-"\n"
-" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-"\n"
-" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
-"\n"
-" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
-"\n"
-" 前次提交的修订版号码\n"
-" 前次提交的作者\n"
-" 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
-" 大小 (以字节为单位)\n"
-" 前次提交的日期与时间\n"
+#: include/svn_error_codes.h:648
+msgid "Authorization failed"
+msgstr "授权失败"
 
-#: clients/cmdline/main.c:403
-#, fuzzy
-msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-" Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"在档案库中锁定工作目录或地址(URL),\n"
-"使得其他用户不能向它提交修改。\n"
-"用法:lock TARGET...\n"
-"\n"
-" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
+#: include/svn_error_codes.h:652
+msgid "Unknown authorization method"
+msgstr "未知的授权方法"
 
-#: clients/cmdline/main.c:412
-msgid ""
-"Show the log messages for a set of revision(s) and/or file(s).\n"
-"usage: 1. log [PATH]\n"
-" 2. log URL [PATH...]\n"
-"\n"
-" 1. Print the log messages for a local PATH (default: '.').\n"
-" The default revision range is BASE:1.\n"
-"\n"
-" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
-" The default revision range is HEAD:1.\n"
-"\n"
-" With -v, also print all affected paths with each log message.\n"
-" With -q, don't print the log message body itself (note that this is\n"
-" compatible with -v).\n"
-"\n"
-" Each log message is printed just once, even if more than one of the\n"
-" affected paths for that revision were explicitly requested. Logs\n"
-" follow copy history by default. Use --stop-on-copy to disable this\n"
-" behavior, which can be useful for determining branchpoints.\n"
-"\n"
-" Examples:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-msgstr ""
-"显示一组修订版与/或文件的提交日志信息。\n"
-"用法:1、log [PATH]\n"
-" 2、log URL [PATH...]\n"
-"\n"
-" 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" BASE:1。\n"
-"\n"
-" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" HEAD:1。\n"
-"\n"
-" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
-" 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v 并存)。\n"
-"\n"
-" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
-" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
-" 个功能,这在找出分支点的很方便。\n"
-"\n"
-" 范例:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
+#: include/svn_error_codes.h:656
+msgid "Repository access method not implemented"
+msgstr "该档案库存取方法未实作"
 
-#: clients/cmdline/main.c:444
-msgid ""
-"Apply the differences between two sources to a working copy path.\n"
-"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. In the first form, the source URLs are specified at revisions\n"
-" N and M. These are the two sources to be compared. The revisions\n"
-" default to HEAD if omitted.\n"
-"\n"
-" 2. In the second form, the URLs corresponding to the source working\n"
-" copy paths define the sources to be compared. The revisions must\n"
-" be specified.\n"
-"\n"
-" 3. In the third form, SOURCE can be a URL, or working copy item\n"
-" in which case the corresponding URL is used. This URL in\n"
-" revision REV is compared as it existed between revisions N and \n"
-" M. If REV is not specified, HEAD is assumed.\n"
-"\n"
-" WCPATH is the working copy path that will receive the changes.\n"
-" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
-" the sources have identical basenames that match a file within '.':\n"
-" in which case, the differences will be applied to that file.\n"
-msgstr ""
-"将两个来源之间的差异应用至工作拷贝路径。\n"
-"用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
-" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
-"\n"
-" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
-" 进行比较的来源。这里必须指定修订版。\n"
-"\n"
-" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
-" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
-"作\n"
-" 比较。如果未指定 REV,就会假设为 HEAD。\n"
-"\n"
-" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
-" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+#: include/svn_error_codes.h:660
+msgid "Item is out-of-date"
+msgstr "项目已过时"
 
-#: clients/cmdline/main.c:474
-msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" Create version controlled directories.\n"
-"\n"
-" 1. Each directory specified by a working copy PATH is created locally\n"
-" and scheduled for addition upon the next commit.\n"
-"\n"
-" 2. Each directory specified by a URL is created in the repository via\n"
-" an immediate commit.\n"
-"\n"
-" In both cases, all the intermediate directories must already exist.\n"
-msgstr ""
-"建立纳入版本控制下的新目录。\n"
-"用法:1、mkdir PATH...\n"
-" 2、mkdir URL...\n"
-"\n"
-" 建立版本控制的目录。\n"
-"\n"
-" 1、每一个以工作拷贝 PATH 指定的目录,都会建立在本地端,并且加入新增\n"
-" 调度,以待下一次的提交。\n"
-"\n"
-" 2、每个以地址(URL)指定的目录,都会透过立即提交于档案库中建立。\n"
-"\n"
-" 在这两个情况下,所有的中间目录都必须事先存在。\n"
+#: include/svn_error_codes.h:664
+msgid "Repository has no UUID"
+msgstr "档案库没有 UUID"
 
-#: clients/cmdline/main.c:494
-msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC DST\n"
-"\n"
-" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
-"\n"
-" SRC and DST can both be working copy (WC) paths or URLs:\n"
-" WC -> WC: move and schedule for addition (with history)\n"
-" URL -> URL: complete server-side rename.\n"
-msgstr ""
-"移动或更名工作拷贝或档案库里的东西。\n"
-"用法:move SRC DST\n"
-"\n"
-" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
-"\n"
-" SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
-" WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
-" URL -> URL : 完全是服务器端的更名。\n"
+#: include/svn_error_codes.h:668
+msgid "Unsupported RA plugin ABI version"
+msgstr "不支持的 RA 外挂 ABI 版本"
 
-#: clients/cmdline/main.c:506
-msgid ""
-"Remove PROPNAME from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Removes versioned props in working copy.\n"
-" 2. Removes unversioned remote prop on repos revision.\n"
-msgstr ""
-"移除目录,文件,或修订版的属性。\n"
-"用法:1、propdel PROPNAME [PATH...]\n"
-" 2、propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、移除纳入版本控制的工作拷贝属性。\n"
-" 2、移除无版本控制的远端档案库修订版属性。\n"
+#: include/svn_error_codes.h:680
+msgid "RA layer failed to init socket layer"
+msgstr "RA 层无法起始 socket 层"
 
-#: clients/cmdline/main.c:516
-msgid ""
-"Edit property PROPNAME with an external editor on targets.\n"
-"usage: 1. propedit PROPNAME PATH...\n"
-" 2. propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Edits versioned props in working copy.\n"
-" 2. Edits unversioned remote prop on repos revision.\n"
-msgstr ""
-"以外部编辑器编辑目标的属性 PROPNAME。\n"
-"用法:1、propedit PROPNAME PATH...\n"
-" 2、propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、编辑纳入版本控制的工作拷贝属性。\n"
-" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
+#: include/svn_error_codes.h:684
+msgid "RA layer failed to create HTTP request"
+msgstr "RA 层建立 HTTP 请求失败"
 
-#: clients/cmdline/main.c:527
-msgid ""
-"Print value of PROPNAME on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Prints versioned prop. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Prints unversioned remote prop on repos revision.\n"
-"\n"
-" By default, this subcommand will add an extra newline to the end\n"
-" of the property values so that the output looks pretty. Also,\n"
-" whenever there are multiple paths involved, each property value\n"
-" is prefixed with the path with which it is associated. Use\n"
-" the --strict option to disable these beautifications (useful,\n"
-" for example, when redirecting binary property values to a file).\n"
-msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
-"用法:1、propget PROPNAME [TARGET[@REV]...]\n"
-" 2、propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、显示纳入版本控制的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、显示无版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
-" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
-" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
-" 将二进制属性内容重导至一个文件时就很有用)。\n"
+#: include/svn_error_codes.h:688
+msgid "RA layer request failed"
+msgstr "RA 层请求失败"
+
+#: include/svn_error_codes.h:692
+msgid "RA layer didn't receive requested OPTIONS info"
+msgstr "RA 层无法取得请求的 OPTIONS 信息"
+
+#: include/svn_error_codes.h:696
+msgid "RA layer failed to fetch properties"
+msgstr "RA 层无法取得属性"
+
+#: include/svn_error_codes.h:700
+msgid "RA layer file already exists"
+msgstr "RA 层文件已存在"
+
+#: include/svn_error_codes.h:704
+msgid "Invalid configuration value"
+msgstr "无效的配置值"
+
+#: include/svn_error_codes.h:708
+msgid "HTTP Path Not Found"
+msgstr "找不到 HTTP 路径"
+
+#: include/svn_error_codes.h:712
+#, fuzzy
+msgid "Failed to execute WebDAV PROPPATCH"
+msgstr "执行 WebDAV PROPPATCH 失败"
+
+#: include/svn_error_codes.h:717 include/svn_error_codes.h:753
+#: libsvn_ra_svn/marshal.c:609 libsvn_ra_svn/marshal.c:717
+#: libsvn_ra_svn/marshal.c:744
+msgid "Malformed network data"
+msgstr "畸形的网络数据"
+
+#: include/svn_error_codes.h:722
+msgid "Unable to extract data from response header"
+msgstr "不能从回应的头信息中获取数据"
+
+#: include/svn_error_codes.h:728 include/svn_error_codes.h:757
+msgid "Couldn't find a repository"
+msgstr "无法找到档案库"
+
+#: include/svn_error_codes.h:732
+msgid "Couldn't open a repository"
+msgstr "无法打开档案库"
+
+# as-is
+#: include/svn_error_codes.h:737
+msgid "Special code for wrapping server errors to report to client"
+msgstr "指定的代码封装服务器错误以便报告客户端"
+
+#: include/svn_error_codes.h:741
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 通讯协定命令"
+
+#: include/svn_error_codes.h:745
+msgid "Network connection closed unexpectedly"
+msgstr "网络连线意想不到地关闭"
+
+#: include/svn_error_codes.h:749
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: include/svn_error_codes.h:761
+msgid "Client/server version mismatch"
+msgstr "客户端/服务器版本不匹配"
+
+#: include/svn_error_codes.h:769
+msgid "Credential data unavailable"
+msgstr "无法取得凭证数据"
+
+#: include/svn_error_codes.h:773
+msgid "No authentication provider available"
+msgstr "无可用的认证提供者"
+
+#: include/svn_error_codes.h:777 include/svn_error_codes.h:781
+msgid "All authentication providers exhausted"
+msgstr "所有的认证提供者已耗尽"
+
+#: include/svn_error_codes.h:787
+msgid "Read access denied for root of edit"
+msgstr "编辑的根目录读取拒绝"
+
+#: include/svn_error_codes.h:792
+#, fuzzy
+msgid "Item is not readable"
+msgstr "项目不能读。"
+
+#: include/svn_error_codes.h:797
+#, fuzzy
+msgid "Item is partially readable"
+msgstr "项目部分可读。"
+
+#: include/svn_error_codes.h:801
+#, fuzzy
+msgid "Invalid authz configuration"
+msgstr "无效的配置值"
+
+#: include/svn_error_codes.h:806
+#, fuzzy
+msgid "Item is not writable"
+msgstr "项目不能写。"
+
+#: include/svn_error_codes.h:812
+msgid "Svndiff data has invalid header"
+msgstr "svndiff 数据包含了无效的档头"
+
+# as-is
+#: include/svn_error_codes.h:816
+msgid "Svndiff data contains corrupt window"
+msgstr "Svndiff 数据包含无效窗口"
+
+# as-is
+#: include/svn_error_codes.h:820
+msgid "Svndiff data contains backward-sliding source view"
+msgstr "Svndiff 数据包含向后变化的资源视图"
+
+#: include/svn_error_codes.h:824
+msgid "Svndiff data contains invalid instruction"
+msgstr "svndiff 数据包含了无效的指令"
+
+#: include/svn_error_codes.h:828
+msgid "Svndiff data ends unexpectedly"
+msgstr "svndiff 数据意想不到地结束"
+
+#: include/svn_error_codes.h:832
+#, fuzzy
+msgid "Svndiff compressed data is invalid"
+msgstr "svndiff 数据包含了无效的档头"
+
+#: include/svn_error_codes.h:838
+#, fuzzy
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff 数据意想不到地结束"
+
+#: include/svn_error_codes.h:844
+msgid "Apache has no path to an SVN filesystem"
+msgstr "Apache 没有指向 SVN 文件系统的路径"
+
+#: include/svn_error_codes.h:848
+msgid "Apache got a malformed URI"
+msgstr "Apache 得到一个畸形的 URI"
+
+# as-is
+#: include/svn_error_codes.h:852
+msgid "Activity not found"
+msgstr "没有找到活动项"
+
+#: include/svn_error_codes.h:856
+msgid "Baseline incorrect"
+msgstr "基线不正确"
+
+#: include/svn_error_codes.h:860
+msgid "Input/output error"
+msgstr "输出入错误"
+
+#: include/svn_error_codes.h:866
+msgid "A path under version control is needed for this operation"
+msgstr "本操作仅能作用于纳入版本控制的路径"
+
+#: include/svn_error_codes.h:870
+msgid "Repository access is needed for this operation"
+msgstr "本操作需要对档案库进行存取"
+
+#: include/svn_error_codes.h:874
+msgid "Bogus revision information given"
+msgstr "使用了有问题的修订版信息"
+
+#: include/svn_error_codes.h:878
+msgid "Attempting to commit to a URL more than once"
+msgstr "尝试对地址(URL)进行一次以上的提交"
+
+#: include/svn_error_codes.h:882
+msgid "Operation does not apply to binary file"
+msgstr "本操作不适用于二进制文件"
+
+#: include/svn_error_codes.h:888
+msgid "Format of an svn:externals property was invalid"
+msgstr "svn:externals 属性的格式是无效的"
+
+#: include/svn_error_codes.h:892
+msgid "Attempting restricted operation for modified resource"
+msgstr "尝试对已修改的资源进行受限的操作"
+
+#: include/svn_error_codes.h:896
+msgid "Operation does not apply to directory"
+msgstr "本操作不适用于目录"
+
+#: include/svn_error_codes.h:900
+msgid "Revision range is not allowed"
+msgstr "不允许的修订版范围"
+
+#: include/svn_error_codes.h:904
+msgid "Inter-repository relocation not allowed"
+msgstr "不支持不同档案库之间的重新安置 (relocation)"
+
+#: include/svn_error_codes.h:908
+msgid "Author name cannot contain a newline"
+msgstr "作者名称不可包含换行符"
+
+#: include/svn_error_codes.h:912
+msgid "Bad property name"
+msgstr "有问题的属性名称"
+
+#: include/svn_error_codes.h:917
+msgid "Two versioned resources are unrelated"
+msgstr "两个纳入版本控制的资源没有相关性"
+
+#: include/svn_error_codes.h:922
+msgid "Path has no lock token"
+msgstr "路径没有锁定标记"
+
+#: include/svn_error_codes.h:928
+msgid "A problem occurred; see later errors for details"
+msgstr "有问题发生;请参阅随附的细节"
+
+#: include/svn_error_codes.h:932
+msgid "Failure loading plugin"
+msgstr "载入外挂失败"
+
+#: include/svn_error_codes.h:936
+msgid "Malformed file"
+msgstr "畸形的文件"
+
+#: include/svn_error_codes.h:940
+msgid "Incomplete data"
+msgstr "不完全的数据"
+
+#: include/svn_error_codes.h:944
+msgid "Incorrect parameters given"
+msgstr "使用不正确的参数"
+
+#: include/svn_error_codes.h:948
+msgid "Tried a versioning operation on an unversioned resource"
+msgstr "尝试对未纳入版本控制的资源进行版本控制操作"
+
+#: include/svn_error_codes.h:952
+msgid "Test failed"
+msgstr "测试失败"
+
+#: include/svn_error_codes.h:956
+msgid "Trying to use an unsupported feature"
+msgstr "尝试要使用不支持的功能"
+
+#: include/svn_error_codes.h:960
+msgid "Unexpected or unknown property kind"
+msgstr "意想不到或未知的属性种类"
+
+#: include/svn_error_codes.h:964
+msgid "Illegal target for the requested operation"
+msgstr "对请求的操作来说是不合法的目标"
+
+#: include/svn_error_codes.h:968
+msgid "MD5 checksum is missing"
+msgstr "没有 MD5 指纹检查值"
+
+#: include/svn_error_codes.h:972
+msgid "Directory needs to be empty but is not"
+msgstr "目录必须为空的,但是结果并非如此"
+
+#: include/svn_error_codes.h:976
+msgid "Error calling external program"
+msgstr "呼叫外部程序时发生错误"
+
+#: include/svn_error_codes.h:980
+msgid "Python exception has been set with the error"
+msgstr "Python 异常已被设定为错误"
+
+#: include/svn_error_codes.h:984
+msgid "A checksum mismatch occurred"
+msgstr "总和检查值不符"
+
+#: include/svn_error_codes.h:988
+msgid "The operation was interrupted"
+msgstr "操作被中断"
+
+#: include/svn_error_codes.h:992
+msgid "The specified diff option is not supported"
+msgstr "指定的 diff 选项不支持"
+
+#: include/svn_error_codes.h:996
+msgid "Property not found"
+msgstr "找不到属性"
+
+#: include/svn_error_codes.h:1000
+msgid "No auth file path available"
+msgstr "未提供 auth 文件路径"
+
+#: include/svn_error_codes.h:1005
+msgid "Incompatible library version"
+msgstr "不相容的程序库版本"
+
+#: include/svn_error_codes.h:1011
+msgid "Client error in parsing arguments"
+msgstr "客户端于剖析参数时发生错误"
+
+#: include/svn_error_codes.h:1015
+msgid "Not enough arguments provided; try 'svn help' for more info"
+msgstr ""
+
+#: include/svn_error_codes.h:1019
+msgid "Mutually exclusive arguments specified"
+msgstr "指定了互斥的参数"
+
+#: include/svn_error_codes.h:1023
+msgid "Attempted command in administrative dir"
+msgstr "尝试于管理目录中执行命令"
+
+#: include/svn_error_codes.h:1027
+msgid "The log message file is under version control"
+msgstr "日志信息文件于版本控制之下"
+
+#: include/svn_error_codes.h:1031
+msgid "The log message is a pathname"
+msgstr "日志信息是路径名"
+
+#: include/svn_error_codes.h:1035
+msgid "Committing in directory scheduled for addition"
+msgstr "于预计新增的目录中进行提交"
+
+#: include/svn_error_codes.h:1039
+msgid "No external editor available"
+msgstr "无法使用外部编辑器"
+
+#: include/svn_error_codes.h:1043
+msgid "Something is wrong with the log message's contents"
+msgstr "日志信息的内容有不妥的地方"
+
+#: include/svn_error_codes.h:1047
+msgid "A log message was given where none was necessary"
+msgstr "在没有需要的地方给出一个日志信息"
+
+#: libsvn_client/add.c:377
+#, c-format
+msgid "Error during recursive add of '%s'"
+msgstr "进行“%s”的递归新增时发生错误"
+
+#: libsvn_client/add.c:388
+#, c-format
+msgid "Can't close directory '%s'"
+msgstr "无法关闭目录“%s”"
+
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
+#, c-format
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr "无法为二进制文件“%s”计算谴责信息"
+
+#: libsvn_client/blame.c:522
+msgid "blame of the WORKING revision is not supported"
+msgstr ""
+
+#: libsvn_client/blame.c:535
+msgid "Start revision must precede end revision"
+msgstr "起始修订版必须大于结束修订版"
+
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "地址(URL)“%s”指向一个目录"
+
+#: libsvn_client/blame.c:798
+#, c-format
+msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
+msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
+
+#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#, fuzzy, c-format
+msgid "'%s' is not under version control or doesn't exist"
+msgstr "“%s”尚未纳入版本控制或不存在"
+
+#: libsvn_client/cat.c:79
+#, fuzzy, c-format
+msgid "'%s' refers to a directory"
+msgstr "“%s”引用一个目录"
+
+# as-is
+#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+msgid "(local)"
+msgstr "(本地)"
+
+#: libsvn_client/checkout.c:92
+#, c-format
+msgid "URL '%s' doesn't exist"
+msgstr "地址(URL)“%s”不存在"
+
+#: libsvn_client/checkout.c:96
+#, c-format
+msgid "URL '%s' refers to a file, not a directory"
+msgstr "地址(URL)“%s”指向一个文件,而非目录"
+
+#: libsvn_client/checkout.c:167
+#, c-format
+msgid "'%s' is already a working copy for a different URL"
+msgstr "“%s”已是不同地址(URL)的工作拷贝"
+
+#: libsvn_client/checkout.c:171
+#, fuzzy
+msgid "; run 'svn update' to complete it"
+msgstr ";请执行“svn update”以完成目前的操作。"
+
+#: libsvn_client/checkout.c:181
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a directory"
+msgstr "“%s”已存在,但不是目录"
+
+#: libsvn_client/commit.c:198
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr "类型“%s”未知或不可版本控制"
+
+#: libsvn_client/commit.c:512
+msgid "New entry name required when importing a file"
+msgstr "导入文件时,需要一个新的项目名称"
+
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:710 libsvn_wc/questions.c:91
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%s”不存在"
+
+#: libsvn_client/commit.c:606 libsvn_client/copy.c:76 svnlook/main.c:1206
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径“%s”不存在"
+
+#: libsvn_client/commit.c:736 libsvn_client/copy.c:85 libsvn_client/copy.c:399
+#: libsvn_client/copy.c:608 libsvn_client/copy.c:758
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径“%s”已存在"
+
+#: libsvn_client/commit.c:751
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%s”是一个保留的名称,无法被导入"
+
+#: libsvn_client/commit.c:867 libsvn_client/copy.c:524
+msgid "Commit failed (details follow):"
+msgstr "提交失败(细节见下):"
+
+#: libsvn_client/commit.c:875 libsvn_client/copy.c:532
+msgid "Commit succeeded, but other errors follow:"
+msgstr "提交成功,但是发生了其它的错误,如后:"
+
+#: libsvn_client/commit.c:882 libsvn_client/copy.c:539
+msgid "Error unlocking locked dirs (details follow):"
+msgstr "解除锁定目录时发生错误(细节见下):"
+
+#: libsvn_client/commit.c:893
+msgid "Error bumping revisions post-commit (details follow):"
+msgstr "post-commit 增加修订版时发生错误 (细节见下):"
+
+#: libsvn_client/commit.c:904 libsvn_client/copy.c:550
+msgid "Error in post-commit clean-up (details follow):"
+msgstr "post-commit 清除时发生错误 (细节见下):"
+
+#: libsvn_client/commit.c:1209
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "“%s”是一个地址(URL),但是地址(URL)不可为作提交的目标"
+
+#: libsvn_client/commit.c:1407
+msgid "Are all the targets part of the same working copy?"
+msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+
+#: libsvn_client/commit.c:1422
+msgid "Cannot non-recursively commit a directory deletion"
+msgstr "无法以非递归提交目录删除"
+
+#: libsvn_client/commit_util.c:251 libsvn_client/commit_util.c:262
+#, c-format
+msgid "Unknown entry kind for '%s'"
+msgstr "未知的项目类型“%s”"
+
+#: libsvn_client/commit_util.c:279
+#, c-format
+msgid "Entry '%s' has unexpectedly changed special status"
+msgstr "项目“%s”意想不到地变换特殊状态"
+
+#: libsvn_client/commit_util.c:330
+#, c-format
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "中止提交:“%s”仍处于冲突状态"
+
+#: libsvn_client/commit_util.c:396
+#, c-format
+msgid "Did not expect '%s' to be a working copy root"
+msgstr "并未预期“%s”是工作拷贝的根目录"
+
+#: libsvn_client/commit_util.c:414 libsvn_client/commit_util.c:1030
+#, c-format
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "提交项目“%s”有复制标志,但是没有复制地址地址(copyfrom URL)"
+
+#: libsvn_client/commit_util.c:704 libsvn_client/commit_util.c:835
+#: libsvn_client/copy.c:1001 libsvn_client/delete.c:67
+#: libsvn_client/diff.c:1410 libsvn_client/diff.c:2140
+#: libsvn_client/diff.c:2735 libsvn_client/diff.c:2862
+#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
+#: libsvn_client/prop_commands.c:180 libsvn_client/prop_commands.c:413
+#: libsvn_client/prop_commands.c:576 libsvn_client/prop_commands.c:917
+#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
+#: libsvn_client/status.c:256 libsvn_client/switch.c:107
+#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
+#: libsvn_wc/adm_crawler.c:770 libsvn_wc/adm_ops.c:1044
+#: libsvn_wc/adm_ops.c:2329 libsvn_wc/adm_ops.c:2355 libsvn_wc/adm_ops.c:2391
+#: libsvn_wc/adm_ops.c:2433 libsvn_wc/copy.c:86 libsvn_wc/copy.c:442
+#: libsvn_wc/copy.c:564 libsvn_wc/copy.c:571 libsvn_wc/diff.c:1793
+#: libsvn_wc/entries.c:2256 libsvn_wc/entries.c:2813 libsvn_wc/props.c:479
+#: libsvn_wc/props.c:1088 libsvn_wc/props.c:1506 libsvn_wc/questions.c:186
+#: libsvn_wc/questions.c:295 libsvn_wc/status.c:726 libsvn_wc/translate.c:199
+#: libsvn_wc/update_editor.c:2167 libsvn_wc/update_editor.c:3006
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "“%s”尚未纳入版本控制"
+
+#: libsvn_client/commit_util.c:707
+#, c-format
+msgid "Entry for '%s' has no URL"
+msgstr "“%s”的项目没有地址(URL)"
+
+#: libsvn_client/commit_util.c:740
+#, c-format
+msgid "'%s' is scheduled for addition within unversioned parent"
+msgstr "“%s”于未纳入版本控制的父路径中被加入新增调度"
 
-#: clients/cmdline/main.c:545
+#: libsvn_client/commit_util.c:760
+#, c-format
 msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [URL]\n"
-"\n"
-" 1. Lists versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Lists unversioned remote props on repos revision.\n"
+"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
+"for addition. Perhaps you're committing a target that is\n"
+"inside an unversioned (or not-yet-versioned) directory?"
 msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
-"用法:1、proplist [TARGET[@REV]...]\n"
-" 2、proplist --revprop -r REV [URL]\n"
-"\n"
-" 1、列出纳入版本管理的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、列出无版本控制的远端档案库修订版属性改变。\n"
+"“%s”项目被标记为“已复制”,但是本身尚未加入新增调度。也许您提交的\n"
+"目标是位于未纳入版本控制 (或尚未纳入) 的目录中?"
 
-#: clients/cmdline/main.c:556
-#, fuzzy
+#: libsvn_client/commit_util.c:801
+#, c-format
 msgid ""
-"Set PROPNAME to PROPVAL on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-"\n"
-" Note: svn recognizes the following special versioned properties\n"
-" but will store any arbitrary properties set:\n"
-" svn:ignore - A newline separated list of file patterns to ignore.\n"
-" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the "
-"object.\n"
-" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last "
-"modified.\n"
-" Rev, Revision, - The last revision the object changed.\n"
-" LastChangedRevision\n"
-" Id - A compressed summary of the previous\n"
-" 4 keywords.\n"
-" svn:executable - If present, make the file executable.\n"
-" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-" svn:mime-type - The mimetype of the file. Used to determine\n"
-" whether to merge the file, and how to serve it from Apache.\n"
-" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-" treated as text. Anything else is treated as binary.\n"
-" svn:externals - A newline separated list of module specifiers,\n"
-" each of which consists of a relative directory path, optional\n"
-" revision flags, and an URL. For example\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - If present, indicates that the file should be locked\n"
-" before it is modified. Makes the working copy file read-only\n"
-" when it is not locked.\n"
-" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
-" attempt will fail, and a recursive attempt will set the property\n"
-" only on the file children of the directory.\n"
+"'%s' is not under version control and is not part of the commit, yet its "
+"child '%s' is part of the commit"
 msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
-" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
-"\n"
-" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
-" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
-" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
-" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
-" Rev, Revision, - 本物件最后一次改变的修订版。\n"
-" LastChangedRevision\n"
-" Id - 前四个关键字的压缩摘要。\n"
-" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
-" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
-" 下的文件子项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
-" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文字,其它则为二进制数据。\n"
-" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
-" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
-"锁定,把工作拷贝文件设置为只读。\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
-"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
-"作只会在目录下的文件设置属性。\n"
+"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
+
+#: libsvn_client/commit_util.c:885
+#, c-format
+msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
+msgstr "无法提交“%s”与“%s”,因为它们都指向同一个地址(URL)"
+
+#: libsvn_client/commit_util.c:1035
+#, c-format
+msgid "Commit item '%s' has copy flag but an invalid revision"
+msgstr "提交项目“%s”有复制标志,但是修订版无效"
+
+#: libsvn_client/copy.c:95 libsvn_client/copy.c:768
+#, fuzzy, c-format
+msgid "Path '%s' is not a directory"
+msgstr "“%s”不是目录"
 
-#: clients/cmdline/main.c:606
+#: libsvn_client/copy.c:138
+msgid "Move will not be attempted unless forced"
+msgstr "除非强行操作,否则不会执行移动操作"
+
+#: libsvn_client/copy.c:334
+#, c-format
 msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
-"\n"
-" Note: this subcommand does not semantically resolve conflicts or\n"
-" remove conflict markers; it merely removes the conflict-related\n"
-" artifact files and allows PATH to be committed again.\n"
+"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
+"s')"
+msgstr "来源与目的似乎不在同一个档案库中 (来源:“%s”;目的:“%s”)"
+
+#: libsvn_client/copy.c:370
+#, c-format
+msgid "Cannot move URL '%s' into itself"
+msgstr "无法移动地址(URL)“%s”至本身"
+
+#: libsvn_client/copy.c:390
+#, c-format
+msgid "Path '%s' does not exist in revision %ld"
+msgstr "路径“%s”不存在于修订版 %ld"
+
+#: libsvn_client/copy.c:745
+#, c-format
+msgid "Path '%s' not found in revision %ld"
+msgstr "路径“%s”于修订版 %ld 中找不到"
+
+#: libsvn_client/copy.c:750
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr "路径“%s”于 HEAD 修订版中找不到"
+
+#: libsvn_client/copy.c:786
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "存在“%s”的项目 (不过工作文件已丢失)"
+
+#: libsvn_client/copy.c:877
+#, c-format
+msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
+msgstr "来源地址(URL)“%s”来自其它的档案库;把它当作是脱离的工作拷贝(WC)"
+
+#: libsvn_client/copy.c:956
+#, c-format
+msgid "Cannot copy path '%s' into its own child '%s'"
+msgstr "无法复制路径“%s”至其子目录“%s”中"
+
+#: libsvn_client/copy.c:967
+#, c-format
+msgid "Cannot move path '%s' into itself"
+msgstr "无法移动路径“%s”至其本身"
+
+#: libsvn_client/copy.c:975
+msgid "No support for repos <--> working copy moves"
+msgstr "不支持档案库 <--> 工作拷贝移动"
+
+#: libsvn_client/copy.c:1007
+#, c-format
+msgid "'%s' does not seem to have a URL associated with it"
+msgstr "“%s”似乎没有关联的地址(URL)"
+
+#: libsvn_client/copy.c:1204 svn/move-cmd.c:72
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "移动操作不可指定修订版"
+
+#: libsvn_client/delete.c:62
+#, c-format
+msgid "'%s' is in the way of the resource actually under version control"
+msgstr "“%s”挡了实际纳入版本控制资源的路"
+
+#: libsvn_client/delete.c:77
+#, c-format
+msgid "'%s' has local modifications"
+msgstr "“%s”已有本地修改"
+
+# as-is
+#: libsvn_client/diff.c:99
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr "%s 属性改变于:%s%s"
+
+# as-is
+#: libsvn_client/diff.c:127
+#, c-format
+msgid "Name: %s%s"
+msgstr "名字:%s%s"
+
+#: libsvn_client/diff.c:203
+#, fuzzy, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
 msgstr ""
-"移除工作拷贝的目录或文件的 '冲突' 状态。\n"
-"用法:resolved PATH...\n"
-"\n"
-" 注意:本子命令不会依语法来解决冲突或是移除冲突标记;它只是移除冲突的\n"
-" 相关文件,然后让 PATH 可以再次提交。\n"
+"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
+"s”与“%s”)"
 
-#: clients/cmdline/main.c:615
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
-"\n"
-" Note: this subcommand does not require network access, and resolves\n"
-" any conflicted states. However, it does not restore removed directories.\n"
+#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
+#, fuzzy, c-format
+msgid "URL has no scheme: '%s'"
 msgstr ""
-"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
-"用法:revert PATH...\n"
-"\n"
-" 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
-" 被删除的目录\n"
+"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
+"s”"
+
+#: libsvn_client/diff.c:222
+#, fuzzy, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
+
+# as-is
+#: libsvn_client/diff.c:287
+#, c-format
+msgid "%s\t(revision %ld)"
+msgstr "%s\t(修订版 %ld)"
+
+# as-is
+#: libsvn_client/diff.c:289
+#, c-format
+msgid "%s\t(working copy)"
+msgstr "%s\t(工作拷贝)"
+
+#: libsvn_client/diff.c:433
+#, c-format
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr "无法显示:文件标记为二进制类型。%s"
+
+# as-is
+#. xgettext: the '.working', '.merge-left.r%ld' and
+#. '.merge-right.r%ld' strings are used to tag onto a file
+#. name in case of a merge conflict
+#: libsvn_client/diff.c:861
+msgid ".working"
+msgstr ".working"
+
+# as-is
+#: libsvn_client/diff.c:863
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
+
+# as-is
+#: libsvn_client/diff.c:866
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
+
+#: libsvn_client/diff.c:1475 libsvn_client/diff.c:1679
+msgid "Not all required revisions are specified"
+msgstr "并未提供全部所需的修订版"
+
+#: libsvn_client/diff.c:1490
+msgid "At least one revision must be non-local for a pegged diff"
+msgstr "对于 peg 差异,必须至少有一个非本地端的修订版"
+
+#: libsvn_client/diff.c:1602 libsvn_client/diff.c:1614
+#, c-format
+msgid "'%s' was not found in the repository at revision %ld"
+msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
 
-#: clients/cmdline/main.c:625
+#: libsvn_client/diff.c:1960
 #, fuzzy
+msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
+
+#: libsvn_client/diff.c:1999
 msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
-"\n"
-" With no args, print only locally modified items (no network access).\n"
-" With -u, add working revision and server out-of-date information.\n"
-" With -v, print full revision information on every item.\n"
-"\n"
-" The first six columns in the output are each one character wide:\n"
-" First column: Says if item was added, deleted, or otherwise changed\n"
-" ' ' no modifications\n"
-" 'A' Added\n"
-" 'C' Conflicted\n"
-" 'D' Deleted\n"
-" 'I' Ignored\n"
-" 'M' Modified\n"
-" 'R' Replaced\n"
-" 'X' item is unversioned, but is used by an externals definition\n"
-" '?' item is not under version control\n"
-" '!' item is missing (removed by non-svn command) or incomplete\n"
-" '~' versioned item obstructed by some item of a different kind\n"
-" Second column: Modifications of a file's or directory's properties\n"
-" ' ' no modifications\n"
-" 'C' Conflicted\n"
-" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
-" Fourth column: Scheduled commit will contain addition-with-history\n"
-" ' ' no history scheduled with commit\n"
-" '+' history scheduled with commit\n"
-" Fifth column: Whether the item is switched relative to its parent\n"
-" ' ' normal\n"
-" 'S' switched\n"
-" Sixth column: Repository lock token\n"
-" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
-" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
-"\n"
-" The out-of-date information appears in the eighth column (with -u):\n"
-" '*' a newer revision exists on the server\n"
-" ' ' the working copy is up to date\n"
-"\n"
-" Remaining fields are variable width and delimited by spaces:\n"
-" The working revision (with -u or -v)\n"
-" The last committed revision and last committed author (with -v)\n"
-" The working copy path is always the final field, so it can\n"
-" include spaces.\n"
-"\n"
-" Example output:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr "目前只支持路径的文件参考基础与其工作文件之间的文件差异"
+
+#: libsvn_client/diff.c:2144 libsvn_client/switch.c:111
+#, c-format
+msgid "Directory '%s' has no URL"
+msgstr "目录“%s”没有地址(URL)"
+
+#: libsvn_client/diff.c:2351
+msgid "Summarizing diff can only compare repository to repository"
 msgstr ""
-"显示工作拷贝目录与文件的状态。\n"
-"用法:status [PATH...]\n"
-"\n"
-" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
-" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
-" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
-"\n"
-" 输出的前五个栏位各为一个字符宽:\n"
-" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
-" ' ' 无修改\n"
-" 'A' 新增\n"
-" 'C' 冲突\n"
-" 'D' 删除\n"
-" 'G' 合并\n"
-" 'I' 忽略\n"
-" 'M' 改变\n"
-" 'R' 替换\n"
-" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
-" '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
-" '~' 版本控制下的项目被不同类型的所替换\n"
-" 第二栏:显示目录或文件的属性状态\n"
-" ' ' 无修改\n"
-" 'C' 冲突\n"
-" 'M' 改变\n"
-" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
-" ' ' 未锁定\n"
-" 'L' 锁定\n"
-" 第四栏:预定要连同历史记录被新增\n"
-" ' ' 预定的提交并不包含历史记录\n"
-" '+' 预定的提交包含历史记录\n"
-" 第五栏:该项目相对其父目录是否已被切换\n"
-" ' ' 正常\n"
-" 'S' 被切换\n"
-" 第六栏:档案库锁定标记 (没有 -u)\n"
-" ' ' 没有锁定标记\n"
-" 'K' 存在锁定标记\n"
-" (有 -u)\n"
-" ' ' 没有在档案库中锁定,没有锁定标记\n"
-" 'K' 在档案库中被锁定,存在锁定标记\n"
-" 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
-" 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
-" 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
-"\n"
-" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
-" '*' 服务器上有更新修订版\n"
-" ' ' 工作拷贝是最新版的\n"
-"\n"
-" 剩余的栏位皆为变动宽度,并以空白隔开:\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
-" 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
-" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
-"\n"
-" 范例输出:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
 
-#: clients/cmdline/main.c:702
-#, fuzzy
-msgid ""
-"Update the working copy to a different URL.\n"
-"usage: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\n"
-" move a working copy to a branch or tag within the same repository.\n"
-"\n"
-" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-" This is used when repository's root URL changes (such as a scheme\n"
-" or hostname change) but your working copy still reflects the same\n"
-" directory within the same repository.\n"
-msgstr ""
-"更新工作拷贝至不同的地址(URL)。\n"
-"用法:1、switch URL [PATH]\n"
-" 2、switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
-" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
-"\n"
-" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
-" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
-" 档案库的同一目录时用之。\n"
+#: libsvn_client/diff.c:2708 libsvn_client/diff.c:2714
+#: libsvn_client/diff.c:2847 libsvn_client/locking_commands.c:263
+#: libsvn_client/ra.c:372 libsvn_client/ra.c:738 libsvn_client/ra.c:875
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%s”没有地址(URL)"
+
+#: libsvn_client/export.c:87
+#, c-format
+msgid "'%s' is not a valid EOL value"
+msgstr "“%s”不是一个有效的 EOL 值"
+
+#: libsvn_client/export.c:271
+msgid "Destination directory exists, and will not be overwritten unless forced"
+msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
+
+#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#, c-format
+msgid "'%s' exists and is not a directory"
+msgstr "“%s”已存在,但不是目录"
+
+#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#, c-format
+msgid "'%s' already exists"
+msgstr "“%s”已存在"
+
+#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1679
+#: libsvn_wc/update_editor.c:2297
+#, c-format
+msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
+
+#: libsvn_client/info.c:244
+#, fuzzy, c-format
+msgid "Cannot read entry for '%s'"
+msgstr "不能读“%s”的条目"
+
+#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#, fuzzy, c-format
+msgid "URL '%s' non-existent in revision %ld"
+msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
+
+#: libsvn_client/list.c:225
+#, c-format
+msgid "URL '%s' non-existent in that revision"
+msgstr "地址(URL)“%s”并不存在于该修订版中"
+
+#: libsvn_client/locking_commands.c:198
+msgid "No common parent found, unable to operate on disjoint arguments"
+msgstr "没有找到公共父节点,不能在分离的参数上操作"
 
-#: clients/cmdline/main.c:723
+#: libsvn_client/locking_commands.c:287
+msgid "Unable to lock/unlock across multiple repositories"
+msgstr "不能跨越多个档案库进行 锁定/解锁"
+
+#: libsvn_client/locking_commands.c:328
+#, fuzzy, c-format
+msgid "'%s' is not locked in this working copy"
+msgstr "“%s”没有在工作拷贝中锁定"
+
+#: libsvn_client/locking_commands.c:376
+#, fuzzy, c-format
+msgid "'%s' is not locked"
+msgstr "“%s”没有被锁定"
+
+#: libsvn_client/locking_commands.c:409 libsvn_fs/fs-loader.c:895
+#: libsvn_ra/ra_loader.c:625
+msgid "Lock comment has illegal characters"
+msgstr "锁定注释存在非法字符"
+
+#: libsvn_client/log.c:73
+msgid "Missing required revision specification"
+msgstr "未提供请求的修订版规格"
+
+#: libsvn_client/log.c:86
 #, fuzzy
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
-"\n"
-" Use --force to break the lock.\n"
-msgstr ""
-"解除工作拷贝或地址(URL)的锁定。\n"
-"用法:unlock TARGET...\n"
-"\n"
-" 使用 -force 中止锁定。\n"
+msgid "Revision type requires a working copy path, not a URL"
+msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+
+#: libsvn_client/log.c:139 libsvn_client/status.c:261
+#: libsvn_client/update.c:87
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr "项目“%s”没有地址(URL)"
 
-#: clients/cmdline/main.c:731
+#: libsvn_client/log.c:370
 #, fuzzy
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
-"\n"
-" If no revision given, bring working copy up-to-date with HEAD rev.\n"
-" Else synchronize working copy to revision given by -r.\n"
-"\n"
-" For each updated item a line will start with a character reporting the\n"
-" action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-"\n"
-" A character in the first column signifies an update to the actual file,\n"
-" while updates to the file's properties are shown in the second column.\n"
-" A 'B' in the third column signifies that the lock for the file has\n"
-" been broken or stolen.\n"
-msgstr ""
-"将档案库的改变反应至工作拷贝。\n"
-"用法:update [PATH...]\n"
-"\n"
-" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
-" 不然的话,同步至 -r 选项所指定的修订版。\n"
-"\n"
-" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
-" 这些字符代表如下:\n"
-"\n"
-" A 新增\n"
-" D 删除\n"
-" U æ›´æ–°\n"
-" C 冲突\n"
-" G 合并\n"
-"\n"
-" 第一栏的字符表示实际文件的更新,\n"
-" 第二栏显示被操作的文件。\n"
-" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
+msgid "No commits in repository"
+msgstr "档案库中没有任何提交"
 
-#: clients/cmdline/main.c:797 svnadmin/main.c:77 svnlook/main.c:284
-msgid "Caught signal"
-msgstr "捕捉到信号(中断)"
+#: libsvn_client/prop_commands.c:71
+#, c-format
+msgid "'%s' is a wcprop, thus not accessible to clients"
+msgstr "“%s”是一个工作拷贝属性(wcprop),应此不能被客户端存取"
 
-#: clients/cmdline/main.c:895
-msgid "Non-numeric limit argument given"
-msgstr "给了非数字的参数"
+#: libsvn_client/prop_commands.c:150
+#, c-format
+msgid "Revision property '%s' not allowed in this context"
+msgstr "修订版属性“%s”在此上下文中并不允许"
 
-#: clients/cmdline/main.c:912 svnadmin/main.c:1219
-msgid ""
-"Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+#: libsvn_client/prop_commands.c:166
+#, fuzzy, c-format
+msgid "Setting property on non-local target '%s' is not supported"
+msgstr "设定非本地目标“%s”的属性尚不支持"
 
-#: clients/cmdline/main.c:924 svnadmin/main.c:1233
+#: libsvn_client/prop_commands.c:172 libsvn_client/prop_commands.c:247
 #, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "修订版参数“%s”中有语法错误"
+msgid "Bad property name: '%s'"
+msgstr "有问题的属性名称:“%s”"
 
-#: clients/cmdline/main.c:1072 clients/cmdline/main.c:1082
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+#: libsvn_client/prop_commands.c:243
+msgid "Value will not be set unless forced"
+msgstr "除非强迫为之,否则其值不会被设定"
+
+#: libsvn_client/prop_commands.c:466
+#, fuzzy, c-format
+msgid "'%s' does not exist in revision %ld"
+msgstr "路径“%s”不存在于修订版 %ld"
 
-#: clients/cmdline/main.c:1098
+#: libsvn_client/prop_commands.c:473 libsvn_client/prop_commands.c:724
 #, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生换列符号参数“%s”中有语法错误"
+msgid "Unknown node kind for '%s'"
+msgstr "“%s”为未知的节点类型"
 
-#: clients/cmdline/main.c:1144 svndumpfilter/main.c:1167 svnlook/main.c:2121
-msgid "Subcommand argument required\n"
-msgstr "必须提供子命令参数\n"
+#: libsvn_client/ra.c:132
+#, c-format
+msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgstr "试图在非提交操作中,设定工作拷贝属性“%s”于“%s”"
 
-#: clients/cmdline/main.c:1162 svnadmin/main.c:1341 svndumpfilter/main.c:1185
-#: svnlook/main.c:2139
+#: libsvn_client/ra.c:349
 #, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知的命令:“%s”\n"
+msgid "Can't find entry for '%s'"
+msgstr "无法找到“%s”的项目"
 
-#: clients/cmdline/main.c:1195
+#: libsvn_client/ra.c:493
 #, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
-msgstr ""
-"子命令“%s”不接受选项“%s”\n"
-"请输入“svn help %s”以取得用法。\n"
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "未提供“%s”于修订版 %ld 的 changed-path 信息"
 
-#: clients/cmdline/main.c:1232
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
+#: libsvn_client/ra.c:613
+#, c-format
+msgid "path '%s' doesn't exist in revision %ld"
+msgstr "路径“%s”不存在于修订版 %ld 中"
 
-#: clients/cmdline/main.c:1239
-#, fuzzy
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+#: libsvn_client/ra.c:660 libsvn_client/ra.c:823
+#, c-format
+msgid "Unable to find repository location for '%s' in revision %ld"
+msgstr "无法找到“%s”的档案库位置于修订版 %ld"
 
-#: clients/cmdline/main.c:1260
-msgid ""
-"The log message is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
+#: libsvn_client/ra.c:671
+#, c-format
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr "“%s”于修订版 %ld 是一个无关的物件"
 
-#: clients/cmdline/main.c:1267
-#, fuzzy
+#: libsvn_client/ra.c:828
+#, c-format
 msgid ""
-"The lock comment is a pathname (was -F intended?); use '--force-log' to "
-"override"
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
 msgstr ""
-"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
+"“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
 
-#: clients/cmdline/main.c:1480
-msgid ""
-"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
-"details)\n"
-msgstr ""
-"svn:请执行“svn cleanup”以移去锁定 (输入“svn help cleanup”以取得详细说明)\n"
+#: libsvn_client/relocate.c:101
+#, fuzzy, c-format
+msgid "'%s' is not the root of the repository"
+msgstr "”%s“没有在档案库中被锁定"
 
-#: clients/cmdline/merge-cmd.c:61
-msgid "Second revision required"
-msgstr "需要第二个修订版"
+#: libsvn_client/relocate.c:108
+#, c-format
+msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
+msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
+
+#: libsvn_client/revisions.c:99
+#, fuzzy, c-format
+msgid "Path '%s' has no committed revision"
+msgstr "路径“%s”于 HEAD 修订版中找不到"
 
-#: clients/cmdline/merge-cmd.c:81 clients/cmdline/merge-cmd.c:106
-msgid "Wrong number of paths given"
-msgstr "指定了错误数目的路径"
+#: libsvn_client/revisions.c:109
+#, c-format
+msgid "Unrecognized revision type requested for '%s'"
+msgstr "无法辨识请求的“%s”的修订版类别"
 
-#: clients/cmdline/merge-cmd.c:128
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作拷贝的合并来源需特别指定修订版"
+#: libsvn_delta/svndiff.c:144
+msgid "Compression of svndiff data failed"
+msgstr ""
 
-#: clients/cmdline/mkdir-cmd.c:84
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替?"
+#: libsvn_delta/svndiff.c:407
+msgid "Decompression of svndiff data failed"
+msgstr ""
 
-#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1215
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移动操作不可指定修订版"
+#: libsvn_delta/svndiff.c:414
+msgid "Size of uncompressed data does not match stored original length"
+msgstr ""
 
-#: clients/cmdline/notify.c:69
+#: libsvn_delta/svndiff.c:484
 #, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "跳过找不到的目标:“%s”\n"
+msgid "Invalid diff stream: insn %d cannot be decoded"
+msgstr "无效的差异流:insn %d 不能解码"
 
-#: clients/cmdline/notify.c:76
+#: libsvn_delta/svndiff.c:488
 #, c-format
-msgid "Skipped '%s'\n"
-msgstr "跳过“%s”\n"
+msgid "Invalid diff stream: insn %d has non-positive length"
+msgstr "无效的差异流:insn %d 出现非正的长度"
 
-#: clients/cmdline/notify.c:94
+#: libsvn_delta/svndiff.c:492
 #, c-format
-msgid "Restored '%s'\n"
-msgstr "已还原“%s”\n"
+msgid "Invalid diff stream: insn %d overflows the target view"
+msgstr "无效的差异流:insn %d 溢出目标视图"
 
-#: clients/cmdline/notify.c:100
+#: libsvn_delta/svndiff.c:501
 #, c-format
-msgid "Reverted '%s'\n"
-msgstr "已恢复“%s”\n"
+msgid "Invalid diff stream: [src] insn %d overflows the source view"
+msgstr "无效的诧异流:[src] insn %d 溢出源视图"
 
-#: clients/cmdline/notify.c:106
+#: libsvn_delta/svndiff.c:508
 #, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "无法恢复“%s”-- 请改用更新试试。\n"
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr "无效的差异流:[tgt] insn %d 起点超过目标视图位置"
 
-#: clients/cmdline/notify.c:114
+#: libsvn_delta/svndiff.c:515
 #, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "“%s”的已解决的冲突状态\n"
+msgid "Invalid diff stream: [new] insn %d overflows the new data section"
+msgstr "无效的差异流:[new] insn %d 溢出新数据区域"
+
+#: libsvn_delta/svndiff.c:525
+msgid "Delta does not fill the target window"
+msgstr "Delta 不能填充目标窗口"
+
+#: libsvn_delta/svndiff.c:528
+msgid "Delta does not contain enough new data"
+msgstr "Delta不能包含足够的新数据"
+
+#: libsvn_delta/svndiff.c:634
+msgid "Svndiff has invalid header"
+msgstr "Svndiff 数据包含了无效的数据头"
+
+# as-is
+#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+msgid "Svndiff contains corrupt window header"
+msgstr "Svndiff 数据包含无效窗口"
+
+# as-is
+#: libsvn_delta/svndiff.c:698
+msgid "Svndiff has backwards-sliding source views"
+msgstr "Svndiff 数据包含向后变化的资源视图"
+
+#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
+#: libsvn_delta/svndiff.c:867
+msgid "Unexpected end of svndiff input"
+msgstr "找到一个意料之外的节点种类"
+
+#: libsvn_diff/diff_file.c:593
+#, c-format
+msgid "The file '%s' changed unexpectedly during diff"
+msgstr ""
+
+#: libsvn_diff/diff_file.c:714
+#, fuzzy, c-format
+msgid "Error parsing diff options"
+msgstr "分解“%s”时发生错误"
 
-#: clients/cmdline/notify.c:195
+#: libsvn_diff/diff_file.c:737
 #, c-format
-msgid ""
-"\n"
-"Fetching external item into '%s'\n"
+msgid "Invalid argument '%s' in diff options"
 msgstr ""
-"\n"
-"正在取得外部项目至“%s”\n"
 
-#: clients/cmdline/notify.c:210
+#: libsvn_diff/diff_file.c:1019
 #, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "导出修订版 %ld 的外部定义。\n"
+msgid "%s\\ No newline at end of file%s"
+msgstr "%s\\ 在文件 %s 末尾没有新行"
 
-#: clients/cmdline/notify.c:211
+#: libsvn_diff/diff_file.c:1608
 #, c-format
-msgid "Exported revision %ld.\n"
-msgstr "导出修订版 %ld。\n"
+msgid "Failed to delete mmap '%s'"
+msgstr "删除mmap ”%s“失败"
 
-#: clients/cmdline/notify.c:219
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
+#: libsvn_ra/ra_loader.c:171
 #, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "取出修订版 %ld 的外部定义。\n"
+msgid "'%s' does not define '%s()'"
+msgstr "“%s”未定义 '%s()'"
 
-#: clients/cmdline/notify.c:220
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "取出修订版 %ld。\n"
+#: libsvn_fs/fs-loader.c:131
+#, fuzzy, c-format
+msgid "Failed to load module for FS type '%s'"
+msgstr "装载FS类别“%s”模块失败"
 
-#: clients/cmdline/notify.c:230
+#: libsvn_fs/fs-loader.c:138
 #, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部定义至修订版 %ld。\n"
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "对“%s”有不符合的 FS 模块版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: clients/cmdline/notify.c:231
+#: libsvn_fs/fs-loader.c:163
 #, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新至修订版 %ld。\n"
+msgid "Unknown FS type '%s'"
+msgstr "未知的文件系统(FS)类别“%s”"
 
-#: clients/cmdline/notify.c:239
-#, c-format
-msgid "External at revision %ld.\n"
-msgstr "于修订版 %ld 的外部定义。\n"
+#: libsvn_fs/fs-loader.c:253
+#, fuzzy, c-format
+msgid "Can't allocate FS mutex"
+msgstr "不能分配文件系统(FS)互斥体"
+
+#: libsvn_fs/fs-loader.c:289
+#, fuzzy, c-format
+msgid "Can't grab FS mutex"
+msgstr "无法获取文件系统(FS)互斥体"
 
-#: clients/cmdline/notify.c:240
+#: libsvn_fs/fs-loader.c:295
 #, c-format
-msgid "At revision %ld.\n"
-msgstr "于修订版 %ld。\n"
+msgid "Can't ungrab FS mutex"
+msgstr "不能释放文件系统(FS)互斥体"
 
-#: clients/cmdline/notify.c:252
-msgid "External export complete.\n"
-msgstr "外部定义导出完成。\n"
+#: libsvn_fs/fs-loader.c:901
+msgid "Negative expiration date passed to svn_fs_lock"
+msgstr "不能接受的有效期传递到 svn_fs_lock"
 
-#: clients/cmdline/notify.c:253
-msgid "Export complete.\n"
-msgstr "导出完成。\n"
+#: libsvn_fs_base/bdb/bdb-err.c:101
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while %s:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: clients/cmdline/notify.c:260
-msgid "External checkout complete.\n"
-msgstr "外部定义取出完成。\n"
+#: libsvn_fs_base/bdb/changes-table.c:87
+msgid "creating change"
+msgstr "正在创建更改"
 
-#: clients/cmdline/notify.c:261
-msgid "Checkout complete.\n"
-msgstr "取出完成。\n"
+#: libsvn_fs_base/bdb/changes-table.c:113
+msgid "deleting changes"
+msgstr "正在删除更改"
 
-#: clients/cmdline/notify.c:268
-msgid "External update complete.\n"
-msgstr "外部定义更新完成。\n"
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2025
+msgid "Missing required node revision ID"
+msgstr "未提供必须的节点修订版 ID"
 
-#: clients/cmdline/notify.c:269
-msgid "Update complete.\n"
-msgstr "更新完成。\n"
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2035
+msgid "Invalid change ordering: new node revision ID without delete"
+msgstr "无效的改变顺序:有新的节点修订版 ID 而没删除"
 
-#: clients/cmdline/notify.c:285
-#, c-format
-msgid ""
-"\n"
-"Performing status on external item at '%s'\n"
-msgstr ""
-"\n"
-"对外部项目“%s”进行状态检查\n"
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2046
+msgid "Invalid change ordering: non-add change on deleted path"
+msgstr "无效的改变顺序:对删除路径进行非新增的改变"
 
-#: clients/cmdline/notify.c:293
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "状态于修订版:%6ld\n"
+#: libsvn_fs_base/bdb/changes-table.c:256
+#: libsvn_fs_base/bdb/changes-table.c:380
+msgid "creating cursor for reading changes"
+msgstr "正在为读取更改创建指针"
 
-#: clients/cmdline/notify.c:301
-#, c-format
-msgid "Sending %s\n"
-msgstr "正在发送 %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:282
+#: libsvn_fs_base/bdb/changes-table.c:401
+#, fuzzy, c-format
+msgid "Error reading changes for key '%s'"
+msgstr "读关键字“%s”的更改时发生错误"
 
-#: clients/cmdline/notify.c:310
-#, c-format
-msgid "Adding (bin) %s\n"
-msgstr "新增 (二进制) %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:341
+#: libsvn_fs_base/bdb/changes-table.c:424
+msgid "fetching changes"
+msgstr "正在获取更改"
 
-#: clients/cmdline/notify.c:317
-#, c-format
-msgid "Adding %s\n"
-msgstr "新增 %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:354
+#: libsvn_fs_base/bdb/changes-table.c:437
+msgid "closing changes cursor"
+msgstr "正在关闭更改指针"
 
-#: clients/cmdline/notify.c:324
-#, c-format
-msgid "Deleting %s\n"
-msgstr "删除 %s\n"
+#: libsvn_fs_base/bdb/copies-table.c:85
+#, fuzzy
+msgid "storing copy record"
+msgstr "正在存储拷贝记录"
 
-#: clients/cmdline/notify.c:331
-#, c-format
-msgid "Replacing %s\n"
-msgstr "替换 %s\n"
+#: libsvn_fs_base/bdb/copies-table.c:110
+msgid "allocating new copy ID (getting 'next-key')"
+msgstr "正在分配新拷贝ID (正在获取'next-key')"
 
-#: clients/cmdline/notify.c:341
-msgid "Transmitting file data "
-msgstr "传输文件数据"
+#: libsvn_fs_base/bdb/copies-table.c:128
+msgid "bumping next copy key"
+msgstr "正在提取下一个拷贝关键字"
 
-#: clients/cmdline/notify.c:351
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "“%s”被用户“%s”锁定。\n"
+#: libsvn_fs_base/bdb/copies-table.c:167
+msgid "deleting entry from 'copies' table"
+msgstr "正在从 'copies' 表中删除条目"
 
-#: clients/cmdline/notify.c:357
-#, c-format
-msgid "'%s' unlocked.\n"
-msgstr "“%s”被解除锁定。\n"
+# as-is
+#: libsvn_fs_base/bdb/copies-table.c:195
+#, fuzzy
+msgid "reading copy"
+msgstr "正在读取拷贝"
 
-#: clients/cmdline/prompt.c:94
-msgid "Can't open stdin"
-msgstr "无法打开标准输入"
+#: libsvn_fs_base/bdb/nodes-table.c:97
+msgid "allocating new node ID (getting 'next-key')"
+msgstr "正在分配新的节点 ID (正在获取 'next-key')"
 
-#: clients/cmdline/prompt.c:112 clients/cmdline/prompt.c:116
-msgid "Can't read stdin"
-msgstr "无法读取标准输入"
+#: libsvn_fs_base/bdb/nodes-table.c:115
+msgid "bumping next node ID key"
+msgstr "正在提取下一个节点 ID 关键字"
 
-#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:310
-msgid "Can't get password"
-msgstr "无法取得密码"
+#: libsvn_fs_base/bdb/nodes-table.c:152
+#, fuzzy, c-format
+msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
+msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
 
-#: clients/cmdline/prompt.c:175
-#, c-format
-msgid "Authentication realm: %s\n"
-msgstr "认证领域:%s\n"
+#: libsvn_fs_base/bdb/nodes-table.c:178
+msgid "deleting entry from 'nodes' table"
+msgstr "正在从 'nodes' 表删除条目"
 
-#: clients/cmdline/prompt.c:201 clients/cmdline/prompt.c:224
-msgid "Username: "
-msgstr "用户登录名:"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/nodes-table.c:218
+#, fuzzy
+msgid "reading node revision"
+msgstr "正在读取节点修订版"
 
-#: clients/cmdline/prompt.c:203
-#, c-format
-msgid "Password for '%s': "
-msgstr "“%s”的密码:"
+#: libsvn_fs_base/bdb/nodes-table.c:250
+#, fuzzy
+msgid "storing node revision"
+msgstr "正在存储节点修订版"
 
-#: clients/cmdline/prompt.c:246
-#, c-format
-msgid "Error validating server certificate for '%s':\n"
-msgstr "验证“%s”的服务器凭证时发生错误:\n"
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
+#, fuzzy, c-format
+msgid "No such representation '%s'"
+msgstr "没有这样的请求 “%s”"
 
-#: clients/cmdline/prompt.c:252
-msgid ""
-" - The certificate is not issued by a trusted authority. Use the\n"
-" fingerprint to validate the certificate manually!\n"
-msgstr ""
-" - 本凭证并不是由受信任的权威机权所核发。请手动利用指纹以验证\n"
-" 凭证的有效性!\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:96
+#, fuzzy
+msgid "reading representation"
+msgstr "正在读取请求"
 
-#: clients/cmdline/prompt.c:259
-msgid " - The certificate hostname does not match.\n"
-msgstr " - 本凭证的主机名称不符。\n"
+#: libsvn_fs_base/bdb/reps-table.c:124
+#, fuzzy
+msgid "storing representation"
+msgstr "正在存储请求"
 
-#: clients/cmdline/prompt.c:265
-msgid " - The certificate is not yet valid.\n"
-msgstr " - 本凭证尚未进入有效期间。\n"
+#: libsvn_fs_base/bdb/reps-table.c:154
+msgid "allocating new representation (getting next-key)"
+msgstr "正在分配新请求 (正在获取 next-key)"
 
-#: clients/cmdline/prompt.c:271
-msgid " - The certificate has expired.\n"
-msgstr " - 本凭证已过期。\n"
+#: libsvn_fs_base/bdb/reps-table.c:175
+#, fuzzy
+msgid "bumping next representation key"
+msgstr "正在提取下一个请求关键字"
 
-#: clients/cmdline/prompt.c:277
-msgid " - The certificate has an unknown error.\n"
-msgstr " - 本凭证发生不明的错误。\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:203
+#, fuzzy
+msgid "deleting representation"
+msgstr "正在删除请求"
 
-#: clients/cmdline/prompt.c:282
-#, c-format
-msgid ""
-"Certificate information:\n"
-" - Hostname: %s\n"
-" - Valid: from %s until %s\n"
-" - Issuer: %s\n"
-" - Fingerprint: %s\n"
-msgstr ""
-"凭证信息:\n"
-" - 主机名称:%s\n"
-" - 有效期间:自 %s 至 %s\n"
-" - 发行者:%s\n"
-" - 指纹:%s\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/rev-table.c:87
+#, fuzzy
+msgid "reading filesystem revision"
+msgstr "正在读取文件系统修订版号"
 
-#: clients/cmdline/prompt.c:297
-msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
-msgstr "(R)拒绝,(t)暂时接受 或 (p)永远接受?"
+#: libsvn_fs_base/bdb/strings-table.c:89
+msgid "creating cursor for reading a string"
+msgstr "正在为读取一个字符串创建指针"
 
-#: clients/cmdline/prompt.c:301
-msgid "(R)eject or accept (t)emporarily? "
-msgstr "(R)拒绝 或 (t)暂时接受 ?"
+#: libsvn_fs_base/bdb/txn-table.c:92
+#, fuzzy
+msgid "storing transaction record"
+msgstr "正在存储事务记录"
 
-#: clients/cmdline/prompt.c:339
-msgid "Client certificate filename: "
-msgstr "用户凭证文件名:"
+#: libsvn_fs_base/bdb/uuids-table.c:114
+#, fuzzy
+msgid "get repository uuid"
+msgstr "获取档案库唯一标记(uuid)"
+
+#: libsvn_fs_base/bdb/uuids-table.c:142
+#, fuzzy
+msgid "set repository uuid"
+msgstr "设置档案库唯一标记(uuid)"
+
+#: libsvn_fs_base/dag.c:217
+#, fuzzy, c-format
+msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
+
+#: libsvn_fs_base/dag.c:225
+#, fuzzy, c-format
+msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
+
+#: libsvn_fs_base/dag.c:234
+#, fuzzy, c-format
+msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
+
+#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:317
+#, fuzzy
+msgid "Attempted to create entry in non-directory parent"
+msgstr "企图在非目录的父节点创建条目"
+
+#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:311
+#, c-format
+msgid "Attempted to create a node with an illegal name '%s'"
+msgstr "企图用一个非法的名字“%s”创建节点"
+
+#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:323
+#, fuzzy, c-format
+msgid "Attempted to clone child of non-mutable node"
+msgstr "企图克隆非可变节点的子节点"
 
-#: clients/cmdline/prompt.c:362
-#, c-format
-msgid "Passphrase for '%s': "
-msgstr "“%s”的密码:"
+#: libsvn_fs_base/dag.c:471
+#, fuzzy, c-format
+msgid "Attempted to create entry that already exists"
+msgstr "企图创建已经存在的子条目"
 
-#: clients/cmdline/propdel-cmd.c:77
-#, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "属性“%s”自档案库修订版 %ld 中删除\n"
+#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:385
+#, fuzzy
+msgid "Attempted to set entry in non-directory node"
+msgstr "企图在非目录节点中设置条目"
 
-#: clients/cmdline/propdel-cmd.c:86
-#, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "删除纳入版本控制的属性“%s”时不可指定修订版"
+#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:391
+#, fuzzy
+msgid "Attempted to set entry in immutable node"
+msgstr "企图在不可改变的节点设置条目"
 
-#: clients/cmdline/propdel-cmd.c:116
+#: libsvn_fs_base/dag.c:592
 #, c-format
-msgid "property '%s' deleted (recursively) from '%s'.\n"
-msgstr "属性“%s”自“%s”删除 (递归)。\n"
+msgid "Can't set proplist on *immutable* node-revision %s"
+msgstr "不能在不可更改节点修订版 %s 设置属性列表"
 
-#: clients/cmdline/propdel-cmd.c:117
+#: libsvn_fs_base/dag.c:704
 #, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "属性“%s”自“%s”删除。\n"
+msgid "Attempted to make a child clone with an illegal name '%s'"
+msgstr "企图以非法名字“%s”建立子克隆"
 
-#: clients/cmdline/propedit-cmd.c:101 clients/cmdline/propedit-cmd.c:225
-#: clients/cmdline/propset-cmd.c:85
-msgid "Bad encoding option: prop value not stored as UTF8"
-msgstr "有问题的编码选项:属性内容未以 UTF8 储存"
+#: libsvn_fs_base/dag.c:830
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from *non*-directory node"
+msgstr "企图从非目录节点删除条目“%s”"
 
-#: clients/cmdline/propedit-cmd.c:110
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "属性“%s”于修订版 %ld 设为新值\n"
+#: libsvn_fs_base/dag.c:836
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from immutable directory node"
+msgstr "企图从不可更改目录节点删除条目“%s”"
 
-#: clients/cmdline/propedit-cmd.c:116
+#: libsvn_fs_base/dag.c:843
 #, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "属性“%s”于修订版 %ld 没有改变\n"
+msgid "Attempted to delete a node with an illegal name '%s'"
+msgstr "企图删除一个非法名字“%s”的节点"
 
-#: clients/cmdline/propedit-cmd.c:124
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "编辑纳入版本控制的属性“%s”时不可指定修订版"
+#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#, fuzzy, c-format
+msgid "Delete failed: directory has no entry '%s'"
+msgstr "删除失败:目录没有项目“%s”"
 
-#: clients/cmdline/propedit-cmd.c:150 clients/cmdline/propset-cmd.c:158
-msgid "Explicit target argument required"
-msgstr "必须明确地提供目标"
+#: libsvn_fs_base/dag.c:940
+#, fuzzy, c-format
+msgid "Attempted removal of immutable node"
+msgstr "企图删除不可改变的节点"
 
-#: clients/cmdline/propedit-cmd.c:173
+#: libsvn_fs_base/dag.c:1060
 #, c-format
-msgid "Editing property on non-local target '%s' not yet supported"
-msgstr "尚不支持编辑非本地目标“%s”的属性"
+msgid "Attempted to get textual contents of a *non*-file node"
+msgstr "企图获取非文件节点的文本内容"
 
-#: clients/cmdline/propedit-cmd.c:200 clients/cmdline/switch-cmd.c:138
+#: libsvn_fs_base/dag.c:1095
 #, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "“%s”不像是工作拷贝路径"
+msgid "Attempted to get length of a *non*-file node"
+msgstr "企图获取非文件节点的长度"
 
-#: clients/cmdline/propedit-cmd.c:232
+#: libsvn_fs_base/dag.c:1121
 #, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "“%2$s”的“%1$s”属性被设为新值\n"
+msgid "Attempted to get checksum of a *non*-file node"
+msgstr "企图获取非文件节点的校验和"
 
-#: clients/cmdline/propedit-cmd.c:239
-#, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "“%2$s”的“%1$s”属性没有改变\n"
+#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of a *non*-file node"
+msgstr "企图设置非文件节点文本内容"
 
-#: clients/cmdline/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of an immutable node"
+msgstr "企图设置不可改变节点文本内容"
 
-#: clients/cmdline/props.c:51
-#, fuzzy
+#: libsvn_fs_base/dag.c:1235
+#, fuzzy, c-format
 msgid ""
-"Must specify the revision as a number, a date or 'HEAD' when operating on a "
-"revision property"
-msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
+"Checksum mismatch, rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"校验和不匹配,报告“%s”:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: clients/cmdline/props.c:58
-#, fuzzy
-msgid "Wrong number of targets specified"
-msgstr "指定了错误数目的目标"
+#: libsvn_fs_base/dag.c:1290
+#, c-format
+msgid "Attempted to open non-existent child node '%s'"
+msgstr "企图打开不存在的子节点“%s”"
 
-#: clients/cmdline/props.c:67
-msgid "Either a URL or versioned item is required"
-msgstr "必须提供地址(URL)或纳入版本控制的项目"
+#: libsvn_fs_base/dag.c:1296
+#, c-format
+msgid "Attempted to open node with an illegal name '%s'"
+msgstr "企图以不合法的名字“%s”打开节点"
+
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
+msgid "Filesystem object has not been opened yet"
+msgstr "文件系统对象尚未打开"
 
-#: clients/cmdline/propset-cmd.c:111
+#: libsvn_fs_base/err.c:51
 #, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "设定属性“%s”于档案库修订版 %ld\n"
+msgid "Corrupt filesystem revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$s”中的文件系统修订版 %1$ld 损坏"
 
-#: clients/cmdline/propset-cmd.c:119
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
 #, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "无法指定修订版以设定版本控制下的属性“%s”"
+msgid "Reference to non-existent node '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”中引用不存在的节点“%1$s”"
 
-#: clients/cmdline/propset-cmd.c:151
+#: libsvn_fs_base/err.c:72
 #, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
+msgid "Reference to non-existent revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$s”中引用不存在的修订版“%1$ld”"
 
-#: clients/cmdline/propset-cmd.c:184
+#: libsvn_fs_base/err.c:84
 #, c-format
-msgid "property '%s' set (recursively) on '%s'\n"
-msgstr "属性“%s”设定 (递归) 于“%s”\n"
+msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%1$s”的 'transactions' 表格有无效的项目"
 
-#: clients/cmdline/propset-cmd.c:185
+#: libsvn_fs_base/err.c:95
 #, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "属性“%s”设定于“%s”\n"
+msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%1$s”的 'copies' 表格有无效的项目"
 
-#: clients/cmdline/revert-cmd.c:61
-#, fuzzy
-msgid "Try 'svn revert --recursive' instead?"
-msgstr "尝试用 “svn revert -recursive” 代替?"
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件无法变更:文件系统“%s”,修订版 %ld,路径“%s”"
 
-#: clients/cmdline/status.c:261
+#: libsvn_fs_base/err.c:117
 #, c-format
-msgid "'%s' has lock token, but no lock owner"
-msgstr "‘%s’锁被盗取,但没有锁的所有者"
+msgid "No transaction named '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”中不存在名为“%1$s”的事务"
 
-#: clients/cmdline/switch-cmd.c:58
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
 #, c-format
-msgid "'%s' to '%s' is not a valid relocation"
-msgstr "“%s”到“%s”不是有效的重定位"
+msgid "Cannot modify transaction named '%s' in filesystem '%s'"
+msgstr "无法在文件系统“%2$s”中修改名为“%1$s”的事务"
 
-#: clients/cmdline/util.c:58
+#: libsvn_fs_base/err.c:139
 #, c-format
-msgid ""
-"\n"
-"Committed revision %ld.\n"
-msgstr ""
-"\n"
-"提交后的修订版为 %ld。\n"
+msgid "No copy with id '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中没有编号“%1$s”的拷贝"
 
-#: clients/cmdline/util.c:126
-msgid ""
-"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
-"no 'editor-cmd' run-time configuration option was found"
-msgstr ""
-"没有一个 SVN_EDITOR,VISUAL 或 EDITOR 环境变数被设定,执行时期的设定中也没有 "
-"'editor-cmd' 选项"
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-#: clients/cmdline/util.c:153
-msgid "Can't get working directory"
-msgstr "无法取得工作目录"
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
+#, fuzzy, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-#: clients/cmdline/util.c:164
-#, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "无法更改工作拷贝至“%s”"
+#: libsvn_fs_base/err.c:171
+#, fuzzy, c-format
+msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
+msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
 
-#: clients/cmdline/util.c:190
-#, c-format
-msgid "Can't write to '%s'"
-msgstr "无法写入至“%s”"
+#: libsvn_fs_base/err.c:181
+#, fuzzy, c-format
+msgid "No token given for path '%s' in filesystem '%s'"
+msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
 
-# as-is
-#: clients/cmdline/util.c:205 clients/cmdline/util.c:229
-#: libsvn_fs_fs/fs_fs.c:1082 libsvn_fs_fs/fs_fs.c:3590 libsvn_subr/io.c:2359
-#, c-format
-msgid "Can't stat '%s'"
-msgstr "不能取得“%s”状态"
+#: libsvn_fs_base/err.c:190
+#, fuzzy, c-format
+msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
 
-#: clients/cmdline/util.c:220
-#, c-format
-msgid "system('%s') returned %d"
-msgstr "系统(“%s”) 返回 %d"
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
+#, fuzzy, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
 
-#: clients/cmdline/util.c:285
-msgid "Can't restore working directory"
-msgstr "无法还原工作目录"
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
 
-#: clients/cmdline/util.c:325
-msgid "Log message contains a zero byte"
-msgstr "日志信息中有一个零字节"
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "文件系统“%s”当前没有用户名关联"
 
-#: clients/cmdline/util.c:385
-msgid "Your commit message was left in a temporary file:"
-msgstr "您的提交信息保留在临时文件中:"
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
+#, fuzzy, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
 
-# as-is
-#: clients/cmdline/util.c:437
-msgid "--This line, and those below, will be ignored--"
-msgstr "--此行及以下内容将会被忽略--"
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
+#, fuzzy, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
 
-#: clients/cmdline/util.c:550
-msgid "Cannot invoke editor to get log message when non-interactive"
-msgstr "在非交互式的情况下不能调用编辑器获取日志信息"
+#: libsvn_fs_base/fs.c:79
+#, c-format
+msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
+msgstr "不正确的数据库版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
 
-#: clients/cmdline/util.c:563
-msgid ""
-"Could not use external editor to fetch log message; consider setting the "
-"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
-"options"
-msgstr ""
-"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
-"message (-m) 或 --file (-F) 选项"
+#: libsvn_fs_base/fs.c:90
+#, c-format
+msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
+msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
 
-#: clients/cmdline/util.c:598
-msgid ""
-"\n"
-"Log message unchanged or not specified\n"
-"a)bort, c)ontinue, e)dit\n"
-msgstr ""
-"\n"
-"日志信息未改变,或是未指定\n"
-"a)中断,c)继续,e)编辑\n"
+#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
+#, fuzzy
+msgid "Filesystem object already open"
+msgstr "文件系统对象已经打开"
 
-#: clients/cmdline/util.c:651
-msgid "Use --force to override this restriction"
-msgstr "请用 --force 来撤销限制"
+#: libsvn_fs_base/fs.c:189
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: clients/cmdline/util.c:673 include/svn_error_codes.h:229
-#: libsvn_subr/cmdline.c:278 libsvn_subr/cmdline.c:295
-msgid "Write error"
-msgstr "写入错误"
+#: libsvn_fs_base/fs.c:539
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-# as-is
-#: include/svn_error_codes.h:152
-msgid "Bad parent pool passed to svn_make_pool()"
-msgstr "无效的内存池(pool)传递到 svn_make_pool()"
+#: libsvn_fs_base/fs.c:545
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: include/svn_error_codes.h:156
-msgid "Bogus filename"
-msgstr "有问题的文件名"
+#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:281
+#, c-format
+msgid "Expected FS format '%d'; found format '%d'"
+msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
 
-#: include/svn_error_codes.h:160
-msgid "Bogus URL"
-msgstr "有问题的地址(URL)"
+#: libsvn_fs_base/fs.c:1094
+#, fuzzy
+msgid ""
+"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
+"may be interfering with the hotcopy algorithm. If \n"
+"the problem persists, try deactivating this feature \n"
+"in DB_CONFIG"
+msgstr ""
+"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
+"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
+"在 DB_CONFIG 中取消这个功能。"
 
-#: include/svn_error_codes.h:164
-msgid "Bogus date"
-msgstr "有问题的日期"
+#: libsvn_fs_base/fs.c:1113
+#, fuzzy
+msgid ""
+"Error running catastrophic recovery on hotcopy; the \n"
+"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
+"hotcopy algorithm. If the problem persists, try deactivating \n"
+"this feature in DB_CONFIG"
+msgstr ""
+"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
+"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
+"尝试在 DB_CONFIG 中取消这个功能。"
 
-#: include/svn_error_codes.h:168
-msgid "Bogus mime-type"
-msgstr "有问题的 mime-type"
+#: libsvn_fs_base/fs.c:1222
+msgid "Module for working with a Berkeley DB repository."
+msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
 
-#: include/svn_error_codes.h:174
-msgid "Version file format not correct"
-msgstr "版本文件格式不正确"
+#: libsvn_fs_base/fs.c:1255
+#, c-format
+msgid "Unsupported FS loader version (%d) for bdb"
+msgstr "不支持的 bdb 的 FS 载入器版本 (%d)"
 
-#: include/svn_error_codes.h:180
-msgid "No such XML tag attribute"
-msgstr "没有这样的 XML 标签属性"
+#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#, c-format
+msgid "Cannot verify lock on path '%s'; no username available"
+msgstr "不能在路径“%s”校验锁;没有有效的用户名"
 
-#: include/svn_error_codes.h:184
-msgid "<delta-pkg> is missing ancestry"
-msgstr "<delta-pkg> 没有演进历程"
+#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#, c-format
+msgid "User %s does not own lock on path '%s' (currently locked by %s)"
+msgstr "用户 %s 不是路径“%s”锁的所有者(当前由用户 %s 锁定)"
 
-#: include/svn_error_codes.h:188
-msgid "Unrecognized binary data encoding; can't decode"
-msgstr "无法辨识的二进制数据编码:无法解译"
+#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#, c-format
+msgid "Cannot verify lock on path '%s'; no matching lock-token available"
+msgstr "不能校验路径“%s”上的锁;没有匹配的可用锁标识"
 
-#: include/svn_error_codes.h:192
-msgid "XML data was not well-formed"
-msgstr "XML 的数据不合语法"
+#. Helper macro that evaluates to an error message indicating that
+#. the representation referred to by X has an unknown node kind.
+#: libsvn_fs_base/reps-strings.c:57
+#, fuzzy, c-format
+msgid "Unknown node kind for representation '%s'"
+msgstr "“%s”为未知的节点类型"
 
-#: include/svn_error_codes.h:196
-msgid "Data cannot be safely XML-escaped"
-msgstr "XML 数据不能正确地解码"
+#: libsvn_fs_base/reps-strings.c:108
+#, fuzzy
+msgid "Representation is not of type 'delta'"
+msgstr "请求不是 “delta” 类型"
 
-#: include/svn_error_codes.h:202
-msgid "Inconsistent line ending style"
-msgstr "不一致的行结束样式"
+#: libsvn_fs_base/reps-strings.c:379
+msgid "Svndiff source length inconsistency"
+msgstr ""
 
-#: include/svn_error_codes.h:206
-msgid "Unrecognized line ending style"
-msgstr "无法辨识的行结束样式"
+#: libsvn_fs_base/reps-strings.c:506
+#, c-format
+msgid "Diff version inconsistencies in representation '%s'"
+msgstr "在“%s”请求Diff 的版本冲突"
 
-#: include/svn_error_codes.h:211
-msgid "Line endings other than expected"
-msgstr "一行以意料之外的方式结束"
+#: libsvn_fs_base/reps-strings.c:532
+#, c-format
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to '%"
+"s'"
+msgstr ""
 
-#: include/svn_error_codes.h:215
-msgid "Ran out of unique names"
-msgstr "已用完不重复的名称"
+#: libsvn_fs_base/reps-strings.c:780
+#, c-format
+msgid "Rep contents are too large: got %s, limit is %s"
+msgstr "报告内容太大:得到 %s,限制是 %s"
 
-# as-is
-#: include/svn_error_codes.h:220
-msgid "Framing error in pipe protocol"
-msgstr "管道协议帧错误"
+#: libsvn_fs_base/reps-strings.c:796
+#, fuzzy, c-format
+msgid "Failure reading rep '%s'"
+msgstr "读取报告“%s”失败"
 
-#: include/svn_error_codes.h:225
-msgid "Read error in pipe"
-msgstr "管道发生读取错误"
+#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch on rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"报告“%s”的校验和不匹配:\n"
+" 预期: %s\n"
+" 实际: %s\n"
 
-#: include/svn_error_codes.h:235
-msgid "Unexpected EOF on stream"
-msgstr "流中有意料之外的结束符"
+#: libsvn_fs_base/reps-strings.c:912
+msgid "Null rep, but offset past zero already"
+msgstr "空的报告,偏移已经超过零值"
 
-#: include/svn_error_codes.h:239
-msgid "Malformed stream data"
-msgstr "畸形的流数据"
+#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
+#, fuzzy, c-format
+msgid "Rep '%s' is not mutable"
+msgstr "报告“%s”是不可变的"
 
-#: include/svn_error_codes.h:243
-msgid "Unrecognized stream data"
-msgstr "无法辨识的流数据"
+#: libsvn_fs_base/reps-strings.c:1040
+#, c-format
+msgid "Rep '%s' both mutable and non-fulltext"
+msgstr "报告 “%s” 可变并且非全文本"
 
-#: include/svn_error_codes.h:249
-msgid "Unknown svn_node_kind"
-msgstr "未知的 svn_node_kind"
+#: libsvn_fs_base/reps-strings.c:1340
+msgid "Failed to get new string key"
+msgstr "取新的字符串关键字失败"
 
-#: include/svn_error_codes.h:253
-msgid "Unexpected node kind found"
-msgstr "找到一个意料之外的节点种类"
+#: libsvn_fs_base/reps-strings.c:1416
+#, c-format
+msgid "Attempt to deltify '%s' against itself"
+msgstr "企图 deltify “%s” 自身"
 
-#: include/svn_error_codes.h:259
-msgid "Can't find an entry"
-msgstr "无法找到一个项目"
+#: libsvn_fs_base/reps-strings.c:1487
+#, fuzzy, c-format
+msgid "Failed to calculate MD5 digest for '%s'"
+msgstr "计算“%s”的MD5指纹失败"
 
-#: include/svn_error_codes.h:265
-msgid "Entry already exists"
-msgstr "项目已存在"
+#: libsvn_fs_base/revs-txns.c:65
+#, fuzzy, c-format
+msgid "Transaction is not dead: '%s'"
+msgstr "事务未结束:“%s”"
 
-#: include/svn_error_codes.h:269
-msgid "Entry has no revision"
-msgstr "项目没有修订版"
+#: libsvn_fs_base/revs-txns.c:68
+#, fuzzy, c-format
+msgid "Transaction is dead: '%s'"
+msgstr "事务已结束:“%s”"
 
-#: include/svn_error_codes.h:273
-msgid "Entry has no URL"
-msgstr "项目没有地址(URL)"
+#: libsvn_fs_base/revs-txns.c:981
+#, fuzzy
+msgid "Transaction aborted, but cleanup failed"
+msgstr "事务中止,但清除失败"
 
-#: include/svn_error_codes.h:277
-msgid "Entry has an invalid attribute"
-msgstr "项目有无效的属性"
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT.
+#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
+#, fuzzy, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "文件找不到:事务“%s” ,路径“%s”"
 
-#: include/svn_error_codes.h:283
-msgid "Obstructed update"
-msgstr "塞住的更新"
+#: libsvn_fs_base/tree.c:393 libsvn_fs_fs/tree.c:317
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "文件找不到:修订版 %ld,路径“%s”"
 
-# as-is
-#: include/svn_error_codes.h:288
-msgid "Mismatch popping the WC unwind stack"
-msgstr "不匹配的弹出工作拷贝(WC)展开堆栈"
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
+#, fuzzy, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
 
-# as-is
-#: include/svn_error_codes.h:293
-msgid "Attempt to pop empty WC unwind stack"
-msgstr "尝试弹出空的工作拷贝(WC)展开堆栈"
+#: libsvn_fs_base/tree.c:408 libsvn_fs_fs/tree.c:338
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
 
-# as-is
-#: include/svn_error_codes.h:298
-msgid "Attempt to unlock with non-empty unwind stack"
-msgstr "尝试解锁非空展开堆栈"
+#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
+#, fuzzy
+msgid "Root object must be a transaction root"
+msgstr "根对象必须是一个事务的根对象"
 
-#: include/svn_error_codes.h:302
-msgid "Attempted to lock an already-locked dir"
-msgstr "尝试要锁定一个已锁定的目录"
+#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
+#, fuzzy, c-format
+msgid "Failure opening '%s'"
+msgstr "打开“%s”失败"
 
-#: include/svn_error_codes.h:306
-msgid "Working copy not locked; this is probably a bug, please report"
-msgstr "工作目录没有被锁定;这可能是一个漏洞,请报告开发者"
+#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
+#, fuzzy
+msgid "Cannot compare property value between two different filesystems"
+msgstr "在两个不同的文件系统之间比较属性值"
 
-#: include/svn_error_codes.h:311
-msgid "Invalid lock"
-msgstr "无效的锁定"
+#: libsvn_fs_base/tree.c:1735
+msgid "Corrupt DB: faulty predecessor count"
+msgstr "无效的数据库:先前的数目不完整"
 
-#: include/svn_error_codes.h:315
-msgid "Path is not a working copy directory"
-msgstr "路径不是工作拷贝目录"
+#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
+#, fuzzy, c-format
+msgid "Unexpected immutable node at '%s'"
+msgstr "在“%s”有未知或意想不到的不可改变节点"
 
-#: include/svn_error_codes.h:319
-msgid "Path is not a working copy file"
-msgstr "路径不是工作拷贝文件"
+# as-is
+#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
+#, fuzzy, c-format
+msgid "Conflict at '%s'"
+msgstr "在“%s”冲突"
 
-#: include/svn_error_codes.h:323
-msgid "Problem running log"
-msgstr "无法执行日志"
+#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
+#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1751
+msgid "Bad merge; ancestor, source, and target not all in same fs"
+msgstr "错误的合并;最初的,原始,目标不是全部在同一个文件系统(fs)"
 
-#: include/svn_error_codes.h:327
-msgid "Can't find a working copy path"
-msgstr "找不到工作拷贝路径"
+#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1280
+#, c-format
+msgid "Bad merge; target '%s' has id '%s', same as ancestor"
+msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
 
-#: include/svn_error_codes.h:331
-msgid "Working copy is not up-to-date"
-msgstr "工作拷贝未更新至最新版"
+#: libsvn_fs_base/tree.c:2373
+#, fuzzy, c-format
+msgid "Transaction '%s' out of date with respect to revision '%s'"
+msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
 
-#: include/svn_error_codes.h:335
-msgid "Left locally modified or unversioned files"
-msgstr "保留本地修改或未纳入版本管理的文件"
+#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
+#, fuzzy
+msgid "The root directory cannot be deleted"
+msgstr "根目录不能删除"
 
-#: include/svn_error_codes.h:339
-msgid "Unmergeable scheduling requested on an entry"
-msgstr "该项目有一个无法合并的调度请求"
+#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
+#, fuzzy, c-format
+msgid "Cannot copy between two different filesystems ('%s' and '%s')"
+msgstr "在两个不同的文件系统之间比较属性值"
 
-#: include/svn_error_codes.h:343
-msgid "Found a working copy path"
-msgstr "找到一个工作拷贝路径"
+#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
+msgid "Copy from mutable tree not currently supported"
+msgstr "当前不支持从可变的树复制"
 
-#: include/svn_error_codes.h:347
-msgid "A conflict in the working copy obstructs the current operation"
-msgstr "工作拷贝中的冲突阻碍了目前的操作"
+#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
+#, fuzzy, c-format
+msgid ""
+"Base checksum mismatch on '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"基本校验和在“%s”不匹配:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:351
-msgid "Working copy is corrupt"
-msgstr "工作拷贝已损坏"
+#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
+#, fuzzy
+msgid "Cannot compare file contents between two different filesystems"
+msgstr "在两个不同的文件系统询问内容的更改"
 
-#: include/svn_error_codes.h:355
-msgid "Working copy text base is corrupt"
-msgstr "工作拷贝的文件参考基础已损坏"
+#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
+#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
+#: libsvn_repos/rev_hunt.c:605
+#, fuzzy, c-format
+msgid "'%s' is not a file"
+msgstr "“%s”不是一个文件"
 
-#: include/svn_error_codes.h:359
-msgid "Cannot change node kind"
-msgstr "无法更改节点种类"
+#: libsvn_fs_fs/dag.c:367
+#, fuzzy
+msgid "Can't get entries of non-directory"
+msgstr "不能获取非目录的条目"
 
-#: include/svn_error_codes.h:363
-msgid "Invalid operation on the current working directory"
-msgstr "这个操作对目前的工作拷贝目录无效"
+#: libsvn_fs_fs/dag.c:914
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, file '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"校验和不匹配,文件“%s”:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:367
-msgid "Problem on first log entry in a working copy"
-msgstr "操作于工作拷贝的第一个日志项目时发生问题"
+#: libsvn_fs_fs/err.c:107
+#, fuzzy, c-format
+msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
 
-#: include/svn_error_codes.h:371
-msgid "Unsupported working copy format"
-msgstr "不支持的工作拷贝格式"
+#: libsvn_fs_fs/fs.c:97
+#, c-format
+msgid "Can't fetch FSFS mutex"
+msgstr "不能获取文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:375
-msgid "Path syntax not supported in this context"
-msgstr "路径语法在此上下文中并不支持"
+#: libsvn_fs_fs/fs.c:104
+#, fuzzy, c-format
+msgid "Can't create FSFS mutex"
+msgstr "无法创建文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:380
-msgid "Invalid schedule"
-msgstr "无效的计划任务"
+#: libsvn_fs_fs/fs.c:108
+#, c-format
+msgid "Can't store FSFS mutex"
+msgstr "不能存储文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:386
-msgid "General filesystem error"
-msgstr "一般性文件系统错误"
+#: libsvn_fs_fs/fs.c:334
+msgid "Module for working with a plain file (FSFS) repository."
+msgstr "模块与纯文本文件(FSFS)档案库一起工作。"
 
-#: include/svn_error_codes.h:390
-msgid "Error closing filesystem"
-msgstr "关闭文件系统发生错误"
+#: libsvn_fs_fs/fs.c:367
+#, c-format
+msgid "Unsupported FS loader version (%d) for fsfs"
+msgstr "不支持的 fsfs 的 FS 载入器版本 (%d)"
 
-#: include/svn_error_codes.h:394
-msgid "Filesystem is already open"
-msgstr "文件系统已打开"
+#: libsvn_fs_fs/fs_fs.c:475 libsvn_fs_fs/fs_fs.c:489
+msgid "Found malformed header in revision file"
+msgstr "在修订版文件中找到畸形的文件头"
 
-#: include/svn_error_codes.h:398
-msgid "Filesystem is not open"
-msgstr "文件系档未打开"
+#: libsvn_fs_fs/fs_fs.c:591 libsvn_fs_fs/fs_fs.c:605 libsvn_fs_fs/fs_fs.c:612
+#: libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627 libsvn_fs_fs/fs_fs.c:635
+msgid "Malformed text rep offset line in node-rev"
+msgstr "node-rev 中没有 text rep offset 列"
 
-#: include/svn_error_codes.h:402
-msgid "Filesystem is corrupt"
-msgstr "文件系统损坏"
+#: libsvn_fs_fs/fs_fs.c:704
+msgid "Missing kind field in node-rev"
+msgstr "node-rev 中没有 kind 栏位"
 
-#: include/svn_error_codes.h:406
-msgid "Invalid filesystem path syntax"
-msgstr "无效的文件系统路径语法"
+#: libsvn_fs_fs/fs_fs.c:735
+msgid "Missing cpath in node-rev"
+msgstr "node-rev 中没有 cpath"
 
-#: include/svn_error_codes.h:410
-msgid "Invalid filesystem revision number"
-msgstr "无效的文件系统修订版号"
+#: libsvn_fs_fs/fs_fs.c:762 libsvn_fs_fs/fs_fs.c:768
+msgid "Malformed copyroot line in node-rev"
+msgstr "node-rev 中的 copyroot 行畸形"
 
-#: include/svn_error_codes.h:414
-msgid "Invalid filesystem transaction name"
-msgstr "无效的文件系统事务名称"
+#: libsvn_fs_fs/fs_fs.c:786 libsvn_fs_fs/fs_fs.c:792
+msgid "Malformed copyfrom line in node-rev"
+msgstr "node-rev 中的 copyfrom 行畸形"
 
-#: include/svn_error_codes.h:418
-msgid "Filesystem directory has no such entry"
-msgstr "文件系统目录没有这样的项目"
+#: libsvn_fs_fs/fs_fs.c:891 libsvn_fs_fs/fs_fs.c:3252
+msgid "Attempted to write to non-transaction"
+msgstr "企图写至非事务"
 
-#: include/svn_error_codes.h:422
-msgid "Filesystem has no such representation"
-msgstr "文件系统没有这样的表现 (representation)"
+#: libsvn_fs_fs/fs_fs.c:975
+msgid "Malformed representation header"
+msgstr "畸形的描述文件头"
 
-#: include/svn_error_codes.h:426
-msgid "Filesystem has no such string"
-msgstr "文件系统没有这样的字串"
+#: libsvn_fs_fs/fs_fs.c:999
+msgid "Missing node-id in node-rev"
+msgstr "node-rev 中没有 node-id"
 
-#: include/svn_error_codes.h:430
-msgid "Filesystem has no such copy"
-msgstr "文件系统没有这样的拷贝"
+#: libsvn_fs_fs/fs_fs.c:1005
+msgid "Corrupt node-id in node-rev"
+msgstr "node-rev 中的 node-id 损坏"
 
-#: include/svn_error_codes.h:434
-msgid "The specified transaction is not mutable"
-msgstr "指定的事务不可改变"
+#: libsvn_fs_fs/fs_fs.c:1050
+#, c-format
+msgid "Revision file lacks trailing newline"
+msgstr "修订版文件缺少结尾换行符"
 
-#: include/svn_error_codes.h:438
-msgid "Filesystem has no item"
-msgstr "文件系统没有项目"
+#: libsvn_fs_fs/fs_fs.c:1062
+#, c-format
+msgid "Final line in revision file longer than 64 characters"
+msgstr "修订版文件的最后一列大于 64 个字符长"
 
-#: include/svn_error_codes.h:442
-msgid "Filesystem has no such node-rev-id"
-msgstr "文件系统没有这样的 node-rev-id"
+#: libsvn_fs_fs/fs_fs.c:1077
+msgid "Final line in revision file missing space"
+msgstr "修订版文件的最后一列少掉空白字符"
 
-#: include/svn_error_codes.h:446
-msgid "String does not represent a node or node-rev-id"
-msgstr "字串并未表示一个节点或 node-rev-id"
+#: libsvn_fs_fs/fs_fs.c:1106 libsvn_fs_fs/fs_fs.c:1164 libsvn_repos/log.c:514
+#: libsvn_repos/log.c:518
+#, c-format
+msgid "No such revision %ld"
+msgstr "没有这个修订版 %ld"
 
-#: include/svn_error_codes.h:450
-msgid "Name does not refer to a filesystem directory"
-msgstr "名称没有指向文件系统目录"
+#: libsvn_fs_fs/fs_fs.c:1224
+msgid "Malformed svndiff data in representation"
+msgstr "请求的svndiff 数据畸形"
 
-#: include/svn_error_codes.h:454
-msgid "Name does not refer to a filesystem file"
-msgstr "名称没有指向文件系统文件"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:1367 libsvn_fs_fs/fs_fs.c:1380
+msgid "Reading one svndiff window read beyond the end of the representation"
+msgstr "正在读取请求的一个 svndiff 窗口最末端"
 
-#: include/svn_error_codes.h:458
-msgid "Name is not a single path component"
-msgstr "名称不是一个单一路径"
+#: libsvn_fs_fs/fs_fs.c:1516
+msgid "svndiff data requested non-existent source"
+msgstr "svndiff 数据请求不存在的来源"
 
-#: include/svn_error_codes.h:462
-msgid "Attempt to change immutable filesystem node"
-msgstr "尝试要修改不可改变的文件系统节点"
+#: libsvn_fs_fs/fs_fs.c:1522
+msgid "svndiff requested position beyond end of stream"
+msgstr "svndiff 请求的位置超出了流的结尾"
 
-#: include/svn_error_codes.h:466
-msgid "Item already exists in filesystem"
-msgstr "该项目已存在于文件系统中"
+#: libsvn_fs_fs/fs_fs.c:1545 libsvn_fs_fs/fs_fs.c:1562
+msgid "svndiff window length is corrupt"
+msgstr "svndiff 的窗格长度已毁损"
 
-#: include/svn_error_codes.h:470
-msgid "Attempt to remove or recreate fs root dir"
-msgstr "尝试要移除或再次建立文件系统的根目录"
+#: libsvn_fs_fs/fs_fs.c:1610
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch while reading representation:\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"当读取请求时校验和不匹配:\n"
+" 预期: %s\n"
+" 实际: %s\n"
 
-#: include/svn_error_codes.h:474
-msgid "Object is not a transaction root"
-msgstr "物件不是一个事务的根物件"
+#: libsvn_fs_fs/fs_fs.c:1833 libsvn_fs_fs/fs_fs.c:1846
+#: libsvn_fs_fs/fs_fs.c:1852
+msgid "Directory entry corrupt"
+msgstr "目录条目损坏"
 
-#: include/svn_error_codes.h:478
-msgid "Object is not a revision root"
-msgstr "物件不是一个修订版的根物件"
+#: libsvn_fs_fs/fs_fs.c:2191 libsvn_fs_fs/fs_fs.c:2199
+#: libsvn_fs_fs/fs_fs.c:2231 libsvn_fs_fs/fs_fs.c:2251
+#: libsvn_fs_fs/fs_fs.c:2285 libsvn_fs_fs/fs_fs.c:2290
+msgid "Invalid changes line in rev-file"
+msgstr "rev-file 中有无效的变更行"
 
-#: include/svn_error_codes.h:482
-msgid "Merge conflict during commit"
-msgstr "提交时发生合并冲突"
+#: libsvn_fs_fs/fs_fs.c:2224
+msgid "Invalid change kind in rev file"
+msgstr "rev 文件中有无效的改变种类"
 
-# as-is
-#: include/svn_error_codes.h:486
-msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改变"
+#: libsvn_fs_fs/fs_fs.c:2244
+msgid "Invalid text-mod flag in rev-file"
+msgstr "rev-file 中有无效的 text-mod 标志"
 
-#: include/svn_error_codes.h:490
-msgid "Tried to change an immutable representation"
-msgstr "尝试变更一个不可改变的表现 (representation)"
+#: libsvn_fs_fs/fs_fs.c:2264
+msgid "Invalid prop-mod flag in rev-file"
+msgstr "rev-file 中有无效的 prop-mod 标志"
 
-#: include/svn_error_codes.h:494
-msgid "Malformed skeleton data"
-msgstr "畸形的框架数据"
+#: libsvn_fs_fs/fs_fs.c:2447
+msgid "Copying from transactions not allowed"
+msgstr "自事务进行复制是不被允许的"
 
-#: include/svn_error_codes.h:498
-msgid "Transaction is out of date"
-msgstr "事务已过时"
+#: libsvn_fs_fs/fs_fs.c:2503
+#, fuzzy, c-format
+msgid "Unable to create transaction directory in '%s' for revision %ld"
+msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
 
-#: include/svn_error_codes.h:502
-msgid "Berkeley DB error"
-msgstr "Berkeley DB 错误"
+#: libsvn_fs_fs/fs_fs.c:2680 libsvn_fs_fs/fs_fs.c:2687
+msgid "next-id file corrupt"
+msgstr "next-id 文件损坏"
 
-#: include/svn_error_codes.h:506
-msgid "Berkeley DB deadlock error"
-msgstr "Berkeley DB 发生死锁错误"
+#: libsvn_fs_fs/fs_fs.c:2772
+#, fuzzy
+msgid "Transaction cleanup failed"
+msgstr "事务清除失败"
 
-#: include/svn_error_codes.h:510
-msgid "Transaction is dead"
-msgstr "事务已结束"
+#: libsvn_fs_fs/fs_fs.c:2940
+msgid "Invalid change type"
+msgstr "无效的变更类型"
 
-#: include/svn_error_codes.h:514
-msgid "Transaction is not dead"
-msgstr "事务未结束"
+#: libsvn_fs_fs/fs_fs.c:3271
+msgid "Can't set text contents of a directory"
+msgstr "无法设定目录的文字内容"
 
-#: include/svn_error_codes.h:519
-msgid "Unknown FS type"
-msgstr "未知的 FS 类别"
+#: libsvn_fs_fs/fs_fs.c:3361 libsvn_fs_fs/fs_fs.c:3366
+#: libsvn_fs_fs/fs_fs.c:3373
+msgid "Corrupt current file"
+msgstr "当前文件损坏"
 
-#: include/svn_error_codes.h:524
-#, fuzzy
-msgid "No user associated with filesystem"
-msgstr "没有用户与文件系统关联"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:3663 libsvn_subr/io.c:2662 svn/util.c:236
+#: svn/util.c:260
+#, c-format
+msgid "Can't stat '%s'"
+msgstr "不能取得“%s”状态"
 
-#: include/svn_error_codes.h:529
-#, fuzzy
-msgid "Path is already locked"
-msgstr "路径“%s”已经被锁定"
+#: libsvn_fs_fs/fs_fs.c:3667
+#, c-format
+msgid "Can't chmod '%s'"
+msgstr "无法 chmod“%s”"
 
-#: include/svn_error_codes.h:534 include/svn_error_codes.h:661
-#, fuzzy
-msgid "Path is not locked"
-msgstr "路径没有被锁定"
+#: libsvn_fs_fs/fs_fs.c:3806
+#, c-format
+msgid "Can't grab FSFS repository mutex"
+msgstr "不能获取文件(FSFS)档案库互斥体"
 
-#: include/svn_error_codes.h:539
-msgid "Lock token is incorrect"
-msgstr "锁定标记是不正确的"
+#: libsvn_fs_fs/fs_fs.c:3820
+#, c-format
+msgid "Can't ungrab FSFS repository mutex"
+msgstr "不能是否文件(FSFS)档案库互斥体"
 
-#: include/svn_error_codes.h:544
-#, fuzzy
-msgid "No lock token provided"
-msgstr "没有提供锁定标记"
+#: libsvn_fs_fs/fs_fs.c:3937
+msgid "Transaction out of date"
+msgstr "事务过时"
 
-#: include/svn_error_codes.h:549
-msgid "Username does not match lock owner"
-msgstr "用户名和锁定所有者不匹配"
+#: libsvn_fs_fs/fs_fs.c:4234
+msgid "No such transaction"
+msgstr "无此事务"
 
-#: include/svn_error_codes.h:554
-#, fuzzy
-msgid "Filesystem has no such lock"
-msgstr "文件系统没有这样的锁"
+#: libsvn_fs_fs/lock.c:230
+#, fuzzy, c-format
+msgid "Cannot write lock/entries hashfile '%s'"
+msgstr "无法写入锁/条目的混杂文件“%s”"
 
-#: include/svn_error_codes.h:559
-msgid "Lock has expired"
-msgstr "锁过期"
+#: libsvn_fs_fs/lock.c:286
+#, fuzzy, c-format
+msgid "Can't parse lock/entries hashfile '%s'"
+msgstr "不能分析锁/条目的混杂文件“%s“"
 
-#: include/svn_error_codes.h:564
-#, fuzzy
-msgid "Item is out of date"
-msgstr "条目已过时"
+#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr "路径“%s”不存在于最新修订版中"
 
-#: include/svn_error_codes.h:576
-#, fuzzy
-msgid "Unsupported FS format"
-msgstr "不支持的 FS 格式"
+#: libsvn_fs_fs/lock.c:741
+#, c-format
+msgid "Lock failed: newer version of '%s' exists"
+msgstr "锁失败:新的版本“%s”已经存在"
 
-#: include/svn_error_codes.h:582
-msgid "The repository is locked, perhaps for db recovery"
-msgstr "档案库被锁定,也许正在作数据库修复"
+#: libsvn_ra/ra_loader.c:213
+#, fuzzy, c-format
+msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: include/svn_error_codes.h:586
-msgid "A repository hook failed"
-msgstr "档案库外挂错误"
+#: libsvn_ra/ra_loader.c:285
+#, fuzzy, c-format
+msgid "Unrecognized URL scheme for '%s'"
+msgstr ""
+"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%s”"
 
-#: include/svn_error_codes.h:590
-msgid "Incorrect arguments supplied"
-msgstr "使用不正确的参数"
+#: libsvn_ra/ra_loader.c:336
+#, fuzzy, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr ""
+"“%s”\n"
+"与\n"
+"“%s”\n"
+"并不在同一个档案库中"
 
-#: include/svn_error_codes.h:594
-msgid "A report cannot be generated because no data was supplied"
-msgstr "无法产生报告,因为没有提供任何数据"
+# as-is
+#: libsvn_ra/ra_loader.c:707
+#, fuzzy, c-format
+msgid " - handles '%s' scheme\n"
+msgstr " - 处理“%s”规则\n"
 
-#: include/svn_error_codes.h:598
-msgid "Bogus revision report"
-msgstr "有问题的修订版报告"
+#: libsvn_ra/ra_loader.c:793
+#, c-format
+msgid "Unrecognized URL scheme '%s'"
+msgstr ""
+"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%s”"
 
-#: include/svn_error_codes.h:607
-msgid "Unsupported repository version"
-msgstr "不支持的档案库版本"
+#: libsvn_ra_dav/commit.c:199
+#, c-format
+msgid "Could not create a request (%s '%s')"
+msgstr "无法建立请求 (%s“%s”)"
 
-#: include/svn_error_codes.h:611
-msgid "Disabled repository feature"
-msgstr "关闭了的档案库功能"
+#: libsvn_ra_dav/commit.c:298
+msgid ""
+"Could not fetch the Version Resource URL (needed during an import or when it "
+"is missing from the local, cached props)"
+msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
 
-#: include/svn_error_codes.h:615
-msgid "Error running post-commit hook"
-msgstr "执行 post-commit 外挂时发生错误"
+#: libsvn_ra_dav/commit.c:487
+#, fuzzy, c-format
+msgid "Could not create a CHECKOUT request (%s)"
+msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
 
-#: include/svn_error_codes.h:620
-#, fuzzy
-msgid "Error running post-lock hook"
-msgstr "执行 post-lock 外挂时发生错误"
+#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
+#: libsvn_ra_serf/commit.c:436
+#, fuzzy, c-format
+msgid "Your file or directory '%s' is probably out-of-date"
+msgstr "您的文件或目录”%s“或许已经过时"
 
-#: include/svn_error_codes.h:625
-#, fuzzy
-msgid "Error running post-unlock hook"
-msgstr "执行 post-unlock 外挂时发生错误"
+#: libsvn_ra_dav/commit.c:582
+msgid "The CHECKOUT response did not contain a 'Location:' header"
+msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
 
-#: include/svn_error_codes.h:632
-msgid "Bad URL passed to RA layer"
-msgstr "传递至 RA 层的地址(URL)有问题"
+#: libsvn_ra_dav/commit.c:881
+#, fuzzy, c-format
+msgid "Could not create a DELETE request (%s)"
+msgstr "无法产生一个删除(DELETE)请求 (%s)"
 
-#: include/svn_error_codes.h:636
-msgid "Authorization failed"
-msgstr "授权失败"
+#: libsvn_ra_dav/commit.c:1169 libsvn_ra_serf/commit.c:1395
+#, c-format
+msgid "File '%s' already exists"
+msgstr "文件“%s”已存在"
 
-#: include/svn_error_codes.h:640
-msgid "Unknown authorization method"
-msgstr "未知的授权方法"
+#: libsvn_ra_dav/commit.c:1307
+#, c-format
+msgid "Could not write svndiff to temp file"
+msgstr "无法写 svndiff 至临时文件"
 
-#: include/svn_error_codes.h:644
-msgid "Repository access method not implemented"
-msgstr "该档案库存取方法未实作"
+#: libsvn_ra_dav/commit.c:1397
+#, c-format
+msgid "Could not create a PUT request (%s)"
+msgstr "无法产生一个加入(PUT)请求 (%s)"
 
-#: include/svn_error_codes.h:648
-msgid "Item is out-of-date"
-msgstr "项目已过时"
+#: libsvn_ra_dav/commit.c:1559
+#, c-format
+msgid "applying log message to %s"
+msgstr "应用日志信息至“%s”"
 
-#: include/svn_error_codes.h:652
-msgid "Repository has no UUID"
-msgstr "档案库没有 UUID"
+#: libsvn_ra_dav/fetch.c:285
+msgid "Could not save the URL of the version resource"
+msgstr "无法储存版本资源的地址(URL)"
 
-#: include/svn_error_codes.h:656
-msgid "Unsupported RA plugin ABI version"
-msgstr "不支持的 RA 外挂 ABI 版本"
+#: libsvn_ra_dav/fetch.c:406
+#, fuzzy, c-format
+msgid "Could not get content-type from response"
+msgstr "不能从回应中获得内容类型(content-type)"
 
-#: include/svn_error_codes.h:668
-msgid "RA layer failed to init socket layer"
-msgstr "RA 层无法起始 socket 层"
+#: libsvn_ra_dav/fetch.c:451
+#, c-format
+msgid "Could not create a GET request for '%s'"
+msgstr "无法为“%s”创建 GET 请求"
 
-#: include/svn_error_codes.h:672
-msgid "RA layer failed to create HTTP request"
-msgstr "RA 层建立 HTTP 请求失败"
+#: libsvn_ra_dav/fetch.c:526
+#, c-format
+msgid "GET request failed for '%s'"
+msgstr "对“%s”的 GET 请求失败"
 
-#: include/svn_error_codes.h:676
-msgid "RA layer request failed"
-msgstr "RA 层请求失败"
+#: libsvn_ra_dav/fetch.c:665
+msgid "Could not save file"
+msgstr "无法储存文件"
 
-#: include/svn_error_codes.h:680
-msgid "RA layer didn't receive requested OPTIONS info"
-msgstr "RA 层无法取得请求的 OPTIONS 信息"
+#: libsvn_ra_dav/fetch.c:906 libsvn_ra_svn/client.c:900
+#, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%s”的总和检查值不符合:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:684
-msgid "RA layer failed to fetch properties"
-msgstr "RA 层无法取得属性"
+#: libsvn_ra_dav/fetch.c:1151
+msgid "Server response missing the expected deadprop-count property"
+msgstr ""
 
-#: include/svn_error_codes.h:688
-msgid "RA layer file already exists"
-msgstr "RA 层文件已存在"
+#: libsvn_ra_dav/fetch.c:1324
+msgid "Server does not support date-based operations"
+msgstr "服务器不支持基于日期的操作"
 
-#: include/svn_error_codes.h:692
-msgid "Invalid configuration value"
-msgstr "无效的配置值"
+#: libsvn_ra_dav/fetch.c:1331
+msgid "Invalid server response to dated-rev request"
+msgstr "对 dated-rev 请求的无效服务器回应"
 
-#: include/svn_error_codes.h:696
-msgid "HTTP Path Not Found"
-msgstr "找不到 HTTP 路径"
+# as-is
+#: libsvn_ra_dav/fetch.c:1470
+#, fuzzy
+msgid "'get-locations' REPORT not implemented"
+msgstr "get-locations REPORT 未实现"
 
-#: include/svn_error_codes.h:700
+#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
+#: libsvn_ra_dav/session.c:1474
 #, fuzzy
-msgid "Failed to execute WebDAV PROPPATCH"
-msgstr "执行 WebDAV PROPPATCH 失败"
+msgid "Incomplete lock data returned"
+msgstr "返回了不完全的锁数据"
 
-#: include/svn_error_codes.h:705 include/svn_error_codes.h:741
-#: libsvn_ra_svn/marshal.c:600 libsvn_ra_svn/marshal.c:708
-#: libsvn_ra_svn/marshal.c:735
-msgid "Malformed network data"
-msgstr "畸形的网络数据"
+#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
+#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
+#, fuzzy
+msgid "Server does not support locking features"
+msgstr "服务器不支持锁定特性"
 
-#: include/svn_error_codes.h:710
-msgid "Unable to extract data from response header"
-msgstr "不能从回应的头信息中获取数据"
+#: libsvn_ra_dav/fetch.c:1908
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr ""
+"DAV 请求失败;可能是档案库的 pre-revprop-change 外挂执行失败;或是不存在"
 
-#: include/svn_error_codes.h:716 include/svn_error_codes.h:745
-msgid "Couldn't find a repository"
-msgstr "无法找到档案库"
+#: libsvn_ra_dav/fetch.c:2643
+#, c-format
+msgid "Error writing to '%s': unexpected EOF"
+msgstr "写入“%s”时发生错误:意外的 EOF"
 
-#: include/svn_error_codes.h:720
-msgid "Couldn't open a repository"
-msgstr "无法打开档案库"
+#: libsvn_ra_dav/fetch.c:2788
+#, c-format
+msgid "Unknown XML encoding: '%s'"
+msgstr "未知的 XML 编码:“%s”"
 
 # as-is
-#: include/svn_error_codes.h:725
-msgid "Special code for wrapping server errors to report to client"
-msgstr "指定的代码封装服务器错误以便报告客户端"
-
-#: include/svn_error_codes.h:729
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 通讯协定命令"
-
-#: include/svn_error_codes.h:733
-msgid "Network connection closed unexpectedly"
-msgstr "网络连线意想不到地关闭"
-
-#: include/svn_error_codes.h:737
-msgid "Network read/write error"
-msgstr "网络读写错误"
+#: libsvn_ra_dav/fetch.c:3075
+#, c-format
+msgid "REPORT response handling failed to complete the editor drive"
+msgstr "报告响应处理失败不能完成编辑驱动"
 
-#: include/svn_error_codes.h:749
-msgid "Client/server version mismatch"
-msgstr "客户端/服务器版本不匹配"
+# as-is
+#: libsvn_ra_dav/file_revs.c:363
+#, fuzzy
+msgid "'get-file-revs' REPORT not implemented"
+msgstr "get-file-revs REPORT 未实现"
 
-#: include/svn_error_codes.h:757
-msgid "Credential data unavailable"
-msgstr "无法取得凭证数据"
+#: libsvn_ra_dav/file_revs.c:379
+msgid "The file-revs report didn't contain any revisions"
+msgstr "file-revs 报告中没有任何修订版"
 
-#: include/svn_error_codes.h:761
-msgid "No authentication provider available"
-msgstr "无可用的认证提供者"
+#: libsvn_ra_dav/merge.c:220
+#, c-format
+msgid ""
+"Protocol error: we told the server not to auto-merge any resources, but it "
+"said that '%s' was merged"
+msgstr ""
+"通讯协定错误:我们告知服务器不要自动合并任何资源,但是它报告“%s”已被合并"
 
-#: include/svn_error_codes.h:765 include/svn_error_codes.h:769
-msgid "All authentication providers exhausted"
-msgstr "所有的认证提供者已耗尽"
+#: libsvn_ra_dav/merge.c:229
+#, c-format
+msgid ""
+"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
+"element within the MERGE response"
+msgstr "内部错误:在 MERGE 回应中,“DAV:response”元素有个未知的父项目 (%d)"
 
-#: include/svn_error_codes.h:775
-msgid "Read access denied for root of edit"
-msgstr "编辑的根目录读取拒绝"
+#: libsvn_ra_dav/merge.c:244
+#, c-format
+msgid ""
+"Protocol error: the MERGE response for the '%s' resource did not return all "
+"of the properties that we asked for (and need to complete the commit)"
+msgstr ""
+"通讯协定错误:对“%s”的 MERGE 回应并未返回所有我们请求的属性 (这些是完成提交操"
+"作所不可缺少的)"
 
-#: include/svn_error_codes.h:780
-#, fuzzy
-msgid "Item is not readable"
-msgstr "项目不能读。"
+#: libsvn_ra_dav/merge.c:263
+#, c-format
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr "对“%s”的 MERGE 回应并不是目标 (“%s”) 的子项目"
 
-#: include/svn_error_codes.h:785
-#, fuzzy
-msgid "Item is partially readable"
-msgstr "项目部分可读。"
+#: libsvn_ra_dav/merge.c:485
+msgid "The MERGE property response had an error status"
+msgstr "MERGE 属性回应包含错误状态"
 
-#: include/svn_error_codes.h:789
-#, fuzzy
-msgid "Invalid authz configuration"
-msgstr "无效的配置值"
+#: libsvn_ra_dav/options.c:130
+msgid ""
+"The OPTIONS response did not include the requested activity-collection-set; "
+"this often means that the URL is not WebDAV-enabled"
+msgstr ""
+"OPTIONS 回应并不包含请求的 activity-collection-set;通常这表示该地址(URL)并不"
+"支持 WebDAV"
 
-#: include/svn_error_codes.h:794
-#, fuzzy
-msgid "Item is not writable"
-msgstr "项目不能写。"
+#: libsvn_ra_dav/props.c:588
+#, c-format
+msgid "Failed to find label '%s' for URL '%s'"
+msgstr "无法找到标记“%s”于地址(URL)“%s”"
 
-#: include/svn_error_codes.h:800
-msgid "Svndiff data has invalid header"
-msgstr "svndiff 数据包含了无效的档头"
+#: libsvn_ra_dav/props.c:617
+#, c-format
+msgid "'%s' was not present on the resource"
+msgstr "“%s”不存在于本资源上"
 
-# as-is
-#: include/svn_error_codes.h:804
-msgid "Svndiff data contains corrupt window"
-msgstr "Svndiff 数据包含无效窗口"
+#: libsvn_ra_dav/props.c:656
+#, c-format
+msgid "Neon was unable to parse URL '%s'"
+msgstr "Neon 不能分析地址(URL)”%s“"
 
-# as-is
-#: include/svn_error_codes.h:808
-msgid "Svndiff data contains backward-sliding source view"
-msgstr "Svndiff 数据包含向后变化的资源视图"
+#: libsvn_ra_dav/props.c:685
+msgid "The path was not part of a repository"
+msgstr "路径不是档案库的一部份"
 
-#: include/svn_error_codes.h:812
-msgid "Svndiff data contains invalid instruction"
-msgstr "svndiff 数据包含了无效的指令"
+#: libsvn_ra_dav/props.c:696
+#, c-format
+msgid "No part of path '%s' was found in repository HEAD"
+msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
 
-#: include/svn_error_codes.h:816
-msgid "Svndiff data ends unexpectedly"
-msgstr "svndiff 数据意想不到地结束"
+#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
+msgid "The VCC property was not found on the resource"
+msgstr "本资源找不到 VCC 属性"
 
-#: include/svn_error_codes.h:822
-msgid "Apache has no path to an SVN filesystem"
-msgstr "Apache 没有指向 SVN 文件系统的路径"
+#: libsvn_ra_dav/props.c:798
+msgid "The relative-path property was not found on the resource"
+msgstr "本资源上找不到相对路径属性"
 
-#: include/svn_error_codes.h:826
-msgid "Apache got a malformed URI"
-msgstr "Apache 得到一个畸形的 URI"
+#: libsvn_ra_dav/props.c:919
+msgid "'DAV:baseline-collection' was not present on the baseline resource"
+msgstr "'DAV:baseline-collection' 不存在于基线资源"
 
-# as-is
-#: include/svn_error_codes.h:830
-msgid "Activity not found"
-msgstr "没有找到活动项"
+#: libsvn_ra_dav/props.c:938
+msgid "'DAV:version-name' was not present on the baseline resource"
+msgstr "'DAV:version-name' 不存在于基线资源"
 
-#: include/svn_error_codes.h:834
-msgid "Baseline incorrect"
-msgstr "基线不正确"
+#: libsvn_ra_dav/props.c:1106 libsvn_ra_serf/commit.c:719
+msgid "At least one property change failed; repository is unchanged"
+msgstr "至少有一个属性变更失败;档案库未改变"
 
-#: include/svn_error_codes.h:838
-msgid "Input/output error"
-msgstr "输出入错误"
+#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
+#, fuzzy
+msgid "Missing revision attr in target-revision element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: include/svn_error_codes.h:844
-msgid "A path under version control is needed for this operation"
-msgstr "本操作仅能作用于纳入版本控制的路径"
+#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
+#, fuzzy
+msgid "Missing revision attr in open-root element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: include/svn_error_codes.h:848
-msgid "Repository access is needed for this operation"
-msgstr "本操作需要对档案库进行存取"
+#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
+msgid "Missing name attr in delete-entry element"
+msgstr ""
 
-#: include/svn_error_codes.h:852
-msgid "Bogus revision information given"
-msgstr "使用了有问题的修订版信息"
+#: libsvn_ra_dav/replay.c:176
+msgid "Missing rev attr in delete-entry element"
+msgstr ""
 
-#: include/svn_error_codes.h:856
-msgid "Attempting to commit to a URL more than once"
-msgstr "尝试对地址(URL)进行一次以上的提交"
+#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
+#, fuzzy
+msgid "Missing name attr in open-directory element"
+msgstr "未提供属性名称与档案库路径参数"
 
-#: include/svn_error_codes.h:860
-msgid "Operation does not apply to binary file"
-msgstr "本操作不适用于二进制文件"
+#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
+#: libsvn_ra_serf/replay.c:371
+#, fuzzy, c-format
+msgid "Missing name attr in %s element"
+msgstr "未提供属性名称参数"
 
-#: include/svn_error_codes.h:866
-msgid "Format of an svn:externals property was invalid"
-msgstr "svn:externals 属性的格式是无效的"
+#: libsvn_ra_dav/replay.c:288
+msgid "Got apply-textdelta element without preceding add-file or open-file"
+msgstr ""
 
-#: include/svn_error_codes.h:870
-msgid "Attempting restricted operation for modified resource"
-msgstr "尝试对已修改的资源进行受限的操作"
+#: libsvn_ra_dav/replay.c:314
+msgid "Got close-file element without preceding add-file or open-file"
+msgstr ""
 
-#: include/svn_error_codes.h:874
-msgid "Operation does not apply to directory"
-msgstr "本操作不适用于目录"
+#: libsvn_ra_dav/replay.c:329
+msgid "Got close-directory element without ever opening a directory"
+msgstr ""
 
-#: include/svn_error_codes.h:878
-msgid "Revision range is not allowed"
-msgstr "不允许的修订版范围"
+#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
+#, fuzzy, c-format
+msgid "Error writing stream: unexpected EOF"
+msgstr "写入流时发生错误:意想不到的 EOF"
 
-#: include/svn_error_codes.h:882
-msgid "Inter-repository relocation not allowed"
-msgstr "不支持不同档案库之间的重新安置 (relocation)"
+#: libsvn_ra_dav/replay.c:463
+#, c-format
+msgid "Got cdata content for a prop delete"
+msgstr ""
 
-#: include/svn_error_codes.h:886
-msgid "Author name cannot contain a newline"
-msgstr "作者名称不可包含换行符"
+#: libsvn_ra_dav/session.c:444
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr "无效的地址(URL):代理(proxy)通信端口编号中有不合法的字符"
 
-#: include/svn_error_codes.h:890
-msgid "Bad property name"
-msgstr "有问题的属性名称"
+#: libsvn_ra_dav/session.c:448
+msgid "Invalid URL: negative proxy port number"
+msgstr "无效的地址(URL):负的代理(proxy)通信端口数值"
 
-#: include/svn_error_codes.h:895
-msgid "Two versioned resources are unrelated"
-msgstr "两个纳入版本控制的资源没有相关性"
+#: libsvn_ra_dav/session.c:451
+msgid ""
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+"无效的地址(URL):代理(proxy)通信端口数值大于最大值的 TCP 通信端口数值 65535"
 
-#: include/svn_error_codes.h:900
-msgid "Path has no lock token"
-msgstr "路径没有锁定标记"
+#: libsvn_ra_dav/session.c:465
+msgid "Invalid config: illegal character in timeout value"
+msgstr "无效的配置:超时数值中有不合法的字符"
 
-#: include/svn_error_codes.h:906
-msgid "A problem occurred; see later errors for details"
-msgstr "有问题发生;请参阅随附的细节"
+#: libsvn_ra_dav/session.c:469
+msgid "Invalid config: negative timeout value"
+msgstr "无效的配置:负的超时数值"
 
-#: include/svn_error_codes.h:910
-msgid "Failure loading plugin"
-msgstr "载入外挂失败"
+#: libsvn_ra_dav/session.c:482
+msgid "Invalid config: illegal character in debug mask value"
+msgstr "无效的配置:除错遮罩值中有不合法的字符"
 
-#: include/svn_error_codes.h:914
-msgid "Malformed file"
-msgstr "畸形的文件"
+# as-is
+#: libsvn_ra_dav/session.c:545
+msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
+msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
 
-#: include/svn_error_codes.h:918
-msgid "Incomplete data"
-msgstr "不完全的数据"
+#: libsvn_ra_dav/session.c:600
+msgid "Malformed URL for repository"
+msgstr "档案库的地址(URL)畸形"
 
-#: include/svn_error_codes.h:922
-msgid "Incorrect parameters given"
-msgstr "使用不正确的参数"
+#: libsvn_ra_dav/session.c:636
+msgid "Network socket initialization failed"
+msgstr "网络 socket 启始失败"
 
-#: include/svn_error_codes.h:926
-msgid "Tried a versioning operation on an unversioned resource"
-msgstr "尝试对未纳入版本控制的资源进行版本控制操作"
+#: libsvn_ra_dav/session.c:662
+msgid "SSL is not supported"
+msgstr "不支持 SSL"
 
-#: include/svn_error_codes.h:930
-msgid "Test failed"
-msgstr "测试失败"
+#: libsvn_ra_dav/session.c:803
+#, c-format
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr "无效的配置:无法载入凭证文件“%s”"
 
-#: include/svn_error_codes.h:934
-msgid "Trying to use an unsupported feature"
-msgstr "尝试要使用不支持的功能"
+#: libsvn_ra_dav/session.c:910
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr "无法在本资源或任何其父项目中找到 UUID 属性"
 
-#: include/svn_error_codes.h:938
-msgid "Unexpected or unknown property kind"
-msgstr "意想不到或未知的属性种类"
+#: libsvn_ra_dav/session.c:918
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "请将服务器升级至 0.19 或更新的版本"
 
-#: include/svn_error_codes.h:942
-msgid "Illegal target for the requested operation"
-msgstr "对请求的操作来说是不合法的目标"
+#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
+#, fuzzy
+msgid "Failed to parse URI"
+msgstr "分析地址(URI)失败"
 
-#: include/svn_error_codes.h:946
-msgid "MD5 checksum is missing"
-msgstr "没有 MD5 指纹检查值"
+#: libsvn_ra_dav/session.c:1183
+#, fuzzy
+msgid "Lock request failed"
+msgstr "锁请求失败"
 
-#: include/svn_error_codes.h:950
-msgid "Directory needs to be empty but is not"
-msgstr "目录必须为空的,但是结果并非如此"
+#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
+#, fuzzy, c-format
+msgid "'%s' is not locked in the repository"
+msgstr "”%s“没有在档案库中被锁定"
 
-#: include/svn_error_codes.h:954
-msgid "Error calling external program"
-msgstr "呼叫外部程序时发生错误"
+#: libsvn_ra_dav/session.c:1349
+#, fuzzy
+msgid "Unlock request failed"
+msgstr "解除锁请求失败"
 
-#: include/svn_error_codes.h:958
-msgid "Python exception has been set with the error"
-msgstr "Python 异常已被设定为错误"
+#: libsvn_ra_dav/session.c:1560
+#, fuzzy
+msgid "Failed to fetch lock information"
+msgstr "获取锁信息失败"
 
-#: include/svn_error_codes.h:962
-msgid "A checksum mismatch occurred"
-msgstr "总和检查值不符"
+#: libsvn_ra_dav/session.c:1633
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_dav"
+msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
 
-#: include/svn_error_codes.h:966
-msgid "The operation was interrupted"
-msgstr "操作被中断"
+#: libsvn_ra_dav/util.c:275
+msgid "authorization failed"
+msgstr "授权失败"
 
-#: include/svn_error_codes.h:970
-msgid "The specified diff option is not supported"
-msgstr "指定的 diff 选项不支持"
+#: libsvn_ra_dav/util.c:279
+msgid "could not connect to server"
+msgstr "无法连接到服务器"
 
-#: include/svn_error_codes.h:974
-msgid "Property not found"
-msgstr "找不到属性"
+#: libsvn_ra_dav/util.c:283
+msgid "timed out waiting for server"
+msgstr "等待服务器超时"
 
-#: include/svn_error_codes.h:978
-msgid "No auth file path available"
-msgstr "未提供 auth 文件路径"
+#: libsvn_ra_dav/util.c:489
+#, c-format
+msgid "Can't calculate the request body size"
+msgstr "无法算出请求的主体大小"
 
-#: include/svn_error_codes.h:983
-msgid "Incompatible library version"
-msgstr "不相容的程序库版本"
+#: libsvn_ra_dav/util.c:726
+#, c-format
+msgid "Error spooling the %s request response to disk"
+msgstr "请求 %s 的响应脱机保存到磁盘时出现错误"
 
-#: include/svn_error_codes.h:989
-msgid "Client error in parsing arguments"
-msgstr "客户端于剖析参数时发生错误"
+#: libsvn_ra_dav/util.c:774
+#, c-format
+msgid "'%s' path not found"
+msgstr "找不到路径“%s”"
 
-#: include/svn_error_codes.h:993
-msgid "Not enough args provided"
-msgstr "未提供足够的参数"
+#. We either have a neon error, or some other error
+#. that we didn't expect.
+#: libsvn_ra_dav/util.c:779 libsvn_ra_dav/util.c:1014
+#, c-format
+msgid "%s of '%s'"
+msgstr "%s 的结果 “%s”"
 
-#: include/svn_error_codes.h:997
-msgid "Mutually exclusive arguments specified"
-msgstr "指定了互斥的参数"
+#: libsvn_ra_dav/util.c:797
+#, c-format
+msgid "Error reading spooled %s request response"
+msgstr "读取请求 %s 回应的脱机数据时出现错误"
 
-#: include/svn_error_codes.h:1001
-msgid "Attempted command in administrative dir"
-msgstr "尝试于管理目录中执行命令"
+#: libsvn_ra_dav/util.c:808
+#, c-format
+msgid "The %s request returned invalid XML in the response: %s (%s)"
+msgstr "%s 请求的回应返回无效的 XML:%s (%s)"
 
-#: include/svn_error_codes.h:1005
-msgid "The log message file is under version control"
-msgstr "日志信息文件于版本控制之下"
+#: libsvn_ra_dav/util.c:828
+#, c-format
+msgid "%s request failed on '%s'"
+msgstr "%s 请求“%s”失败"
 
-#: include/svn_error_codes.h:1009
-msgid "The log message is a pathname"
-msgstr "日志信息是路径名"
+#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:587
+#: libsvn_wc/update_editor.c:2464
+#, c-format
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"“%s”\n"
+"与\n"
+"“%s”\n"
+"并不在同一个档案库中"
 
-#: include/svn_error_codes.h:1013
-msgid "Committing in directory scheduled for addition"
-msgstr "于预计新增的目录中进行提交"
+# as-is
+#. ----------------------------------------------------------------
+#. * The RA vtable routines *
+#: libsvn_ra_local/ra_plugin.c:245
+msgid "Module for accessing a repository on local disk."
+msgstr "访问本地磁盘的档案库模块。"
 
-#: include/svn_error_codes.h:1017
-msgid "No external editor available"
-msgstr "无法使用外部编辑器"
+#: libsvn_ra_local/ra_plugin.c:285
+msgid "Unable to open an ra_local session to URL"
+msgstr "无法打开地址(URL)的 ra_local 会话"
 
-#: include/svn_error_codes.h:1021
-msgid "Something is wrong with the log message's contents"
-msgstr "日志信息的内容有不妥的地方"
+# as-is
+#: libsvn_ra_local/ra_plugin.c:1340
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
 
-#: include/svn_error_codes.h:1025
-msgid "A log message was given where none was necessary"
-msgstr "在没有需要的地方给出一个日志信息"
+#: libsvn_ra_local/split_url.c:44
+#, c-format
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
 
-#: libsvn_client/add.c:371
+#: libsvn_ra_local/split_url.c:55
 #, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "进行“%s”的递归新增时发生错误"
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr "本地地址(URL)“%s”仅含主机名称,没有路径"
 
-#: libsvn_client/add.c:382
+#: libsvn_ra_local/split_url.c:117
 #, c-format
-msgid "Can't close directory '%s'"
-msgstr "无法关闭目录“%s”"
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr "本地地址(URL)“%s”包含未支持的主机名称"
 
-#: libsvn_client/blame.c:382 libsvn_client/blame.c:774
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
 #, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "无法为二进制文件“%s”计算谴责信息"
+msgid "Unable to open repository '%s'"
+msgstr "无法打开档案库“%s”"
 
-#: libsvn_client/blame.c:543
-msgid "Start revision must precede end revision"
-msgstr "起始修订版必须大于结束修订版"
+#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
+#: libsvn_repos/commit.c:393
+#, fuzzy, c-format
+msgid "Path '%s' not present"
+msgstr "路径“%s”不存在"
 
-#: libsvn_client/blame.c:659 libsvn_client/cat.c:205
+#: libsvn_ra_serf/commit.c:910
 #, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "地址(URL)“%s”指向一个目录"
+msgid "Failed writing updated file"
+msgstr ""
 
-#: libsvn_client/blame.c:732
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
+#: libsvn_ra_serf/getlocations.c:289
+#, fuzzy
+msgid "File doesn't exist on HEAD"
+msgstr "路径“%s”不存在于最新修订版中"
 
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#: libsvn_ra_serf/locks.c:354
 #, fuzzy, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "“%s”尚未纳入版本控制或不存在"
+msgid "Lock request failed: %d %s"
+msgstr "锁请求失败"
 
-#: libsvn_client/cat.c:79
+#: libsvn_ra_serf/locks.c:703
 #, fuzzy, c-format
-msgid "'%s' refers to a directory"
-msgstr "“%s”引用一个目录"
+msgid "Unlock request failed: %d %s"
+msgstr "解除锁请求失败"
 
-# as-is
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
-msgid "(local)"
-msgstr "(本地)"
+#: libsvn_ra_serf/replay.c:204
+#, fuzzy
+msgid "Missing revision attr in delete-entry element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-# as-is
-#: libsvn_client/cat.c:245
-#, c-format
-msgid "Can't seek in '%s'"
-msgstr "不能在“%s”定位"
+#: libsvn_ra_serf/replay.c:230
+#, fuzzy
+msgid "Missing revision attr in open-directory element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/checkout.c:88
-#, c-format
-msgid "URL '%s' doesn't exist"
-msgstr "地址(URL)“%s”不存在"
+#: libsvn_ra_serf/replay.c:250
+#, fuzzy
+msgid "Missing name attr in add-directory element"
+msgstr "未提供属性名称与档案库路径参数"
 
-#: libsvn_client/checkout.c:92
-#, c-format
-msgid "URL '%s' refers to a file, not a directory"
-msgstr "地址(URL)“%s”指向一个文件,而非目录"
+#: libsvn_ra_serf/replay.c:285
+#, fuzzy
+msgid "Missing name attr in open-file element"
+msgstr "未提供属性名称参数"
 
-#: libsvn_client/checkout.c:152
-#, c-format
-msgid "'%s' is already a working copy for a different URL"
-msgstr "“%s”已是不同地址(URL)的工作拷贝"
+#: libsvn_ra_serf/replay.c:291
+#, fuzzy
+msgid "Missing revision attr in open-file element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/checkout.c:156
+#: libsvn_ra_serf/replay.c:311
 #, fuzzy
-msgid "; run 'svn update' to complete it"
-msgstr ";请执行“svn update”以完成目前的操作。"
+msgid "Missing name attr in add-file element"
+msgstr "未提供属性名称参数"
 
-#: libsvn_client/checkout.c:166
-#, fuzzy, c-format
-msgid "'%s' already exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+# as-is
+#: libsvn_ra_serf/serf.c:52
+#, fuzzy
+msgid "Access repository via WebDAV protocol through serf."
+msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
 
-#: libsvn_client/commit.c:209
+#: libsvn_ra_serf/serf.c:155
 #, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "类型“%s”未知或不可版本控制"
+msgid "Could not lookup hostname: %s://%s"
+msgstr ""
 
-#: libsvn_client/commit.c:522
-msgid "New entry name required when importing a file"
-msgstr "导入文件时,需要一个新的项目名称"
+#: libsvn_ra_serf/serf.c:741
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
 
-#: libsvn_client/commit.c:556 libsvn_wc/props.c:1197 libsvn_wc/questions.c:62
+#: libsvn_ra_serf/update.c:2114
 #, c-format
-msgid "'%s' does not exist"
-msgstr "“%s”不存在"
+msgid "Error retrieving REPORT (%d)"
+msgstr ""
 
-#: libsvn_client/commit.c:616 libsvn_client/copy.c:81 svnlook/main.c:1263
-#, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径“%s”不存在"
+#: libsvn_ra_serf/util.c:743
+msgid "Premature EOF seen from server"
+msgstr ""
 
-#: libsvn_client/commit.c:746 libsvn_client/copy.c:398
-#: libsvn_client/copy.c:414
+#: libsvn_ra_svn/client.c:115
 #, c-format
-msgid "Path '%s' already exists"
-msgstr "路径“%s”已存在"
+msgid "Unknown hostname '%s'"
+msgstr "未知的主机名称“%s”"
 
-#: libsvn_client/commit.c:756
+#: libsvn_ra_svn/client.c:127
 #, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%s”是一个保留的名称,无法被导入"
-
-#: libsvn_client/commit.c:869 libsvn_client/copy.c:544
-msgid "Commit failed (details follow):"
-msgstr "提交失败(细节见下):"
-
-#: libsvn_client/commit.c:877 libsvn_client/copy.c:552
-msgid "Commit succeeded, but other errors follow:"
-msgstr "提交成功,但是发生了其它的错误,如后:"
-
-#: libsvn_client/commit.c:884 libsvn_client/copy.c:559
-msgid "Error unlocking locked dirs (details follow):"
-msgstr "解除锁定目录时发生错误(细节见下):"
-
-#: libsvn_client/commit.c:895
-msgid "Error bumping revisions post-commit (details follow):"
-msgstr "post-commit 增加修订版时发生错误 (细节见下):"
-
-#: libsvn_client/commit.c:906 libsvn_client/copy.c:570
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "post-commit 清除时发生错误 (细节见下):"
+msgid "Can't create socket"
+msgstr "无法建立 socket"
 
-#: libsvn_client/commit.c:1220
+#: libsvn_ra_svn/client.c:131
 #, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "“%s”是一个地址(URL),但是地址(URL)不可为作提交的目标"
+msgid "Can't connect to host '%s'"
+msgstr "无法连线至主机“%s”"
 
-#: libsvn_client/commit.c:1412
-msgid "Are all the targets part of the same working copy?"
-msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+# as-is
+#: libsvn_ra_svn/client.c:152
+msgid "Proplist element not a list"
+msgstr "属性列表元素不是一个列表"
 
-#: libsvn_client/commit.c:1427
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr "无法以非递归提交目录删除"
+# as-is
+#: libsvn_ra_svn/client.c:176
+msgid "Prop diffs element not a list"
+msgstr "Prop diffs 元素不是一个列表"
 
-#: libsvn_client/commit_util.c:243 libsvn_client/commit_util.c:254
+#: libsvn_ra_svn/client.c:214
 #, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "未知的项目类型“%s”"
+msgid "Unrecognized node kind '%s' from server"
+msgstr "无法辨识来自服务器的节点种类“%s”"
 
-#: libsvn_client/commit_util.c:271
+#: libsvn_ra_svn/client.c:365
 #, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "项目“%s”意想不到地变换特殊状态"
+msgid "Undefined tunnel scheme '%s'"
+msgstr "无法辨识的隧道规则“%s”"
 
-#: libsvn_client/commit_util.c:322
+#: libsvn_ra_svn/client.c:382
 #, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "中止提交:“%s”仍处于冲突状态"
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr "隧道规则 %s 需要设定环境变数 %s"
 
-#: libsvn_client/commit_util.c:388
+# as-is
+#: libsvn_ra_svn/client.c:393
 #, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "并未预期“%s”是工作拷贝的根目录"
+msgid "Can't tokenize command '%s'"
+msgstr "不能 tokenize 命令“%s”"
 
-#: libsvn_client/commit_util.c:406
+#: libsvn_ra_svn/client.c:424
 #, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
+msgid "Error in child process: %s"
+msgstr "子程序错误:%s"
 
-#: libsvn_client/commit_util.c:678 libsvn_client/commit_util.c:808
-#: libsvn_client/copy.c:1073 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1390 libsvn_client/diff.c:1988
-#: libsvn_client/diff.c:2510 libsvn_client/diff.c:2619
-#: libsvn_client/locking_commands.c:248 libsvn_client/locking_commands.c:272
-#: libsvn_client/log.c:129 libsvn_client/prop_commands.c:213
-#: libsvn_client/prop_commands.c:446 libsvn_client/prop_commands.c:602
-#: libsvn_client/prop_commands.c:951 libsvn_client/ra.c:180
-#: libsvn_client/revisions.c:89 libsvn_client/status.c:256
-#: libsvn_client/switch.c:104 libsvn_wc/adm_ops.c:2261
-#: libsvn_wc/adm_ops.c:2287 libsvn_wc/adm_ops.c:2324 libsvn_wc/copy.c:448
-#: libsvn_wc/entries.c:1498 libsvn_wc/entries.c:1990 libsvn_wc/props.c:286
-#: libsvn_wc/props.c:1124 libsvn_wc/questions.c:171
+#: libsvn_ra_svn/client.c:448
 #, c-format
-msgid "'%s' is not under version control"
-msgstr "“%s”尚未纳入版本控制"
+msgid "Can't create tunnel"
+msgstr "无法建立 tunnel"
 
-#: libsvn_client/commit_util.c:681
+#: libsvn_ra_svn/client.c:486
 #, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "“%s”的项目没有地址(URL)"
+msgid "Illegal svn repository URL '%s'"
+msgstr "不合法的 svn 档案库地址(URL)“%s”"
 
-#: libsvn_client/commit_util.c:714
+#: libsvn_ra_svn/client.c:525
 #, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "“%s”于未纳入版本控制的父路径中被加入新增调度"
+msgid "Server requires minimum version %d"
+msgstr "服务器最低要求的版号为 %d"
 
-#: libsvn_client/commit_util.c:734
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"“%s”项目被标记为“已复制”,但是本身尚未加入新增调度。也许您提交的\n"
-"目标是位于未纳入版本控制 (或尚未纳入) 的目录中?"
+#: libsvn_ra_svn/client.c:580
+msgid "Impossibly long repository root from server"
+msgstr "服务器回传的档案库根路径长得太夸张"
 
-#: libsvn_client/commit_util.c:774
-#, c-format
-msgid ""
-"'%s' is not under version control and is not part of the commit, yet its "
-"child '%s' is part of the commit"
-msgstr ""
-"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
+# as-is
+#: libsvn_ra_svn/client.c:591
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr "使用svn网络协议访问档案库的模块。"
 
-#: libsvn_client/commit_util.c:857
-#, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr "无法提交“%s”与“%s”,因为它们都指向同一个地址(URL)"
+#: libsvn_ra_svn/client.c:739
+msgid "Server did not send repository root"
+msgstr "服务器没有返回档案库根路径"
 
-#: libsvn_client/commit_util.c:1002
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "提交项目“%s”有复制标志,但是没有复制地址地址(copyfrom URL)"
+#: libsvn_ra_svn/client.c:880
+msgid "Non-string as part of file contents"
+msgstr "文件内容的一部份不是字串"
 
-#: libsvn_client/commit_util.c:1007
-#, c-format
-msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "提交项目“%s”有复制标志,但是修订版无效"
+# as-is
+#: libsvn_ra_svn/client.c:979
+msgid "Dirlist element not a list"
+msgstr "目录列表元素不是一个列表"
 
-#: libsvn_client/copy.c:101 libsvn_client/copy.c:646 libsvn_client/copy.c:832
-#: libsvn_ra_dav/commit.c:1172
-#, c-format
-msgid "File '%s' already exists"
-msgstr "文件“%s”已存在"
+# as-is
+#: libsvn_ra_svn/client.c:1136
+msgid "Log entry not a list"
+msgstr "日志条目不是一个列表"
 
-#: libsvn_client/copy.c:144
-msgid "Move will not be attempted unless forced"
-msgstr "除非强行操作,否则不会执行移动操作"
+# as-is
+#: libsvn_ra_svn/client.c:1149
+msgid "Changed-path entry not a list"
+msgstr "已修改路径条目不是一个列表"
 
-#: libsvn_client/copy.c:328
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "无法移动地址(URL)“%s”至本身"
+# as-is
+#: libsvn_ra_svn/client.c:1225
+#, fuzzy
+msgid "'stat' not implemented"
+msgstr "get-locations 未实现"
 
-#: libsvn_client/copy.c:359
-#, c-format
-msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
-msgstr "来源与目的似乎不在同一个档案库中 (来源:“%s”;目的:“%s”)"
+# as-is
+#: libsvn_ra_svn/client.c:1282
+#, fuzzy
+msgid "'get-locations' not implemented"
+msgstr "get-locations 未实现"
 
-#: libsvn_client/copy.c:385
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "路径“%s”不存在于修订版 %ld"
+# as-is
+#: libsvn_ra_svn/client.c:1294
+msgid "Location entry not a list"
+msgstr "区域条目不是一个列表"
 
-#: libsvn_client/copy.c:419
-#, c-format
-msgid "Unrecognized node kind of '%s'"
-msgstr "“%s”的节点种类无法辨识"
+# as-is
+#: libsvn_ra_svn/client.c:1344
+#, fuzzy
+msgid "'get-file-revs' not implemented"
+msgstr "get-file-revs 未实现"
 
-#: libsvn_client/copy.c:790
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "路径“%s”于修订版 %ld 中找不到"
+# as-is
+#: libsvn_ra_svn/client.c:1357
+msgid "Revision entry not a list"
+msgstr "修订版条目不是一个列表"
+
+#: libsvn_ra_svn/client.c:1370 libsvn_ra_svn/client.c:1395
+msgid "Text delta chunk not a string"
+msgstr "文字差异区段并非字串"
+
+#: libsvn_ra_svn/client.c:1407
+msgid "The get-file-revs command didn't return any revisions"
+msgstr "get-file-revs 命令没有返回任何修订版"
+
+#: libsvn_ra_svn/client.c:1455
+#, fuzzy
+msgid "Server doesn't support the lock command"
+msgstr "服务器不支持锁命令"
+
+#: libsvn_ra_svn/client.c:1519
+#, fuzzy
+msgid "Server doesn't support the unlock command"
+msgstr "服务器不支持解除锁命令"
+
+# as-is
+#: libsvn_ra_svn/client.c:1616
+#, fuzzy
+msgid "Lock response not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_client/copy.c:795
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "路径“%s”于 HEAD 修订版中找不到"
+#: libsvn_ra_svn/client.c:1630
+#, fuzzy
+msgid "Unknown status for lock command"
+msgstr "未知的 svn 通讯协定命令"
 
-#: libsvn_client/copy.c:841
-#, c-format
-msgid "'%s' is in the way"
-msgstr "“%s”挡在中间"
+#: libsvn_ra_svn/client.c:1652
+msgid "Didn't receive end marker for lock responses"
+msgstr ""
 
-#: libsvn_client/copy.c:858
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "存在“%s”的项目 (不过工作文件已丢失)"
+# as-is
+#: libsvn_ra_svn/client.c:1739
+#, fuzzy
+msgid "Unlock response not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_client/copy.c:949
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "来源地址(URL)“%s”来自其它的档案库;把它当作是脱离的工作拷贝(WC)"
+#: libsvn_ra_svn/client.c:1753
+#, fuzzy
+msgid "Unknown status for unlock command"
+msgstr "命令回应中的未知状态“%s”"
 
-#: libsvn_client/copy.c:1028
-#, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "无法复制路径“%s”至其子目录“%s”中"
+#: libsvn_ra_svn/client.c:1774
+msgid "Didn't receive end marker for unlock responses"
+msgstr ""
 
-#: libsvn_client/copy.c:1039
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "无法移动路径“%s”至其本身"
+#: libsvn_ra_svn/client.c:1798 libsvn_ra_svn/client.c:1826
+#, fuzzy
+msgid "Server doesn't support the get-lock command"
+msgstr "服务器不支持获取锁命令get-lock"
 
-#: libsvn_client/copy.c:1047
-msgid "No support for repos <--> working copy moves"
-msgstr "不支持档案库 <--> 工作拷贝移动"
+# as-is
+#: libsvn_ra_svn/client.c:1839
+#, fuzzy
+msgid "Lock element not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_client/copy.c:1079
-#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "“%s”似乎没有关联的地址(URL)"
+#: libsvn_ra_svn/client.c:1862
+#, fuzzy
+msgid "Server doesn't support the replay command"
+msgstr "服务器不支持锁命令"
 
-#: libsvn_client/delete.c:62
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "“%s”挡了实际纳入版本控制资源的路"
+#: libsvn_ra_svn/client.c:1926
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_svn"
+msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
 
-#: libsvn_client/delete.c:77
-#, c-format
-msgid "'%s' has local modifications"
-msgstr "“%s”已有本地修改"
+#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
+#: libsvn_ra_svn/sasl_auth.c:302 libsvn_ra_svn/sasl_auth.c:357
+#: libsvn_ra_svn/simple_auth.c:61
+msgid "Unexpected server response to authentication"
+msgstr "意想不到的认证时服务器回应"
 
 # as-is
-#: libsvn_client/diff.c:94
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%s 属性改变于:%s%s"
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
+msgid "Invalid file or dir token during edit"
+msgstr "编辑时遇到无效的文件或目录"
 
-# as-is
-#: libsvn_client/diff.c:122
-#, c-format
-msgid "Name: %s%s"
-msgstr "名字:%s%s"
+#: libsvn_ra_svn/editor.c:621
+msgid "Non-string as part of text delta"
+msgstr "文件差异的一部份不是字串"
 
-#: libsvn_client/diff.c:198
-#, fuzzy, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
 msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"s”与“%s”)"
 
-#: libsvn_client/diff.c:204 libsvn_client/diff.c:210
-#, fuzzy, c-format
-msgid "URL has no scheme: '%s'"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"s”"
+# as-is
+#: libsvn_ra_svn/editorp.c:129
+msgid "Successful edit status returned too soon"
+msgstr "成功修改状态返回太快"
 
-#: libsvn_client/diff.c:217
-#, fuzzy, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
+# as-is
+#: libsvn_ra_svn/editorp.c:665
+msgid "Apply-textdelta already active"
+msgstr "Apply-textdelta 已经激活"
 
 # as-is
-#: libsvn_client/diff.c:282
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
+msgid "Apply-textdelta not active"
+msgstr "Apply-textdelta 没有激活"
+
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:842
 #, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(修订版 %ld)"
+msgid "Unknown command '%s'"
+msgstr "未知的命令:“%s”"
 
 # as-is
-#: libsvn_client/diff.c:284
-#, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(工作拷贝)"
+#: libsvn_ra_svn/marshal.c:78
+msgid "Capability entry is not a word"
+msgstr "容量条目不是一个 word"
 
-#: libsvn_client/diff.c:428
+#: libsvn_ra_svn/marshal.c:166
 #, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "无法显示:文件标记为二进制类型。%s"
+msgid "Can't write to connection"
+msgstr "无法写入连线"
 
-#: libsvn_client/diff.c:501
+#: libsvn_ra_svn/marshal.c:259
 #, c-format
-msgid "'%s' is not supported"
-msgstr "“%s”不支持"
+msgid "Can't read from connection"
+msgstr "无法读取连线"
 
-# as-is
-#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
-#. strings are used to tag onto a filename in case of a merge conflict
-#: libsvn_client/diff.c:771
-msgid ".working"
-msgstr ".working"
+#: libsvn_ra_svn/marshal.c:262
+msgid "Connection closed unexpectedly"
+msgstr "网络连线意想不到地关闭"
 
-# as-is
-#: libsvn_client/diff.c:773
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
+#: libsvn_ra_svn/marshal.c:506
+msgid "String length larger than maximum"
+msgstr "字串长度超出上限"
 
-# as-is
-#: libsvn_client/diff.c:776
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
+#: libsvn_ra_svn/marshal.c:543
+msgid "Too many nested items"
+msgstr "太多嵌套的项目"
 
-#: libsvn_client/diff.c:1446 libsvn_client/diff.c:2088
-#: libsvn_client/diff.c:2168
-msgid "Not all required revisions are specified"
-msgstr "并未提供全部所需的修订版"
+#: libsvn_ra_svn/marshal.c:562
+msgid "Number is larger than maximum"
+msgstr "数字大小超过上限"
 
-#: libsvn_client/diff.c:1717
-#, fuzzy
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
+#: libsvn_ra_svn/marshal.c:765
+msgid "Empty error list"
+msgstr "空的错误列表"
 
-#: libsvn_client/diff.c:1756
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr "目前只支持路径的文件参考基础与其工作文件之间的文件差异"
+#: libsvn_ra_svn/marshal.c:774
+msgid "Malformed error list"
+msgstr "畸形的错误列表"
 
-#: libsvn_client/diff.c:1871 libsvn_client/diff.c:1876
+#: libsvn_ra_svn/marshal.c:813
 #, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
+msgid "Unknown status '%s' in command response"
+msgstr "命令回应中的未知状态“%s”"
 
-#: libsvn_client/diff.c:1992 libsvn_client/switch.c:108
+#: libsvn_ra_svn/sasl_auth.c:155
+msgid "Could not initialize the SASL library"
+msgstr ""
+
+#: libsvn_ra_svn/sasl_auth.c:215 libsvn_ra_svn/simple_auth.c:58
+#: libsvn_ra_svn/simple_auth.c:110
 #, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录“%s”没有地址(URL)"
+msgid "Authentication error from server: %s"
+msgstr "来自服务器的认证错误:%s"
 
-#: libsvn_client/diff.c:2179
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于 peg 差异,必须至少有一个非本地端的修订版"
+#: libsvn_ra_svn/sasl_auth.c:232
+msgid "Unhandled SASL interaction"
+msgstr ""
 
-#: libsvn_client/diff.c:2483 libsvn_client/diff.c:2489
-#: libsvn_client/diff.c:2604 libsvn_client/locking_commands.c:252
-#: libsvn_client/locking_commands.c:276 libsvn_client/ra.c:368
-#: libsvn_client/ra.c:729 libsvn_client/ra.c:865
+#: libsvn_ra_svn/simple_auth.c:97 libsvn_subr/prompt.c:156
 #, c-format
-msgid "'%s' has no URL"
-msgstr "“%s”没有地址(URL)"
+msgid "Can't get password"
+msgstr "无法取得密码"
 
-#: libsvn_client/export.c:87
-#, c-format
-msgid "'%s' is not a valid EOL value"
-msgstr "“%s”不是一个有效的 EOL 值"
+#: libsvn_ra_svn/simple_auth.c:117
+msgid "Cannot negotiate authentication mechanism"
+msgstr "无法协商出认识机制"
 
-#: libsvn_client/export.c:271
-msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
+#: libsvn_repos/commit.c:128
+#, c-format
+msgid "Out of date: '%s' in transaction '%s'"
+msgstr "过期:”%s“在事务”%s“"
 
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
 #, c-format
-msgid "'%s' exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+msgid "Got source path but no source revision for '%s'"
+msgstr "获得源路径,但”%s“没有源修订版"
 
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
 #, c-format
-msgid "'%s' already exists"
-msgstr "“%s”已存在"
+msgid "Source url '%s' is from different repository"
+msgstr "来源地址(URL)“%s”来自其它的档案库"
 
-#: libsvn_client/export.c:686 libsvn_wc/update_editor.c:1634
-#: libsvn_wc/update_editor.c:2407
+#: libsvn_repos/commit.c:609
 #, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
+msgid ""
+"Checksum mismatch for resulting fulltext\n"
+"(%s):\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%s”的总和检查值不符合:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: libsvn_client/info.c:234
-#, fuzzy, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "不能读“%s”的条目"
+#: libsvn_repos/delta.c:180
+msgid "Unable to open root of edit"
+msgstr "无法打开编辑"
 
-#: libsvn_client/info.c:321 libsvn_client/info.c:346 libsvn_client/info.c:356
-#, fuzzy, c-format
-msgid "URL '%s' non-existent in revision '%ld'"
-msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
+#: libsvn_repos/delta.c:231
+msgid "Invalid target path"
+msgstr "无效的目标路径"
 
-#: libsvn_client/locking_commands.c:198
-msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "没有找到公共父节点,不能在分离的参数上操作"
+#: libsvn_repos/delta.c:257
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr "无效的编辑器定位;至少一个输入路径不是目录并且没有源入口"
 
-#: libsvn_client/locking_commands.c:300
-msgid "Unable to lock/unlock across multiple repositories"
-msgstr "不能跨越多个档案库进行 锁定/解锁"
+# as-is
+#: libsvn_repos/dump.c:416
+#, c-format
+msgid ""
+"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
+"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
+"WARNING: will fail.\n"
+msgstr ""
+"警告:修订版 %ld 的参考数据比最旧的转存数据修订版 (%ld)还旧。\n"
+"警告: 装载这个转存到空的档案库会失败。\n"
+"\n"
+
+#: libsvn_repos/dump.c:933
+#, c-format
+msgid "Start revision %ld is greater than end revision %ld"
+msgstr "起始修订版 %ld 比结束修订版号 %ld 为大"
+
+#: libsvn_repos/dump.c:938
+#, c-format
+msgid "End revision %ld is invalid (youngest revision is %ld)"
+msgstr "结束修订版 %ld 无效 (最新的修订版为 %ld)"
 
-#: libsvn_client/locking_commands.c:341
+# as-is
+#: libsvn_repos/dump.c:1045
 #, fuzzy, c-format
-msgid "'%s' is not locked in this working copy"
-msgstr "“%s”没有在工作拷贝中锁定"
+msgid "* Dumped revision %ld.\n"
+msgstr "* 导出修订版 %ld。\n"
 
-#: libsvn_client/locking_commands.c:389
+# as-is
+#: libsvn_repos/dump.c:1046
 #, fuzzy, c-format
-msgid "'%s' is not locked"
-msgstr "“%s”没有被锁定"
+msgid "* Verified revision %ld.\n"
+msgstr "* 校验修订版 %ld。\n"
 
-#: libsvn_client/locking_commands.c:425 libsvn_fs/fs-loader.c:896
-#: libsvn_ra/ra_loader.c:512
-msgid "Lock comment has illegal characters"
-msgstr "锁定注释存在非法字符"
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1211
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr "提交成功,但是发送提交外挂(post-commit)失败"
 
-#: libsvn_client/log.c:72
-msgid "Missing required revision specification"
-msgstr "未提供请求的修订版规格"
+#: libsvn_repos/fs-wrap.c:157
+#, c-format
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
+
+#: libsvn_repos/fs-wrap.c:296
+#, fuzzy, c-format
+msgid "Write denied: not authorized to read all of revision %ld"
+msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
 
-#: libsvn_client/log.c:135 libsvn_client/status.c:261
-#: libsvn_client/update.c:86
+#: libsvn_repos/fs-wrap.c:484
 #, c-format
-msgid "Entry '%s' has no URL"
-msgstr "项目“%s”没有地址(URL)"
+msgid "Cannot unlock path '%s', no authenticated username available"
+msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
 
-#: libsvn_client/log.c:321
+#: libsvn_repos/fs-wrap.c:498
 #, fuzzy
-msgid "No commits in repository"
-msgstr "档案库中没有任何提交"
-
-#: libsvn_client/ls.c:140 libsvn_client/ls.c:148
-#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "地址(URL)“%s”并不存在于该修订版中"
+msgid "Unlock succeeded, but post-unlock hook failed"
+msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
 
-#: libsvn_client/prop_commands.c:104
+#: libsvn_repos/hooks.c:71
 #, c-format
-msgid "'%s' is a wcprop, thus not accessible to clients"
-msgstr "“%s”是一个工作拷贝属性(wcprop),应此不能被客户端存取"
+msgid "Can't create pipe for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
 
-#: libsvn_client/prop_commands.c:183
-#, c-format
-msgid "Revision property '%s' not allowed in this context"
-msgstr "修订版属性“%s”在此上下文中并不允许"
+#: libsvn_repos/hooks.c:83
+#, fuzzy, c-format
+msgid "Can't make pipe read handle non-inherited for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
 
-#: libsvn_client/prop_commands.c:199
+#: libsvn_repos/hooks.c:89
 #, fuzzy, c-format
-msgid "Setting property on non-local target '%s' is not supported"
-msgstr "设定非本地目标“%s”的属性尚不支持"
+msgid "Can't make pipe write handle non-inherited for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
 
-#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
+#: libsvn_repos/hooks.c:98
 #, c-format
-msgid "Bad property name: '%s'"
-msgstr "有问题的属性名称:“%s”"
-
-#: libsvn_client/prop_commands.c:276
-msgid "Value will not be set unless forced"
-msgstr "除非强迫为之,否则其值不会被设定"
+msgid "Can't create null stdout for hook '%s'"
+msgstr "无法为外挂“%s”创建空的标准输出"
 
-#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:758
+#: libsvn_repos/hooks.c:110
 #, c-format
-msgid "Unknown node kind for '%s'"
-msgstr "“%s”为未知的节点类型"
+msgid "Error closing write end of stderr pipe"
+msgstr "关闭标准错误管道末尾发生错误"
 
-#: libsvn_client/ra.c:131
-#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr "试图在非提交操作中,设定工作拷贝属性“%s”于“%s”"
+#: libsvn_repos/hooks.c:115
+#, fuzzy, c-format
+msgid "Failed to start '%s' hook"
+msgstr "运行外挂“%s”失败"
 
-#: libsvn_client/ra.c:345
+#: libsvn_repos/hooks.c:137
 #, c-format
-msgid "Can't find entry for '%s'"
-msgstr "无法找到“%s”的项目"
+msgid ""
+"'%s' hook failed with error output:\n"
+"%s"
+msgstr ""
+"外挂“%s”失败,错误输出:\n"
+"%s"
 
-#: libsvn_client/ra.c:489
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未提供“%s”于修订版 %ld 的 changed-path 信息"
+#: libsvn_repos/hooks.c:144
+#, fuzzy, c-format
+msgid "'%s' hook failed; no error output available"
+msgstr "外挂“%s”失败;没有可用的错误输出"
 
-#: libsvn_client/ra.c:609
+#: libsvn_repos/hooks.c:163
 #, c-format
-msgid "path '%s' doesn't exist in revision %ld"
-msgstr "路径“%s”不存在于修订版 %ld 中"
+msgid "Error closing read end of stderr pipe"
+msgstr "关闭读标准错误管道末尾发生错误"
 
-#: libsvn_client/ra.c:656 libsvn_client/ra.c:813
+#: libsvn_repos/hooks.c:167
 #, c-format
-msgid "Unable to find repository location for '%s' in revision %ld"
-msgstr "无法找到“%s”的档案库位置于修订版 %ld"
+msgid "Error closing null file"
+msgstr "关闭空文件发生错误"
 
-#: libsvn_client/ra.c:667
+#: libsvn_repos/hooks.c:464
 #, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "“%s”于修订版 %ld 是一个无关的物件"
+msgid "Failed to run '%s' hook; broken symlink"
+msgstr "运行外挂“%s”失败;无效的符号连接"
 
-#: libsvn_client/ra.c:818
-#, c-format
+#: libsvn_repos/hooks.c:605
 msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
+"Repository has not been enabled to accept revision propchanges;\n"
+"ask the administrator to create a pre-revprop-change hook"
 msgstr ""
-"“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
+"档案库未激活接受修订版属性改变;请管理员创建一个 pre-revprop-change 外挂"
 
-#: libsvn_client/relocate.c:53
-#, c-format
-msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
+#: libsvn_repos/load.c:117
+msgid "Premature end of content data in dumpstream"
+msgstr "导出流中内容数据过早结束"
 
-#: libsvn_client/revisions.c:105
-#, c-format
-msgid "Unrecognized revision type requested for '%s'"
-msgstr "无法辨识请求的“%s”的修订版类别"
+#: libsvn_repos/load.c:124
+msgid "Dumpstream data appears to be malformed"
+msgstr "导出流数据中出现畸形"
 
-#: libsvn_delta/svndiff.c:350
+#: libsvn_repos/load.c:173
 #, c-format
-msgid "Invalid diff stream: insn %d cannot be decoded"
-msgstr "无效的差异流:insn %d 不能解码"
+msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
+msgstr ""
 
-#: libsvn_delta/svndiff.c:354
+#: libsvn_repos/load.c:186
 #, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
-msgstr "无效的差异流:insn %d 出现非正的长度"
+msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
+msgstr ""
 
-#: libsvn_delta/svndiff.c:358
-#, c-format
-msgid "Invalid diff stream: insn %d overflows the target view"
-msgstr "无效的差异流:insn %d 溢出目标视图"
+#: libsvn_repos/load.c:273
+msgid "Incomplete or unterminated property block"
+msgstr "不完整或未结束的属性块"
 
-#: libsvn_delta/svndiff.c:367
-#, c-format
-msgid "Invalid diff stream: [src] insn %d overflows the source view"
-msgstr "无效的诧异流:[src] insn %d 溢出源视图"
+#: libsvn_repos/load.c:411
+msgid "Unexpected EOF writing contents"
+msgstr "写内容时有意料之外的结束符"
 
-#: libsvn_delta/svndiff.c:374
-#, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr "无效的差异流:[tgt] insn %d 起点超过目标视图位置"
+#: libsvn_repos/load.c:440
+msgid "Malformed dumpfile header"
+msgstr "畸形的导出文件头"
 
-#: libsvn_delta/svndiff.c:381
+#: libsvn_repos/load.c:446 libsvn_repos/load.c:488
 #, c-format
-msgid "Invalid diff stream: [new] insn %d overflows the new data section"
-msgstr "无效的差异流:[new] insn %d 溢出新数据区域"
-
-#: libsvn_delta/svndiff.c:391
-msgid "Delta does not fill the target window"
-msgstr "Delta 不能填充目标窗口"
+msgid "Unsupported dumpfile version: %d"
+msgstr "不支持的导出文件版本:%d"
 
-#: libsvn_delta/svndiff.c:394
-msgid "Delta does not contain enough new data"
-msgstr "Delta不能包含足够的新数据"
+#: libsvn_repos/load.c:591
+msgid "Unrecognized record type in stream"
+msgstr "流中有无法辨识的记录类型"
 
-#: libsvn_delta/svndiff.c:471
-msgid "Svndiff has invalid header"
-msgstr "Svndiff 数据包含了无效的数据头"
+#: libsvn_repos/load.c:703
+msgid "Sum of subblock sizes larger than total block content length"
+msgstr "子块大小总数大于块内容长度总数"
 
 # as-is
-#: libsvn_delta/svndiff.c:526 libsvn_delta/svndiff.c:681
-msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff 数据包含无效窗口"
+#: libsvn_repos/load.c:884
+#, c-format
+msgid "<<< Started new transaction, based on original revision %ld\n"
+msgstr "<<< 开始新的事务,基于最初的修订版 %ld\n"
 
-# as-is
-#: libsvn_delta/svndiff.c:535
-msgid "Svndiff has backwards-sliding source views"
-msgstr "Svndiff 数据包含向后变化的资源视图"
+#: libsvn_repos/load.c:929
+#, c-format
+msgid "Relative source revision %ld is not available in current repository"
+msgstr "相对来源修订版 %ld 不存在于目前档案库之中"
 
-#: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630
-#: libsvn_delta/svndiff.c:703
-msgid "Unexpected end of svndiff input"
-msgstr "找到一个意料之外的节点种类"
+#: libsvn_repos/load.c:978
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr "畸形的导出流:修订版 0 不能包含节点记录"
 
-#: libsvn_diff/diff_file.c:666
+#: libsvn_repos/load.c:988
 #, c-format
-msgid "%s\\ No newline at end of file%s"
-msgstr "%s\\ 在文件 %s 末尾没有新行"
+msgid " * editing path : %s ..."
+msgstr " * 正在修改路径:%s ..."
 
-#: libsvn_diff/diff_file.c:1225
+#: libsvn_repos/load.c:995
 #, c-format
-msgid "Failed to delete mmap '%s'"
-msgstr "删除mmap ”%s“失败"
+msgid " * deleting path : %s ..."
+msgstr " * 正在删除路径:%s ..."
 
-#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:157
-#: libsvn_ra/ra_loader.c:170
+#: libsvn_repos/load.c:1003
 #, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "“%s”未定义 '%s()'"
-
-#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
-msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%s”模块失败"
+msgid " * adding path : %s ..."
+msgstr " * 正在添加路径:%s ..."
 
-#: libsvn_fs/fs-loader.c:138
+#: libsvn_repos/load.c:1012
 #, c-format
-msgid ""
-"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "对“%s”有不符合的 FS 模块版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+msgid " * replacing path : %s ..."
+msgstr " * 正在替换路径:%s ..."
 
-#: libsvn_fs/fs-loader.c:163
+#: libsvn_repos/load.c:1022
 #, c-format
-msgid "Unknown FS type '%s'"
-msgstr "未知的文件系统(FS)类别“%s”"
-
-#: libsvn_fs/fs-loader.c:244
-#, fuzzy
-msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统(FS)互斥体"
+msgid "Unrecognized node-action on node '%s'"
+msgstr "“%s”的节点种动作法辨识"
 
-#: libsvn_fs/fs-loader.c:280
+#: libsvn_repos/load.c:1158
 #, fuzzy
-msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统(FS)互斥体"
-
-#: libsvn_fs/fs-loader.c:286
-msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统(FS)互斥体"
-
-#: libsvn_fs/fs-loader.c:902
-msgid "Negative expiration date passed to svn_fs_lock"
-msgstr "不能接受的有效期传递到 svn_fs_lock"
+msgid " done.\n"
+msgstr "完成。\n"
 
-#: libsvn_fs_base/bdb/bdb-err.c:101
+# as-is
+#: libsvn_repos/load.c:1233
 #, c-format
-msgid "Berkeley DB error for filesystem %s while %s:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
-
-#: libsvn_fs_base/bdb/changes-table.c:88
-msgid "creating change"
-msgstr "正在创建更改"
-
-#: libsvn_fs_base/bdb/changes-table.c:114
-msgid "deleting changes"
-msgstr "正在删除更改"
-
-#: libsvn_fs_base/bdb/changes-table.c:146 libsvn_fs_fs/fs_fs.c:1965
-msgid "Missing required node revision ID"
-msgstr "未提供必须的节点修订版 ID"
-
-#: libsvn_fs_base/bdb/changes-table.c:157 libsvn_fs_fs/fs_fs.c:1975
-msgid "Invalid change ordering: new node revision ID without delete"
-msgstr "无效的改变顺序:有新的节点修订版 ID 而没删除"
-
-#: libsvn_fs_base/bdb/changes-table.c:167 libsvn_fs_fs/fs_fs.c:1986
-msgid "Invalid change ordering: non-add change on deleted path"
-msgstr "无效的改变顺序:对删除路径进行非新增的改变"
-
-#: libsvn_fs_base/bdb/changes-table.c:257
-#: libsvn_fs_base/bdb/changes-table.c:381
-msgid "creating cursor for reading changes"
-msgstr "正在为读取更改创建指针"
-
-#: libsvn_fs_base/bdb/changes-table.c:283
-#: libsvn_fs_base/bdb/changes-table.c:402
-#, fuzzy, c-format
-msgid "Error reading changes for key '%s'"
-msgstr "读关键字“%s”的更改时发生错误"
-
-#: libsvn_fs_base/bdb/changes-table.c:342
-#: libsvn_fs_base/bdb/changes-table.c:425
-msgid "fetching changes"
-msgstr "正在获取更改"
-
-#: libsvn_fs_base/bdb/changes-table.c:355
-#: libsvn_fs_base/bdb/changes-table.c:438
-msgid "closing changes cursor"
-msgstr "正在关闭更改指针"
-
-#: libsvn_fs_base/bdb/copies-table.c:87
-#, fuzzy
-msgid "storing copy record"
-msgstr "正在存储拷贝记录"
-
-#: libsvn_fs_base/bdb/copies-table.c:112
-msgid "allocating new copy ID (getting 'next-key')"
-msgstr "正在分配新拷贝ID (正在获取'next-key')"
-
-#: libsvn_fs_base/bdb/copies-table.c:130
-msgid "bumping next copy key"
-msgstr "正在提取下一个拷贝关键字"
-
-#: libsvn_fs_base/bdb/copies-table.c:169
-msgid "deleting entry from 'copies' table"
-msgstr "正在从 'copies' 表中删除条目"
+msgid ""
+"\n"
+"------- Committed revision %ld >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- 提交后的修订版 %ld >>>\n"
+"\n"
 
 # as-is
-#: libsvn_fs_base/bdb/copies-table.c:197
-#, fuzzy
-msgid "reading copy"
-msgstr "正在读取拷贝"
-
-#: libsvn_fs_base/bdb/nodes-table.c:99
-msgid "allocating new node ID (getting 'next-key')"
-msgstr "正在分配新的节点 ID (正在获取 'next-key')"
-
-#: libsvn_fs_base/bdb/nodes-table.c:117
-msgid "bumping next node ID key"
-msgstr "正在提取下一个节点 ID 关键字"
-
-#: libsvn_fs_base/bdb/nodes-table.c:154
-#, fuzzy, c-format
-msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
-msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
+#: libsvn_repos/load.c:1239
+#, c-format
+msgid ""
+"\n"
+"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- 提交新修订版 %ld (从原始修订版 %ld 装载) >>>\n"
+"\n"
 
-#: libsvn_fs_base/bdb/nodes-table.c:180
-msgid "deleting entry from 'nodes' table"
-msgstr "正在从 'nodes' 表删除条目"
+#: libsvn_repos/node_tree.c:238
+#, c-format
+msgid "'%s' not found in filesystem"
+msgstr "在文件系统中找不到“%s”"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:220
-#, fuzzy
-msgid "reading node revision"
-msgstr "正在读取节点修订版"
+#: libsvn_repos/replay.c:359
+#, c-format
+msgid "Filesystem path '%s' is neither a file nor a directory"
+msgstr "文件系统中路径“%s”既不是文件也不是目录"
 
-#: libsvn_fs_base/bdb/nodes-table.c:252
-#, fuzzy
-msgid "storing node revision"
-msgstr "正在存储节点修订版"
+#: libsvn_repos/reporter.c:602
+#, c-format
+msgid "Working copy path '%s' does not exist in repository"
+msgstr "工作拷贝路径“%s”不存在档案库中"
 
-#: libsvn_fs_base/bdb/reps-table.c:95 libsvn_fs_base/bdb/reps-table.c:202
-#, fuzzy, c-format
-msgid "No such representation '%s'"
-msgstr "没有这样的请求 “%s”"
+#: libsvn_repos/reporter.c:823
+msgid "Not authorized to open root of edit operation"
+msgstr "未授权打开根进行编辑操作"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:98
+#: libsvn_repos/reporter.c:842
 #, fuzzy
-msgid "reading representation"
-msgstr "正在读取请求"
+msgid "Target path does not exist"
+msgstr "路径“%s”不存在"
 
-#: libsvn_fs_base/bdb/reps-table.c:126
-#, fuzzy
-msgid "storing representation"
-msgstr "正在存储请求"
+#: libsvn_repos/reporter.c:849
+msgid "Cannot replace a directory from within"
+msgstr "不能在目录中替换"
 
-#: libsvn_fs_base/bdb/reps-table.c:156
-msgid "allocating new representation (getting next-key)"
-msgstr "正在分配新请求 (正在获取 next-key)"
+#: libsvn_repos/reporter.c:892
+msgid "Invalid report for top level of working copy"
+msgstr "无效的最上层工作拷贝报告"
 
-#: libsvn_fs_base/bdb/reps-table.c:177
-#, fuzzy
-msgid "bumping next representation key"
-msgstr "正在提取下一个请求关键字"
+#: libsvn_repos/reporter.c:907
+msgid "Two top-level reports with no target"
+msgstr "两个最上层报告没有目标"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:205
-#, fuzzy
-msgid "deleting representation"
-msgstr "正在删除请求"
+#: libsvn_repos/repos.c:176
+#, c-format
+msgid "'%s' exists and is non-empty"
+msgstr "“%s”已存在并且非空"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/rev-table.c:88
-#, fuzzy
-msgid "reading filesystem revision"
-msgstr "正在读取文件系统修订版号"
+#: libsvn_repos/repos.c:238
+msgid "Creating db logs lock file"
+msgstr "正在创建数据库日值锁文件"
 
-#: libsvn_fs_base/bdb/strings-table.c:91
-msgid "creating cursor for reading a string"
-msgstr "正在为读取一个字符串创建指针"
+#: libsvn_repos/repos.c:256
+msgid "Creating db lock file"
+msgstr "正在创建数据库锁文件"
 
-#: libsvn_fs_base/bdb/txn-table.c:94
-#, fuzzy
-msgid "storing transaction record"
-msgstr "正在存储事务记录"
+#: libsvn_repos/repos.c:266
+msgid "Creating lock dir"
+msgstr "正在创建锁文件目录"
 
-#: libsvn_fs_base/bdb/uuids-table.c:112
-#, fuzzy
-msgid "get repository uuid"
-msgstr "获取档案库唯一标记(uuid)"
+#: libsvn_repos/repos.c:307
+msgid "Creating hook directory"
+msgstr "正在创建外挂目录"
 
-#: libsvn_fs_base/bdb/uuids-table.c:140
-#, fuzzy
-msgid "set repository uuid"
-msgstr "设置档案库唯一标记(uuid)"
+#: libsvn_repos/repos.c:413
+msgid "Creating start-commit hook"
+msgstr "正在创建 start-commit 外挂时发生错误"
 
-#: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
-msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
+#: libsvn_repos/repos.c:550
+msgid "Creating pre-commit hook"
+msgstr "正在创建 pre-commit 外挂"
 
-#: libsvn_fs_base/dag.c:247
-#, fuzzy, c-format
-msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
+#: libsvn_repos/repos.c:682
+msgid "Creating pre-revprop-change hook"
+msgstr "正在创建 pre-revprop-change 外挂"
 
-#: libsvn_fs_base/dag.c:256
-#, fuzzy, c-format
-msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
+#: libsvn_repos/repos.c:1057
+msgid "Creating post-commit hook"
+msgstr "正在创建 post-commit 外挂"
 
-#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:386
-#, fuzzy
-msgid "Attempted to create entry in non-directory parent"
-msgstr "企图在非目录的父节点创建条目"
+#: libsvn_repos/repos.c:1377
+msgid "Creating post-revprop-change hook"
+msgstr "正在创建 post-revprop-change 外挂"
 
-#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:380
-#, c-format
-msgid "Attempted to create a node with an illegal name '%s'"
-msgstr "企图用一个非法的名字“%s”创建节点"
+#: libsvn_repos/repos.c:1387
+msgid "Creating conf directory"
+msgstr "正在创建 conf 目录"
 
-#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:392
-#, fuzzy
-msgid "Attempted to clone child of non-mutable node"
-msgstr "企图克隆非可变节点的子节点"
+#: libsvn_repos/repos.c:1453
+msgid "Creating svnserve.conf file"
+msgstr "正在创建 svnserve.conf 文件"
 
-#: libsvn_fs_base/dag.c:494
-#, fuzzy
-msgid "Attempted to create entry that already exists"
-msgstr "企图创建已经存在的子条目"
+#: libsvn_repos/repos.c:1478
+msgid "Creating passwd file"
+msgstr "正在创建 passwd 文件"
 
-#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:454
+#: libsvn_repos/repos.c:1527
 #, fuzzy
-msgid "Attempted to set entry in non-directory node"
-msgstr "企图在非目录节点中设置条目"
+msgid "Creating authz file"
+msgstr "正在创建 passwd 文件"
 
-#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:460
-#, fuzzy
-msgid "Attempted to set entry in immutable node"
-msgstr "企图在不可改变的节点设置条目"
+#: libsvn_repos/repos.c:1560
+msgid "Could not create top-level directory"
+msgstr "无法创建最上层目录"
 
-#: libsvn_fs_base/dag.c:615
-#, c-format
-msgid "Can't set proplist on *immutable* node-revision %s"
-msgstr "不能在不可更改节点修订版 %s 设置属性列表"
+#: libsvn_repos/repos.c:1564
+msgid "Creating DAV sandbox dir"
+msgstr "正在创建 DAV sandbox 目录"
 
-#: libsvn_fs_base/dag.c:727
-#, c-format
-msgid "Attempted to make a child clone with an illegal name '%s'"
-msgstr "企图以非法名字“%s”建立子克隆"
+#: libsvn_repos/repos.c:1645
+msgid "Error opening db lockfile"
+msgstr "打开数据库锁文件错误"
 
-#: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from *non*-directory node"
-msgstr "企图从非目录节点删除条目“%s”"
+#: libsvn_repos/repos.c:1676
+msgid "Repository creation failed"
+msgstr "档案库创建失败"
 
-#: libsvn_fs_base/dag.c:858
+#: libsvn_repos/repos.c:1756
 #, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from immutable directory node"
-msgstr "企图从不可更改目录节点删除条目“%s”"
+msgid "Expected format '%d' of repository; found format '%d'"
+msgstr "预期档案库格式“%d”;找到格式“%d”"
 
-#: libsvn_fs_base/dag.c:865
+#: libsvn_repos/rev_hunt.c:64
 #, c-format
-msgid "Attempted to delete a node with an illegal name '%s'"
-msgstr "企图删除一个非法名字“%s”的节点"
-
-#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
-#, fuzzy, c-format
-msgid "Delete failed: directory has no entry '%s'"
-msgstr "删除失败:目录没有项目“%s”"
-
-#: libsvn_fs_base/dag.c:962
-#, fuzzy
-msgid "Attempted removal of immutable node"
-msgstr "企图删除不可改变的节点"
-
-#: libsvn_fs_base/dag.c:1082
-msgid "Attempted to get textual contents of a *non*-file node"
-msgstr "企图获取非文件节点的文本内容"
-
-#: libsvn_fs_base/dag.c:1117
-msgid "Attempted to get length of a *non*-file node"
-msgstr "企图获取非文件节点的长度"
+msgid "Failed to find time on revision %ld"
+msgstr "无法找到修订版 %ld 的时间"
 
-#: libsvn_fs_base/dag.c:1143
-msgid "Attempted to get checksum of a *non*-file node"
-msgstr "企图获取非文件节点的校验和"
+#: libsvn_repos/rev_hunt.c:219
+#, c-format
+msgid "Invalid start revision %ld"
+msgstr "无效的起始修订版 %ld"
 
-#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy
-msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "企图设置非文件节点文本内容"
+#: libsvn_repos/rev_hunt.c:223
+#, c-format
+msgid "Invalid end revision %ld"
+msgstr "无效的结束修订版 %ld"
 
-#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
+#: libsvn_repos/rev_hunt.c:315
 #, fuzzy
-msgid "Attempted to set textual contents of an immutable node"
-msgstr "企图设置不可改变节点文本内容"
+msgid "Unreadable path encountered; access denied"
+msgstr "遇到不能读的路径;访问拒绝。"
 
-#: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
+#: libsvn_subr/cmdline.c:481
+#, c-format
+msgid "Error initializing command line arguments"
 msgstr ""
-"校验和不匹配,报告“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
 
-#: libsvn_fs_base/dag.c:1312
+#: libsvn_subr/config.c:630
 #, c-format
-msgid "Attempted to open non-existent child node '%s'"
-msgstr "企图打开不存在的子节点“%s”"
+msgid "Config error: invalid boolean value '%s'"
+msgstr "配置错误:无效的布尔值“%s”"
 
-#: libsvn_fs_base/dag.c:1318
+#: libsvn_subr/config.c:880
 #, c-format
-msgid "Attempted to open node with an illegal name '%s'"
-msgstr "企图以不合法的名字“%s”打开节点"
-
-#: libsvn_fs_base/err.c:37 libsvn_fs_fs/err.c:39
-msgid "Filesystem object has not been opened yet"
-msgstr "文件系统对象尚未打开"
+msgid "Config error: invalid integer value '%s'"
+msgstr "配置错误:无效的整数值“%s”"
 
-#: libsvn_fs_base/err.c:68 libsvn_fs_fs/err.c:70
-#, c-format
-msgid "Corrupt filesystem revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$s”中的文件系统修订版 %1$ld 损坏"
+#: libsvn_subr/config_auth.c:94
+msgid "Unable to open auth file for reading"
+msgstr "不能打开认证文件读取数据"
 
-#: libsvn_fs_base/err.c:81 libsvn_fs_fs/err.c:83
+#: libsvn_subr/config_auth.c:99
 #, c-format
-msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
+msgid "Error parsing '%s'"
+msgstr "分解“%s”时发生错误"
 
-#: libsvn_fs_base/err.c:101 libsvn_fs_fs/err.c:103
-#, c-format
-msgid "Reference to non-existent node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中引用不存在的节点“%1$s”"
+#: libsvn_subr/config_auth.c:123
+msgid "Unable to locate auth file"
+msgstr "无法定位认证文件文件"
 
-#: libsvn_fs_base/err.c:111 libsvn_fs_fs/err.c:113
-#, c-format
-msgid "Reference to non-existent revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$s”中引用不存在的修订版“%1$ld”"
+#: libsvn_subr/config_auth.c:134
+msgid "Unable to open auth file for writing"
+msgstr "无法打开认证文件写入数据"
 
-#: libsvn_fs_base/err.c:122 libsvn_fs_fs/err.c:124
+#: libsvn_subr/config_auth.c:137
 #, c-format
-msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
+msgid "Error writing hash to '%s'"
+msgstr "写哈希数据至“%s”时发生错误"
 
-#: libsvn_fs_base/err.c:132 libsvn_fs_fs/err.c:134
+#: libsvn_subr/date.c:204
 #, c-format
-msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
+msgid "Can't manipulate current date"
+msgstr "不能获得当前日期"
 
-#: libsvn_fs_base/err.c:144 libsvn_fs_fs/err.c:146
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
 #, c-format
-msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'transactions' 表格有无效的项目"
+msgid "Can't calculate requested date"
+msgstr "无法计算被请求的日期"
 
-#: libsvn_fs_base/err.c:155 libsvn_fs_fs/err.c:157
+#: libsvn_subr/date.c:281
 #, c-format
-msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'copies' 表格有无效的项目"
+msgid "Can't expand time"
+msgstr "无法明确时间"
 
-#: libsvn_fs_base/err.c:166 libsvn_fs_fs/err.c:190
-#, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件无法变更:文件系统“%s”,修订版 %ld,路径“%s”"
+#: libsvn_subr/dso.c:70
+#, fuzzy, c-format
+msgid "Can't grab DSO mutex"
+msgstr "无法获取文件系统(FS)互斥体"
 
-#: libsvn_fs_base/err.c:177 libsvn_fs_fs/err.c:201
-#, c-format
-msgid "Search for malformed path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
+#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
+#, fuzzy, c-format
+msgid "Can't ungrab DSO mutex"
+msgstr "不能释放文件系统(FS)互斥体"
 
-#: libsvn_fs_base/err.c:188 libsvn_fs_fs/err.c:212
-#, c-format
-msgid "No transaction named '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中不存在名为“%1$s”的事务"
+#: libsvn_subr/error.c:326
+msgid "Can't recode error string from APR"
+msgstr "无法自 APR 将错误信息重新编码"
 
-#: libsvn_fs_base/err.c:199 libsvn_fs_fs/err.c:223
+#: libsvn_subr/error.c:417
 #, c-format
-msgid "Cannot modify transaction named '%s' in filesystem '%s'"
-msgstr "无法在文件系统“%2$s”中修改名为“%1$s”的事务"
+msgid "%swarning: %s\n"
+msgstr "%s警告:%s\n"
 
-#: libsvn_fs_base/err.c:210 libsvn_fs_fs/err.c:234
+#: libsvn_subr/io.c:122
 #, c-format
-msgid "No copy with id '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中没有编号“%1$s”的拷贝"
+msgid "Can't check path '%s'"
+msgstr "无法检查路径“%s”"
 
-#: libsvn_fs_base/err.c:220 libsvn_fs_fs/err.c:266
+#: libsvn_subr/io.c:376 libsvn_subr/io.c:507
 #, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgid "Can't open '%s'"
+msgstr "不能打开“%s”"
 
-#: libsvn_fs_base/err.c:231 libsvn_fs_fs/err.c:288
-#, fuzzy, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+#: libsvn_subr/io.c:398 libsvn_subr/io.c:520
+#, c-format
+msgid "Unable to make name for '%s'"
+msgstr "不能使用名字“%s”"
 
-#: libsvn_fs_base/err.c:242 libsvn_fs_fs/err.c:277
-#, fuzzy, c-format
-msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
-msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
+#: libsvn_subr/io.c:524 libsvn_subr/io.c:578 libsvn_subr/io.c:606
+msgid "Symbolic links are not supported on this platform"
+msgstr "此平台不支持符号链接"
 
-#: libsvn_fs_base/err.c:252
-#, fuzzy, c-format
-msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
+#: libsvn_subr/io.c:557
+#, c-format
+msgid "Can't read contents of link"
+msgstr "不能读取连接的内容"
 
-#: libsvn_fs_base/err.c:261
-#, fuzzy, c-format
-msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
+#: libsvn_subr/io.c:619
+#, c-format
+msgid "Can't find a temporary directory"
+msgstr "无法找到临时目录"
 
-#: libsvn_fs_base/err.c:271 libsvn_fs_fs/err.c:244
-#, fuzzy, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
+#: libsvn_subr/io.c:752
+#, c-format
+msgid "Can't copy '%s' to '%s'"
+msgstr "不能复制“%s”到“%s”"
 
-#: libsvn_fs_base/err.c:282 libsvn_fs_fs/err.c:179
-#, fuzzy, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
+# as-is
+#: libsvn_subr/io.c:786
+#, c-format
+msgid "Can't set permissions on '%s'"
+msgstr "不能在“%s”设置许可权限"
 
-#: libsvn_fs_base/err.c:293 libsvn_fs_fs/err.c:255
+#: libsvn_subr/io.c:808
 #, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "文件系统“%s”当前没有用户名关联"
+msgid "Can't append '%s' to '%s'"
+msgstr "不能附加“%s”到“%s”"
 
-#: libsvn_fs_base/err.c:305 libsvn_fs_fs/err.c:312
-#, fuzzy, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
+#: libsvn_subr/io.c:842
+#, c-format
+msgid "Source '%s' is not a directory"
+msgstr "源“%s”不是目录"
 
-#: libsvn_fs_base/err.c:317 libsvn_fs_fs/err.c:299
-#, fuzzy, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
+#: libsvn_subr/io.c:848
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的“%s”不是目录"
 
-#: libsvn_fs_base/fs.c:79
+#: libsvn_subr/io.c:854
 #, c-format
-msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
-msgstr "不正确的数据库版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
+msgid "Destination '%s' already exists"
+msgstr "目的“%s”已存在"
 
-#: libsvn_fs_base/fs.c:90
+#: libsvn_subr/io.c:923 libsvn_subr/io.c:1820 libsvn_subr/io.c:1871
+#: libsvn_subr/io.c:1934
 #, c-format
-msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
+msgid "Can't read directory '%s'"
+msgstr "无法读取目录“%s”"
 
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:57
-#, fuzzy
-msgid "Filesystem object already open"
-msgstr "文件系统对象已经打开"
+#: libsvn_subr/io.c:928 libsvn_subr/io.c:1825 libsvn_subr/io.c:1876
+#: libsvn_subr/io.c:1939 libsvn_subr/io.c:2986
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "关闭目录“%s”时发生错误"
 
-#: libsvn_fs_base/fs.c:676 libsvn_fs_fs/fs_fs.c:252
+#: libsvn_subr/io.c:954
 #, c-format
-msgid "Expected FS format '%d'; found format '%d'"
-msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
+msgid "Can't make directory '%s'"
+msgstr "无法创建目录“%s”"
 
 # as-is
-#: libsvn_fs_base/fs.c:1055
-#, fuzzy, c-format
-msgid "Can't open file '%s' for reading"
-msgstr "不能打开文件“%s”进行读取"
+#: libsvn_subr/io.c:1041
+#, c-format
+msgid "Can't set access time of '%s'"
+msgstr "不能设置“%s”的存取时间"
+
+#: libsvn_subr/io.c:1181
+#, c-format
+msgid "Can't get default file perms for file at '%s' (file stat error)"
+msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
 
 # as-is
-#: libsvn_fs_base/fs.c:1064
+#: libsvn_subr/io.c:1192
 #, fuzzy, c-format
-msgid "Can't open file '%s' for writing"
-msgstr "不能打开文件“%s”进行写入"
+msgid "Can't open file at '%s'"
+msgstr "不能打开文件“%s”"
 
-#: libsvn_fs_base/fs.c:1084
+#: libsvn_subr/io.c:1196
 #, fuzzy, c-format
-msgid "Error reading file '%s'"
-msgstr "读取文件“%s”时发生错误"
+msgid "Can't get file perms for file at '%s' (file stat error)"
+msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
 
-#: libsvn_fs_base/fs.c:1095
+#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
 #, fuzzy, c-format
-msgid "Error writing file '%s'"
-msgstr "写入文件“%s”时发生错误"
+msgid "Can't change perms of file '%s'"
+msgstr "不能改变文件“%s”为可读写权限"
 
-#: libsvn_fs_base/fs.c:1103 libsvn_fs_base/fs.c:1107 libsvn_subr/io.c:2210
+#: libsvn_subr/io.c:1370
 #, c-format
-msgid "Can't close file '%s'"
-msgstr "无法关闭文件“%s”"
+msgid "Can't set file '%s' read-only"
+msgstr "无法设置文件“%s”只读"
 
-#: libsvn_fs_base/fs.c:1216
-#, fuzzy
-msgid ""
-"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
-"may be interfering with the hotcopy algorithm. If \n"
-"the problem persists, try deactivating this feature \n"
-"in DB_CONFIG"
-msgstr ""
-"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
-"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
-"在 DB_CONFIG 中取消这个功能。"
+#: libsvn_subr/io.c:1402
+#, c-format
+msgid "Can't set file '%s' read-write"
+msgstr "无法设置文件“%s”可读写"
 
-#: libsvn_fs_base/fs.c:1235
-#, fuzzy
-msgid ""
-"Error running catastrophic recovery on hotcopy; the \n"
-"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
-"hotcopy algorithm. If the problem persists, try deactivating \n"
-"this feature in DB_CONFIG"
-msgstr ""
-"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
-"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
-"尝试在 DB_CONFIG 中取消这个功能。"
+#: libsvn_subr/io.c:1446
+#, c-format
+msgid "Error getting UID of process"
+msgstr "获取进程用户ID(UID)时发生错误"
 
-#: libsvn_fs_base/fs.c:1345
-msgid "Module for working with a Berkeley DB repository."
-msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
+#: libsvn_subr/io.c:1527
+#, c-format
+msgid "Can't get shared lock on file '%s'"
+msgstr "不能获取文件“%s“的共享锁"
 
-#: libsvn_fs_base/fs.c:1379
+#: libsvn_subr/io.c:1531
 #, c-format
-msgid "Unsupported FS loader version (%d) for bdb"
-msgstr "不支持的 bdb 的 FS 载入器版本 (%d)"
+msgid "Can't get exclusive lock on file '%s'"
+msgstr "不能获取文件“%s”的排他锁"
 
-#: libsvn_fs_base/lock.c:449 libsvn_fs_fs/lock.c:615
+# as-is
+#: libsvn_subr/io.c:1562
 #, c-format
-msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "不能在路径“%s”校验锁;没有有效的用户名"
+msgid "Can't flush file '%s'"
+msgstr "不能写入文件“%s”"
 
-#: libsvn_fs_base/lock.c:455 libsvn_fs_fs/lock.c:621
+#: libsvn_subr/io.c:1563
 #, c-format
-msgid "User %s does not own lock on path '%s' (currently locked by %s)"
-msgstr "用户 %s 不是路径“%s”锁的所有者(当前由用户 %s 锁定)"
+msgid "Can't flush stream"
+msgstr "不能写入流"
 
-#: libsvn_fs_base/lock.c:462 libsvn_fs_fs/lock.c:628
+#: libsvn_subr/io.c:1575 libsvn_subr/io.c:1592
 #, c-format
-msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "不能校验路径“%s”上的锁;没有匹配的可用锁标识"
+msgid "Can't flush file to disk"
+msgstr "不能把文件写入磁盘"
 
-#: libsvn_fs_base/reps-strings.c:103
-#, fuzzy
-msgid "Representation is not of type 'delta'"
-msgstr "请求不是 “delta” 类型"
+#: libsvn_subr/io.c:1613
+msgid "Reading from stdin is currently broken, so disabled"
+msgstr "从标准输入设备读取数据时被中断,所以把它禁止"
 
-#: libsvn_fs_base/reps-strings.c:495
+#: libsvn_subr/io.c:1634
 #, c-format
-msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%s”请求Diff 的版本冲突"
+msgid "Can't get file name"
+msgstr "无法获取文件名"
 
-#: libsvn_fs_base/reps-strings.c:758
+# as-is
+#: libsvn_subr/io.c:1702
 #, c-format
-msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,限制是 %s"
+msgid "Can't remove file '%s'"
+msgstr "不能移动文件“%s”"
 
-#: libsvn_fs_base/reps-strings.c:774
-#, fuzzy, c-format
-msgid "Failure reading rep '%s'"
-msgstr "读取报告“%s”失败"
+#: libsvn_subr/io.c:1756 libsvn_subr/io.c:2837 libsvn_subr/io.c:2923
+#, c-format
+msgid "Can't open directory '%s'"
+msgstr "无法打开目录“%s”"
 
-#: libsvn_fs_base/reps-strings.c:790 libsvn_fs_base/reps-strings.c:876
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch on rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"报告“%s”的校验和不匹配:\n"
-" 预期: %s\n"
-" 实际: %s\n"
+#: libsvn_subr/io.c:1801 libsvn_subr/io.c:1831
+#, c-format
+msgid "Can't remove '%s'"
+msgstr "无法删除“%s”"
 
-#: libsvn_fs_base/reps-strings.c:890
-msgid "Null rep, but offset past zero already"
-msgstr "空的报告,偏移已经超过零值"
+#: libsvn_subr/io.c:1811
+#, c-format
+msgid "Can't rewind directory '%s'"
+msgstr "无法返回目录“%s”"
 
-#: libsvn_fs_base/reps-strings.c:1003 libsvn_fs_base/reps-strings.c:1199
-#, fuzzy, c-format
-msgid "Rep '%s' is not mutable"
-msgstr "报告“%s”是不可变的"
+#: libsvn_subr/io.c:2003
+#, c-format
+msgid "Can't create process '%s' attributes"
+msgstr "无法建立进程“%s”的属性"
 
-#: libsvn_fs_base/reps-strings.c:1018
+#: libsvn_subr/io.c:2009
 #, c-format
-msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s” 可变并且非全文本"
+msgid "Can't set process '%s' cmdtype"
+msgstr "无法设置进程“%s”的命令类型"
 
-#: libsvn_fs_base/reps-strings.c:1318
-msgid "Failed to get new string key"
-msgstr "取新的字符串关键字失败"
+#: libsvn_subr/io.c:2021
+#, c-format
+msgid "Can't set process '%s' directory"
+msgstr "无法设定进程“%s”目录"
 
-#: libsvn_fs_base/reps-strings.c:1393
+#: libsvn_subr/io.c:2034
 #, c-format
-msgid "Attempt to deltify '%s' against itself"
-msgstr "企图 deltify “%s” 自身"
+msgid "Can't set process '%s' child input"
+msgstr "无法设置子进程“%s”输入"
 
-#: libsvn_fs_base/reps-strings.c:1459
-#, fuzzy, c-format
-msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%s”的MD5指纹失败"
+#: libsvn_subr/io.c:2041
+#, c-format
+msgid "Can't set process '%s' child outfile"
+msgstr "无法设置子进程“%s”输出文件"
 
-#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
-msgid "Transaction is not dead: '%s'"
-msgstr "事务未结束:“%s”"
+#: libsvn_subr/io.c:2048
+#, c-format
+msgid "Can't set process '%s' child errfile"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
+#: libsvn_subr/io.c:2055
 #, fuzzy, c-format
-msgid "Transaction is dead: '%s'"
-msgstr "事务已结束:“%s”"
-
-#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
-msgid "Transaction aborted, but cleanup failed"
-msgstr "事务中止,但清除失败"
+msgid "Can't set process '%s' child errfile for error handler"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:311
+#: libsvn_subr/io.c:2061
 #, fuzzy, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "文件找不到:事务“%s” ,路径“%s”"
+msgid "Can't set process '%s' error handler"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:317
+# as-is
+#: libsvn_subr/io.c:2084
 #, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "文件找不到:修订版 %ld,路径“%s”"
-
-#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
+msgid "Can't start process '%s'"
+msgstr "不能取得进程“%s”状态"
 
-#: libsvn_fs_base/tree.c:418 libsvn_fs_fs/tree.c:338
+#: libsvn_subr/io.c:2108
 #, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
+msgid "Error waiting for process '%s'"
+msgstr "为进程“%s”写入时发生错误"
 
-#: libsvn_fs_base/tree.c:428 libsvn_fs_fs/tree.c:348
-#, fuzzy
-msgid "Root object must be a transaction root"
-msgstr "根对象必须是一个事务的根对象"
+#: libsvn_subr/io.c:2116
+#, c-format
+msgid "Process '%s' failed (exitwhy %d)"
+msgstr "进程“%s”失败(返回 %d)"
 
-#: libsvn_fs_base/tree.c:837 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
-msgid "Failure opening '%s'"
-msgstr "打开“%s”失败"
+#: libsvn_subr/io.c:2123
+#, c-format
+msgid "Process '%s' returned error exitcode %d"
+msgstr "进程“%s”返回错误退出码 %d"
 
-#: libsvn_fs_base/tree.c:1407 libsvn_fs_fs/tree.c:1155
-#, fuzzy
-msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个不同的文件系统之间比较属性值"
+#: libsvn_subr/io.c:2234
+#, c-format
+msgid "'%s' returned %d"
+msgstr "“%s” 返回 %d"
 
-#: libsvn_fs_base/tree.c:1741
-msgid "Corrupt DB: faulty predecessor count"
-msgstr "无效的数据库:先前的数目不完整"
+#: libsvn_subr/io.c:2357
+#, c-format
+msgid ""
+"Error running '%s': exitcode was %d, args were:\n"
+"in directory '%s', basenames:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"运行“%s”时发生错误:退出码是 %d,参数是:\n"
+"在目录“%s”,名字:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#: libsvn_fs_base/tree.c:1796 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
-msgid "Unexpected immutable node at '%s'"
-msgstr "在“%s”有未知或意想不到的不可改变节点"
+#: libsvn_subr/io.c:2410
+#, c-format
+msgid "Can't detect MIME type of non-file '%s'"
+msgstr "不能检测非文件的“%s”的MIME类型"
 
 # as-is
-#: libsvn_fs_base/tree.c:1817 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
-msgid "Conflict at '%s'"
-msgstr "在“%s”冲突"
-
-#: libsvn_fs_base/tree.c:1867 libsvn_fs_base/tree.c:2570
-#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1753
-msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "错误的合并;最初的,原始,目标不是全部在同一个文件系统(fs)"
-
-#: libsvn_fs_base/tree.c:1883 libsvn_fs_fs/tree.c:1280
+#: libsvn_subr/io.c:2477
 #, c-format
-msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
+msgid "Can't open file '%s'"
+msgstr "不能打开文件“%s”"
 
-#: libsvn_fs_base/tree.c:2377
-#, fuzzy, c-format
-msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
+#: libsvn_subr/io.c:2513
+#, c-format
+msgid "Can't close file '%s'"
+msgstr "无法关闭文件“%s”"
 
-#: libsvn_fs_base/tree.c:2753 libsvn_fs_fs/tree.c:1892
-#, fuzzy
-msgid "The root directory cannot be deleted"
-msgstr "根目录不能删除"
+#: libsvn_subr/io.c:2514
+#, c-format
+msgid "Can't close stream"
+msgstr "无法关闭流"
 
-#: libsvn_fs_base/tree.c:2912 libsvn_fs_fs/tree.c:1939
-msgid "Copy from mutable tree not currently supported"
-msgstr "当前不支持从可变的树复制"
+# as-is
+#: libsvn_subr/io.c:2524 libsvn_subr/io.c:2548 libsvn_subr/io.c:2561
+#, c-format
+msgid "Can't read file '%s'"
+msgstr "不能读取文件“%s”"
 
-#: libsvn_fs_base/tree.c:3407 libsvn_fs_fs/tree.c:2363
-#, fuzzy, c-format
-msgid ""
-"Base checksum mismatch on '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"基本校验和在“%s”不匹配:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#, c-format
+msgid "Can't read stream"
+msgstr "无法读取流"
 
-#: libsvn_fs_base/tree.c:3660 libsvn_fs_fs/tree.c:2599
-#, fuzzy
-msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个不同的文件系统询问内容的更改"
+#: libsvn_subr/io.c:2536
+#, c-format
+msgid "Can't get attribute information from file '%s'"
+msgstr "无法从文件“%s”获取属性信息"
 
-#: libsvn_fs_base/tree.c:3669 libsvn_fs_base/tree.c:3674
-#: libsvn_fs_fs/tree.c:2608 libsvn_fs_fs/tree.c:2613
-#: libsvn_repos/rev_hunt.c:540
-#, fuzzy, c-format
-msgid "'%s' is not a file"
-msgstr "“%s”不是一个文件"
+#: libsvn_subr/io.c:2537
+#, c-format
+msgid "Can't get attribute information from stream"
+msgstr "无法从流获取属性信息"
 
-#: libsvn_fs_fs/dag.c:436
-#, fuzzy
-msgid "Can't get entries of non-directory"
-msgstr "不能获取非目录的条目"
+#: libsvn_subr/io.c:2573
+#, c-format
+msgid "Can't set position pointer in file '%s'"
+msgstr "无法在文件“%s”设置定位指针"
 
-#: libsvn_fs_fs/dag.c:952
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, file '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"校验和不匹配,文件“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:2574
+#, c-format
+msgid "Can't set position pointer in stream"
+msgstr "无法在流中设置定位指针"
 
-#: libsvn_fs_fs/err.c:60
+#: libsvn_subr/io.c:2585 libsvn_subr/io.c:2598
 #, c-format
-msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
+msgid "Can't write to file '%s'"
+msgstr "无法写入文件“%s”"
 
-#: libsvn_fs_fs/err.c:92
+#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
 #, c-format
-msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
+msgid "Can't write to stream"
+msgstr "无法写入流"
 
-#: libsvn_fs_fs/err.c:168
+# as-is
+#: libsvn_subr/io.c:2639
 #, fuzzy, c-format
-msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
-
-#: libsvn_fs_fs/fs.c:98
-msgid "Can't fetch FSFS mutex"
-msgstr "不能获取文件系统(FSFS)互斥体"
+msgid "Can't read length line in file '%s'"
+msgstr "不能从文件“%s”读取长度行"
 
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_subr/io.c:2643
 #, fuzzy
-msgid "Can't create FSFS mutex"
-msgstr "无法创建文件系统(FSFS)互斥体"
+msgid "Can't read length line in stream"
+msgstr "无法从数据流读取长度行"
 
-#: libsvn_fs_fs/fs.c:109
-msgid "Can't store FSFS mutex"
-msgstr "不能存储文件系统(FSFS)互斥体"
+#: libsvn_subr/io.c:2690
+#, c-format
+msgid "Can't move '%s' to '%s'"
+msgstr "不能移动“%s”到“%s”"
 
-#: libsvn_fs_fs/fs.c:334
-msgid "Module for working with a plain file (FSFS) repository."
-msgstr "模块与纯文本文件(FSFS)档案库一起工作。"
+#: libsvn_subr/io.c:2768
+#, c-format
+msgid "Can't create directory '%s'"
+msgstr "无法创建目录“%s”"
 
-#: libsvn_fs_fs/fs.c:368
+#: libsvn_subr/io.c:2779 libsvn_wc/copy.c:298
 #, c-format
-msgid "Unsupported FS loader version (%d) for fsfs"
-msgstr "不支持的 fsfs 的 FS 载入器版本 (%d)"
+msgid "Can't hide directory '%s'"
+msgstr "无法隐藏目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:455 libsvn_fs_fs/fs_fs.c:469
-msgid "Found malformed header in revision file"
-msgstr "在修订版文件中找到畸形的文件头"
+#: libsvn_subr/io.c:2791
+#, c-format
+msgid "Can't stat directory '%s'"
+msgstr "无法获取目录“%s”的状态"
 
-#: libsvn_fs_fs/fs_fs.c:571 libsvn_fs_fs/fs_fs.c:585 libsvn_fs_fs/fs_fs.c:592
-#: libsvn_fs_fs/fs_fs.c:599 libsvn_fs_fs/fs_fs.c:607 libsvn_fs_fs/fs_fs.c:615
-msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 中没有 text rep offset 列"
+#: libsvn_subr/io.c:2855
+#, c-format
+msgid "Can't remove directory '%s'"
+msgstr "无法删除目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:684
-msgid "Missing kind field in node-rev"
-msgstr "node-rev 中没有 kind 栏位"
+#: libsvn_subr/io.c:2873
+#, c-format
+msgid "Can't read directory"
+msgstr "无法读取目录"
 
-#: libsvn_fs_fs/fs_fs.c:715
-msgid "Missing cpath in node-rev"
-msgstr "node-rev 中没有 cpath"
+#: libsvn_subr/io.c:2942
+#, c-format
+msgid "Can't read directory entry in '%s'"
+msgstr "无法在目录“%s”读取内容"
 
-#: libsvn_fs_fs/fs_fs.c:742 libsvn_fs_fs/fs_fs.c:748
-msgid "Malformed copyroot line in node-rev"
-msgstr "node-rev 中的 copyroot 行畸形"
+#: libsvn_subr/io.c:3067
+#, c-format
+msgid "Can't check directory '%s'"
+msgstr "无法检查目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:766 libsvn_fs_fs/fs_fs.c:772
-msgid "Malformed copyfrom line in node-rev"
-msgstr "node-rev 中的 copyfrom 行畸形"
+#: libsvn_subr/io.c:3089
+#, c-format
+msgid "Version %d is not non-negative"
+msgstr "版本 %d 未被确认"
 
-#: libsvn_fs_fs/fs_fs.c:871 libsvn_fs_fs/fs_fs.c:3184
-msgid "Attempted to write to non-transaction"
-msgstr "企图写至非事务"
+#: libsvn_subr/io.c:3139
+#, c-format
+msgid "Reading '%s'"
+msgstr "正在读取“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:955
-msgid "Malformed representation header"
-msgstr "畸形的描述文件头"
+#: libsvn_subr/io.c:3155
+#, c-format
+msgid "First line of '%s' contains non-digit"
+msgstr "“%s”的第一行包含了非阿拉伯数字"
 
-#: libsvn_fs_fs/fs_fs.c:979
-msgid "Missing node-id in node-rev"
-msgstr "node-rev 中没有 node-id"
+#: libsvn_subr/nls.c:79
+#, fuzzy, c-format
+msgid "Can't convert string to UCS-2: '%s'"
+msgstr "不能把字符串转换为UCS-2:“%s”。"
 
-#: libsvn_fs_fs/fs_fs.c:985
-msgid "Corrupt node-id in node-rev"
-msgstr "node-rev 中的 node-id 损坏"
+#: libsvn_subr/nls.c:86
+#, fuzzy
+msgid "Can't get module file name"
+msgstr "无法获取模块文件名"
 
-#: libsvn_fs_fs/fs_fs.c:1030
-msgid "Revision file lacks trailing newline"
-msgstr "修订版文件缺少结尾换行符"
+#: libsvn_subr/nls.c:101
+#, c-format
+msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
+msgstr "不能把模块路径从UCS-2转换为UTF-8:“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:1042
-msgid "Final line in revision file longer than 64 characters"
-msgstr "修订版文件的最后一列大于 64 个字符长"
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
+msgid ""
+"\n"
+"Valid options:\n"
+msgstr ""
+"\n"
+"有效选项:\n"
 
-#: libsvn_fs_fs/fs_fs.c:1055
-msgid "Final line in revision file missing space"
-msgstr "修订版文件的最后一列少掉空白字符"
+#: libsvn_subr/opt.c:424
+msgid " arg"
+msgstr " 参数"
 
-#: libsvn_fs_fs/fs_fs.c:1085 libsvn_fs_fs/fs_fs.c:3593
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
 #, c-format
-msgid "Can't chmod '%s'"
-msgstr "无法 chmod“%s”"
+msgid ""
+"\"%s\": unknown command.\n"
+"\n"
+msgstr ""
+"“%s”:未知的命令。\n"
+"\n"
 
-#: libsvn_fs_fs/fs_fs.c:1143 libsvn_fs_fs/fs_fs.c:1200 libsvn_repos/log.c:480
-#: libsvn_repos/log.c:484
+#: libsvn_subr/opt.c:740
 #, c-format
-msgid "No such revision %ld"
-msgstr "没有这个修订版 %ld"
-
-#: libsvn_fs_fs/fs_fs.c:1275
-msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff 数据畸形"
-
-# as-is
-#: libsvn_fs_fs/fs_fs.c:1386 libsvn_fs_fs/fs_fs.c:1399
-#: libsvn_fs_fs/fs_fs.c:1430
-msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "正在读取请求的一个 svndiff 窗口最末端"
+msgid "Syntax error parsing revision '%s'"
+msgstr "剖析修订版“%s”时发生语法错误"
 
-#: libsvn_fs_fs/fs_fs.c:1543
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff 数据请求不存在的来源"
+#: libsvn_subr/opt.c:817
+#, c-format
+msgid "URL '%s' is not properly URI-encoded"
+msgstr "地址(URL)“%s”不是正确地以 URI 编码"
 
-#: libsvn_fs_fs/fs_fs.c:1549
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 请求的位置超出了流的结尾"
+#: libsvn_subr/opt.c:823
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr "地址(URL)“%s”包含 '..' 元素"
 
-#: libsvn_fs_fs/fs_fs.c:1572 libsvn_fs_fs/fs_fs.c:1589
-msgid "svndiff window length is corrupt"
-msgstr "svndiff 的窗格长度已毁损"
+#: libsvn_subr/opt.c:852
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr "解析“%s”时发生错误"
 
-#: libsvn_fs_fs/fs_fs.c:1637
-#, fuzzy, c-format
+#: libsvn_subr/opt.c:954
+#, c-format
 msgid ""
-"Checksum mismatch while reading representation:\n"
-" expected: %s\n"
-" actual: %s\n"
+"%s, version %s\n"
+" compiled %s, %s\n"
+"\n"
 msgstr ""
-"当读取请求时校验和不匹配:\n"
-" 预期: %s\n"
-" 实际: %s\n"
-
-#: libsvn_fs_fs/fs_fs.c:1773 libsvn_fs_fs/fs_fs.c:1786
-#: libsvn_fs_fs/fs_fs.c:1792
-msgid "Directory entry corrupt"
-msgstr "目录条目损坏"
+"%s,版本 %s\n"
+" 编译于 %s,%s\n"
+"\n"
 
-#: libsvn_fs_fs/fs_fs.c:2128 libsvn_fs_fs/fs_fs.c:2136
-#: libsvn_fs_fs/fs_fs.c:2168 libsvn_fs_fs/fs_fs.c:2188
-#: libsvn_fs_fs/fs_fs.c:2222 libsvn_fs_fs/fs_fs.c:2227
-msgid "Invalid changes line in rev-file"
-msgstr "rev-file 中有无效的变更行"
+# as-is
+#: libsvn_subr/opt.c:957
+#, fuzzy
+msgid ""
+"Copyright (C) 2000-2006 CollabNet.\n"
+"Subversion is open source software, see http://subversion.tigris.org/\n"
+"This product includes software developed by CollabNet (http://www.Collab."
+"Net/).\n"
+"\n"
+msgstr ""
+"版权所有 (C) 2000-2004 CollabNet.\n"
+"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
+"此产�包�的软件由 CollabNet (http://www.Collab.Net/)开�。\n"
+"\n"
 
-#: libsvn_fs_fs/fs_fs.c:2161
-msgid "Invalid change kind in rev file"
-msgstr "rev 文件中有无效的改变种类"
+#: libsvn_subr/opt.c:1008 libsvn_subr/opt.c:1049
+#, c-format
+msgid "Type '%s help' for usage.\n"
+msgstr "请使用“%s help”以得到用法和帮助。\n"
 
-#: libsvn_fs_fs/fs_fs.c:2181
-msgid "Invalid text-mod flag in rev-file"
-msgstr "rev-file 中有无效的 text-mod 标志"
+#: libsvn_subr/path.c:1054
+#, c-format
+msgid "Couldn't determine absolute path of '%s'"
+msgstr "不能确定“%s”的绝对路径"
 
-#: libsvn_fs_fs/fs_fs.c:2201
-msgid "Invalid prop-mod flag in rev-file"
-msgstr "rev-file 中有无效的 prop-mod 标志"
+#: libsvn_subr/path.c:1093
+#, c-format
+msgid "'%s' is neither a file nor a directory name"
+msgstr "“%s”不是文件名也不是目录名"
 
-#: libsvn_fs_fs/fs_fs.c:2384
-msgid "Copying from transactions not allowed"
-msgstr "自事务进行复制是不被允许的"
+#: libsvn_subr/path.c:1199
+#, c-format
+msgid "Can't determine the native path encoding"
+msgstr "不能确定本地路径编码"
 
-#: libsvn_fs_fs/fs_fs.c:2440
+#: libsvn_subr/path.c:1253
 #, fuzzy, c-format
-msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
-
-#: libsvn_fs_fs/fs_fs.c:2629 libsvn_fs_fs/fs_fs.c:2636
-msgid "next-id file corrupt"
-msgstr "next-id 文件损坏"
+msgid "Invalid control character '0x%02x' in path '%s'"
+msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
 
-#: libsvn_fs_fs/fs_fs.c:2721
-#, fuzzy
-msgid "Transaction cleanup failed"
-msgstr "事务清除失败"
+#: libsvn_subr/prompt.c:97 svnserve/main.c:490
+#, c-format
+msgid "Can't open stdin"
+msgstr "无法打开标准输入"
 
-#: libsvn_fs_fs/fs_fs.c:2884
-msgid "Invalid change type"
-msgstr "无效的变更类型"
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#, c-format
+msgid "Can't read stdin"
+msgstr "无法读取标准输入"
 
-#: libsvn_fs_fs/fs_fs.c:3203
-msgid "Can't set text contents of a directory"
-msgstr "无法设定目录的文字内容"
+#: libsvn_subr/prompt.c:178
+#, c-format
+msgid "Authentication realm: %s\n"
+msgstr "认证领域:%s\n"
 
-#: libsvn_fs_fs/fs_fs.c:3293 libsvn_fs_fs/fs_fs.c:3298
-#: libsvn_fs_fs/fs_fs.c:3305
-msgid "Corrupt current file"
-msgstr "当前文件损坏"
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+msgid "Username: "
+msgstr "用户登录名:"
 
-#: libsvn_fs_fs/fs_fs.c:3731
-msgid "Can't grab FSFS repository mutex"
-msgstr "不能获取文件(FSFS)档案库互斥体"
+#: libsvn_subr/prompt.c:206
+#, c-format
+msgid "Password for '%s': "
+msgstr "“%s”的密码:"
 
-#: libsvn_fs_fs/fs_fs.c:3745
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "不能是否文件(FSFS)档案库互斥体"
+#: libsvn_subr/prompt.c:249
+#, c-format
+msgid "Error validating server certificate for '%s':\n"
+msgstr "验证“%s”的服务器凭证时发生错误:\n"
 
-#: libsvn_fs_fs/fs_fs.c:3861
-msgid "Transaction out of date"
-msgstr "事务过时"
+#: libsvn_subr/prompt.c:255
+msgid ""
+" - The certificate is not issued by a trusted authority. Use the\n"
+" fingerprint to validate the certificate manually!\n"
+msgstr ""
+" - 本凭证并不是由受信任的权威机权所核发。请手动利用指纹以验证\n"
+" 凭证的有效性!\n"
 
-#: libsvn_fs_fs/fs_fs.c:4133
-msgid "No such transaction"
-msgstr "无此事务"
+#: libsvn_subr/prompt.c:262
+msgid " - The certificate hostname does not match.\n"
+msgstr " - 本凭证的主机名称不符。\n"
 
-#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
-msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "无法写入锁/条目的混杂文件“%s”"
+#: libsvn_subr/prompt.c:268
+msgid " - The certificate is not yet valid.\n"
+msgstr " - 本凭证尚未进入有效期间。\n"
 
-#: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
-msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "不能分析锁/条目的混杂文件“%s“"
+#: libsvn_subr/prompt.c:274
+msgid " - The certificate has expired.\n"
+msgstr " - 本凭证已过期。\n"
 
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%s”不存在于最新修订版中"
+#: libsvn_subr/prompt.c:280
+msgid " - The certificate has an unknown error.\n"
+msgstr " - 本凭证发生不明的错误。\n"
 
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_subr/prompt.c:285
 #, c-format
-msgid "Lock failed: newer version of '%s' exists"
-msgstr "锁失败:新的版本“%s”已经存在"
+msgid ""
+"Certificate information:\n"
+" - Hostname: %s\n"
+" - Valid: from %s until %s\n"
+" - Issuer: %s\n"
+" - Fingerprint: %s\n"
+msgstr ""
+"凭证信息:\n"
+" - 主机名称:%s\n"
+" - 有效期间:自 %s 至 %s\n"
+" - 发行者:%s\n"
+" - 指纹:%s\n"
 
-#: libsvn_ra/ra_loader.c:212
-#, fuzzy, c-format
-msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+#: libsvn_subr/prompt.c:300
+msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
+msgstr "(R)拒绝,(t)暂时接受 或 (p)永远接受?"
 
-#: libsvn_ra/ra_loader.c:268
-#, fuzzy, c-format
-msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+#: libsvn_subr/prompt.c:304
+msgid "(R)eject or accept (t)emporarily? "
+msgstr "(R)拒绝 或 (t)暂时接受 ?"
 
-# as-is
-#: libsvn_ra/ra_loader.c:582
-#, fuzzy, c-format
-msgid " - handles '%s' scheme\n"
-msgstr " - 处理“%s”规则\n"
+#: libsvn_subr/prompt.c:343
+msgid "Client certificate filename: "
+msgstr "用户凭证文件名:"
 
-#: libsvn_ra/ra_loader.c:668
+#: libsvn_subr/prompt.c:366
 #, c-format
-msgid "Unrecognized URL scheme '%s'"
-msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+msgid "Passphrase for '%s': "
+msgstr "“%s”的密码:"
+
+#: libsvn_subr/subst.c:1559
+#, fuzzy, c-format
+msgid "'%s' has unsupported special file type '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-#: libsvn_ra_dav/commit.c:193
+#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
 #, c-format
-msgid "Could not create a request (%s '%s')"
-msgstr "无法建立请求 (%s“%s”)"
+msgid "File '%s' has inconsistent newlines"
+msgstr "文件“%s”内的换行符不一致"
 
-#: libsvn_ra_dav/commit.c:292
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
-msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
+#: libsvn_subr/utf.c:194
+msgid "Can't lock charset translation mutex"
+msgstr "不能锁定字符转换互斥体"
 
-#: libsvn_ra_dav/commit.c:485
-#, fuzzy, c-format
-msgid "Could not create a CHECKOUT request (%s)"
-msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
+msgid "Can't unlock charset translation mutex"
+msgstr "不能解锁字符转换互斥体"
 
-#: libsvn_ra_dav/commit.c:572
+#: libsvn_subr/utf.c:271
 #, fuzzy, c-format
-msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录”%s“或许已经过时"
+msgid "Can't create a character converter from native encoding to '%s'"
+msgstr "不能创建从本地编码到“%s”的字符转换器"
 
-#: libsvn_ra_dav/commit.c:580
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
+#: libsvn_subr/utf.c:275
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to native encoding"
+msgstr "不能创建从“%s”到本地编码的字符转换器"
 
-#: libsvn_ra_dav/commit.c:879
+#: libsvn_subr/utf.c:279
 #, fuzzy, c-format
-msgid "Could not create a DELETE request (%s)"
-msgstr "无法产生一个删除(DELETE)请求 (%s)"
+msgid "Can't create a character converter from '%s' to '%s'"
+msgstr "不能创建从“%s”到“%s”的字符转换器"
 
-#: libsvn_ra_dav/commit.c:1310
-msgid "Could not write svndiff to temp file"
-msgstr "无法写 svndiff 至临时文件"
+#: libsvn_subr/utf.c:285
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%i' to '%i'"
+msgstr "不能创建从“%s”到“%s”的字符转换器"
 
-#: libsvn_ra_dav/commit.c:1400
-#, c-format
-msgid "Could not create a PUT request (%s)"
-msgstr "无法产生一个加入(PUT)请求 (%s)"
+#: libsvn_subr/utf.c:513
+#, fuzzy, c-format
+msgid "Can't convert string from native encoding to '%s':"
+msgstr "不能把字符串从本地编码转换为”%s“编码。"
 
-#: libsvn_ra_dav/commit.c:1564
-#, c-format
-msgid "applying log message to %s"
-msgstr "应用日志信息至“%s”"
+#: libsvn_subr/utf.c:517
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to native encoding:"
+msgstr "不能把字符串从”%s“编码转换为本地编码。"
 
-#: libsvn_ra_dav/fetch.c:277
-msgid "Could not save the URL of the version resource"
-msgstr "无法储存版本资源的地址(URL)"
+#: libsvn_subr/utf.c:521
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to '%s':"
+msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
 
-#: libsvn_ra_dav/fetch.c:398
-msgid "Could not get content-type from response."
-msgstr "不能从回应中获得内容类型(content-type)"
+#: libsvn_subr/utf.c:527
+#, fuzzy, c-format
+msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
+msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
 
-#: libsvn_ra_dav/fetch.c:443
-#, c-format
-msgid "Could not create a GET request for '%s'"
-msgstr "无法为“%s”创建 GET 请求"
+#: libsvn_subr/utf.c:572
+#, fuzzy, c-format
+msgid ""
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
+msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
 
-#: libsvn_ra_dav/fetch.c:518
+#: libsvn_subr/utf.c:580
 #, c-format
-msgid "GET request failed for '%s'"
-msgstr "对“%s”的 GET 请求失败"
-
-#: libsvn_ra_dav/fetch.c:657
-msgid "Could not save file"
-msgstr "无法储存文件"
+msgid ""
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr "检测到非ASCII字符 (代码 %d),并且不能转换到UTF-8(或从UTF-8转换)"
 
-#: libsvn_ra_dav/fetch.c:898 libsvn_ra_svn/client.c:912
+#: libsvn_subr/utf.c:622
 #, c-format
 msgid ""
-"Checksum mismatch for '%s':\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+"Valid UTF-8 data\n"
+"(hex:%s)\n"
+"followed by invalid UTF-8 sequence\n"
+"(hex:%s)"
 msgstr ""
-"“%s”的总和检查值不符合:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"有效 UTF-8 数据\n"
+"(16进制:%s)\n"
+"后接无效 UTF-8 序列\n"
+"(16进制:%s)"
 
-#: libsvn_ra_dav/fetch.c:1163
-msgid "Server does not support date-based operations"
-msgstr "服务器不支持基于日期的操作"
+#: libsvn_subr/validate.c:48
+#, c-format
+msgid "MIME type '%s' has empty media type"
+msgstr "MIME 类别“%s”含有空的媒体类别"
 
-#: libsvn_ra_dav/fetch.c:1170
-msgid "Invalid server response to dated-rev request"
-msgstr "对 dated-rev 请求的无效服务器回应"
+#: libsvn_subr/validate.c:53
+#, c-format
+msgid "MIME type '%s' does not contain '/'"
+msgstr "MIME 类别“%s”没包含 '/'"
 
-# as-is
-#: libsvn_ra_dav/fetch.c:1309
-#, fuzzy
-msgid "'get-locations' REPORT not implemented"
-msgstr "get-locations REPORT 未实现"
+#: libsvn_subr/validate.c:58
+#, c-format
+msgid "MIME type '%s' ends with non-alphanumeric character"
+msgstr "MIME 类别“%s”以非字母与数字字符结束"
 
-#: libsvn_ra_dav/fetch.c:1482 libsvn_ra_dav/session.c:1129
-#: libsvn_ra_dav/session.c:1415
-#, fuzzy
-msgid "Incomplete lock data returned"
-msgstr "返回了不完全的锁数据"
+#: libsvn_subr/version.c:74
+#, c-format
+msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%s”的版本不一致:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: libsvn_ra_dav/fetch.c:1651 libsvn_ra_dav/fetch.c:1659
-#: libsvn_ra_dav/fetch.c:1663
-#, fuzzy
-msgid "Server does not support locking features"
-msgstr "服务器不支持锁定特性"
+#: libsvn_subr/xml.c:400
+#, c-format
+msgid "Malformed XML: %s at line %d"
+msgstr "畸形的XML:%s 在第 %d 行"
 
-#: libsvn_ra_dav/fetch.c:1740
-msgid ""
-"DAV request failed; it's possible that the repository's pre-revprop-change "
-"hook either failed or is non-existent"
-msgstr ""
-"DAV 请求失败;可能是档案库的 pre-revprop-change 外挂执行失败;或是不存在"
+#: libsvn_wc/adm_crawler.c:605
+msgid "Error aborting report"
+msgstr "取消报告时发生错误"
 
-#: libsvn_ra_dav/fetch.c:2474
-#, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "写入“%s”时发生错误:意外的 EOF"
+#: libsvn_wc/adm_crawler.c:800
+msgid "Error opening local file"
+msgstr "打开本地文件时发生错误"
 
-#: libsvn_ra_dav/fetch.c:2619
+#: libsvn_wc/adm_crawler.c:865
 #, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML 编码:“%s”"
+msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
 
-# as-is
-#: libsvn_ra_dav/fetch.c:2901
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "报告响应处理失败不能完成编辑驱动"
+#: libsvn_wc/adm_files.c:100
+#, fuzzy, c-format
+msgid "'%s' is not a valid administrative directory name"
+msgstr "“%s”不是文件名也不是目录名"
 
-# as-is
-#: libsvn_ra_dav/file_revs.c:360
-#, fuzzy
-msgid "'get-file-revs' REPORT not implemented"
-msgstr "get-file-revs REPORT 未实现"
+# plz leave this as-is
+#: libsvn_wc/adm_files.c:260
+msgid "Bad type indicator"
+msgstr "错误的类型"
 
-#: libsvn_ra_dav/file_revs.c:376
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs 报告中没有任何修订版"
+#: libsvn_wc/adm_files.c:501
+msgid "APR_APPEND not supported for adm files"
+msgstr "APR_APPEND 不支持管理文件"
 
-#: libsvn_ra_dav/merge.c:217
-#, c-format
+#: libsvn_wc/adm_files.c:544
 msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr ""
-"通讯协定错误:我们告知服务器不要自动合并任何资源,但是它报告“%s”已被合并"
+"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
+"again"
+msgstr "您的 .svn/tmp 目录可能丢失或损坏;请执行“svn cleanup”,然后再试一次"
 
-#: libsvn_ra_dav/merge.c:226
+#: libsvn_wc/adm_files.c:687 libsvn_wc/lock.c:592 libsvn_wc/lock.c:855
 #, c-format
-msgid ""
-"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
-"element within the MERGE response"
-msgstr "内部错误:在 MERGE 回应中,“DAV:response”元素有个未知的父项目 (%d)"
+msgid "'%s' is not a working copy"
+msgstr "“%s”不是工作拷贝"
 
-#: libsvn_ra_dav/merge.c:241
-#, c-format
-msgid ""
-"Protocol error: the MERGE response for the '%s' resource did not return all "
-"of the properties that we asked for (and need to complete the commit)"
-msgstr ""
-"通讯协定错误:对“%s”的 MERGE 回应并未返回所有我们请求的属性 (这些是完成提交操"
-"作所不可缺少的)"
+#: libsvn_wc/adm_files.c:694 libsvn_wc/adm_files.c:762
+#: libsvn_wc/adm_files.c:824
+msgid "No such thing as 'base' working copy properties!"
+msgstr "没有 '基础' 工作拷贝属性这样的东西"
 
-#: libsvn_ra_dav/merge.c:260
+#: libsvn_wc/adm_files.c:893 libsvn_wc/util.c:51
 #, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "对“%s”的 MERGE 回应并不是目标 (“%s”) 的子项目"
+msgid "'%s' is not a directory"
+msgstr "“%s”不是目录"
 
-#: libsvn_ra_dav/merge.c:481
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 属性回应包含错误状态"
+#: libsvn_wc/adm_files.c:955
+#, c-format
+msgid "No entry for '%s'"
+msgstr "没有“%s”的项目"
 
-#: libsvn_ra_dav/options.c:130
-msgid ""
-"The OPTIONS response did not include the requested activity-collection-set; "
-"this often means that the URL is not WebDAV-enabled"
-msgstr ""
-"OPTIONS 回应并不包含请求的 activity-collection-set;通常这表示该地址(URL)并不"
-"支持 WebDAV"
+#: libsvn_wc/adm_files.c:968
+#, c-format
+msgid "Revision %ld doesn't match existing revision %ld in '%s'"
+msgstr "修订版 %ld 不符合现有的修订版 %ld 于“%s”中"
 
-#: libsvn_ra_dav/props.c:585
+#: libsvn_wc/adm_files.c:976
 #, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "无法找到标记“%s”于地址(URL)“%s”"
+msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
+msgstr "地址(URL)“%s”不符合现有的地址(URL)“%s”于“%s”中"
 
-#: libsvn_ra_dav/props.c:614
+#: libsvn_wc/adm_ops.c:258
 #, c-format
-msgid "'%s' was not present on the resource"
-msgstr "“%s”不存在于本资源上"
+msgid "Unrecognized node kind: '%s'"
+msgstr "无法确认的节点种类:“%s”"
 
-#: libsvn_ra_dav/props.c:653
+#: libsvn_wc/adm_ops.c:1082
 #, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon 不能分析地址(URL)”%s“"
+msgid "'%s' not found"
+msgstr "找不到“%s”"
 
-#: libsvn_ra_dav/props.c:682
-msgid "The path was not part of a repository"
-msgstr "路径不是档案库的一部份"
+#: libsvn_wc/adm_ops.c:1086
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr "路径“%s”为不支持的节点种类"
 
-#: libsvn_ra_dav/props.c:693
+#: libsvn_wc/adm_ops.c:1116
 #, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
+msgid "'%s' is already under version control"
+msgstr "“%s”已纳入版本控制"
 
-#: libsvn_ra_dav/props.c:727 libsvn_ra_dav/props.c:782
-msgid "The VCC property was not found on the resource"
-msgstr "本资源找不到 VCC 属性"
+#: libsvn_wc/adm_ops.c:1128
+#, fuzzy, c-format
+msgid ""
+"Can't replace '%s' with a node of a differing type; the deletion must be "
+"committed and the parent updated before adding '%s'"
+msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
 
-#: libsvn_ra_dav/props.c:795
-msgid "The relative-path property was not found on the resource"
-msgstr "本资源上找不到相对路径属性"
+#: libsvn_wc/adm_ops.c:1145
+#, c-format
+msgid "Can't find parent directory's entry while trying to add '%s'"
+msgstr "在尝试新增“%s”时,无法找到父目录的项目"
 
-#: libsvn_ra_dav/props.c:916
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' 不存在于基线资源"
+#: libsvn_wc/adm_ops.c:1150
+#, c-format
+msgid "Can't add '%s' to a parent directory scheduled for deletion"
+msgstr "无法新增“%s”至已预定要删除的父目录"
 
-#: libsvn_ra_dav/props.c:935
-msgid "'DAV:version-name' was not present on the baseline resource"
-msgstr "'DAV:version-name' 不存在于基线资源"
+#: libsvn_wc/adm_ops.c:1166
+#, fuzzy, c-format
+msgid "The URL '%s' has a different repository root than its parent"
+msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
 
-#: libsvn_ra_dav/props.c:1103
-msgid "At least one property change failed; repository is unchanged"
-msgstr "至少有一个属性变更失败;档案库未改变"
+#: libsvn_wc/adm_ops.c:1495
+#, c-format
+msgid "Error restoring text for '%s'"
+msgstr "还原“%s”文字时发生错误"
 
-#: libsvn_ra_dav/session.c:442
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "无效的地址(URL):代理(proxy)通信端口编号中有不合法的字符"
+#: libsvn_wc/adm_ops.c:1626
+#, c-format
+msgid "Cannot revert: '%s' is not under version control"
+msgstr "无法恢复:“%s”未纳入版本控制"
 
-#: libsvn_ra_dav/session.c:446
-msgid "Invalid URL: negative proxy port number"
-msgstr "无效的地址(URL):负的代理(proxy)通信端口数值"
+#: libsvn_wc/adm_ops.c:1654
+#, c-format
+msgid "Cannot revert '%s': unsupported entry node kind"
+msgstr "无法恢复“%s”:不支持的项目节点种类"
 
-#: libsvn_ra_dav/session.c:449
-msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr ""
-"无效的地址(URL):代理(proxy)通信端口数值大于最大值的 TCP 通信端口数值 65535"
+#: libsvn_wc/adm_ops.c:1665
+#, c-format
+msgid "Cannot revert '%s': unsupported node kind in working copy"
+msgstr "无法恢复“%s”:工作拷贝中有不支持的节点种类"
 
-#: libsvn_ra_dav/session.c:463
-msgid "Invalid config: illegal character in timeout value"
-msgstr "无效的配置:超时数值中有不合法的字符"
+#: libsvn_wc/adm_ops.c:1712
+msgid ""
+"Cannot revert addition of current directory; please try again from the "
+"parent directory"
+msgstr "无法恢复目前目录的新增;请从父目录再试一次"
 
-#: libsvn_ra_dav/session.c:467
-msgid "Invalid config: negative timeout value"
-msgstr "无效的配置:负的超时数值"
+#: libsvn_wc/adm_ops.c:1734
+#, c-format
+msgid "Unknown or unexpected kind for path '%s'"
+msgstr "路径“%s”有未知或意想不到的种类"
 
-#: libsvn_ra_dav/session.c:480
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "无效的配置:除错遮罩值中有不合法的字符"
+#: libsvn_wc/adm_ops.c:1896
+#, c-format
+msgid "File '%s' has local modifications"
+msgstr "文件“%s”有本地的修改"
 
-# as-is
-#: libsvn_ra_dav/session.c:543
-msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
-msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
+#: libsvn_wc/copy.c:141
+#, c-format
+msgid "'%s' already exists and is in the way"
+msgstr "“%s”已存在,变成路中间的大石头"
 
-#: libsvn_ra_dav/session.c:593
-msgid "Malformed URL for repository"
-msgstr "档案库的地址(URL)畸形"
+#: libsvn_wc/copy.c:153
+#, c-format
+msgid "There is already a versioned item '%s'"
+msgstr "已有纳入版本控制项目“%s”"
 
-#: libsvn_ra_dav/session.c:601
-msgid "Network socket initialization failed"
-msgstr "网络 socket 启始失败"
+#: libsvn_wc/copy.c:163
+#, c-format
+msgid "Cannot copy or move '%s': it's not under version control"
+msgstr "无法复制或移动“%s”:它尚未纳入版本控制"
 
-#: libsvn_ra_dav/session.c:618
-msgid "SSL is not supported"
-msgstr "不支持 SSL"
+#: libsvn_wc/copy.c:172
+#, c-format
+msgid ""
+"Cannot copy or move '%s': it's not in the repository yet; try committing "
+"first"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-#: libsvn_ra_dav/session.c:764
+#: libsvn_wc/copy.c:451
 #, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "无效的配置:无法载入凭证文件“%s”"
+msgid ""
+"Cannot copy or move '%s': it is not in the repository yet; try committing "
+"first"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-#: libsvn_ra_dav/session.c:852
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "无法在本资源或任何其父项目中找到 UUID 属性"
+#: libsvn_wc/copy.c:578
+#, fuzzy, c-format
+msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-#: libsvn_ra_dav/session.c:860
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "请将服务器升级至 0.19 或更新的版本"
+#: libsvn_wc/copy.c:585
+#, c-format
+msgid "Cannot copy to '%s' as it is scheduled for deletion"
+msgstr "无法复制到“%s”至因为它已预定为要删除"
 
-#: libsvn_ra_dav/session.c:1101 libsvn_ra_dav/session.c:1238
-#, fuzzy
-msgid "Failed to parse URI"
-msgstr "分析地址(URI)失败"
+#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:562
+#: libsvn_wc/entries.c:819
+#, c-format
+msgid "Entry '%s' has invalid '%s' value"
+msgstr "项目“%s”有无效的“%s”值"
 
-#: libsvn_ra_dav/session.c:1124
+#: libsvn_wc/entries.c:111
 #, fuzzy
-msgid "Lock request failed"
-msgstr "锁请求失败"
-
-#: libsvn_ra_dav/session.c:1253
-#, fuzzy, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "”%s“没有在档案库中被锁定"
+msgid "Invalid escape sequence"
+msgstr "无效的计划任务"
 
-#: libsvn_ra_dav/session.c:1290
+#: libsvn_wc/entries.c:118
 #, fuzzy
-msgid "Unlock request failed"
-msgstr "解除锁请求失败"
+msgid "Invalid escaped character"
+msgstr "无效的变更类型"
 
-#: libsvn_ra_dav/session.c:1501
+#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
+#: libsvn_wc/entries.c:203
 #, fuzzy
-msgid "Failed to fetch lock information"
-msgstr "获取锁信息失败"
-
-#: libsvn_ra_dav/session.c:1572
-#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
-
-#: libsvn_ra_dav/util.c:275
-msgid "authorization failed"
-msgstr "授权失败"
-
-#: libsvn_ra_dav/util.c:279
-msgid "could not connect to server"
-msgstr "无法连接到服务器"
-
-#: libsvn_ra_dav/util.c:283
-msgid "timed out waiting for server"
-msgstr "等待服务器超时"
-
-#: libsvn_ra_dav/util.c:489
-msgid "Can't calculate the request body size"
-msgstr "无法算出请求的主体大小"
+msgid "Unexpected end of entry"
+msgstr "找到一个意料之外的节点种类"
 
-#: libsvn_ra_dav/util.c:725
+#: libsvn_wc/entries.c:225
 #, c-format
-msgid "Error spooling the %s request response to disk"
-msgstr "请求 %s 的响应脱机保存到磁盘时出现错误"
+msgid "Invalid value for field '%s'"
+msgstr ""
 
-#: libsvn_ra_dav/util.c:773
+#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:537
 #, c-format
-msgid "'%s' path not found"
-msgstr "找不到路径“%s”"
+msgid "Entry '%s' has invalid node kind"
+msgstr "项目“%s”有无效的节点种类"
 
-#. We either have a neon error, or some other error
-#. that we didn't expect.
-#: libsvn_ra_dav/util.c:778 libsvn_ra_dav/util.c:1008
-#, c-format
-msgid "%s of '%s'"
-msgstr "%s 的结果 “%s”"
+#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:514
+#, fuzzy, c-format
+msgid "Entry for '%s' has invalid repository root"
+msgstr "“%s”的入口档案库根目录无效"
 
-#: libsvn_ra_dav/util.c:796
+#: libsvn_wc/entries.c:944
 #, c-format
-msgid "Error reading spooled %s request response"
-msgstr "读取请求 %s 回应的脱机数据时出现错误"
+msgid "XML parser failed in '%s'"
+msgstr "XML 剖析器无法处理“%s”"
 
-#: libsvn_ra_dav/util.c:807
-#, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s 请求的回应返回无效的 XML:%s (%s)"
+#: libsvn_wc/entries.c:1003
+msgid "Missing default entry"
+msgstr "丢失默认项目"
 
-#: libsvn_ra_dav/util.c:827
-#, c-format
-msgid "%s request failed on '%s'"
-msgstr "%s 请求“%s”失败"
+#: libsvn_wc/entries.c:1008
+msgid "Default entry has no revision number"
+msgstr "默认项目没有修订版编号"
 
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:576
-#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
-msgstr ""
-"“%s”\n"
-"与\n"
-"“%s”\n"
-"并不在同一个档案库中"
+#: libsvn_wc/entries.c:1013
+msgid "Default entry is missing URL"
+msgstr "默认项目没有地址(URL)"
 
-# as-is
-#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
-msgid "Module for accessing a repository on local disk."
-msgstr "访问本地磁盘的档案库模块。"
+#: libsvn_wc/entries.c:1089
+#, fuzzy, c-format
+msgid "Invalid version line in entries file of '%s'"
+msgstr "写入“%s”的项目文件时发生错误"
 
-#: libsvn_ra_local/ra_plugin.c:285
-msgid "Unable to open an ra_local session to URL"
-msgstr "无法打开地址(URL)的 ra_local 会话"
+#: libsvn_wc/entries.c:1106
+#, fuzzy
+msgid "Missing entry terminator"
+msgstr "丢失默认项目"
 
-# as-is
-#: libsvn_ra_local/ra_plugin.c:1286
+#: libsvn_wc/entries.c:1109
+#, fuzzy
+msgid "Invalid entry terminator"
+msgstr "无效的目标路径"
+
+#: libsvn_wc/entries.c:1113
 #, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
+msgid "Error at entry %d in entries file for '%s':"
+msgstr "写入“%s”的项目文件时发生错误"
 
-#: libsvn_ra_local/split_url.c:44
+#: libsvn_wc/entries.c:1209
 #, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
+msgid "Corrupt working copy: '%s' has no default entry"
+msgstr "损坏的工作拷贝:目录“%s”没有默认的项目"
 
-#: libsvn_ra_local/split_url.c:55
+#: libsvn_wc/entries.c:1226
 #, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "本地地址(URL)“%s”仅含主机名称,没有路径"
+msgid "Corrupt working copy: directory '%s' has an invalid schedule"
+msgstr "损坏的工作拷贝:目录“%s”有无效的调度"
 
-#: libsvn_ra_local/split_url.c:74
+#: libsvn_wc/entries.c:1260
 #, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "本地地址(URL)“%s”包含未支持的主机名称"
+msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
+msgstr "损坏的工作拷贝:“%s”于目录“%s”中有无效的调度"
 
-#: libsvn_ra_local/split_url.c:128 libsvn_ra_local/split_url.c:135
+#: libsvn_wc/entries.c:1269
 #, c-format
-msgid "Unable to open repository '%s'"
-msgstr "无法打开档案库“%s”"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"addition) is not itself scheduled for addition"
+msgstr ""
+"损坏的工作拷贝:“%s”于目录“%s”中 (已加入新增调度) 与加入新增调度的不一致"
 
-#: libsvn_ra_svn/client.c:125
+#: libsvn_wc/entries.c:1277
 #, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主机名称“%s”"
-
-#: libsvn_ra_svn/client.c:137
-msgid "Can't create socket"
-msgstr "无法建立 socket"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"deletion) is not itself scheduled for deletion"
+msgstr ""
+"损坏的工作拷贝:“%s”于目录“%s”中 (已加入删除调度) 与加入删除调度的不一致"
 
-#: libsvn_ra_svn/client.c:141
+#: libsvn_wc/entries.c:1285
 #, c-format
-msgid "Can't connect to host '%s'"
-msgstr "无法连线至主机“%s”"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"replacement) has an invalid schedule"
+msgstr "损坏的工作拷贝:“%s”于目录“%s”中 (已加入替换调度) 有无效的调度"
 
-# as-is
-#: libsvn_ra_svn/client.c:162
-msgid "Proplist element not a list"
-msgstr "属性列表元素不是一个列表"
+#: libsvn_wc/entries.c:1915
+#, c-format
+msgid "No default entry in directory '%s'"
+msgstr "在目录“%s”中没有默认的项目"
 
-# as-is
-#: libsvn_ra_svn/client.c:186
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs 元素不是一个列表"
+#: libsvn_wc/entries.c:1970
+#, c-format
+msgid "Error writing to '%s'"
+msgstr "写至“%s”时发生错误"
 
-#: libsvn_ra_svn/client.c:224
+#: libsvn_wc/entries.c:2283
 #, c-format
-msgid "Unrecognized node kind '%s' from server"
-msgstr "无法辨识来自服务器的节点种类“%s”"
+msgid ""
+"Can't add '%s' to deleted directory; try undeleting its parent directory "
+"first"
+msgstr "无法新增“%s”至已删除的目录;请先尝试恢复其父目录"
 
-#: libsvn_ra_svn/client.c:269 libsvn_ra_svn/client.c:323
+#: libsvn_wc/entries.c:2289
 #, c-format
-msgid "Authentication error from server: %s"
-msgstr "来自服务器的认证错误:%s"
+msgid ""
+"Can't replace '%s' in deleted directory; try undeleting its parent directory "
+"first"
+msgstr "无法在已删除的目录中替换“%s”;请先尝试恢复其父目录"
 
-#: libsvn_ra_svn/client.c:272 libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-msgid "Unexpected server response to authentication"
-msgstr "意想不到的认证时服务器回应"
+#: libsvn_wc/entries.c:2298
+#, c-format
+msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
+msgstr "“%s”被标记为不存在,所以无法加入新增调度"
 
-#: libsvn_ra_svn/client.c:330
-msgid "Cannot negotiate authentication mechanism"
-msgstr "无法协商出认识机制"
+#: libsvn_wc/entries.c:2327
+#, c-format
+msgid "Entry '%s' is already under version control"
+msgstr "项目“%s”已纳入版本控制"
 
-#: libsvn_ra_svn/client.c:461
+#: libsvn_wc/entries.c:2424
 #, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "无法辨识的隧道规则“%s”"
+msgid "Entry '%s' has illegal schedule"
+msgstr "项目“%s”有不合法的调度"
 
-#: libsvn_ra_svn/client.c:478
+#: libsvn_wc/entries.c:2570
 #, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "隧道规则 %s 需要设定环境变数 %s"
+msgid "No such entry: '%s'"
+msgstr "没有这样的项目:“%s”"
 
-# as-is
-#: libsvn_ra_svn/client.c:489
+#: libsvn_wc/entries.c:2697
 #, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "不能 tokenize 命令“%s”"
+msgid "Error writing entries file for '%s'"
+msgstr "写入“%s”的项目文件时发生错误"
 
-#: libsvn_ra_svn/client.c:518
+#: libsvn_wc/entries.c:2736
 #, c-format
-msgid "Error in child process: %s"
-msgstr "子程序错误:%s"
+msgid "Directory '%s' has no THIS_DIR entry"
+msgstr "目录“%s”没有 THIS_DIR 项目"
 
-#: libsvn_ra_svn/client.c:541
-msgid "Can't create tunnel"
-msgstr "无法建立 tunnel"
+#: libsvn_wc/entries.c:2825
+#, c-format
+msgid "'%s' has an unrecognized node kind"
+msgstr "“%s”的节点种类无法辨识"
 
-# as-is
-#: libsvn_ra_svn/client.c:570
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "使用svn网络协议访问档案库的模块。"
+#: libsvn_wc/entries.c:2861
+#, c-format
+msgid "Unexpectedly found '%s': path is marked 'missing'"
+msgstr "意想不到地找到了“%s”:路径已被标记为 '丢失'"
 
-#: libsvn_ra_svn/client.c:607
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
 #, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "不合法的 svn 档案库地址(URL)“%s”"
+msgid "Working copy '%s' locked"
+msgstr "工作拷贝“%s”被锁定了"
 
-#: libsvn_ra_svn/client.c:633
+#: libsvn_wc/lock.c:481
 #, c-format
-msgid "Server requires minimum version %d"
-msgstr "服务器最低要求的版号为 %d"
+msgid "Path '%s' ends in '%s', which is unsupported for this operation"
+msgstr "路径“%s”以“%s”结束,本操作不支持"
 
-#: libsvn_ra_svn/client.c:683
-msgid "Impossibly long repository root from server"
-msgstr "服务器回传的档案库根路径长得太夸张"
+#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
+#, fuzzy, c-format
+msgid "Unable to check path existence for '%s'"
+msgstr "不能使用名字“%s”"
 
-#: libsvn_ra_svn/client.c:750
-msgid "Server did not send repository root"
-msgstr "服务器没有返回档案库根路径"
+#: libsvn_wc/lock.c:937
+#, c-format
+msgid "Expected '%s' to be a directory but found a file"
+msgstr ""
 
-#: libsvn_ra_svn/client.c:892
-msgid "Non-string as part of file contents"
-msgstr "文件内容的一部份不是字串"
+#: libsvn_wc/lock.c:944
+#, fuzzy, c-format
+msgid "Expected '%s' to be a file but found a directory"
+msgstr "地址(URL)“%s”指向一个文件,而非目录"
 
-# as-is
-#: libsvn_ra_svn/client.c:960
-msgid "Dirlist element not a list"
-msgstr "目录列表元素不是一个列表"
+#: libsvn_wc/lock.c:963
+#, fuzzy, c-format
+msgid "Directory '%s' is missing"
+msgstr "目录“%s”没有地址(URL)"
 
-# as-is
-#: libsvn_ra_svn/client.c:1116
-msgid "Log entry not a list"
-msgstr "日志条目不是一个列表"
+#: libsvn_wc/lock.c:968
+#, c-format
+msgid "Directory '%s' containing working copy admin area is missing"
+msgstr ""
 
-# as-is
-#: libsvn_ra_svn/client.c:1129
-msgid "Changed-path entry not a list"
-msgstr "已修改路径条目不是一个列表"
+#: libsvn_wc/lock.c:973
+#, fuzzy, c-format
+msgid "Unable to lock '%s'"
+msgstr "无法打开编辑"
 
-# as-is
-#: libsvn_ra_svn/client.c:1208
-#, fuzzy
-msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/lock.c:978
+#, fuzzy, c-format
+msgid "Working copy '%s' is not locked"
+msgstr "工作拷贝“%s”被锁定了"
 
-# as-is
-#: libsvn_ra_svn/client.c:1265
-#, fuzzy
-msgid "'get-locations' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/lock.c:1371
+#, c-format
+msgid "Write-lock stolen in '%s'"
+msgstr "“%s”中的写入锁定被偷走了"
 
-# as-is
-#: libsvn_ra_svn/client.c:1277
-msgid "Location entry not a list"
-msgstr "区域条目不是一个列表"
+#: libsvn_wc/lock.c:1379
+#, c-format
+msgid "No write-lock in '%s'"
+msgstr "“%s”中没有写入锁定"
 
-# as-is
-#: libsvn_ra_svn/client.c:1327
-#, fuzzy
-msgid "'get-file-revs' not implemented"
-msgstr "get-file-revs 未实现"
+#: libsvn_wc/lock.c:1401
+#, c-format
+msgid "Lock file '%s' is not a regular file"
+msgstr "锁定文件“%s”不是一般的文件"
 
-# as-is
-#: libsvn_ra_svn/client.c:1340
-msgid "Revision entry not a list"
-msgstr "修订版条目不是一个列表"
+#: libsvn_wc/log.c:339
+msgid "Can't move source to dest"
+msgstr "无法移动来源至目的"
 
-#: libsvn_ra_svn/client.c:1353 libsvn_ra_svn/client.c:1378
-msgid "Text delta chunk not a string"
-msgstr "文字差异区段并非字串"
+#: libsvn_wc/log.c:500
+#, c-format
+msgid "In directory '%s'"
+msgstr "在目录“%s”中"
 
-#: libsvn_ra_svn/client.c:1390
-msgid "The get-file-revs command didn't return any revisions"
-msgstr "get-file-revs 命令没有返回任何修订版"
+#: libsvn_wc/log.c:528
+#, c-format
+msgid "Missing 'left' attribute in '%s'"
+msgstr "“%s”丢失了 'left' 属性"
 
-#: libsvn_ra_svn/client.c:1438
-#, fuzzy
-msgid "Server doesn't support the lock command"
-msgstr "服务器不支持锁命令"
+#: libsvn_wc/log.c:535
+#, c-format
+msgid "Missing 'right' attribute in '%s'"
+msgstr "“%s”丢失了 'right' 属性"
 
-#: libsvn_ra_svn/client.c:1502
-#, fuzzy
-msgid "Server doesn't support the unlock command"
-msgstr "服务器不支持解除锁命令"
+#: libsvn_wc/log.c:603
+#, c-format
+msgid "Missing 'dest' attribute in '%s'"
+msgstr "“%s”丢失了 'dest' 属性"
 
-# as-is
-#: libsvn_ra_svn/client.c:1602 libsvn_ra_svn/client.c:1755
-#, fuzzy
-msgid "Lock element not a list"
-msgstr "锁元素不是一个列表"
+#: libsvn_wc/log.c:684
+#, c-format
+msgid "Missing 'timestamp' attribute in '%s'"
+msgstr "“%s”丢失 'timestamp' 属性"
 
-#: libsvn_ra_svn/client.c:1607
-#, fuzzy
-msgid "Unable to parse lock data"
-msgstr "无法打开编辑"
+#: libsvn_wc/log.c:780 libsvn_wc/log.c:820
+#, c-format
+msgid "Error getting 'affected time' on '%s'"
+msgstr "取得“%s”的“affected time”时发生错误"
 
-#: libsvn_ra_svn/client.c:1714 libsvn_ra_svn/client.c:1742
-#, fuzzy
-msgid "Server doesn't support the get-lock command"
-msgstr "服务器不支持获取锁命令get-lock"
+#: libsvn_wc/log.c:831
+#, c-format
+msgid "Error modifying entry for '%s'"
+msgstr "修改“%s”的项目时发生错误"
 
-#: libsvn_ra_svn/client.c:1814
+#: libsvn_wc/log.c:857
 #, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
+msgid "Error removing lock from entry for '%s'"
+msgstr "移除条目“%s”的锁时发生错误"
 
-# as-is
-#: libsvn_ra_svn/editor.c:383 libsvn_ra_svn/editorp.c:418
-msgid "Invalid file or dir token during edit"
-msgstr "编辑时遇到无效的文件或目录"
+#: libsvn_wc/log.c:880
+#, fuzzy, c-format
+msgid "Error removing changelist from entry '%s'"
+msgstr "读关键字“%s”的更改时发生错误"
 
-#: libsvn_ra_svn/editor.c:616
-msgid "Non-string as part of text delta"
-msgstr "文件差异的一部份不是字串"
+#: libsvn_wc/log.c:1010
+#, c-format
+msgid "Missing 'revision' attribute for '%s'"
+msgstr "“%s”丢失了 'revision' 属性"
 
-# as-is
-#: libsvn_ra_svn/editorp.c:128
-msgid "Successful edit status returned too soon"
-msgstr "成功修改状态返回太快"
+#: libsvn_wc/log.c:1034
+#, c-format
+msgid "Log command for directory '%s' is mislocated"
+msgstr "对目录“%s”的日志命令被错置"
 
-# as-is
-#: libsvn_ra_svn/editorp.c:609
-msgid "Apply-textdelta already active"
-msgstr "Apply-textdelta 已经激活"
+#: libsvn_wc/log.c:1209 libsvn_wc/log.c:1285
+#, c-format
+msgid "Error checking existence of '%s'"
+msgstr "检查“%s”是否存在时发生错误"
+
+#: libsvn_wc/log.c:1219 libsvn_wc/log.c:1225
+#, c-format
+msgid "Error getting 'affected time' for '%s'"
+msgstr "取得“%s”的 'affected time' 时发生错误"
+
+#: libsvn_wc/log.c:1235
+#, c-format
+msgid "Error comparing '%s' and '%s'"
+msgstr "比较“%s”与“%s”时发生错误"
+
+#: libsvn_wc/log.c:1345
+#, c-format
+msgid "Error replacing text-base of '%s'"
+msgstr "替换“%s”的文件参考基础时发生错误"
 
-# as-is
-#: libsvn_ra_svn/editorp.c:631 libsvn_ra_svn/editorp.c:649
-msgid "Apply-textdelta not active"
-msgstr "Apply-textdelta 没有激活"
+#: libsvn_wc/log.c:1354
+#, c-format
+msgid "Error getting 'affected time' of '%s'"
+msgstr "取得“%s”的 'affected time' 时发生错误"
 
-#: libsvn_ra_svn/editorp.c:797 libsvn_ra_svn/marshal.c:833
+#: libsvn_wc/log.c:1392 libsvn_wc/log.c:1459
 #, c-format
-msgid "Unknown command '%s'"
-msgstr "未知的命令:“%s”"
+msgid "Error modifying entry of '%s'"
+msgstr "修改“%s”的项目时发生错误"
 
-# as-is
-#: libsvn_ra_svn/marshal.c:78
-msgid "Capability entry is not a word"
-msgstr "容量条目不是一个 word"
+#: libsvn_wc/log.c:1514
+#, fuzzy
+msgid "Invalid 'format' attribute"
+msgstr "无效的配置值"
 
-#: libsvn_ra_svn/marshal.c:160
-msgid "Can't write to connection"
-msgstr "无法写入连线"
+#: libsvn_wc/log.c:1549
+#, c-format
+msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
+msgstr "日志文件项目丢失 'name' 属性 (项目“%s”对应至目录“%s”)"
 
-#: libsvn_ra_svn/marshal.c:250
-msgid "Can't read from connection"
-msgstr "无法读取连线"
+#: libsvn_wc/log.c:1620
+#, c-format
+msgid "Unrecognized logfile element '%s' in '%s'"
+msgstr "无法确认的日志文件元素“%s”于“%s”中"
 
-#: libsvn_ra_svn/marshal.c:253
-msgid "Connection closed unexpectedly"
-msgstr "网络连线意想不到地关闭"
+#: libsvn_wc/log.c:1631
+#, c-format
+msgid "Error processing command '%s' in '%s'"
+msgstr "在“%2$s”中处理命令“%1$s”时发生错误"
 
-#: libsvn_ra_svn/marshal.c:497
-msgid "String length larger than maximum"
-msgstr "字串长度超出上限"
+#: libsvn_wc/log.c:1809
+msgid "Couldn't open log"
+msgstr "无法打开日志文件"
 
-#: libsvn_ra_svn/marshal.c:534
-msgid "Too many nested items"
-msgstr "太多嵌套的项目"
+#: libsvn_wc/log.c:1820
+#, c-format
+msgid "Error reading administrative log file in '%s'"
+msgstr "于“%s”中读取管理日志文件时发生错误"
 
-#: libsvn_ra_svn/marshal.c:553
-msgid "Number is larger than maximum"
-msgstr "数字大小超过上限"
+#: libsvn_wc/log.c:2435
+#, c-format
+msgid "Error writing log for '%s'"
+msgstr "为“%s”写入日志时发生错误"
 
-#: libsvn_ra_svn/marshal.c:756
-msgid "Empty error list"
-msgstr "空的错误列表"
+#: libsvn_wc/log.c:2483
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "“%s”并不是工作拷贝目录"
 
-#: libsvn_ra_svn/marshal.c:765
-msgid "Malformed error list"
-msgstr "畸形的错误列表"
+#: libsvn_wc/props.c:93
+#, c-format
+msgid "Can't parse '%s'"
+msgstr "无法剖析“%s”"
 
-#: libsvn_ra_svn/marshal.c:804
+#: libsvn_wc/props.c:120
 #, c-format
-msgid "Unknown status '%s' in command response"
-msgstr "命令回应中的未知状态“%s”"
+msgid "Can't write property hash to '%s'"
+msgstr "无法写入属性集到“%s”"
 
-#: libsvn_repos/commit.c:128
+#: libsvn_wc/props.c:213
 #, c-format
-msgid "Out of date: '%s' in transaction '%s'"
-msgstr "过期:”%s“在事务”%s“"
+msgid "Can't find entry '%s' in '%s'"
+msgstr "无法在“%2$s”中找到项目“%1$s”"
 
-#: libsvn_repos/commit.c:295 libsvn_repos/commit.c:460
+#: libsvn_wc/props.c:628
 #, c-format
-msgid "Got source path but no source revision for '%s'"
-msgstr "获得源路径,但”%s“没有源修订版"
+msgid ""
+"Trying to add new property '%s' with value '%s',\n"
+"but property already exists with value '%s'."
+msgstr ""
+"尝试添加新属性“%s”的值为“%s”,\n"
+"但是属性已经存在,值为“%s”。"
 
-#: libsvn_repos/commit.c:327 libsvn_repos/commit.c:491
+#: libsvn_wc/props.c:651
 #, c-format
-msgid "Source url '%s' is from different repository"
-msgstr "来源地址(URL)“%s”来自其它的档案库"
+msgid ""
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but the property does not exist."
+msgstr ""
+"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
+"但是属性并不存在。"
 
-#: libsvn_repos/commit.c:400
+#: libsvn_wc/props.c:679
 #, fuzzy, c-format
-msgid "Path '%s' not present"
-msgstr "路径“%s”不存在"
+msgid ""
+"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+msgstr ""
+"尝试添加新属性“%s”的值为“%s”,\n"
+"但是属性已经存在,值为“%s”。"
 
-#: libsvn_repos/commit.c:616
+#: libsvn_wc/props.c:697
 #, c-format
 msgid ""
-"Checksum mismatch for resulting fulltext\n"
-"(%s):\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but property already exists with value '%s'."
 msgstr ""
-"“%s”的总和检查值不符合:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
+"但是属性的值已经是“%s”了。"
 
-#: libsvn_repos/delta.c:180
-msgid "Unable to open root of edit"
-msgstr "无法打开编辑"
+#: libsvn_wc/props.c:880
+#, fuzzy, c-format
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_repos/delta.c:231
-msgid "Invalid target path"
-msgstr "无效的目标路径"
+#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
+#: libsvn_wc/props.c:1626
+msgid "Failed to load properties from disk"
+msgstr "无法从磁碟装载属性"
 
-#: libsvn_repos/delta.c:257
-msgid ""
-"Invalid editor anchoring; at least one of the input paths is not a directory "
-"and there was no source entry"
-msgstr "无效的编辑器定位;至少一个输入路径不是目录并且没有源入口"
+#: libsvn_wc/props.c:1128
+#, c-format
+msgid "Cannot write property hash for '%s'"
+msgstr "无法写入“%s”的属性杂凑"
 
-# as-is
-#: libsvn_repos/dump.c:416
+#: libsvn_wc/props.c:1362 libsvn_wc/props.c:1498
 #, c-format
-msgid ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-msgstr ""
-"警告:修订版 %ld 的参考数据比最旧的转存数据修订版 (%ld)还旧。\n"
-"警告: 装载这个转存到空的档案库会失败。\n"
-"\n"
+msgid "Property '%s' is an entry property"
+msgstr "属性“%s”是项目属性"
 
-#: libsvn_repos/dump.c:934
+#: libsvn_wc/props.c:1407
 #, c-format
-msgid "Start revision %ld is greater than end revision %ld"
-msgstr "起始修订版 %ld 比结束修订版号 %ld 为大"
+msgid "Cannot set '%s' on a directory ('%s')"
+msgstr "无法设定“%s”于目录 (“%s”)"
 
-#: libsvn_repos/dump.c:939
+#: libsvn_wc/props.c:1415
 #, c-format
-msgid "End revision %ld is invalid (youngest revision is %ld)"
-msgstr "结束修订版 %ld 无效 (最新的修订版为 %ld)"
+msgid "Cannot set '%s' on a file ('%s')"
+msgstr "无法设定“%s”于文件 (“%s”)"
 
-# as-is
-#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
-msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+#: libsvn_wc/props.c:1421
+#, c-format
+msgid "'%s' is not a file or directory"
+msgstr "“%s”不是文件或目录"
 
-# as-is
-#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
-msgid "* Verified revision %ld.\n"
-msgstr "* 校验修订版 %ld。\n"
+#: libsvn_wc/props.c:1445
+#, c-format
+msgid "File '%s' has binary mime type property"
+msgstr "文件“%s”有二进制的 mime 型别属性"
 
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1218
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "提交成功,但是发送提交外挂(post-commit)失败"
+#: libsvn_wc/props.c:2101
+#, c-format
+msgid "Error parsing %s property on '%s': '%s'"
+msgstr "剖析 %s 属性于“%s”发生错误:“%s”"
 
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_wc/props.c:2114
 #, c-format
 msgid ""
-"Storage of non-regular property '%s' is disallowed through the repository "
-"interface, and could indicate a bug in your client"
-msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
+"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
+"path"
+msgstr "无效属性 %s 于“%s”:目录牵涉到 '.' 或 '..' 或是绝对路径"
 
-#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
-msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
+#: libsvn_wc/questions.c:120
+#, c-format
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr "“%s”的工作拷贝格式已过时(%d);请重新取出您的工作拷贝"
 
-#: libsvn_repos/fs-wrap.c:484
+#: libsvn_wc/questions.c:128
 #, c-format
-msgid "Cannot unlock path '%s', no authenticated username available"
-msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
+msgid ""
+"This client is too old to work with working copy '%s'; please get a newer "
+"Subversion client"
+msgstr "本客户端已过时,无法存取工作拷贝“%s”;请取得更新版的 Subversion 客户端"
 
-#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
-msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
+#: libsvn_wc/questions.c:341
+#, c-format
+msgid ""
+"Checksum mismatch indicates corrupt text base: '%s'\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"总和检查值不一致,表示文件参考基础损坏:“%s”\n"
+" 预期: %s\n"
+" 实际: %s\n"
+
+#: libsvn_wc/relocate.c:69
+msgid "Relocate can only change the repository part of an URL"
+msgstr ""
 
-#: libsvn_repos/hooks.c:66
+#: libsvn_wc/update_editor.c:390
 #, c-format
-msgid "Can't create pipe for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgid "No '.' entry in: '%s'"
+msgstr "不存在 '.' 项目:“%s”"
 
-#: libsvn_repos/hooks.c:73
+#: libsvn_wc/update_editor.c:896
 #, c-format
-msgid "Can't create null stdout for hook '%s'"
-msgstr "无法为外挂“%s”创建空的标准输出"
+msgid "Won't delete locally modified directory '%s'"
+msgstr "无法删除本地修改的目录“%s”"
 
-#: libsvn_repos/hooks.c:85
-msgid "Error closing write end of stderr pipe"
-msgstr "关闭标准错误管道末尾发生错误"
+#: libsvn_wc/update_editor.c:970
+#, c-format
+msgid "Error writing log file for '%s'"
+msgstr "写入“%s”的日志文件时发生错误"
 
-#: libsvn_repos/hooks.c:90
+#: libsvn_wc/update_editor.c:1078
 #, fuzzy, c-format
-msgid "Failed to start '%s' hook"
-msgstr "运行外挂“%s”失败"
-
-#: libsvn_repos/hooks.c:108
-#, c-format
 msgid ""
-"'%s' hook failed with error output:\n"
-"%s"
-msgstr ""
-"外挂“%s”失败,错误输出:\n"
-"%s"
+"Failed to add directory '%s': a non-directory object of the same name "
+"already exists"
+msgstr "无法新增目录“%s”:同名物件已存在"
 
-#: libsvn_repos/hooks.c:115
+#: libsvn_wc/update_editor.c:1108
 #, fuzzy, c-format
-msgid "'%s' hook failed; no error output available"
-msgstr "外挂“%s”失败;没有可用的错误输出"
-
-#: libsvn_repos/hooks.c:134
-msgid "Error closing read end of stderr pipe"
-msgstr "关闭读标准错误管道末尾发生错误"
-
-#: libsvn_repos/hooks.c:138
-msgid "Error closing null file"
-msgstr "关闭空文件发生错误"
+msgid ""
+"Failed to forcibly add directory '%s': a versioned directory of the same "
+"name already exists"
+msgstr "无法新增目录“%s”:同名物件已存在"
 
-#: libsvn_repos/hooks.c:220
+#: libsvn_wc/update_editor.c:1121
 #, c-format
-msgid "Failed to run '%s' hook; broken symlink"
-msgstr "运行外挂“%s”失败;无效的符号连接"
+msgid "Failed to add directory '%s': object of the same name already exists"
+msgstr "无法新增目录“%s”:同名物件已存在"
 
-#: libsvn_repos/hooks.c:361
+#: libsvn_wc/update_editor.c:1130
+#, c-format
 msgid ""
-"Repository has not been enabled to accept revision propchanges;\n"
-"ask the administrator to create a pre-revprop-change hook"
-msgstr ""
-"档案库未激活接受修订版属性改变;请管理员创建一个 pre-revprop-change 外挂"
-
-#: libsvn_repos/load.c:157 libsvn_repos/load.c:169
-msgid "Found malformed header block in dumpfile stream"
-msgstr "在导出文件流中找到有畸形的文件头"
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
+msgstr "无法新增目录“%s”:物件与管理目录同名"
 
-#: libsvn_repos/load.c:187
-msgid "Premature end of content data in dumpstream"
-msgstr "导出流中内容数据过早结束"
+#: libsvn_wc/update_editor.c:1144
+#, c-format
+msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
+msgstr "无法新增文件“%s”:copyfrom 参数尚不支持"
 
-#: libsvn_repos/load.c:194
-msgid "Dumpstream data appears to be malformed"
-msgstr "导出流数据中出现畸形"
+#: libsvn_wc/update_editor.c:1165
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name is already scheduled "
+"for addition"
+msgstr "无法新增目录“%s”:同名物件已加入新增调度"
 
-#: libsvn_repos/load.c:232
-msgid "Incomplete or unterminated property block"
-msgstr "不完整或未结束的属性块"
+#: libsvn_wc/update_editor.c:1370
+msgid "Couldn't do property merge"
+msgstr "无法进行属性合并"
 
-#: libsvn_repos/load.c:425
-msgid "Unexpected EOF writing contents"
-msgstr "写内容时有意料之外的结束符"
+#: libsvn_wc/update_editor.c:1434
+#, c-format
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr "无法将“%s”标记为不存在:同名项目已加入新增调度"
 
-#: libsvn_repos/load.c:454
-msgid "Malformed dumpfile header"
-msgstr "畸形的导出文件头"
+#: libsvn_wc/update_editor.c:1534
+#, fuzzy, c-format
+msgid ""
+"Failed to add file '%s': a non-file object of the same name already exists"
+msgstr "无法新增文件“%s”:同名物件已存在"
 
-#: libsvn_repos/load.c:460 libsvn_repos/load.c:502
+#: libsvn_wc/update_editor.c:1545
 #, c-format
-msgid "Unsupported dumpfile version: %d"
-msgstr "不支持的导出文件版本:%d"
+msgid "Failed to add file '%s': object of the same name already exists"
+msgstr "无法新增文件“%s”:同名物件已存在"
 
-#: libsvn_repos/load.c:600
-msgid "Unrecognized record type in stream"
-msgstr "流中有无法辨识的记录类型"
+#: libsvn_wc/update_editor.c:1567
+#, c-format
+msgid ""
+"Failed to add file '%s': object of the same name is already scheduled for "
+"addition"
+msgstr "无法新增文件“%s”:同名物件已加入新增调度"
 
-#: libsvn_repos/load.c:712
-msgid "Sum of subblock sizes larger than total block content length"
-msgstr "子块大小总数大于块内容长度总数"
+#: libsvn_wc/update_editor.c:1575
+#, c-format
+msgid "File '%s' in directory '%s' is not a versioned resource"
+msgstr "文件“%s”于目录“%s”中的并不是纳入版本控制的资源"
 
-# as-is
-#: libsvn_repos/load.c:891
+#: libsvn_wc/update_editor.c:1687
 #, c-format
-msgid "<<< Started new transaction, based on original revision %ld\n"
-msgstr "<<< 开始新的事务,基于最初的修订版 %ld\n"
+msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不符合;记录:“%s”,实际:“%s”"
 
-#: libsvn_repos/load.c:936
+#: libsvn_wc/update_editor.c:2851
 #, c-format
-msgid "Relative source revision %ld is not available in current repository"
-msgstr "相对来源修订版 %ld 不存在于目前档案库之中"
+msgid "'%s' has no ancestry information"
+msgstr "“%s”没有演进历程信息"
 
-#: libsvn_repos/load.c:985
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "畸形的导出流:修订版 0 不能包含节点记录"
+#: libsvn_wc/update_editor.c:3014
+#, fuzzy, c-format
+msgid "Copyfrom-url '%s' has different repository root than '%s'"
+msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
 
-#: libsvn_repos/load.c:995
-#, c-format
-msgid " * editing path : %s ..."
-msgstr " * 正在修改路径:%s ..."
+#: libsvn_wc/util.c:83
+msgid "Unable to make any directories"
+msgstr "无法建立任何目录"
+
+#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+msgid "'verbose' option invalid in XML mode"
+msgstr "在XML模式中“详细”选项无效"
 
-#: libsvn_repos/load.c:1002
+#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
+#: svn/status-cmd.c:268
+msgid "'incremental' option only valid in XML mode"
+msgstr "只有在XML模式“增加”选项才有效"
+
+#: svn/blame-cmd.c:313
 #, c-format
-msgid " * deleting path : %s ..."
-msgstr " * 正在删除路径:%s ..."
+msgid "Skipping binary file: '%s'\n"
+msgstr "跳过二进制文件:“%s”\n"
 
-#: libsvn_repos/load.c:1010
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
 #, c-format
-msgid " * adding path : %s ..."
-msgstr " * 正在添加路径:%s ..."
+msgid "'%s' does not appear to be a URL"
+msgstr "“%s”不像是地址(URL)"
+
+#: svn/copy-cmd.c:108 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
+msgid "Local, non-commit operations do not take a log message"
+msgstr "本地操作,非提交的操作不能获取日志信息"
 
-#: libsvn_repos/load.c:1019
+#: svn/diff-cmd.c:117 svnserve/main.c:499
 #, c-format
-msgid " * replacing path : %s ..."
-msgstr " * 正在替换路径:%s ..."
+msgid "Can't open stdout"
+msgstr "无法打开标准输出 (stdout)"
 
-#: libsvn_repos/load.c:1029
+#: svn/diff-cmd.c:119
 #, c-format
-msgid "Unrecognized node-action on node '%s'"
-msgstr "“%s”的节点种动作法辨识"
+msgid "Can't open stderr"
+msgstr "无法打开标准错误 (stderr)"
 
-#: libsvn_repos/load.c:1165
+#: svn/diff-cmd.c:184
 #, fuzzy
-msgid " done.\n"
-msgstr "完成。\n"
+msgid "'--new' option only valid with '--old' option"
+msgstr "只有在XML模式“增加”选项才有效"
 
-# as-is
-#: libsvn_repos/load.c:1240
+#: svn/diff-cmd.c:214
 #, c-format
+msgid "Target lists to diff may not contain both working copy paths and URLs"
+msgstr "差异比较目标不可同时包含工作拷贝路径与地址(URL)"
+
+#: svn/export-cmd.c:84
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
+
+#: svn/help-cmd.c:45
+#, fuzzy, c-format
 msgid ""
+"usage: svn <subcommand> [options] [args]\n"
+"Subversion command-line client, version %s.\n"
+"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svn --version' to see the program version and RA modules\n"
+" or 'svn --version --quiet' to see just the version number.\n"
 "\n"
-"------- Committed revision %ld >>>\n"
+"Most subcommands take file and/or directory arguments, recursing\n"
+"on the directories. If no arguments are supplied to such a\n"
+"command, it recurses on the current directory (inclusive) by default.\n"
 "\n"
+"Available subcommands:\n"
 msgstr ""
+"用法:svn <subcommand> [options] [args]\n"
+"Subversion 命令行客户端,版本 %s。\n"
+"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
+"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
+"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
+"行递归存取。\n"
 "\n"
-"------- 提交后的修订版 %ld >>>\n"
-"\n"
+"可用的子命令:\n"
 
-# as-is
-#: libsvn_repos/load.c:1246
-#, c-format
+#: svn/help-cmd.c:58
 msgid ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
+"Subversion is a tool for version control.\n"
+"For additional information, see http://subversion.tigris.org/\n"
 msgstr ""
+"Subversion 是个版本控制系统的工具。\n"
+"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+
+#: svn/help-cmd.c:65 svnsync/main.c:1246
+msgid ""
+"The following repository access (RA) modules are available:\n"
 "\n"
-"------- 提交新修订版 %ld (从原始修订版 %ld 装载) >>>\n"
+msgstr ""
+"可使用以下的档案库存取 (RA) 模块:\n"
 "\n"
 
-#: libsvn_repos/node_tree.c:238
-#, c-format
-msgid "'%s' not found in filesystem"
-msgstr "在文件系统中找不到“%s”"
+#: svn/import-cmd.c:82
+msgid "Repository URL required when importing"
+msgstr "导入时必须提供档案库的地址(URL)"
 
-#: libsvn_repos/replay.c:159
-#, c-format
-msgid "Filesystem path '%s' is neither a file nor a directory"
-msgstr "文件系统中路径“%s”既不是文件也不是目录"
+#: svn/import-cmd.c:86
+msgid "Too many arguments to import command"
+msgstr "导入命令有太多参数"
 
-#: libsvn_repos/reporter.c:603
+#: svn/import-cmd.c:101
 #, c-format
-msgid "Working copy path '%s' does not exist in repository"
-msgstr "工作拷贝路径“%s”不存在档案库中"
-
-#: libsvn_repos/reporter.c:824
-msgid "Not authorized to open root of edit operation"
-msgstr "未授权打开根进行编辑操作"
+msgid "Invalid URL '%s'"
+msgstr "无效地址(URL)“%s”"
 
-#: libsvn_repos/reporter.c:845
-msgid "Cannot replace a directory from within"
-msgstr "不能在目录中替换"
+#: svn/info-cmd.c:111
+#, fuzzy, c-format
+msgid "'%s' has invalid revision"
+msgstr "项目“%s”有无效的节点种类"
 
-#: libsvn_repos/reporter.c:888
-msgid "Invalid report for top level of working copy"
-msgstr "无效的最上层工作拷贝报告"
+#: svn/info-cmd.c:267 svnadmin/main.c:1046
+#, c-format
+msgid "Path: %s\n"
+msgstr "路径:%s\n"
 
-#: libsvn_repos/reporter.c:903
-msgid "Two top-level reports with no target"
-msgstr "两个最上层报告没有目标"
+# this points to filename according to sunny256
+#: svn/info-cmd.c:273 svnlook/main.c:734
+#, c-format
+msgid "Name: %s\n"
+msgstr "文件名:%s\n"
 
-#: libsvn_repos/repos.c:176
+#: svn/info-cmd.c:277
 #, c-format
-msgid "'%s' exists and is non-empty"
-msgstr "“%s”已存在并且非空"
+msgid "URL: %s\n"
+msgstr "地址(URL):%s\n"
 
-#: libsvn_repos/repos.c:200
-msgid "Creating db logs lock file"
-msgstr "正在创建数据库日值锁文件"
+#: svn/info-cmd.c:280
+#, fuzzy, c-format
+msgid "Repository Root: %s\n"
+msgstr "档案库根路径:%s\n"
 
-#: libsvn_repos/repos.c:225
-msgid "Creating db lock file"
-msgstr "正在创建数据库锁文件"
+#: svn/info-cmd.c:284
+#, c-format
+msgid "Repository UUID: %s\n"
+msgstr "档案库 UUID:%s\n"
 
-#: libsvn_repos/repos.c:235
-msgid "Creating lock dir"
-msgstr "正在创建锁文件目录"
+#: svn/info-cmd.c:288
+#, c-format
+msgid "Revision: %ld\n"
+msgstr "修订版:%ld\n"
 
-#: libsvn_repos/repos.c:276
-msgid "Creating hook directory"
-msgstr "正在创建外挂目录"
+#: svn/info-cmd.c:293
+#, c-format
+msgid "Node Kind: file\n"
+msgstr "节点种类:文件\n"
 
-#: libsvn_repos/repos.c:382
-msgid "Creating start-commit hook"
-msgstr "正在创建 start-commit 外挂时发生错误"
+#: svn/info-cmd.c:297
+#, c-format
+msgid "Node Kind: directory\n"
+msgstr "节点种类:目录\n"
 
-#: libsvn_repos/repos.c:519
-msgid "Creating pre-commit hook"
-msgstr "正在创建 pre-commit 外挂"
+#: svn/info-cmd.c:301
+#, c-format
+msgid "Node Kind: none\n"
+msgstr "节点种类:无\n"
 
-#: libsvn_repos/repos.c:651
-msgid "Creating pre-revprop-change hook"
-msgstr "正在创建 pre-revprop-change 外挂"
+#: svn/info-cmd.c:306
+#, c-format
+msgid "Node Kind: unknown\n"
+msgstr "节点种类:未知\n"
 
-#: libsvn_repos/repos.c:1026
-msgid "Creating post-commit hook"
-msgstr "正在创建 post-commit 外挂"
+#: svn/info-cmd.c:315
+#, c-format
+msgid "Schedule: normal\n"
+msgstr "调度:正常\n"
 
-#: libsvn_repos/repos.c:1346
-msgid "Creating post-revprop-change hook"
-msgstr "正在创建 post-revprop-change 外挂"
+#: svn/info-cmd.c:319
+#, c-format
+msgid "Schedule: add\n"
+msgstr "调度:新增\n"
 
-#: libsvn_repos/repos.c:1356
-msgid "Creating conf directory"
-msgstr "正在创建 conf 目录"
+#: svn/info-cmd.c:323
+#, c-format
+msgid "Schedule: delete\n"
+msgstr "调度:删除\n"
 
-#: libsvn_repos/repos.c:1408
-msgid "Creating svnserve.conf file"
-msgstr "正在创建 svnserve.conf 文件"
+#: svn/info-cmd.c:327
+#, c-format
+msgid "Schedule: replace\n"
+msgstr "调度:替换\n"
 
-#: libsvn_repos/repos.c:1433
-msgid "Creating passwd file"
-msgstr "正在创建 passwd 文件"
+#: svn/info-cmd.c:335
+#, c-format
+msgid "Copied From URL: %s\n"
+msgstr "复制自地址(URL):%s\n"
 
-#: libsvn_repos/repos.c:1459
-msgid "Could not create top-level directory"
-msgstr "无法创建最上层目录"
+#: svn/info-cmd.c:339
+#, c-format
+msgid "Copied From Rev: %ld\n"
+msgstr "复制自修订版:%ld\n"
 
-#: libsvn_repos/repos.c:1463
-msgid "Creating DAV sandbox dir"
-msgstr "正在创建 DAV sandbox 目录"
+#: svn/info-cmd.c:344
+#, c-format
+msgid "Last Changed Author: %s\n"
+msgstr "最后修改的作者:%s\n"
 
-# as-is
-#: libsvn_repos/repos.c:1506
-msgid "Creating readme file"
-msgstr "正在创建 readme 文件"
+#: svn/info-cmd.c:348
+#, c-format
+msgid "Last Changed Rev: %ld\n"
+msgstr "最后修改的修订版:%ld\n"
 
-#: libsvn_repos/repos.c:1538
-msgid "Repository creation failed"
-msgstr "档案库创建失败"
+#: svn/info-cmd.c:353
+msgid "Last Changed Date"
+msgstr "最后修改的时间"
 
-#: libsvn_repos/repos.c:1610
-#, fuzzy, c-format
-msgid "Expected format '%d' of repository; found format '%d'"
-msgstr "预期档案库格式“%d”;找到格式“%d”"
+#: svn/info-cmd.c:359
+msgid "Text Last Updated"
+msgstr "文本最后更新"
 
-#: libsvn_repos/repos.c:1658
-msgid "Error opening db lockfile"
-msgstr "打开数据库锁文件错误"
+#: svn/info-cmd.c:363
+msgid "Properties Last Updated"
+msgstr "属性最后更新"
 
-#: libsvn_repos/rev_hunt.c:63
+#: svn/info-cmd.c:366
 #, c-format
-msgid "Failed to find time on revision %ld"
-msgstr "无法找到修订版 %ld 的时间"
+msgid "Checksum: %s\n"
+msgstr "校验和:%s\n"
 
-#: libsvn_repos/rev_hunt.c:218
+#: svn/info-cmd.c:371
 #, c-format
-msgid "Invalid start revision %ld"
-msgstr "无效的起始修订版 %ld"
+msgid "Conflict Previous Base File: %s\n"
+msgstr "冲突之前的文件:%s\n"
 
-#: libsvn_repos/rev_hunt.c:222
+#: svn/info-cmd.c:377
 #, c-format
-msgid "Invalid end revision %ld"
-msgstr "无效的结束修订版 %ld"
-
-#: libsvn_repos/rev_hunt.c:314
-#, fuzzy
-msgid "Unreadable path encountered; access denied"
-msgstr "遇到不能读的路径;访问拒绝。"
+msgid "Conflict Previous Working File: %s\n"
+msgstr "冲突之前的工作文件:%s\n"
 
-#: libsvn_subr/config.c:632
+#: svn/info-cmd.c:382
 #, c-format
-msgid "Config error: invalid boolean value '%s'"
-msgstr "配置错误:无效的布尔值“%s”"
+msgid "Conflict Current Base File: %s\n"
+msgstr "冲突之前的当前文件:%s\n"
 
-#: libsvn_subr/config.c:882
+#: svn/info-cmd.c:387
 #, c-format
-msgid "Config error: invalid integer value '%s'"
-msgstr "配置错误:无效的整数值“%s”"
+msgid "Conflict Properties File: %s\n"
+msgstr "冲突的属性文件:%s\n"
 
-#: libsvn_subr/config_auth.c:94
-msgid "Unable to open auth file for reading"
-msgstr "不能打开认证文件读取数据"
+#: svn/info-cmd.c:395
+#, c-format
+msgid "Lock Token: %s\n"
+msgstr "锁定记号:%s\n"
 
-#: libsvn_subr/config_auth.c:99
+#: svn/info-cmd.c:399
 #, c-format
-msgid "Error parsing '%s'"
-msgstr "分解“%s”时发生错误"
+msgid "Lock Owner: %s\n"
+msgstr "锁定所有者:%s\n"
 
-#: libsvn_subr/config_auth.c:123
-msgid "Unable to locate auth file"
-msgstr "无法定位认证文件文件"
+#: svn/info-cmd.c:404
+msgid "Lock Created"
+msgstr "锁定已创建的"
 
-#: libsvn_subr/config_auth.c:134
-msgid "Unable to open auth file for writing"
-msgstr "无法打开认证文件写入数据"
+#: svn/info-cmd.c:408
+msgid "Lock Expires"
+msgstr "锁定过期的"
 
-#: libsvn_subr/config_auth.c:137
+#: svn/info-cmd.c:417
 #, c-format
-msgid "Error writing hash to '%s'"
-msgstr "写哈希数据至“%s”时发生错误"
+msgid ""
+"Lock Comment (%i lines):\n"
+"%s\n"
+msgstr ""
+"锁定注释(%i 行):\n"
+"%s\n"
 
-# as-is
-#: libsvn_subr/config_file.c:393
+#: svn/info-cmd.c:418
 #, c-format
-msgid "Can't open config file '%s'"
-msgstr "不能打开配置文件“%s”"
+msgid ""
+"Lock Comment (%i line):\n"
+"%s\n"
+msgstr ""
+"锁定注释(%i line):\n"
+"%s\n"
 
-# as-is
-#: libsvn_subr/config_file.c:397
+#: svn/info-cmd.c:425
+#, fuzzy, c-format
+msgid "Changelist: %s\n"
+msgstr "校验和:%s\n"
+
+#: svn/info-cmd.c:477 svn/revert-cmd.c:59
+#, fuzzy, c-format
+msgid "no such changelist '%s'"
+msgstr "没有这样的项目:“%s”"
+
+#: svn/info-cmd.c:539
 #, c-format
-msgid "Can't find config file '%s'"
-msgstr "找不到配置文件“%s”"
+msgid ""
+"%s: (Not a versioned resource)\n"
+"\n"
+msgstr ""
+"%s:(不是受版本控制的资源)\n"
+"\n"
 
-#: libsvn_subr/date.c:204
-msgid "Can't manipulate current date"
-msgstr "不能获得当前日期"
+#: svn/info-cmd.c:548
+#, fuzzy, c-format
+msgid ""
+"%s: (Not a valid URL)\n"
+"\n"
+msgstr ""
+"%s:(不是有效的地址(URL))\n"
+"\n"
 
-#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
-msgid "Can't calculate requested date"
-msgstr "无法计算被请求的日期"
+#: svn/lock-cmd.c:52
+#, fuzzy
+msgid "Lock comment contains a zero byte"
+msgstr "锁定的注释中有一个零字节"
 
-#: libsvn_subr/date.c:281
-msgid "Can't expand time"
-msgstr "无法明确时间"
+#: svn/log-cmd.c:162
+msgid "(no author)"
+msgstr "(没有作者信息)"
 
-#: libsvn_subr/error.c:326
-msgid "Can't recode error string from APR"
-msgstr "无法自 APR 将错误信息重新编码"
+#: svn/log-cmd.c:173
+msgid "(no date)"
+msgstr "(没有时间)"
 
-#: libsvn_subr/error.c:414
+#: svn/log-cmd.c:203
 #, c-format
-msgid "%swarning: %s\n"
-msgstr "%s警告:%s\n"
+msgid "Changed paths:\n"
+msgstr "改变的路径:\n"
 
-#: libsvn_subr/io.c:129
+#: svn/log-cmd.c:218
 #, c-format
-msgid "Can't check path '%s'"
-msgstr "无法检查路径“%s”"
+msgid " (from %s:%ld)"
+msgstr " (从 %s:%ld)"
 
-#: libsvn_subr/io.c:248 libsvn_subr/io.c:337
-#, c-format
-msgid "Can't open '%s'"
-msgstr "不能打开“%s”"
+#: svn/log-cmd.c:450
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "当指定工作拷贝路径,只有一个目标会被指定"
 
-#: libsvn_subr/io.c:262 libsvn_subr/io.c:350
-#, c-format
-msgid "Unable to make name for '%s'"
-msgstr "不能使用名字“%s”"
+#: svn/log-cmd.c:462
+msgid "Only relative paths can be specified after a URL"
+msgstr "地址(URL)后只能指定相对路径"
 
-#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418
-msgid "Symbolic links are not supported on this platform"
-msgstr "此平台不支持符号链接"
+#: svn/main.c:60
+msgid "force operation to run"
+msgstr "强制操作运行"
 
-#: libsvn_subr/io.c:377
-msgid "Can't read contents of link"
-msgstr "不能读取连接的内容"
+#: svn/main.c:62
+msgid "force validity of log message source"
+msgstr "强制校验日志信息资源"
 
-#: libsvn_subr/io.c:519 libsvn_subr/io.c:529
-msgid "Can't find a temporary directory"
-msgstr "无法找到临时目录"
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:227 svnadmin/main.c:230
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+msgid "show help on a subcommand"
+msgstr "显示子命令帮助"
 
-#: libsvn_subr/io.c:566
-#, c-format
-msgid "Can't copy '%s' to '%s'"
-msgstr "不能复制“%s”到“%s”"
+#: svn/main.c:65
+#, fuzzy
+msgid "specify log message ARG"
+msgstr "指定提交信息ARG"
 
-# as-is
-#: libsvn_subr/io.c:599
-#, c-format
-msgid "Can't set permissions on '%s'"
-msgstr "不能在“%s”设置许可权限"
+#: svn/main.c:66
+msgid "print as little as possible"
+msgstr "打印尽可能少"
 
-#: libsvn_subr/io.c:621
-#, c-format
-msgid "Can't append '%s' to '%s'"
-msgstr "不能附加“%s”到“%s”"
+#: svn/main.c:67
+msgid "descend recursively"
+msgstr "向下递归"
 
-#: libsvn_subr/io.c:655
-#, c-format
-msgid "Source '%s' is not a directory"
-msgstr "源“%s”不是目录"
+#: svn/main.c:68
+msgid "operate on single directory only"
+msgstr "只在单个目录操作"
 
-#: libsvn_subr/io.c:661
-#, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目的“%s”不是目录"
+#: svn/main.c:70
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+" If ARG is negative this is like -r ARG:ARG-1"
+msgstr ""
 
-#: libsvn_subr/io.c:667
-#, c-format
-msgid "Destination '%s' already exists"
-msgstr "目的“%s”已存在"
+#: svn/main.c:74
+#, fuzzy
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" '{' DATE '}' revision at start of the date\n"
+" 'HEAD' latest in repository\n"
+" 'BASE' base rev of item's working "
+"copy\n"
+" 'COMMITTED' last commit at or before BASE\n"
+" 'PREV' revision just before COMMITTED"
+msgstr ""
+"ARG (一些命令需要 ARG1:ARG2 )\n"
+" 修订版参数可以是:\n"
+" 数字 修订版号\n"
+" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
+" \"HEAD\" 最近的档案库\n"
+" \"BASE\" 基线,基于修订版的工作条目 \n"
+" \"COMMITTED\" 最后提交或基线之前\n"
+" \"PREV\" 修订版提交之前"
 
-#: libsvn_subr/io.c:736 libsvn_subr/io.c:1636 libsvn_subr/io.c:1707
-#, c-format
-msgid "Can't read directory '%s'"
-msgstr "无法读取目录“%s”"
+#: svn/main.c:84
+#, fuzzy
+msgid "read log message from file ARG"
+msgstr "从文件 ARG 读取数据"
 
-#: libsvn_subr/io.c:741 libsvn_subr/io.c:1641 libsvn_subr/io.c:1712
-#: libsvn_subr/io.c:2695
-#, c-format
-msgid "Error closing directory '%s'"
-msgstr "关闭目录“%s”时发生错误"
+#: svn/main.c:86
+msgid "give output suitable for concatenation"
+msgstr "给予适合输出的"
 
-#: libsvn_subr/io.c:767
-#, c-format
-msgid "Can't make directory '%s'"
-msgstr "无法创建目录“%s”"
+#: svn/main.c:89
+msgid "treat value as being in charset encoding ARG"
+msgstr "指定的值 ARG 为字符编码"
 
-# as-is
-#: libsvn_subr/io.c:835
-#, c-format
-msgid "Can't set access time of '%s'"
-msgstr "不能设置“%s”的存取时间"
+#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
+#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
+#: svnversion/main.c:125
+#, fuzzy
+msgid "show program version information"
+msgstr "显示版本信息"
 
-#: libsvn_subr/io.c:950
-#, c-format
-msgid "Can't set file '%s' read-only"
-msgstr "无法设置文件“%s”只读"
+#: svn/main.c:93
+msgid "print extra information"
+msgstr "打印附加信息"
 
-#: libsvn_subr/io.c:975
-#, c-format
-msgid "Can't set file '%s' read-write"
-msgstr "无法设置文件“%s”可读写"
+#: svn/main.c:94
+msgid "display update information"
+msgstr "显示更新信息"
 
-#: libsvn_subr/io.c:1025
-#, c-format
-msgid "Can't get default file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+#: svn/main.c:96 svnsync/main.c:96
+msgid "specify a username ARG"
+msgstr "指定用户 ARG"
 
-# as-is
-#: libsvn_subr/io.c:1035
-#, fuzzy, c-format
-msgid "Can't open file at '%s'"
-msgstr "不能打开文件“%s”"
+#: svn/main.c:98 svnsync/main.c:98
+msgid "specify a password ARG"
+msgstr "指定密码 ARG"
 
-#: libsvn_subr/io.c:1039
-#, fuzzy, c-format
-msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+#: svn/main.c:101
+msgid ""
+"Default: '-u'. When Subversion is invoking an\n"
+" external diff program, ARG is simply passed "
+"along\n"
+" to the program. But when Subversion is using "
+"its\n"
+" default internal diff implementation, or when\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
+" could be any of the following:\n"
+" -u (--unified):\n"
+" Output 3 lines of unified context.\n"
+" -b (--ignore-space-change):\n"
+" Ignore changes in the amount of white "
+"space.\n"
+" -w (--ignore-all-space):\n"
+" Ignore all white space.\n"
+" --ignore-eol-style:\n"
+" Ignore changes in EOL style"
+msgstr ""
 
-#: libsvn_subr/io.c:1072 libsvn_subr/io.c:1132
-#, fuzzy, c-format
-msgid "Can't change read-write perms of file '%s'"
-msgstr "不能改变文件“%s”为可读写权限"
+#: svn/main.c:130
+msgid "pass contents of file ARG as additional args"
+msgstr "传递文件 ARG 内容为附件参数"
 
-#: libsvn_subr/io.c:1171 libsvn_subr/io.c:1215 libsvn_subr/io.c:1239
-#, c-format
-msgid "Can't change executability of file '%s'"
-msgstr "不能改变文件“%s”为可执行"
+#: svn/main.c:131
+msgid "output in XML"
+msgstr "输出为 XML"
 
-#: libsvn_subr/io.c:1266
-msgid "Error getting UID of process"
-msgstr "获取进程用户ID(UID)时发生错误"
+#: svn/main.c:132
+msgid "use strict semantics"
+msgstr "使用严格的语法"
 
-#: libsvn_subr/io.c:1347
-#, c-format
-msgid "Can't get shared lock on file '%s'"
-msgstr "不能获取文件“%s“的共享锁"
+#: svn/main.c:134
+msgid "do not cross copies while traversing history"
+msgstr "查看历史不要跨越不同的拷贝"
 
-#: libsvn_subr/io.c:1351
-#, c-format
-msgid "Can't get exclusive lock on file '%s'"
-msgstr "不能获取文件“%s”的排他锁"
+#: svn/main.c:136
+msgid "disregard default and svn:ignore property ignores"
+msgstr "忽略默认值和 svn:ignore 属性"
 
-# as-is
-#: libsvn_subr/io.c:1382
-#, c-format
-msgid "Can't flush file '%s'"
-msgstr "不能写入文件“%s”"
+#: svn/main.c:138 svnsync/main.c:94
+msgid "do not cache authentication tokens"
+msgstr "不要缓冲用户验证"
 
-#: libsvn_subr/io.c:1383
-msgid "Can't flush stream"
-msgstr "不能写入流"
+#: svn/main.c:140 svnsync/main.c:92
+msgid "do no interactive prompting"
+msgstr "不要交互提示"
 
-#: libsvn_subr/io.c:1395 libsvn_subr/io.c:1412
-msgid "Can't flush file to disk"
-msgstr "不能把文件写入磁盘"
+#: svn/main.c:142
+msgid "try operation but make no changes"
+msgstr "尝试操作但不修改"
 
-#: libsvn_subr/io.c:1433
-msgid "Reading from stdin is currently broken, so disabled"
-msgstr "从标准输入设备读取数据时被中断,所以把它禁止"
+#: svn/main.c:144 svnlook/main.c:111
+msgid "do not print differences for deleted files"
+msgstr "不要打印已删除文件的不同处"
 
-#: libsvn_subr/io.c:1454
-msgid "Can't get file name"
-msgstr "无法获取文件名"
+#: svn/main.c:146
+msgid "notice ancestry when calculating differences"
+msgstr "比较差异时提示原始信息"
 
-# as-is
-#: libsvn_subr/io.c:1522
-#, c-format
-msgid "Can't remove file '%s'"
-msgstr "不能移动文件“%s”"
+#: svn/main.c:148
+msgid "ignore ancestry when calculating merges"
+msgstr "合并时忽略原始信息"
 
-#: libsvn_subr/io.c:1551
-#, c-format
-msgid "Can't rewind directory '%s'"
-msgstr "无法返回目录“%s”"
+#: svn/main.c:150
+msgid "ignore externals definitions"
+msgstr "忽略外部定义"
 
-#: libsvn_subr/io.c:1586 libsvn_subr/io.c:2544 libsvn_subr/io.c:2632
-#, c-format
-msgid "Can't open directory '%s'"
-msgstr "无法打开目录“%s”"
+#: svn/main.c:153
+msgid "use ARG as diff command"
+msgstr "使用 ARG 作为差异比较命令"
 
-#: libsvn_subr/io.c:1625 libsvn_subr/io.c:1647
-#, c-format
-msgid "Can't remove '%s'"
-msgstr "无法删除“%s”"
+#: svn/main.c:155
+msgid "use ARG as merge command"
+msgstr "使用 ARG 作为合并命令"
 
-#: libsvn_subr/io.c:1751
-#, c-format
-msgid "Can't create process '%s' attributes"
-msgstr "无法建立进程“%s”的属性"
+#: svn/main.c:157
+msgid "use ARG as external editor"
+msgstr "使用 ARG 作为外部编辑器"
 
-#: libsvn_subr/io.c:1757
-#, c-format
-msgid "Can't set process '%s' cmdtype"
-msgstr "无法设置进程“%s”的命令类型"
+#: svn/main.c:160
+msgid "use ARG as the older target"
+msgstr "使用 ARG 作为旧目标"
 
-#: libsvn_subr/io.c:1769
-#, c-format
-msgid "Can't set process '%s' directory"
-msgstr "无法设定进程“%s”目录"
+#: svn/main.c:162
+msgid "use ARG as the newer target"
+msgstr "使用 ARG 作为新目标"
 
-#: libsvn_subr/io.c:1782
-#, c-format
-msgid "Can't set process '%s' child input"
-msgstr "无法设置子进程“%s”输入"
+#: svn/main.c:164
+msgid "operate on a revision property (use with -r)"
+msgstr "在修订版属性上作操作(使用-r参数)"
 
-#: libsvn_subr/io.c:1789
-#, c-format
-msgid "Can't set process '%s' child outfile"
-msgstr "无法设置子进程“%s”输出文件"
+#: svn/main.c:166
+msgid "relocate via URL-rewriting"
+msgstr "通过URL改写重新部署"
 
-#: libsvn_subr/io.c:1796
-#, c-format
-msgid "Can't set process '%s' child errfile"
-msgstr "无法设置子进程“%s”错误输出文件"
+#: svn/main.c:168 svnadmin/main.c:269 svnsync/main.c:100
+msgid "read user configuration files from directory ARG"
+msgstr "从目录 ARG 读取用户配置文件"
 
-# as-is
-#: libsvn_subr/io.c:1820
-#, c-format
-msgid "Can't start process '%s'"
-msgstr "不能取得进程“%s”状态"
+#: svn/main.c:170
+msgid "enable automatic properties"
+msgstr "使自动属性有效"
 
-#: libsvn_subr/io.c:1842
-#, c-format
-msgid "Error waiting for process '%s'"
-msgstr "为进程“%s”写入时发生错误"
+#: svn/main.c:172
+msgid "disable automatic properties"
+msgstr "使自动属性无效"
 
-#: libsvn_subr/io.c:1850
-#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "进程“%s”失败(返回 %d)"
+#: svn/main.c:174
+#, fuzzy
+msgid ""
+"use a different EOL marker than the standard\n"
+" system marker for files with the svn:eol-style\n"
+" property set to 'native'.\n"
+" ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+"使用一个与标准不同的 EOL 标记\n"
+" 系统为文件标记 svn:eol-style 属性为 'native'。\n"
+" ARG 可以是以下之一 'LF','CR','CRLF'"
 
-#: libsvn_subr/io.c:1857
-#, c-format
-msgid "Process '%s' returned error exitcode %d"
-msgstr "进程“%s”返回错误退出码 %d"
+#: svn/main.c:182
+msgid "maximum number of log entries"
+msgstr "日值项最大值"
 
-#: libsvn_subr/io.c:1968
-#, c-format
-msgid "'%s' returned %d"
-msgstr "“%s” 返回 %d"
+#: svn/main.c:184
+msgid "don't unlock the targets"
+msgstr "不要锁定目标"
 
-#: libsvn_subr/io.c:2071
-#, c-format
-msgid ""
-"Error running '%s': exitcode was %d, args were:\n"
-"in directory '%s', basenames:\n"
-"%s\n"
-"%s\n"
-"%s"
+#: svn/main.c:186
+msgid "show a summary of the results"
 msgstr ""
-"运行“%s”时发生错误:退出码是 %d,参数是:\n"
-"在目录“%s”,名字:\n"
-"%s\n"
-"%s\n"
-"%s"
 
-#: libsvn_subr/io.c:2107
-#, c-format
-msgid "Can't detect MIME type of non-file '%s'"
-msgstr "不能检测非文件的“%s”的MIME类型"
+#: svn/main.c:188
+msgid "remove changelist association"
+msgstr ""
 
-# as-is
-#: libsvn_subr/io.c:2174
-#, c-format
-msgid "Can't open file '%s'"
-msgstr "不能打开文件“%s”"
+#: svn/main.c:190
+msgid "operate only on members of changelist ARG"
+msgstr ""
 
-#: libsvn_subr/io.c:2211
-msgid "Can't close stream"
-msgstr "无法关闭流"
+#: svn/main.c:192
+msgid "don't delete changelist after commit"
+msgstr ""
 
-# as-is
-#: libsvn_subr/io.c:2221 libsvn_subr/io.c:2245 libsvn_subr/io.c:2258
-#, c-format
-msgid "Can't read file '%s'"
-msgstr "不能读取文件“%s”"
+#: svn/main.c:231
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository. They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+"把文件和目录放入版本控制中,\n"
+"通过调度加到档案库。它们会在下一次提交时加入。\n"
+"用法:add 路径...\n"
 
-#: libsvn_subr/io.c:2222 libsvn_subr/io.c:2246 libsvn_subr/io.c:2259
-msgid "Can't read stream"
-msgstr "无法读取流"
+#: svn/main.c:239
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地址(URL)的内容,每行包含修订版和作者信息。\n"
+"\n"
+"用法:blame 目标[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
 
-#: libsvn_subr/io.c:2233
-#, c-format
-msgid "Can't get attribute information from file '%s'"
-msgstr "无法从文件“%s”获取属性信息"
+#: svn/main.c:249
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地址(URL)的内容。\n"
+"用法:cat 目标[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
 
-#: libsvn_subr/io.c:2234
-msgid "Can't get attribute information from stream"
-msgstr "无法从流获取属性信息"
+#: svn/main.c:257
+msgid ""
+"Associate (or deassociate) local paths with changelist CLNAME.\n"
+"usage: 1. changelist CLNAME TARGET...\n"
+" 2. changelist --clear TARGET...\n"
+msgstr ""
 
-#: libsvn_subr/io.c:2270
-#, c-format
-msgid "Can't set position pointer in file '%s'"
-msgstr "无法在文件“%s”设置定位指针"
+#: svn/main.c:263
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
+"\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up.\n"
+"\n"
+" If PATH is omitted, the basename of the URL will be used as\n"
+" the destination. If multiple URLs are given each will be checked\n"
+" out into a sub-directory of PATH, with the name of the sub-directory\n"
+" being the basename of the URL.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy destination do not automatically cause the check out to fail.\n"
+" If the obstructing path is the same type (file or directory) as the\n"
+" corresponding path in the repository it becomes versioned but its\n"
+" contents are left 'as-is' in the working copy. This means that an\n"
+" obstructing directory's unversioned children may also obstruct and\n"
+" become versioned. For files, any content differences between the\n"
+" obstruction and the repository are treated like a local modification\n"
+" to the working copy. All properties from the repository are applied\n"
+" to the obstructing path.\n"
+msgstr ""
 
-#: libsvn_subr/io.c:2271
-msgid "Can't set position pointer in stream"
-msgstr "无法在流中设置定位指针"
+#: svn/main.c:288
+msgid ""
+"Recursively clean up the working copy, removing locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [PATH...]\n"
+msgstr ""
+"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
+"\n"
+"用法:cleanup [路径...]\n"
 
-#: libsvn_subr/io.c:2282 libsvn_subr/io.c:2295
-#, c-format
-msgid "Can't write to file '%s'"
-msgstr "无法写入文件“%s”"
+#: svn/main.c:295
+#, fuzzy
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
+"\n"
+" A log message must be provided, but it can be empty. If it is not\n"
+" given by a --message or --file option, an editor will be started.\n"
+" If any targets are (or contain) locked items, those will be\n"
+" unlocked after a successful commit.\n"
+msgstr ""
+"把改变从工作拷贝发送到档案库。\n"
+"用法:commit [路径...]\n"
+"\n"
+" 日志信息必须提供,但可以是空的。\n"
+" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
+" 如果一些目标(或包含)锁定了条目,\n"
+" 在一个提交成功后这些条目会被解除锁定。\n"
 
-#: libsvn_subr/io.c:2283 libsvn_subr/io.c:2296
-msgid "Can't write to stream"
-msgstr "无法写入流"
+#: svn/main.c:303
+#, fuzzy
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
+"\n"
+" A log message must be provided, but it can be empty.\n"
+" OS400 does not support the starting of an editor,\n"
+" so --message or --file must be used. If any targets are\n"
+" (or contain) locked items, those will be unlocked after a\n"
+" successful commit.\n"
+msgstr ""
+"把改变从工作拷贝发送到档案库。\n"
+"用法:commit [路径...]\n"
+"\n"
+" 日志信息必须提供,但可以是空的。\n"
+" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
+" 如果一些目标(或包含)锁定了条目,\n"
+" 在一个提交成功后这些条目会被解除锁定。\n"
 
-# as-is
-#: libsvn_subr/io.c:2336
-#, fuzzy, c-format
-msgid "Can't read length line in file '%s'"
-msgstr "不能从文件“%s”读取长度行"
+#: svn/main.c:318
+msgid ""
+"Duplicate something in working copy or repository, remembering history.\n"
+"usage: copy SRC DST\n"
+"\n"
+" SRC and DST can each be either a working copy (WC) path or URL:\n"
+" WC -> WC: copy and schedule for addition (with history)\n"
+" WC -> URL: immediately commit a copy of WC to URL\n"
+" URL -> WC: check out URL into WC, schedule for addition\n"
+" URL -> URL: complete server-side copy; used to branch & tag\n"
+msgstr ""
+"在工作拷贝或档案库中复制数据,恢复历史。\n"
+"用法:copy 起源 目的\n"
+"\n"
+" 起源 和 目的 可以是工作拷贝路径或地址(URL):\n"
+" 工作拷贝 -> 工作拷贝 : 复制和通过调度进行增加(包含历史)\n"
+" 工作拷贝 -> 地址(URL) : 马上提交一个工作拷贝到地址(URL)\n"
+" 地址(URL) -> 工作拷贝 : 签出地址(URL)到工作目录,通过调度进行增加\n"
+" 地址(URL) -> 地址(URL) : 完全服务器端复制;一般用于分支和标签\n"
+
+#: svn/main.c:330
+msgid ""
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+" 2. delete URL...\n"
+"\n"
+" 1. Each item specified by a PATH is scheduled for deletion upon\n"
+" the next commit. Files, and directories that have not been\n"
+" committed, are immediately removed from the working copy.\n"
+" PATHs that are, or contain, unversioned or modified items will\n"
+" not be removed unless the --force option is given.\n"
+"\n"
+" 2. Each item specified by a URL is deleted from the repository\n"
+" via an immediate commit.\n"
+msgstr ""
+"从版本控制中删除文件和目录。\n"
+"用法:1、delete 路径...\n"
+" 2、delete 地址...\n"
+"\n"
+" 1、每一个通过路径指定的项目会被进行调度删除,下次提交时被真正删除。\n"
+" 文件和目录若未改变将马上从工作拷贝中删除。\n"
+" 路径本身或包含不受版本控制或已修改项目,\n"
+" 不会被删除,除非指定了 --force 选项。\n"
+" \n"
+"\n"
+" 2、每一个地址(URL)指定的项目会被马上从档案库中删除,并提交。\n"
+" \n"
 
-#: libsvn_subr/io.c:2340
+#: svn/main.c:346
 #, fuzzy
-msgid "Can't read length line in stream"
-msgstr "无法从数据流读取长度行"
-
-#: libsvn_subr/io.c:2415
-#, c-format
-msgid "Can't move '%s' to '%s'"
-msgstr "不能移动“%s”到“%s”"
-
-#: libsvn_subr/io.c:2460
-#, c-format
-msgid "Can't create directory '%s'"
-msgstr "无法创建目录“%s”"
-
-#: libsvn_subr/io.c:2471 libsvn_wc/copy.c:303
-#, c-format
-msgid "Can't hide directory '%s'"
-msgstr "无法隐藏目录“%s”"
-
-#: libsvn_subr/io.c:2484
-#, c-format
-msgid "Can't stat directory '%s'"
-msgstr "无法获取目录“%s”的状态"
+msgid ""
+"Display the differences between two revisions or paths.\n"
+"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
+" [PATH...]\n"
+" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+"\n"
+" 1. Display the changes made to TARGETs as they are seen in REV between\n"
+" two revisions. TARGETs may be all working copy paths or all URLs.\n"
+" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
+" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
+" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+"\n"
+" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
+"\n"
+" Use just 'svn diff' to display local modifications in a working copy.\n"
+msgstr ""
+"显示两个路径中的差异。\n"
+"用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
+" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
+" [PATH...]\n"
+" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
+"\n"
+" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
+" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
+"\n"
+" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
+" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
+" HEAD。\n"
+"\n"
+" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
+" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
+" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
+" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
+" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
+" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
+"法。\n"
+"\n"
+" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
 
-#: libsvn_subr/io.c:2500
-#, c-format
-msgid "Can't stat new directory '%s'"
-msgstr "无法获取新目录“%s”的状态"
+#: svn/main.c:376
+#, fuzzy
+msgid ""
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1. Exports a clean directory tree from the repository specified by\n"
+" URL, at revision REV if it is given, otherwise at HEAD, into\n"
+" PATH. If PATH is omitted, the last component of the URL is used\n"
+" for the local directory name.\n"
+"\n"
+" 2. Exports a clean directory tree from the working copy specified by\n"
+" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
+" for the local directory name. If REV is not specified, all local\n"
+" changes will be preserved. Files not under version control will\n"
+" not be copied.\n"
+"\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"产生一个无版本控制的目录树拷贝。\n"
+"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
+" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
+" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
+"\n"
+" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
+" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
+" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
+" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
+" 版本控制的文件不会被复制。\n"
+"\n"
+" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+"\n"
 
-#: libsvn_subr/io.c:2562
-#, c-format
-msgid "Can't remove directory '%s'"
-msgstr "无法删除目录“%s”"
+#: svn/main.c:399
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+"描述本程序或其子命令的用法。\n"
+"用法:help [子命令...]\n"
 
-#: libsvn_subr/io.c:2580
-msgid "Can't read directory"
-msgstr "无法读取目录"
+#: svn/main.c:405
+#, fuzzy
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
+"\n"
+" Recursively commit a copy of PATH to URL.\n"
+" If PATH is omitted '.' is assumed.\n"
+" Parent directories are created as necessary in the repository.\n"
+" If PATH is a directory, the contents of the directory are added\n"
+" directly under URL.\n"
+msgstr ""
+"提交未纳入版本控制的文件或目录树至档案库。\n"
+"用法:import [PATH] URL\n"
+"\n"
+" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
+" 依需要于档案库内建立。\n"
 
-#: libsvn_subr/io.c:2651
-#, c-format
-msgid "Can't read directory entry in '%s'"
-msgstr "无法在目录“%s”读取内容"
+#: svn/main.c:418
+#, fuzzy
+msgid ""
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
+"\n"
+" Print information about each TARGET (default: '.')\n"
+" TARGET may be either a working-copy path or URL. If specified, REV\n"
+" determines in which revision the target is first looked up.\n"
+msgstr ""
+"显示本地或远端条目的信息。\n"
+"用法:info [TARGET...]\n"
+"\n"
+" 显示每个 TARGET 的信息 (默认:'.')。\n"
+" TARGET 可以是工作目录或地址(URL)。\n"
 
-#: libsvn_subr/io.c:2776
-#, c-format
-msgid "Can't check directory '%s'"
-msgstr "无法检查目录“%s”"
+#: svn/main.c:428
+#, fuzzy
+msgid ""
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
+"\n"
+" List each TARGET file and the contents of each TARGET directory as\n"
+" they exist in the repository. If TARGET is a working copy path, the\n"
+" corresponding repository URL will be used. If specified, REV determines\n"
+" in which revision the target is first looked up.\n"
+"\n"
+" The default TARGET is '.', meaning the repository URL of the current\n"
+" working directory.\n"
+"\n"
+" With --verbose, the following fields will be shown for each item:\n"
+"\n"
+" Revision number of the last commit\n"
+" Author of the last commit\n"
+" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
+" Size (in bytes)\n"
+" Date and time of the last commit\n"
+msgstr ""
+"列出档案库中的目录项目。\n"
+"用法:list [TARGET[@REV]...]\n"
+"\n"
+" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
+" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+"\n"
+" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
+"\n"
+" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
+"\n"
+" 前次提交的修订版号码\n"
+" 前次提交的作者\n"
+" 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
+" 大小 (以字节为单位)\n"
+" 前次提交的日期与时间\n"
 
-#: libsvn_subr/io.c:2798
-#, c-format
-msgid "Version %d is not non-negative"
-msgstr "版本 %d 未被确认"
+#: svn/main.c:450
+#, fuzzy
+msgid ""
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
+"\n"
+" Use --force to steal the lock from another user or working copy.\n"
+msgstr ""
+"在档案库中锁定工作目录或地址(URL),\n"
+"使得其他用户不能向它提交修改。\n"
+"用法:lock TARGET...\n"
+"\n"
+" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
 
-#: libsvn_subr/io.c:2845
-#, c-format
-msgid "Reading '%s'"
-msgstr "正在读取“%s”"
+#: svn/main.c:458
+#, fuzzy
+msgid "read lock comment from file ARG"
+msgstr "从文件 ARG 读取数据"
 
-#: libsvn_subr/io.c:2861
-#, c-format
-msgid "First line of '%s' contains non-digit"
-msgstr "“%s”的第一行包含了非阿拉伯数字"
+#: svn/main.c:459
+#, fuzzy
+msgid "specify lock comment ARG"
+msgstr "指定提交信息ARG"
 
-#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
-msgid "Can't convert string to UCS-2: '%s'"
-msgstr "不能把字符串转换为UCS-2:“%s”。"
+#: svn/main.c:462
+#, fuzzy
+msgid ""
+"Show the log messages for a set of revision(s) and/or file(s).\n"
+"usage: 1. log [PATH]\n"
+" 2. log URL[@REV] [PATH...]\n"
+"\n"
+" 1. Print the log messages for a local PATH (default: '.').\n"
+" The default revision range is BASE:1.\n"
+"\n"
+" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up. The default revision range is HEAD:1.\n"
+"\n"
+" With -v, also print all affected paths with each log message.\n"
+" With -q, don't print the log message body itself (note that this is\n"
+" compatible with -v).\n"
+"\n"
+" Each log message is printed just once, even if more than one of the\n"
+" affected paths for that revision were explicitly requested. Logs\n"
+" follow copy history by default. Use --stop-on-copy to disable this\n"
+" behavior, which can be useful for determining branchpoints.\n"
+"\n"
+" Examples:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
+msgstr ""
+"显示一组修订版与/或文件的提交日志信息。\n"
+"用法:1、log [PATH]\n"
+" 2、log URL [PATH...]\n"
+"\n"
+" 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
+" BASE:1。\n"
+"\n"
+" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
+" HEAD:1。\n"
+"\n"
+" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
+" 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v 并存)。\n"
+"\n"
+" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
+" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
+" 个功能,这在找出分支点的很方便。\n"
+"\n"
+" 范例:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
 
-#: libsvn_subr/nls.c:86
+#: svn/main.c:492
 #, fuzzy
-msgid "Can't get module file name"
-msgstr "无法获取模块文件名"
-
-#: libsvn_subr/nls.c:101
-#, c-format
-msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
-msgstr "不能把模块路径从UCS-2转换为UTF-8:“%s”"
-
-#: libsvn_subr/opt.c:146
 msgid ""
+"Apply the differences between two sources to a working copy path.\n"
+"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
 "\n"
-"Valid options:\n"
+" 1. In the first form, the source URLs are specified at revisions\n"
+" N and M. These are the two sources to be compared. The revisions\n"
+" default to HEAD if omitted.\n"
+"\n"
+" 2. In the second form, the URLs corresponding to the source working\n"
+" copy paths define the sources to be compared. The revisions must\n"
+" be specified.\n"
+"\n"
+" 3. In the third form, SOURCE can be a URL, or working copy item\n"
+" in which case the corresponding URL is used. This URL in\n"
+" revision REV is compared as it existed between revisions N and \n"
+" M. If REV is not specified, HEAD is assumed.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" WCPATH is the working copy path that will receive the changes.\n"
+" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
+" the sources have identical basenames that match a file within '.':\n"
+" in which case, the differences will be applied to that file.\n"
 msgstr ""
+"将两个来源之间的差异应用至工作拷贝路径。\n"
+"用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
 "\n"
-"有效选项:\n"
+" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
+" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
+"\n"
+" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
+" 进行比较的来源。这里必须指定修订版。\n"
+"\n"
+" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
+" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
+"作\n"
+" 比较。如果未指定 REV,就会假设为 HEAD。\n"
+"\n"
+" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
+" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
+" 差异将会直接应用至该文件去。\n"
 
-#: libsvn_subr/opt.c:236
-msgid " arg"
-msgstr " 参数"
+#: svn/main.c:521
+msgid ""
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+" 2. mkdir URL...\n"
+"\n"
+" Create version controlled directories.\n"
+"\n"
+" 1. Each directory specified by a working copy PATH is created locally\n"
+" and scheduled for addition upon the next commit.\n"
+"\n"
+" 2. Each directory specified by a URL is created in the repository via\n"
+" an immediate commit.\n"
+"\n"
+" In both cases, all the intermediate directories must already exist.\n"
+msgstr ""
+"建立纳入版本控制下的新目录。\n"
+"用法:1、mkdir PATH...\n"
+" 2、mkdir URL...\n"
+"\n"
+" 建立版本控制的目录。\n"
+"\n"
+" 1、每一个以工作拷贝 PATH 指定的目录,都会建立在本地端,并且加入新增\n"
+" 调度,以待下一次的提交。\n"
+"\n"
+" 2、每个以地址(URL)指定的目录,都会透过立即提交于档案库中建立。\n"
+"\n"
+" 在这两个情况下,所有的中间目录都必须事先存在。\n"
 
-#: libsvn_subr/opt.c:259
-#, c-format
+#: svn/main.c:538
+#, fuzzy
 msgid ""
-"\"%s\": unknown command.\n"
+"Move and/or rename something in working copy or repository.\n"
+"usage: move SRC DST\n"
+"\n"
+" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
+" Note: the --revision option has no use and is deprecated.\n"
 "\n"
+" SRC and DST can both be working copy (WC) paths or URLs:\n"
+" WC -> WC: move and schedule for addition (with history)\n"
+" URL -> URL: complete server-side rename.\n"
 msgstr ""
-"“%s”:未知的命令。\n"
+"移动或更名工作拷贝或档案库里的东西。\n"
+"用法:move SRC DST\n"
+"\n"
+" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
 "\n"
+" SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
+" WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
+" URL -> URL : 完全是服务器端的更名。\n"
 
-#: libsvn_subr/opt.c:449
-msgid "Too few arguments"
-msgstr "参数太少"
+#: svn/main.c:551
+#, fuzzy
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Removes versioned props in working copy.\n"
+" 2. Removes unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"移除目录,文件,或修订版的属性。\n"
+"用法:1、propdel PROPNAME [PATH...]\n"
+" 2、propdel PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、移除纳入版本控制的工作拷贝属性。\n"
+" 2、移除无版本控制的远端档案库修订版属性。\n"
 
-#: libsvn_subr/opt.c:530
-#, c-format
-msgid "Syntax error parsing revision '%s'"
-msgstr "剖析修订版“%s”时发生语法错误"
+#: svn/main.c:563
+#, fuzzy
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME PATH...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Edits versioned props in working copy.\n"
+" 2. Edits unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"以外部编辑器编辑目标的属性 PROPNAME。\n"
+"用法:1、propedit PROPNAME PATH...\n"
+" 2、propedit PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、编辑纳入版本控制的工作拷贝属性。\n"
+" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
 
-#: libsvn_subr/opt.c:607
-#, c-format
-msgid "URL '%s' is not properly URI-encoded"
-msgstr "地址(URL)“%s”不是正确地以 URI 编码"
+#: svn/main.c:576
+#, fuzzy
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Prints versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Prints unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" By default, this subcommand will add an extra newline to the end\n"
+" of the property values so that the output looks pretty. Also,\n"
+" whenever there are multiple paths involved, each property value\n"
+" is prefixed with the path with which it is associated. Use\n"
+" the --strict option to disable these beautifications (useful,\n"
+" for example, when redirecting binary property values to a file).\n"
+msgstr ""
+"显示目录,文件,或修订版的属性内容。\n"
+"用法:1、propget PROPNAME [TARGET[@REV]...]\n"
+" 2、propget PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、显示纳入版本控制的工作拷贝属性。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2、显示无版本控制的远端档案库修订版属性。\n"
+"\n"
+" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
+" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
+" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
+" 将二进制属性内容重导至一个文件时就很有用)。\n"
 
-#: libsvn_subr/opt.c:613
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "地址(URL)“%s”包含 '..' 元素"
+#: svn/main.c:595
+#, fuzzy
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+" 2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Lists versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Lists unversioned remote props on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"列出所有目录,文件,或修订版的属性。\n"
+"用法:1、proplist [TARGET[@REV]...]\n"
+" 2、proplist --revprop -r REV [URL]\n"
+"\n"
+" 1、列出纳入版本管理的工作拷贝属性。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2、列出无版本控制的远端档案库修订版属性改变。\n"
 
-#: libsvn_subr/opt.c:642
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "解析“%s”时发生错误"
+#: svn/main.c:607
+#, fuzzy
+msgid ""
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1. Creates a versioned, local propchange in working copy.\n"
+" 2. Creates an unversioned, remote propchange on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+" Note: svn recognizes the following special versioned properties\n"
+" but will store any arbitrary properties set:\n"
+" svn:ignore - A newline separated list of file patterns to ignore.\n"
+" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
+" URL, HeadURL - The URL for the head version of the "
+"object.\n"
+" Author, LastChangedBy - The last person to modify the file.\n"
+" Date, LastChangedDate - The date/time the object was last "
+"modified.\n"
+" Rev, Revision, - The last revision the object changed.\n"
+" LastChangedRevision\n"
+" Id - A compressed summary of the previous\n"
+" 4 keywords.\n"
+" svn:executable - If present, make the file executable.\n"
+" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+" svn:mime-type - The mimetype of the file. Used to determine\n"
+" whether to merge the file, and how to serve it from Apache.\n"
+" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+" treated as text. Anything else is treated as binary.\n"
+" svn:externals - A newline separated list of module specifiers,\n"
+" each of which consists of a relative directory path, optional\n"
+" revision flags, and an URL. For example\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - If present, indicates that the file should be locked\n"
+" before it is modified. Makes the working copy file read-only\n"
+" when it is not locked.\n"
+" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
+" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
+" attempt will fail, and a recursive attempt will set the property\n"
+" only on the file children of the directory.\n"
+msgstr ""
+"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
+"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
+" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
+"\n"
+" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
+" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
+"\n"
+" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
+" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
+" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
+" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
+" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
+" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
+" Rev, Revision, - 本物件最后一次改变的修订版。\n"
+" LastChangedRevision\n"
+" Id - 前四个关键字的压缩摘要。\n"
+" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
+" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
+" 下的文件子项目。\n"
+" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
+" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
+" 开始的会被视为文字,其它则为二进制数据。\n"
+" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
+" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
+"锁定,把工作拷贝文件设置为只读。\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
+"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
+"作只会在目录下的文件设置属性。\n"
 
-#: libsvn_subr/opt.c:738
-#, c-format
+#: svn/main.c:649
+#, fuzzy
+msgid "read property value from file ARG"
+msgstr "从文件 ARG 读取数据"
+
+#: svn/main.c:652
 msgid ""
-"%s, version %s\n"
-" compiled %s, %s\n"
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
 "\n"
+" Note: this subcommand does not semantically resolve conflicts or\n"
+" remove conflict markers; it merely removes the conflict-related\n"
+" artifact files and allows PATH to be committed again.\n"
 msgstr ""
-"%s,版本 %s\n"
-" 编译于 %s,%s\n"
+"移除工作拷贝的目录或文件的 '冲突' 状态。\n"
+"用法:resolved PATH...\n"
 "\n"
+" 注意:本子命令不会依语法来解决冲突或是移除冲突标记;它只是移除冲突的\n"
+" 相关文件,然后让 PATH 可以再次提交。\n"
 
-# as-is
-#: libsvn_subr/opt.c:741
-#, fuzzy
+#: svn/main.c:661
 msgid ""
-"Copyright (C) 2000-2005 CollabNet.\n"
-"Subversion is open source software, see http://subversion.tigris.org/\n"
-"This product includes software developed by CollabNet (http://www.Collab."
-"Net/).\n"
+"Restore pristine working copy file (undo most local edits).\n"
+"usage: revert PATH...\n"
 "\n"
+" Note: this subcommand does not require network access, and resolves\n"
+" any conflicted states. However, it does not restore removed directories.\n"
 msgstr ""
-"版权所有 (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
-"此产�包�的软件由 CollabNet (http://www.Collab.Net/)开�。\n"
+"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
+"用法:revert PATH...\n"
 "\n"
+" 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
+" 被删除的目录\n"
 
-#: libsvn_subr/opt.c:794
-#, c-format
-msgid "Type '%s help' for usage.\n"
-msgstr "请使用“%s help”以得到用法和帮助。\n"
-
-#: libsvn_subr/path.c:1059
-#, c-format
-msgid "Couldn't determine absolute path of '%s'"
-msgstr "不能确定“%s”的绝对路径"
-
-#: libsvn_subr/path.c:1098
-#, c-format
-msgid "'%s' is neither a file nor a directory name"
-msgstr "“%s”不是文件名也不是目录名"
-
-#: libsvn_subr/path.c:1204
-msgid "Can't determine the native path encoding"
-msgstr "不能确定本地路径编码"
-
-#: libsvn_subr/path.c:1258
-#, fuzzy, c-format
-msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
-
-#: libsvn_subr/subst.c:1013 libsvn_wc/props.c:1441
-#, c-format
-msgid "File '%s' has inconsistent newlines"
-msgstr "文件“%s”内的换行符不一致"
-
-#: libsvn_subr/utf.c:157
-msgid "Can't lock charset translation mutex"
-msgstr "不能锁定字符转换互斥体"
-
-#: libsvn_subr/utf.c:175 libsvn_subr/utf.c:263
-msgid "Can't unlock charset translation mutex"
-msgstr "不能解锁字符转换互斥体"
-
-#: libsvn_subr/utf.c:222
-#, fuzzy, c-format
-msgid "Can't create a character converter from native encoding to '%s'"
-msgstr "不能创建从本地编码到“%s”的字符转换器"
-
-#: libsvn_subr/utf.c:226
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to native encoding"
-msgstr "不能创建从“%s”到本地编码的字符转换器"
-
-#: libsvn_subr/utf.c:230
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to '%s'"
-msgstr "不能创建从“%s”到“%s”的字符转换器"
-
-#: libsvn_subr/utf.c:454
-#, fuzzy, c-format
-msgid "Can't convert string from native encoding to '%s':"
-msgstr "不能把字符串从本地编码转换为”%s“编码。"
-
-#: libsvn_subr/utf.c:458
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to native encoding:"
-msgstr "不能把字符串从”%s“编码转换为本地编码。"
-
-#: libsvn_subr/utf.c:462
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to '%s':"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
-
-#: libsvn_subr/utf.c:506
-#, fuzzy, c-format
-msgid ""
-"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
-"UTF-8"
-msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
-
-#: libsvn_subr/utf.c:514
-#, c-format
-msgid ""
-"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "检测到非ASCII字符 (代码 %d),并且不能转换到UTF-8(或从UTF-8转换)"
-
-#: libsvn_subr/utf.c:556
-#, c-format
-msgid ""
-"Valid UTF-8 data\n"
-"(hex:%s)\n"
-"followed by invalid UTF-8 sequence\n"
-"(hex:%s)"
-msgstr ""
-"有效 UTF-8 数据\n"
-"(16进制:%s)\n"
-"后接无效 UTF-8 序列\n"
-"(16进制:%s)"
-
-#: libsvn_subr/validate.c:48
-#, c-format
-msgid "MIME type '%s' has empty media type"
-msgstr "MIME 类别“%s”含有空的媒体类别"
-
-#: libsvn_subr/validate.c:53
-#, c-format
-msgid "MIME type '%s' does not contain '/'"
-msgstr "MIME 类别“%s”没包含 '/'"
-
-#: libsvn_subr/validate.c:58
-#, c-format
-msgid "MIME type '%s' ends with non-alphanumeric character"
-msgstr "MIME 类别“%s”以非字母与数字字符结束"
-
-#: libsvn_subr/version.c:74
-#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的版本不一致:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
-
-#: libsvn_subr/xml.c:400
-#, c-format
-msgid "Malformed XML: %s at line %d"
-msgstr "畸形的XML:%s 在第 %d 行"
-
-#: libsvn_wc/adm_crawler.c:379
-#, c-format
-msgid ""
-"The entry '%s' is no longer a directory; remove the entry before updating"
-msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
-
-#: libsvn_wc/adm_crawler.c:633
-msgid "Error aborting report"
-msgstr "取消报告时发生错误"
-
-#: libsvn_wc/adm_crawler.c:823
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
-
-#: libsvn_wc/adm_crawler.c:849
-msgid "Error opening local file"
-msgstr "打开本地文件时发生错误"
-
-# plz leave this as-is
-#: libsvn_wc/adm_files.c:202
-msgid "Bad type indicator"
-msgstr "错误的类型"
-
-#: libsvn_wc/adm_files.c:394
-msgid "APR_APPEND not supported for adm files"
-msgstr "APR_APPEND 不支持管理文件"
-
-#: libsvn_wc/adm_files.c:437
+#: svn/main.c:670
+#, fuzzy
 msgid ""
-"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
-"again"
-msgstr "您的 .svn/tmp 目录可能丢失或损坏;请执行“svn cleanup”,然后再试一次"
-
-#: libsvn_wc/adm_files.c:612 libsvn_wc/lock.c:378 libsvn_wc/lock.c:631
-#, c-format
-msgid "'%s' is not a working copy"
-msgstr "“%s”不是工作拷贝"
-
-#: libsvn_wc/adm_files.c:619 libsvn_wc/adm_files.c:687
-#: libsvn_wc/adm_files.c:749
-msgid "No such thing as 'base' working copy properties!"
-msgstr "没有 '基础' 工作拷贝属性这样的东西"
-
-#: libsvn_wc/adm_files.c:818 libsvn_wc/util.c:51
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "“%s”不是目录"
-
-#: libsvn_wc/adm_files.c:872
-#, c-format
-msgid "No entry for '%s'"
-msgstr "没有“%s”的项目"
-
-#: libsvn_wc/adm_files.c:884
-#, c-format
-msgid "Revision %ld doesn't match existing revision %ld in '%s'"
-msgstr "修订版 %ld 不符合现有的修订版 %ld 于“%s”中"
-
-#: libsvn_wc/adm_files.c:893
-#, c-format
-msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
-msgstr "地址(URL)“%s”不符合现有的地址(URL)“%s”于“%s”中"
-
-#: libsvn_wc/adm_ops.c:223
-#, c-format
-msgid "Unrecognized node kind: '%s'"
-msgstr "无法确认的节点种类:“%s”"
-
-#: libsvn_wc/adm_ops.c:443 libsvn_wc/update_editor.c:946
-#: libsvn_wc/update_editor.c:1347
-#, c-format
-msgid "Error writing log file for '%s'"
-msgstr "写入“%s”的日志文件时发生错误"
-
-#: libsvn_wc/adm_ops.c:977
-#, c-format
-msgid "'%s' not found"
-msgstr "找不到“%s”"
-
-#: libsvn_wc/adm_ops.c:981
-#, c-format
-msgid "Unsupported node kind for path '%s'"
-msgstr "路径“%s”为不支持的节点种类"
-
-#: libsvn_wc/adm_ops.c:1011
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%s”已纳入版本控制"
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+" With no args, print only locally modified items (no network access).\n"
+" With -u, add working revision and server out-of-date information.\n"
+" With -v, print full revision information on every item.\n"
+"\n"
+" The first six columns in the output are each one character wide:\n"
+" First column: Says if item was added, deleted, or otherwise changed\n"
+" ' ' no modifications\n"
+" 'A' Added\n"
+" 'C' Conflicted\n"
+" 'D' Deleted\n"
+" 'I' Ignored\n"
+" 'M' Modified\n"
+" 'R' Replaced\n"
+" 'X' item is unversioned, but is used by an externals definition\n"
+" '?' item is not under version control\n"
+" '!' item is missing (removed by non-svn command) or incomplete\n"
+" '~' versioned item obstructed by some item of a different kind\n"
+" Second column: Modifications of a file's or directory's properties\n"
+" ' ' no modifications\n"
+" 'C' Conflicted\n"
+" 'M' Modified\n"
+" Third column: Whether the working copy directory is locked\n"
+" ' ' not locked\n"
+" 'L' locked\n"
+" Fourth column: Scheduled commit will contain addition-with-history\n"
+" ' ' no history scheduled with commit\n"
+" '+' history scheduled with commit\n"
+" Fifth column: Whether the item is switched relative to its parent\n"
+" ' ' normal\n"
+" 'S' switched\n"
+" Sixth column: Repository lock token\n"
+" (without -u)\n"
+" ' ' no lock token\n"
+" 'K' lock token present\n"
+" (with -u)\n"
+" ' ' not locked in repository, no lock token\n"
+" 'K' locked in repository, lock toKen present\n"
+" 'O' locked in repository, lock token in some Other working copy\n"
+" 'T' locked in repository, lock token present but sTolen\n"
+" 'B' not locked in repository, lock token present but Broken\n"
+"\n"
+" The out-of-date information appears in the eighth column (with -u):\n"
+" '*' a newer revision exists on the server\n"
+" ' ' the working copy is up to date\n"
+"\n"
+" Remaining fields are variable width and delimited by spaces:\n"
+" The working revision (with -u or -v)\n"
+" The last committed revision and last committed author (with -v)\n"
+" The working copy path is always the final field, so it can\n"
+" include spaces.\n"
+"\n"
+" Example output:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
+msgstr ""
+"显示工作拷贝目录与文件的状态。\n"
+"用法:status [PATH...]\n"
+"\n"
+" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
+" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
+" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
+"\n"
+" 输出的前五个栏位各为一个字符宽:\n"
+" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
+" ' ' 无修改\n"
+" 'A' 新增\n"
+" 'C' 冲突\n"
+" 'D' 删除\n"
+" 'G' 合并\n"
+" 'I' 忽略\n"
+" 'M' 改变\n"
+" 'R' 替换\n"
+" 'X' 未纳入版本控制,但被外部定义所用\n"
+" '?' 该项目未纳入版本控制\n"
+" '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
+" '~' 版本控制下的项目被不同类型的所替换\n"
+" 第二栏:显示目录或文件的属性状态\n"
+" ' ' 无修改\n"
+" 'C' 冲突\n"
+" 'M' 改变\n"
+" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
+" ' ' 未锁定\n"
+" 'L' 锁定\n"
+" 第四栏:预定要连同历史记录被新增\n"
+" ' ' 预定的提交并不包含历史记录\n"
+" '+' 预定的提交包含历史记录\n"
+" 第五栏:该项目相对其父目录是否已被切换\n"
+" ' ' 正常\n"
+" 'S' 被切换\n"
+" 第六栏:档案库锁定标记 (没有 -u)\n"
+" ' ' 没有锁定标记\n"
+" 'K' 存在锁定标记\n"
+" (有 -u)\n"
+" ' ' 没有在档案库中锁定,没有锁定标记\n"
+" 'K' 在档案库中被锁定,存在锁定标记\n"
+" 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
+" 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
+" 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
+"\n"
+" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
+" '*' 服务器上有更新修订版\n"
+" ' ' 工作拷贝是最新版的\n"
+"\n"
+" 剩余的栏位皆为变动宽度,并以空白隔开:\n"
+" 工作修订版 (与 -u 或 -v 并用时)\n"
+" 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
+" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
+"\n"
+" 范例输出:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
 
-#: libsvn_wc/adm_ops.c:1023
-#, c-format
+#: svn/main.c:746
+#, fuzzy
 msgid ""
-"Can't replace '%s' with a node of a differing type; commit the deletion, "
-"update the parent, and then add '%s'"
-msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
-
-#: libsvn_wc/adm_ops.c:1039
-#, c-format
-msgid "Can't find parent directory's entry while trying to add '%s'"
-msgstr "在尝试新增“%s”时,无法找到父目录的项目"
-
-#: libsvn_wc/adm_ops.c:1044
-#, c-format
-msgid "Can't add '%s' to a parent directory scheduled for deletion"
-msgstr "无法新增“%s”至已预定要删除的父目录"
-
-#: libsvn_wc/adm_ops.c:1060
-#, fuzzy, c-format
-msgid "The URL '%s' has different repository root than its parent"
-msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
-
-#: libsvn_wc/adm_ops.c:1334 libsvn_wc/adm_ops.c:1339 libsvn_wc/adm_ops.c:1375
-#, c-format
-msgid "Error restoring props for '%s'"
-msgstr "还原“%s”的属性时发生错误"
-
-#: libsvn_wc/adm_ops.c:1349
-#, c-format
-msgid "Error removing props for '%s'"
-msgstr "移除“%s”的属性时发生错误"
-
-#: libsvn_wc/adm_ops.c:1421
-#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "还原“%s”文字时发生错误"
-
-#: libsvn_wc/adm_ops.c:1522
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "无法恢复:“%s”未纳入版本控制"
-
-#: libsvn_wc/adm_ops.c:1550
-#, c-format
-msgid "Cannot revert '%s': unsupported entry node kind"
-msgstr "无法恢复“%s”:不支持的项目节点种类"
-
-#: libsvn_wc/adm_ops.c:1561
-#, c-format
-msgid "Cannot revert '%s': unsupported node kind in working copy"
-msgstr "无法恢复“%s”:工作拷贝中有不支持的节点种类"
+"Update the working copy to a different URL.\n"
+"usage: 1. switch URL [PATH]\n"
+" 2. switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1. Update the working copy to mirror a new URL within the repository.\n"
+" This behaviour is similar to 'svn update', and is the way to\n"
+" move a working copy to a branch or tag within the same repository.\n"
+"\n"
+" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+" This is used when repository's root URL changes (such as a scheme\n"
+" or hostname change) but your working copy still reflects the same\n"
+" directory within the same repository.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the switch attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path.\n"
+msgstr ""
+"更新工作拷贝至不同的地址(URL)。\n"
+"用法:1、switch URL [PATH]\n"
+" 2、switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
+" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
+"\n"
+" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
+" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
+" 档案库的同一目录时用之。\n"
 
-#: libsvn_wc/adm_ops.c:1609
+#: svn/main.c:773
+#, fuzzy
 msgid ""
-"Cannot revert addition of current directory; please try again from the "
-"parent directory"
-msgstr "无法恢复目前目录的新增;请从父目录再试一次"
-
-#: libsvn_wc/adm_ops.c:1631
-#, c-format
-msgid "Unknown or unexpected kind for path '%s'"
-msgstr "路径“%s”有未知或意想不到的种类"
-
-#: libsvn_wc/adm_ops.c:1834
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "文件“%s”有本地的修改"
-
-#: libsvn_wc/copy.c:148
-#, c-format
-msgid "'%s' already exists and is in the way"
-msgstr "“%s”已存在,变成路中间的大石头"
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+" Use --force to break the lock.\n"
+msgstr ""
+"解除工作拷贝或地址(URL)的锁定。\n"
+"用法:unlock TARGET...\n"
+"\n"
+" 使用 -force 中止锁定。\n"
 
-#: libsvn_wc/copy.c:160
-#, c-format
+#: svn/main.c:781
+#, fuzzy
 msgid ""
-"'%s' is scheduled for deletion; it must be committed before being overwritten"
-msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+" If no revision given, bring working copy up-to-date with HEAD rev.\n"
+" Else synchronize working copy to revision given by -r.\n"
+"\n"
+" For each updated item a line will start with a character reporting the\n"
+" action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+" E Existed\n"
+"\n"
+" A character in the first column signifies an update to the actual file,\n"
+" while updates to the file's properties are shown in the second column.\n"
+" A 'B' in the third column signifies that the lock for the file has\n"
+" been broken or stolen.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the update attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path. Obstructing paths are reported\n"
+" in the first column with code 'E'.\n"
+msgstr ""
+"将档案库的改变反应至工作拷贝。\n"
+"用法:update [PATH...]\n"
+"\n"
+" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
+" 不然的话,同步至 -r 选项所指定的修订版。\n"
+"\n"
+" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
+" 这些字符代表如下:\n"
+"\n"
+" A 新增\n"
+" D 删除\n"
+" U æ›´æ–°\n"
+" C 冲突\n"
+" G 合并\n"
+"\n"
+" 第一栏的字符表示实际文件的更新,\n"
+" 第二栏显示被操作的文件。\n"
+" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
 
-#: libsvn_wc/copy.c:165
-#, c-format
-msgid "There is already a versioned item '%s'"
-msgstr "已有纳入版本控制项目“%s”"
+#: svn/main.c:857 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+msgid "Caught signal"
+msgstr "捕捉到信号(中断)"
 
-#: libsvn_wc/copy.c:176
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "无法复制或移动“%s”:它尚未纳入版本控制"
+#: svn/main.c:969
+msgid "Non-numeric limit argument given"
+msgstr "给了非数字的参数"
 
-#: libsvn_wc/copy.c:183
-#, c-format
-msgid ""
-"Cannot copy or move '%s': it's not in the repository yet; try committing "
-"first"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
+#: svn/main.c:975
+msgid "Argument to --limit must be positive"
+msgstr ""
 
-#: libsvn_wc/copy.c:455
-#, c-format
+#: svn/main.c:995
+#, fuzzy
 msgid ""
-"Cannot copy or move '%s': it is not in the repository yet; try committing "
-"first"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
-
-#: libsvn_wc/copy.c:525
-#, c-format
-msgid "Cannot copy to '%s' as it is scheduled for deletion"
-msgstr "无法复制到“%s”至因为它已预定为要删除"
-
-#: libsvn_wc/entries.c:127
-#, c-format
-msgid "Error writing entries file for '%s'"
-msgstr "写入“%s”的项目文件时发生错误"
-
-#: libsvn_wc/entries.c:222
-#, fuzzy, c-format
-msgid "Entry for '%s' has invalid repository root"
-msgstr "“%s”的入口档案库根目录无效"
-
-#: libsvn_wc/entries.c:244
-#, c-format
-msgid "Entry '%s' has invalid node kind"
-msgstr "项目“%s”有无效的节点种类"
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
 
-#: libsvn_wc/entries.c:269 libsvn_wc/entries.c:319 libsvn_wc/entries.c:359
-#: libsvn_wc/entries.c:386 libsvn_wc/entries.c:413
-#, c-format
-msgid "Entry '%s' has invalid '%s' value"
-msgstr "项目“%s”有无效的“%s”值"
+#: svn/main.c:1003 svn/main.c:1194
+msgid "Can't specify -c with --old"
+msgstr ""
 
-#: libsvn_wc/entries.c:627
-msgid "Missing default entry"
-msgstr "丢失默认项目"
+#: svn/main.c:1010
+#, fuzzy
+msgid "Non-numeric change argument given to -c"
+msgstr "给了非数字的参数"
 
-#: libsvn_wc/entries.c:632
-msgid "Default entry has no revision number"
-msgstr "默认项目没有修订版编号"
+#: svn/main.c:1016
+#, fuzzy
+msgid "There is no change 0"
+msgstr "正在创建更改"
 
-#: libsvn_wc/entries.c:637
-msgid "Default entry is missing URL"
-msgstr "默认项目没有地址(URL)"
+#: svn/main.c:1043
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
+"N:M' instead of '-r N -r M'"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
 
-#: libsvn_wc/entries.c:725
+#: svn/main.c:1056 svnadmin/main.c:1244
 #, c-format
-msgid "XML parser failed in '%s'"
-msgstr "XML 剖析器无法处理“%s”"
+msgid "Syntax error in revision argument '%s'"
+msgstr "修订版参数“%s”中有语法错误"
+
+#: svn/main.c:1210 svn/main.c:1220
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
 
-#: libsvn_wc/entries.c:813
+#: svn/main.c:1236
 #, c-format
-msgid "Corrupt working copy: '%s' has no default entry"
-msgstr "损坏的工作拷贝:目录“%s”没有默认的项目"
+msgid "Syntax error in native-eol argument '%s'"
+msgstr "原生换列符号参数“%s”中有语法错误"
 
-#: libsvn_wc/entries.c:830
+#: svn/main.c:1309 svndumpfilter/main.c:1207 svnlook/main.c:2037
 #, c-format
-msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr "损坏的工作拷贝:目录“%s”有无效的调度"
+msgid "Subcommand argument required\n"
+msgstr "必须提供子命令参数\n"
 
-#: libsvn_wc/entries.c:864
+#: svn/main.c:1328 svnadmin/main.c:1367 svndumpfilter/main.c:1226
+#: svnlook/main.c:2056
 #, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr "损坏的工作拷贝:“%s”于目录“%s”中有无效的调度"
+msgid "Unknown command: '%s'\n"
+msgstr "未知的命令:“%s”\n"
 
-#: libsvn_wc/entries.c:873
+#: svn/main.c:1361
 #, c-format
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"addition) is not itself scheduled for addition"
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
 msgstr ""
-"损坏的工作拷贝:“%s”于目录“%s”中 (已加入新增调度) 与加入新增调度的不一致"
+"子命令“%s”不接受选项“%s”\n"
+"请输入“svn help %s”以取得用法。\n"
 
-#: libsvn_wc/entries.c:881
-#, c-format
+#: svn/main.c:1398
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
+
+#: svn/main.c:1405
+#, fuzzy
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+
+#: svn/main.c:1426
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"deletion) is not itself scheduled for deletion"
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
 msgstr ""
-"损坏的工作拷贝:“%s”于目录“%s”中 (已加入删除调度) 与加入删除调度的不一致"
+"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
 
-#: libsvn_wc/entries.c:889
-#, c-format
+#: svn/main.c:1433
+#, fuzzy
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"replacement) has an invalid schedule"
-msgstr "损坏的工作拷贝:“%s”于目录“%s”中 (已加入替换调度) 有无效的调度"
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
 
-#: libsvn_wc/entries.c:1204
-#, c-format
-msgid "No default entry in directory '%s'"
-msgstr "在目录“%s”中没有默认的项目"
+#: svn/main.c:1558
+msgid ""
+"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
+"details)\n"
+msgstr ""
+"svn:请执行“svn cleanup”以移去锁定 (输入“svn help cleanup”以取得详细说明)\n"
 
-#: libsvn_wc/entries.c:1259
-#, c-format
-msgid "Error writing to '%s'"
-msgstr "写至“%s”时发生错误"
+#: svn/merge-cmd.c:59
+msgid "Second revision required"
+msgstr "需要第二个修订版"
 
-#: libsvn_wc/entries.c:1525
-#, c-format
-msgid ""
-"Can't add '%s' to deleted directory; try undeleting its parent directory "
-"first"
-msgstr "无法新增“%s”至已删除的目录;请先尝试恢复其父目录"
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
+#, fuzzy
+msgid "Too many arguments given"
+msgstr "导入命令有太多参数"
 
-#: libsvn_wc/entries.c:1531
+#: svn/merge-cmd.c:117
+msgid "A working copy merge source needs an explicit revision"
+msgstr "工作拷贝的合并来源需特别指定修订版"
+
+#: svn/mkdir-cmd.c:84
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替?"
+
+#: svn/notify.c:69
 #, c-format
-msgid ""
-"Can't replace '%s' in deleted directory; try undeleting its parent directory "
-"first"
-msgstr "无法在已删除的目录中替换“%s”;请先尝试恢复其父目录"
+msgid "Skipped missing target: '%s'\n"
+msgstr "跳过找不到的目标:“%s”\n"
 
-#: libsvn_wc/entries.c:1540
+#: svn/notify.c:76
 #, c-format
-msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
-msgstr "“%s”被标记为不存在,所以无法加入新增调度"
+msgid "Skipped '%s'\n"
+msgstr "跳过“%s”\n"
 
-#: libsvn_wc/entries.c:1569
+#: svn/notify.c:100
 #, c-format
-msgid "Entry '%s' is already under version control"
-msgstr "项目“%s”已纳入版本控制"
+msgid "Restored '%s'\n"
+msgstr "已还原“%s”\n"
 
-#: libsvn_wc/entries.c:1661
+#: svn/notify.c:106
 #, c-format
-msgid "Entry '%s' has illegal schedule"
-msgstr "项目“%s”有不合法的调度"
+msgid "Reverted '%s'\n"
+msgstr "已恢复“%s”\n"
 
-#: libsvn_wc/entries.c:1802
+#: svn/notify.c:112
 #, c-format
-msgid "No such entry: '%s'"
-msgstr "没有这样的项目:“%s”"
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr "无法恢复“%s”-- 请改用更新试试。\n"
 
-#: libsvn_wc/entries.c:1913
+#: svn/notify.c:120
 #, c-format
-msgid "Directory '%s' has no THIS_DIR entry"
-msgstr "目录“%s”没有 THIS_DIR 项目"
+msgid "Resolved conflicted state of '%s'\n"
+msgstr "“%s”的已解决的冲突状态\n"
 
-#: libsvn_wc/entries.c:2002
+#: svn/notify.c:201
 #, c-format
-msgid "'%s' has an unrecognized node kind"
-msgstr "“%s”的节点种类无法辨识"
+msgid ""
+"\n"
+"Fetching external item into '%s'\n"
+msgstr ""
+"\n"
+"正在取得外部项目至“%s”\n"
 
-#: libsvn_wc/entries.c:2038
+#: svn/notify.c:216
 #, c-format
-msgid "Unexpectedly found '%s': path is marked 'missing'"
-msgstr "意想不到地找到了“%s”:路径已被标记为 '丢失'"
+msgid "Exported external at revision %ld.\n"
+msgstr "导出修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/lock.c:159 libsvn_wc/lock.c:360
+#: svn/notify.c:217
 #, c-format
-msgid "Working copy '%s' locked"
-msgstr "工作拷贝“%s”被锁定了"
+msgid "Exported revision %ld.\n"
+msgstr "导出修订版 %ld。\n"
 
-#: libsvn_wc/lock.c:280
+#: svn/notify.c:225
 #, c-format
-msgid "Path '%s' ends in '%s', which is unsupported for this operation"
-msgstr "路径“%s”以“%s”结束,本操作不支持"
+msgid "Checked out external at revision %ld.\n"
+msgstr "取出修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/lock.c:679
-#, fuzzy, c-format
-msgid "Working copy '%s' is missing or not locked"
-msgstr "工作拷贝“%s”丢失或并未锁定"
+#: svn/notify.c:226
+#, c-format
+msgid "Checked out revision %ld.\n"
+msgstr "取出修订版 %ld。\n"
 
-#: libsvn_wc/lock.c:1079
+#: svn/notify.c:236
 #, c-format
-msgid "Write-lock stolen in '%s'"
-msgstr "“%s”中的写入锁定被偷走了"
+msgid "Updated external to revision %ld.\n"
+msgstr "更新外部定义至修订版 %ld。\n"
 
-#: libsvn_wc/lock.c:1087
+#: svn/notify.c:237
 #, c-format
-msgid "No write-lock in '%s'"
-msgstr "“%s”中没有写入锁定"
+msgid "Updated to revision %ld.\n"
+msgstr "更新至修订版 %ld。\n"
 
-#: libsvn_wc/lock.c:1109
+#: svn/notify.c:245
 #, c-format
-msgid "Lock file '%s' is not a regular file"
-msgstr "锁定文件“%s”不是一般的文件"
+msgid "External at revision %ld.\n"
+msgstr "于修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/log.c:183
-msgid "Can't move source to dest"
-msgstr "无法移动来源至目的"
+#: svn/notify.c:246
+#, c-format
+msgid "At revision %ld.\n"
+msgstr "于修订版 %ld。\n"
 
-#: libsvn_wc/log.c:339
+#: svn/notify.c:258
 #, c-format
-msgid "In directory '%s'"
-msgstr "在目录“%s”中"
+msgid "External export complete.\n"
+msgstr "外部定义导出完成。\n"
 
-#: libsvn_wc/log.c:365
+#: svn/notify.c:259
 #, c-format
-msgid "Missing 'left' attribute in '%s'"
-msgstr "“%s”丢失了 'left' 属性"
+msgid "Export complete.\n"
+msgstr "导出完成。\n"
 
-#: libsvn_wc/log.c:372
+#: svn/notify.c:266
 #, c-format
-msgid "Missing 'right' attribute in '%s'"
-msgstr "“%s”丢失了 'right' 属性"
+msgid "External checkout complete.\n"
+msgstr "外部定义取出完成。\n"
 
-#: libsvn_wc/log.c:415
+#: svn/notify.c:267
 #, c-format
-msgid "Missing 'dest' attribute in '%s'"
-msgstr "“%s”丢失了 'dest' 属性"
+msgid "Checkout complete.\n"
+msgstr "取出完成。\n"
 
-#: libsvn_wc/log.c:475
+#: svn/notify.c:274
 #, c-format
-msgid "Missing 'timestamp' attribute in '%s'"
-msgstr "“%s”丢失 'timestamp' 属性"
+msgid "External update complete.\n"
+msgstr "外部定义更新完成。\n"
 
-#: libsvn_wc/log.c:551 libsvn_wc/log.c:584
+#: svn/notify.c:275
 #, c-format
-msgid "Error checking path '%s'"
-msgstr "检查路径“%s”时发生错误"
+msgid "Update complete.\n"
+msgstr "更新完成。\n"
 
-#: libsvn_wc/log.c:558 libsvn_wc/log.c:591
+#: svn/notify.c:291
 #, c-format
-msgid "Error getting 'affected time' on '%s'"
-msgstr "取得“%s”的“affected time”时发生错误"
+msgid ""
+"\n"
+"Performing status on external item at '%s'\n"
+msgstr ""
+"\n"
+"对外部项目“%s”进行状态检查\n"
 
-#: libsvn_wc/log.c:602
+#: svn/notify.c:299
 #, c-format
-msgid "Error modifying entry for '%s'"
-msgstr "修改“%s”的项目时发生错误"
+msgid "Status against revision: %6ld\n"
+msgstr "状态于修订版:%6ld\n"
 
-#: libsvn_wc/log.c:628
-#, fuzzy, c-format
-msgid "Error removing lock from entry for '%s'"
-msgstr "移除条目“%s”的锁时发生错误"
+#: svn/notify.c:307
+#, c-format
+msgid "Sending %s\n"
+msgstr "正在发送 %s\n"
 
-#: libsvn_wc/log.c:759
+#: svn/notify.c:316
 #, c-format
-msgid "Missing 'revision' attribute for '%s'"
-msgstr "“%s”丢失了 'revision' 属性"
+msgid "Adding (bin) %s\n"
+msgstr "新增 (二进制) %s\n"
 
-#: libsvn_wc/log.c:773
+#: svn/notify.c:323
 #, c-format
-msgid "Log command for directory '%s' is mislocated"
-msgstr "对目录“%s”的日志命令被错置"
+msgid "Adding %s\n"
+msgstr "新增 %s\n"
 
-#: libsvn_wc/log.c:940 libsvn_wc/log.c:1012
+#: svn/notify.c:330
 #, c-format
-msgid "Error checking existence of '%s'"
-msgstr "检查“%s”是否存在时发生错误"
+msgid "Deleting %s\n"
+msgstr "删除 %s\n"
 
-#: libsvn_wc/log.c:951 libsvn_wc/log.c:1023
+#: svn/notify.c:337
 #, c-format
-msgid "Error comparing '%s' and '%s'"
-msgstr "比较“%s”与“%s”时发生错误"
+msgid "Replacing %s\n"
+msgstr "替换 %s\n"
 
-#: libsvn_wc/log.c:963
+#: svn/notify.c:347
 #, c-format
-msgid "Error getting 'affected time' for '%s'"
-msgstr "取得“%s”的 'affected time' 时发生错误"
+msgid "Transmitting file data "
+msgstr "传输文件数据"
 
-#: libsvn_wc/log.c:1034 libsvn_wc/log.c:1121
+#: svn/notify.c:356
 #, c-format
-msgid "Error getting 'affected time' of '%s'"
-msgstr "取得“%s”的 'affected time' 时发生错误"
+msgid "'%s' locked by user '%s'.\n"
+msgstr "“%s”被用户“%s”锁定。\n"
 
-#: libsvn_wc/log.c:1092
+#: svn/notify.c:362
 #, c-format
-msgid "Error replacing text-base of '%s'"
-msgstr "替换“%s”的文件参考基础时发生错误"
+msgid "'%s' unlocked.\n"
+msgstr "“%s”被解除锁定。\n"
 
-#: libsvn_wc/log.c:1161 libsvn_wc/log.c:1210
+#: svn/propdel-cmd.c:77
 #, c-format
-msgid "Error modifying entry of '%s'"
-msgstr "修改“%s”的项目时发生错误"
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr "属性“%s”自档案库修订版 %ld 中删除\n"
 
-#: libsvn_wc/log.c:1269
+#: svn/propdel-cmd.c:86
 #, c-format
-msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
-msgstr "日志文件项目丢失 'name' 属性 (项目“%s”对应至目录“%s”)"
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr "删除纳入版本控制的属性“%s”时不可指定修订版"
 
-#: libsvn_wc/log.c:1331
+#: svn/propdel-cmd.c:116
 #, c-format
-msgid "Unrecognized logfile element '%s' in '%s'"
-msgstr "无法确认的日志文件元素“%s”于“%s”中"
+msgid "property '%s' deleted (recursively) from '%s'.\n"
+msgstr "属性“%s”自“%s”删除 (递归)。\n"
 
-#: libsvn_wc/log.c:1342
+#: svn/propdel-cmd.c:117
 #, c-format
-msgid "Error processing command '%s' in '%s'"
-msgstr "在“%2$s”中处理命令“%1$s”时发生错误"
+msgid "property '%s' deleted from '%s'.\n"
+msgstr "属性“%s”自“%s”删除。\n"
 
-#: libsvn_wc/log.c:1464
-msgid "Couldn't open log"
-msgstr "无法打开日志文件"
+#: svn/propedit-cmd.c:60
+#, fuzzy, c-format
+msgid "'%s' is not a valid Subversion property name"
+msgstr "“%s”不是一个有效的 EOL 值"
 
-#: libsvn_wc/log.c:1475
-#, c-format
-msgid "Error reading administrative log file in '%s'"
-msgstr "于“%s”中读取管理日志文件时发生错误"
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:229 svn/propset-cmd.c:85
+msgid "Bad encoding option: prop value not stored as UTF8"
+msgstr "有问题的编码选项:属性内容未以 UTF8 储存"
 
-#: libsvn_wc/log.c:1569
+#: svn/propedit-cmd.c:114
 #, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "“%s”并不是工作拷贝目录"
-
-#: libsvn_wc/merge.c:306 libsvn_wc/merge.c:308 libsvn_wc/merge.c:310
-#: libsvn_wc/merge.c:312
-msgid "Unable to delete temporary file"
-msgstr "无法删除暂存文件"
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr "属性“%s”于修订版 %ld 设为新值\n"
 
-#: libsvn_wc/props.c:100
+#: svn/propedit-cmd.c:120
 #, c-format
-msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr "属性“%s”于修订版 %ld 没有改变\n"
 
-#: libsvn_wc/props.c:109
+#: svn/propedit-cmd.c:128
 #, c-format
-msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr "编辑纳入版本控制的属性“%s”时不可指定修订版"
 
-#: libsvn_wc/props.c:125
-#, c-format
-msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+msgid "Explicit target argument required"
+msgstr "必须明确地提供目标"
 
-#: libsvn_wc/props.c:172
+#: svn/propedit-cmd.c:177
 #, c-format
-msgid "Can't parse '%s'"
-msgstr "无法剖析“%s”"
+msgid "Editing property on non-local target '%s' not yet supported"
+msgstr "尚不支持编辑非本地目标“%s”的属性"
 
-#: libsvn_wc/props.c:198
+#: svn/propedit-cmd.c:204 svn/switch-cmd.c:140
 #, c-format
-msgid "Can't write property hash to '%s'"
-msgstr "无法写入属性集到“%s”"
+msgid "'%s' does not appear to be a working copy path"
+msgstr "“%s”不像是工作拷贝路径"
 
-#: libsvn_wc/props.c:251
+#: svn/propedit-cmd.c:236
 #, c-format
-msgid "Can't find entry '%s' in '%s'"
-msgstr "无法在“%2$s”中找到项目“%1$s”"
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr "“%2$s”的“%1$s”属性被设为新值\n"
 
-#: libsvn_wc/props.c:323 libsvn_wc/props.c:1161 libsvn_wc/update_editor.c:2342
+#: svn/propedit-cmd.c:243
 #, c-format
-msgid "Error writing log for '%s'"
-msgstr "为“%s”写入日志时发生错误"
+msgid "No changes to property '%s' on '%s'\n"
+msgstr "“%2$s”的“%1$s”属性没有改变\n"
 
-#: libsvn_wc/props.c:459
+#: svn/proplist-cmd.c:71
 #, c-format
-msgid ""
-"Trying to add new property '%s' with value '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"尝试添加新属性“%s”的值为“%s”,\n"
-"但是属性已经存在,值为“%s”。"
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
 
-#: libsvn_wc/props.c:481
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
-msgstr ""
-"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
-"但是属性并不存在。"
+#: svn/proplist-cmd.c:119
+#, fuzzy, c-format
+msgid "Properties on '%s':\n"
+msgstr "属性“%s”设定于“%s”\n"
 
-#: libsvn_wc/props.c:510
-#, c-format
+#: svn/props.c:51
+#, fuzzy
 msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
-"但是属性的值已经是“%s”了。"
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
 
-#: libsvn_wc/props.c:1202
-#, c-format
-msgid "Unknown node kind: '%s'"
-msgstr "未知的节点类型:“%s”"
+#: svn/props.c:58
+#, fuzzy
+msgid "Wrong number of targets specified"
+msgstr "指定了错误数目的目标"
 
-#: libsvn_wc/props.c:1238 libsvn_wc/props.c:1260 libsvn_wc/props.c:1344
-#: libsvn_wc/props.c:1582
-msgid "Failed to load properties from disk"
-msgstr "无法从磁碟装载属性"
+#: svn/props.c:67
+msgid "Either a URL or versioned item is required"
+msgstr "必须提供地址(URL)或纳入版本控制的项目"
 
-#: libsvn_wc/props.c:1276 libsvn_wc/props.c:1612
+#: svn/propset-cmd.c:111
 #, c-format
-msgid "Cannot write property hash for '%s'"
-msgstr "无法写入“%s”的属性杂凑"
+msgid "property '%s' set on repository revision %ld\n"
+msgstr "设定属性“%s”于档案库修订版 %ld\n"
 
-#: libsvn_wc/props.c:1336 libsvn_wc/props.c:1474
+#: svn/propset-cmd.c:119
 #, c-format
-msgid "Property '%s' is an entry property"
-msgstr "属性“%s”是项目属性"
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr "无法指定修订版以设定版本控制下的属性“%s”"
 
-#: libsvn_wc/props.c:1381
+#: svn/propset-cmd.c:151
 #, c-format
-msgid "Cannot set '%s' on a directory ('%s')"
-msgstr "无法设定“%s”于目录 (“%s”)"
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
 
-#: libsvn_wc/props.c:1389
+#: svn/propset-cmd.c:184
 #, c-format
-msgid "Cannot set '%s' on a file ('%s')"
-msgstr "无法设定“%s”于文件 (“%s”)"
+msgid "property '%s' set (recursively) on '%s'\n"
+msgstr "属性“%s”设定 (递归) 于“%s”\n"
 
-#: libsvn_wc/props.c:1395
+#: svn/propset-cmd.c:185
 #, c-format
-msgid "'%s' is not a file or directory"
-msgstr "“%s”不是文件或目录"
+msgid "property '%s' set on '%s'\n"
+msgstr "属性“%s”设定于“%s”\n"
+
+#: svn/revert-cmd.c:86
+#, fuzzy
+msgid "Try 'svn revert --recursive' instead?"
+msgstr "尝试用 “svn revert -recursive” 代替?"
 
-#: libsvn_wc/props.c:1419
+#: svn/status-cmd.c:317
 #, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "文件“%s”有二进制的 mime 型别属性"
+msgid ""
+"\n"
+"--- Changelist '%s':\n"
+msgstr ""
 
-#: libsvn_wc/props.c:2038
+#: svn/status.c:263
 #, c-format
-msgid "Error parsing %s property on '%s': '%s'"
-msgstr "剖析 %s 属性于“%s”发生错误:“%s”"
+msgid "'%s' has lock token, but no lock owner"
+msgstr "‘%s’锁被盗取,但没有锁的所有者"
 
-#: libsvn_wc/props.c:2051
+#: svn/switch-cmd.c:58
 #, c-format
-msgid ""
-"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
-"path"
-msgstr "无效属性 %s 于“%s”:目录牵涉到 '.' 或 '..' 或是绝对路径"
+msgid "'%s' to '%s' is not a valid relocation"
+msgstr "“%s”到“%s”不是有效的重定位"
 
-#: libsvn_wc/questions.c:104
+#: svn/util.c:60
 #, c-format
 msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
-msgstr "“%s”的工作拷贝格式已过时(%d);请重新取出您的工作拷贝"
+"\n"
+"Committed revision %ld.\n"
+msgstr ""
+"\n"
+"提交后的修订版为 %ld。\n"
 
-#: libsvn_wc/questions.c:112
-#, c-format
+#: svn/util.c:68
+#, fuzzy, c-format
 msgid ""
-"This client is too old to work with working copy '%s'; please get a newer "
-"Subversion client"
-msgstr "本客户端已过时,无法存取工作拷贝“%s”;请取得更新版的 Subversion 客户端"
+"\n"
+"Warning: %s\n"
+msgstr "%s警告:%s\n"
 
-#: libsvn_wc/questions.c:352
-#, c-format
+#: svn/util.c:136
 msgid ""
-"Checksum mismatch indicates corrupt text base: '%s'\n"
-" expected: %s\n"
-" actual: %s\n"
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
+"no 'editor-cmd' run-time configuration option was found"
 msgstr ""
-"总和检查值不一致,表示文件参考基础损坏:“%s”\n"
-" 预期: %s\n"
-" 实际: %s\n"
+"没有一个 SVN_EDITOR,VISUAL 或 EDITOR 环境变数被设定,执行时期的设定中也没有 "
+"'editor-cmd' 选项"
 
-#: libsvn_wc/translate.c:124
+#: svn/util.c:162
 #, c-format
-msgid "'%s' has unknown value for svn:eol-style property"
-msgstr "“%s”的 svn:eol-style 属性有不明的数值"
+msgid "Can't get working directory"
+msgstr "无法取得工作目录"
 
-#: libsvn_wc/update_editor.c:387
+#: svn/util.c:173 svn/util.c:196
 #, c-format
-msgid "No '.' entry in: '%s'"
-msgstr "不存在 '.' 项目:“%s”"
+msgid "Can't change working directory to '%s'"
+msgstr "无法更改工作拷贝至“%s”"
 
-#: libsvn_wc/update_editor.c:863
+#: svn/util.c:221
 #, c-format
-msgid "Won't delete locally modified directory '%s'"
-msgstr "无法删除本地修改的目录“%s”"
+msgid "Can't write to '%s'"
+msgstr "无法写入至“%s”"
 
-#: libsvn_wc/update_editor.c:1049
+#: svn/util.c:251
 #, c-format
-msgid "Failed to add directory '%s': object of the same name already exists"
-msgstr "无法新增目录“%s”:同名物件已存在"
+msgid "system('%s') returned %d"
+msgstr "系统(“%s”) 返回 %d"
 
-#: libsvn_wc/update_editor.c:1057
+#: svn/util.c:318
 #, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
-msgstr "无法新增目录“%s”:物件与管理目录同名"
+msgid "Can't restore working directory"
+msgstr "无法还原工作目录"
 
-#: libsvn_wc/update_editor.c:1071
-#, c-format
-msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
-msgstr "无法新增文件“%s”:copyfrom 参数尚不支持"
+#: svn/util.c:358
+msgid "Log message contains a zero byte"
+msgstr "日志信息中有一个零字节"
 
-#: libsvn_wc/update_editor.c:1092
-#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name is already scheduled "
-"for addition"
-msgstr "无法新增目录“%s”:同名物件已加入新增调度"
+#: svn/util.c:418
+msgid "Your commit message was left in a temporary file:"
+msgstr "您的提交信息保留在临时文件中:"
 
-#: libsvn_wc/update_editor.c:1315
-msgid "Couldn't do property merge"
-msgstr "无法进行属性合并"
+# as-is
+#: svn/util.c:470
+msgid "--This line, and those below, will be ignored--"
+msgstr "--此行及以下内容将会被忽略--"
 
-#: libsvn_wc/update_editor.c:1409
-#, c-format
+#: svn/util.c:510
+#, fuzzy
 msgid ""
-"Failed to mark '%s' absent: item of the same name is already scheduled for "
-"addition"
-msgstr "无法将“%s”标记为不存在:同名项目已加入新增调度"
+"Use of an external editor to fetch log message is not supported on OS400; "
+"consider using the --message (-m) or --file (-F) options"
+msgstr ""
+"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
+"message (-m) 或 --file (-F) 选项"
 
-#: libsvn_wc/update_editor.c:1501
-#, c-format
-msgid "Failed to add file '%s': object of the same name already exists"
-msgstr "无法新增文件“%s”:同名物件已存在"
+#: svn/util.c:592
+msgid "Cannot invoke editor to get log message when non-interactive"
+msgstr "在非交互式的情况下不能调用编辑器获取日志信息"
 
-#: libsvn_wc/update_editor.c:1522
-#, c-format
+#: svn/util.c:605
 msgid ""
-"Failed to add file '%s': object of the same name is already scheduled for "
-"addition"
-msgstr "无法新增文件“%s”:同名物件已加入新增调度"
-
-#: libsvn_wc/update_editor.c:1530
-#, c-format
-msgid "File '%s' in directory '%s' is not a versioned resource"
-msgstr "文件“%s”于目录“%s”中的并不是纳入版本控制的资源"
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
+"message (-m) 或 --file (-F) 选项"
 
-#: libsvn_wc/update_editor.c:1651
-#, c-format
-msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不符合;记录:“%s”,实际:“%s”"
+#: svn/util.c:641
+msgid ""
+"\n"
+"Log message unchanged or not specified\n"
+"a)bort, c)ontinue, e)dit\n"
+msgstr ""
+"\n"
+"日志信息未改变,或是未指定\n"
+"a)中断,c)继续,e)编辑\n"
 
-#: libsvn_wc/update_editor.c:1957
-msgid "Move failed"
-msgstr "移动失败"
+#: svn/util.c:694
+msgid "Use --force to override this restriction"
+msgstr "请用 --force 来撤销限制"
 
-#: libsvn_wc/update_editor.c:2884
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
 #, c-format
-msgid "'%s' has no ancestry information"
-msgstr "“%s”没有演进历程信息"
-
-#: libsvn_wc/update_editor.c:2972
-#, fuzzy, c-format
-msgid "Copyfrom-url '%s' has different repository root than '%s'"
-msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
-
-#: libsvn_wc/util.c:83
-msgid "Unable to make any directories"
-msgstr "无法建立任何目录"
-
-#: svnadmin/main.c:94 svndumpfilter/main.c:62
 msgid "Can't open stdio file"
 msgstr "无法启动标准输出入文件"
 
-#: svnadmin/main.c:123
+#: svnadmin/main.c:124
 msgid "Repository argument required"
 msgstr "需有档案库参数"
 
-#: svnadmin/main.c:128
+#: svnadmin/main.c:129
 #, c-format
 msgid "'%s' is an URL when it should be a path"
 msgstr "“%s”是地址(URL),但是应该是路径"
 
-#: svnadmin/main.c:233 svndumpfilter/main.c:762 svnlook/main.c:98
-#: svnserve/main.c:111 svnversion/main.c:182
-msgid "show version information"
-msgstr "显示版本信息"
-
 #: svnadmin/main.c:236
 msgid "specify revision number ARG (or X:Y range)"
 msgstr "指定修订版编号 ARG (或 X:Y 范围)"
@@ -6808,18 +7415,21 @@
 msgstr "关闭日志文件自动移除 [Berkeley DB]"
 
 #: svnadmin/main.c:272
-msgid "remove redundant log files from source repository"
+#, fuzzy
+msgid ""
+"remove redundant Berkeley DB log files\n"
+" from source repository [Berkeley DB]"
 msgstr "自来源档案库移除多余的日志文件"
 
-#: svnadmin/main.c:275
+#: svnadmin/main.c:276
 msgid "call pre-commit hook before committing revisions"
 msgstr "提交修订版签调用 pre-commit 外挂"
 
-#: svnadmin/main.c:278
+#: svnadmin/main.c:279
 msgid "call post-commit hook after committing revisions"
 msgstr "提交修订版后调用 post-commit 外挂"
 
-#: svnadmin/main.c:281
+#: svnadmin/main.c:282
 msgid ""
 "wait instead of exit if the repository is in\n"
 " use by another process"
@@ -6827,7 +7437,21 @@
 "如果档案库被其他进程占用,等待而不直接退出\n"
 " "
 
-#: svnadmin/main.c:294
+#: svnadmin/main.c:286
+msgid ""
+"disallow use of SVNDIFF1 in on-disk storage,\n"
+" for backwards compatibility"
+msgstr ""
+
+#: svnadmin/main.c:299
+msgid ""
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"
+"Open the repository at REPOS_PATH, then abort, thus simulating\n"
+"a process that crashes while holding an open repository handle.\n"
+msgstr ""
+
+#: svnadmin/main.c:305
 msgid ""
 "usage: svnadmin create REPOS_PATH\n"
 "\n"
@@ -6837,7 +7461,7 @@
 "\n"
 "于 REPOS_PATH 建立一个新的,空的 Subversion 档案库。\n"
 
-#: svnadmin/main.c:300
+#: svnadmin/main.c:311
 msgid ""
 "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
 "\n"
@@ -6853,7 +7477,7 @@
 "与前一修订版的差异,deltification 本质上可压缩档案库。如果没有指定\n"
 "修订版的话,则直接对 HEAD 修订版进行。\n"
 
-#: svnadmin/main.c:309
+#: svnadmin/main.c:320
 msgid ""
 "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
 "\n"
@@ -6872,7 +7496,7 @@
 "一个修订版树。如果使用了 --incremental 选项,那么第一个转存的修订版会\n"
 "是与前一个修订版的差异,而非平常的全文输出。\n"
 
-#: svnadmin/main.c:320
+#: svnadmin/main.c:330
 msgid ""
 "usage: svnadmin help [SUBCOMMAND...]\n"
 "\n"
@@ -6882,7 +7506,7 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: svnadmin/main.c:325
+#: svnadmin/main.c:335
 msgid ""
 "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
 "\n"
@@ -6892,7 +7516,7 @@
 "\n"
 "产生档案库的即时拷贝。\n"
 
-#: svnadmin/main.c:330
+#: svnadmin/main.c:340
 msgid ""
 "usage: svnadmin list-dblogs REPOS_PATH\n"
 "\n"
@@ -6907,7 +7531,7 @@
 "\n"
 "警告:修改或删除仍在使用中的记录文件将导致档案库损坏。\n"
 
-#: svnadmin/main.c:337
+#: svnadmin/main.c:347
 msgid ""
 "usage: svnadmin list-unused-dblogs REPOS_PATH\n"
 "\n"
@@ -6919,7 +7543,7 @@
 "列出无用的 Berkeley DB 日志文件。\n"
 "\n"
 
-#: svnadmin/main.c:342
+#: svnadmin/main.c:352
 msgid ""
 "usage: svnadmin load REPOS_PATH\n"
 "\n"
@@ -6934,7 +7558,7 @@
 "系统中。如果档案库原先是空的,默认会将其 UUID 以流中的数值代之。\n"
 "进度报告会送至标准输出。\n"
 
-#: svnadmin/main.c:353
+#: svnadmin/main.c:362
 #, fuzzy
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH\n"
@@ -6945,7 +7569,7 @@
 "\n"
 "显示所有锁的相信信息。\n"
 
-#: svnadmin/main.c:358
+#: svnadmin/main.c:367
 msgid ""
 "usage: svnadmin lstxns REPOS_PATH\n"
 "\n"
@@ -6955,7 +7579,7 @@
 "\n"
 "显示所有未处理事务的名称。\n"
 
-#: svnadmin/main.c:363
+#: svnadmin/main.c:372
 msgid ""
 "usage: svnadmin recover REPOS_PATH\n"
 "\n"
@@ -6974,7 +7598,7 @@
 "上结束。\n"
 "\n"
 
-#: svnadmin/main.c:371
+#: svnadmin/main.c:380
 msgid ""
 "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
 "\n"
@@ -6984,7 +7608,7 @@
 "\n"
 "无条件地从每一个 LOCKED_PATH 删除锁。\n"
 
-#: svnadmin/main.c:376
+#: svnadmin/main.c:385
 msgid ""
 "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
 "\n"
@@ -6994,7 +7618,7 @@
 "\n"
 "从档案库删除命名事务。\n"
 
-#: svnadmin/main.c:381
+#: svnadmin/main.c:390
 msgid ""
 "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
 "\n"
@@ -7018,7 +7642,7 @@
 "注意:修订版属性并未纳入版本控管,所以这个命令会永远盖写掉先前的\n"
 "日志信息。\n"
 
-#: svnadmin/main.c:395
+#: svnadmin/main.c:402
 msgid ""
 "usage: svnadmin verify REPOS_PATH\n"
 "\n"
@@ -7028,33 +7652,36 @@
 "\n"
 "校验储存于档案库的数据。\n"
 
-#: svnadmin/main.c:448
+#: svnadmin/main.c:456
 #, fuzzy
 msgid "Invalid revision specifier"
 msgstr "指定了无效的修订版本"
 
-#: svnadmin/main.c:453
+#: svnadmin/main.c:461
 #, fuzzy, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
 msgstr "修订版必须不能大于最新的修订版号(%ld)"
 
-#: svnadmin/main.c:521 svnadmin/main.c:603
+#: svnadmin/main.c:534 svnadmin/main.c:629
 msgid "First revision cannot be higher than second"
 msgstr "第一个修订版不可高于第二个"
 
-#: svnadmin/main.c:530
+#: svnadmin/main.c:543
 #, c-format
 msgid "Deltifying revision %ld..."
 msgstr "正在 deltify 修订版 %ld..."
 
-#: svnadmin/main.c:534
+#: svnadmin/main.c:547
+#, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: svnadmin/main.c:634
+#: svnadmin/main.c:654
+#, fuzzy
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnadmin --version' to see the program version and FS modules.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7063,7 +7690,7 @@
 "\n"
 "可用的子命令:\n"
 
-#: svnadmin/main.c:641 svnlook/main.c:1765 svnserve/main.c:158
+#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
 #, fuzzy
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
@@ -7072,7 +7699,8 @@
 "以下的档案库后台(FS) 模块可用:\n"
 "\n"
 
-#: svnadmin/main.c:724
+#: svnadmin/main.c:738
+#, c-format
 msgid ""
 "Repository lock acquired.\n"
 "Please wait; recovering the repository may take some time...\n"
@@ -7080,7 +7708,7 @@
 "已取得档案库锁定。\n"
 "请稍候;修复档案库也许得花费一些时间...\n"
 
-#: svnadmin/main.c:759
+#: svnadmin/main.c:773
 msgid ""
 "Failed to get exclusive repository access; perhaps another process\n"
 "such as httpd, svnserve or svn has it open?"
@@ -7088,11 +7716,13 @@
 "无法取得独占存取权限;可能是其他如 httpd,svnserve 或 svn 的进程正在打开它\n"
 "并没有释放权限?"
 
-#: svnadmin/main.c:764
+#: svnadmin/main.c:778
+#, c-format
 msgid "Waiting on repository lock; perhaps another process has it open?\n"
 msgstr "等待档案库锁定中;也许其它的进程把它打开了?\n"
 
-#: svnadmin/main.c:771
+#: svnadmin/main.c:785
+#, c-format
 msgid ""
 "\n"
 "Recovery completed.\n"
@@ -7100,50 +7730,53 @@
 "\n"
 "修复完成。\n"
 
-#: svnadmin/main.c:778
+#: svnadmin/main.c:792
 #, c-format
 msgid "The latest repos revision is %ld.\n"
 msgstr "最新的档案库修订版为 %ld。\n"
 
-#: svnadmin/main.c:888
+#: svnadmin/main.c:902
 #, c-format
 msgid "Transaction '%s' removed.\n"
 msgstr "事务“%s”被移除。\n"
 
-#: svnadmin/main.c:912
+#: svnadmin/main.c:926
+#, c-format
 msgid "Missing revision"
 msgstr "丢失修订版"
 
-#: svnadmin/main.c:915
+#: svnadmin/main.c:929
+#, c-format
 msgid "Only one revision allowed"
 msgstr "仅允许一个修订版"
 
-#: svnadmin/main.c:921
+#: svnadmin/main.c:935
+#, c-format
 msgid "Exactly one file argument required"
 msgstr "必须提供恰好一个的文件参数"
 
-#: svnadmin/main.c:1029 svnlook/main.c:1830
+#: svnadmin/main.c:1047 svnlook/main.c:1728
 #, c-format
 msgid "UUID Token: %s\n"
 msgstr "UUID 标识:%s\n"
 
 # this points to filename according to sunny256
-#: svnadmin/main.c:1030 svnlook/main.c:1831
+#: svnadmin/main.c:1048 svnlook/main.c:1729
 #, fuzzy, c-format
 msgid "Owner: %s\n"
 msgstr "所有者:%s\n"
 
-#: svnadmin/main.c:1031 svnlook/main.c:1832
+#: svnadmin/main.c:1049 svnlook/main.c:1730
 #, fuzzy, c-format
 msgid "Created: %s\n"
 msgstr "创建于:%s\n"
 
-#: svnadmin/main.c:1032 svnlook/main.c:1833
+#: svnadmin/main.c:1050 svnlook/main.c:1731
 #, c-format
 msgid "Expires: %s\n"
 msgstr "过期:%s\n"
 
-#: svnadmin/main.c:1034
+#: svnadmin/main.c:1052
 #, c-format
 msgid ""
 "Comment (%i lines):\n"
@@ -7154,7 +7787,7 @@
 "%s\n"
 "\n"
 
-#: svnadmin/main.c:1035
+#: svnadmin/main.c:1053
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -7165,21 +7798,28 @@
 "%s\n"
 "\n"
 
-#: svnadmin/main.c:1102
+#: svnadmin/main.c:1110
 #, fuzzy, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr "路径“%s”没有被锁定。\n"
 
-#: svnadmin/main.c:1114
+#: svnadmin/main.c:1122
 #, fuzzy, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr "删除“%s”上的锁。\n"
 
-#: svnadmin/main.c:1324
+#: svnadmin/main.c:1230
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+
+#: svnadmin/main.c:1349
+#, c-format
 msgid "subcommand argument required\n"
 msgstr "必须提供子命令参数\n"
 
-#: svnadmin/main.c:1409
+#: svnadmin/main.c:1434
 #, c-format
 msgid ""
 "subcommand '%s' doesn't accept option '%s'\n"
@@ -7189,50 +7829,51 @@
 "请使用“svnadmin help %s”以了解用法。\n"
 
 # as-is
-#: svndumpfilter/main.c:325
+#: svndumpfilter/main.c:319
 msgid "This is an empty revision for padding."
 msgstr "This is an empty revision for padding."
 
-#: svndumpfilter/main.c:378
+#: svndumpfilter/main.c:389
 #, c-format
 msgid "Revision %ld committed as %ld.\n"
 msgstr "修订版 %ld 提交为 %ld。\n"
 
-#: svndumpfilter/main.c:386
+#: svndumpfilter/main.c:412
 #, c-format
 msgid "Revision %ld skipped.\n"
 msgstr "跳过修订版 %ld。\n"
 
-#: svndumpfilter/main.c:489
+#: svndumpfilter/main.c:514
 #, c-format
 msgid "Invalid copy source path '%s'"
 msgstr "无效的复制来源路径“%s”"
 
-#: svndumpfilter/main.c:532
-msgid "Node with dropped parent sneaked in"
-msgstr "其父节点已舍弃的节点偷跑进来"
+#: svndumpfilter/main.c:558
+#, c-format
+msgid "No valid copyfrom revision in filtered stream"
+msgstr ""
 
-#: svndumpfilter/main.c:638
+#: svndumpfilter/main.c:663
 msgid "Delta property block detected - not supported by svndumpfilter"
 msgstr "Delta 属性块被检测到 - svndumpfilter 不支持"
 
-#: svndumpfilter/main.c:764
+#: svndumpfilter/main.c:788
 msgid "Do not display filtering statistics."
 msgstr "不显示过滤的统计数据。"
 
-#: svndumpfilter/main.c:766
+#: svndumpfilter/main.c:790
 msgid "Remove revisions emptied by filtering."
 msgstr "移除因过滤而产生的空修订版。"
 
-#: svndumpfilter/main.c:768
+#: svndumpfilter/main.c:792
 msgid "Renumber revisions left after filtering."
 msgstr "过滤后重编余下的修订版。"
 
-#: svndumpfilter/main.c:770
+#: svndumpfilter/main.c:794
 msgid "Don't filter revision properties."
 msgstr "不过滤修订版属性。"
 
-#: svndumpfilter/main.c:781
+#: svndumpfilter/main.c:805
 msgid ""
 "Filter out nodes with given prefixes from dumpstream.\n"
 "usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -7240,7 +7881,7 @@
 "自转存流移除符合指定字首的节点。\n"
 "用法:svndumpfilter exclude PATH_PREFIX...\n"
 
-#: svndumpfilter/main.c:787
+#: svndumpfilter/main.c:811
 msgid ""
 "Filter out nodes without given prefixes from dumpstream.\n"
 "usage: svndumpfilter include PATH_PREFIX...\n"
@@ -7248,7 +7889,7 @@
 "自转存串流移除未包含指定字首的节点。\n"
 "用法:svndumpfilter include PATH_PREFIX...\n"
 
-#: svndumpfilter/main.c:793
+#: svndumpfilter/main.c:817
 msgid ""
 "Describe the usage of this program or its subcommands.\n"
 "usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -7256,10 +7897,12 @@
 "描述本程序或其子命令的用法。\n"
 "用法:svndumpfilter help [SUBCOMMAND...]\n"
 
-#: svndumpfilter/main.c:863
+#: svndumpfilter/main.c:888
+#, fuzzy
 msgid ""
 "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
 "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svndumpfilter --version' to see the program version number.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7268,23 +7911,27 @@
 "\n"
 "可用的子命令:\n"
 
-#: svndumpfilter/main.c:917
+#: svndumpfilter/main.c:943
+#, c-format
 msgid "Excluding (and dropping empty revisions for) prefixes:\n"
 msgstr "排除 (以及丢弃空修订版) 的字首:\n"
 
-#: svndumpfilter/main.c:919
+#: svndumpfilter/main.c:945
+#, c-format
 msgid "Excluding prefixes:\n"
 msgstr "排除字首:\n"
 
-#: svndumpfilter/main.c:921
+#: svndumpfilter/main.c:947
+#, c-format
 msgid "Including (and dropping empty revisions for) prefixes:\n"
 msgstr "涵盖 (以及丢弃空修订版) 的字首:\n"
 
-#: svndumpfilter/main.c:923
+#: svndumpfilter/main.c:949
+#, c-format
 msgid "Including prefixes:\n"
 msgstr "包含的字首:\n"
 
-#: svndumpfilter/main.c:950
+#: svndumpfilter/main.c:976
 #, c-format
 msgid ""
 "Dropped %d revision(s).\n"
@@ -7293,21 +7940,22 @@
 "丢弃 %d 修订版。\n"
 "\n"
 
-#: svndumpfilter/main.c:956
+#: svndumpfilter/main.c:982
 msgid "Revisions renumbered as follows:\n"
 msgstr "修订版被重新编号,如下:\n"
 
-#: svndumpfilter/main.c:984
+#: svndumpfilter/main.c:1009
 #, c-format
 msgid " %ld => (dropped)\n"
 msgstr " %ld => (丢弃)\n"
 
-#: svndumpfilter/main.c:999
+#: svndumpfilter/main.c:1024
 #, c-format
 msgid "Dropped %d node(s):\n"
 msgstr "丢弃 %d 节点:\n"
 
-#: svndumpfilter/main.c:1204
+#: svndumpfilter/main.c:1245
+#, c-format
 msgid ""
 "\n"
 "Error: no prefixes supplied.\n"
@@ -7315,7 +7963,7 @@
 "\n"
 "错误:没有提供前置字首,\n"
 
-#: svndumpfilter/main.c:1247
+#: svndumpfilter/main.c:1289
 #, fuzzy, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -7324,40 +7972,44 @@
 "子命令“%s”不接受选项“%s”\n"
 "请使用“svndumpfilter help %s”以了解用法。\n"
 
-#: svnlook/main.c:101
+#: svnlook/main.c:99
 msgid "specify revision number ARG"
 msgstr "指定修订版编号 ARG"
 
-#: svnlook/main.c:104
+#: svnlook/main.c:102
 msgid "specify transaction name ARG"
 msgstr "指定事务名称 ARG"
 
-#: svnlook/main.c:107
+#: svnlook/main.c:105
 msgid "be verbose"
 msgstr "详细"
 
-#: svnlook/main.c:110
+#: svnlook/main.c:108
 msgid "show node revision ids for each path"
 msgstr "为每个路径显示节点修订版编号"
 
-#: svnlook/main.c:116
+#: svnlook/main.c:114
 #, fuzzy
 msgid "do not print differences for added files"
 msgstr "不要打印已新加文件的不同处"
 
-#: svnlook/main.c:119
+#: svnlook/main.c:117
 msgid "print differences against the copy source"
 msgstr "显示差异并对照原始内容"
 
-#: svnlook/main.c:122
+#: svnlook/main.c:120
 #, fuzzy
 msgid "operate on a revision property (use with -r or -t)"
 msgstr "在修订版属性上作操作(使用-r参数)"
 
-#: svnlook/main.c:125
+#: svnlook/main.c:123
 msgid "show full paths instead of indenting them"
 msgstr "显示完整路径代替缩略形式"
 
+#: svnlook/main.c:126
+msgid "show details for copies"
+msgstr ""
+
 #: svnlook/main.c:138
 msgid ""
 "usage: svnlook author REPOS_PATH\n"
@@ -7378,7 +8030,7 @@
 "\n"
 "显示文件的内容。FILE_PATH 前的 '/' 可省略。\n"
 
-#: svnlook/main.c:149
+#: svnlook/main.c:148
 msgid ""
 "usage: svnlook changed REPOS_PATH\n"
 "\n"
@@ -7388,7 +8040,7 @@
 "\n"
 "显示已改变的路径。\n"
 
-#: svnlook/main.c:154
+#: svnlook/main.c:153
 msgid ""
 "usage: svnlook date REPOS_PATH\n"
 "\n"
@@ -7398,7 +8050,7 @@
 "\n"
 "显示日期。\n"
 
-#: svnlook/main.c:159
+#: svnlook/main.c:158
 msgid ""
 "usage: svnlook diff REPOS_PATH\n"
 "\n"
@@ -7408,7 +8060,7 @@
 "\n"
 "以 GNU 样式,显示档案库中改变的文件与属性差异。\n"
 
-#: svnlook/main.c:165
+#: svnlook/main.c:164
 msgid ""
 "usage: svnlook dirs-changed REPOS_PATH\n"
 "\n"
@@ -7419,7 +8071,7 @@
 "\n"
 "显示本身曾改变 (或属性编辑) 过的目录,或是其下的文件更曾动过目录。\n"
 
-#: svnlook/main.c:171
+#: svnlook/main.c:170
 msgid ""
 "usage: svnlook help [SUBCOMMAND...]\n"
 "\n"
@@ -7429,7 +8081,7 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: svnlook/main.c:176
+#: svnlook/main.c:175
 msgid ""
 "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -7440,7 +8092,7 @@
 "\n"
 "显示档案库中,某个路径的历史记录信息 (如果没有指定路径,则为根目录)。\n"
 
-#: svnlook/main.c:182
+#: svnlook/main.c:181
 msgid ""
 "usage: svnlook info REPOS_PATH\n"
 "\n"
@@ -7450,7 +8102,7 @@
 "\n"
 "显示作者,日期戳,日志信息大小,以及日志信息。\n"
 
-#: svnlook/main.c:187
+#: svnlook/main.c:186
 #, fuzzy
 msgid ""
 "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
@@ -7461,7 +8113,7 @@
 "\n"
 "如果档案库路径已经存在锁,描述它。\n"
 
-#: svnlook/main.c:192
+#: svnlook/main.c:191
 msgid ""
 "usage: svnlook log REPOS_PATH\n"
 "\n"
@@ -7471,7 +8123,7 @@
 "\n"
 "显示日志信息。\n"
 
-#: svnlook/main.c:197
+#: svnlook/main.c:196
 #, fuzzy
 msgid ""
 "usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
@@ -7484,7 +8136,7 @@
 "显示档案库中,某个路径的属性的原始内容。\n"
 "加上 --revprop, 显示修订版属性的原始值。\n"
 
-#: svnlook/main.c:203
+#: svnlook/main.c:202
 #, fuzzy
 msgid ""
 "usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
@@ -7499,7 +8151,7 @@
 "加上 --revprop 选项, 修订版属性。\n"
 "加上 -v 的话,一并显示属性内容。\n"
 
-#: svnlook/main.c:210
+#: svnlook/main.c:209
 msgid ""
 "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -7511,7 +8163,7 @@
 "显示目录树,自 PATH_IN_REPOS 开始 (如果有提供的话,不然就从目录树的\n"
 "根目录开始),可选择性地显示节点修订版 id。\n"
 
-#: svnlook/main.c:216
+#: svnlook/main.c:215
 msgid ""
 "usage: svnlook uuid REPOS_PATH\n"
 "\n"
@@ -7521,7 +8173,7 @@
 "\n"
 "显示档案库的 UUID。\n"
 
-#: svnlook/main.c:221
+#: svnlook/main.c:220
 msgid ""
 "usage: svnlook youngest REPOS_PATH\n"
 "\n"
@@ -7531,60 +8183,53 @@
 "\n"
 "显示最新的修订版号。\n"
 
-#: svnlook/main.c:589
-#, fuzzy, c-format
-msgid "Error creating dir '%s' (path exists)"
-msgstr "创建目录“%s”时发生错误(路径已经存在)"
-
-#: svnlook/main.c:863
+#: svnlook/main.c:815
 #, c-format
 msgid "Copied: %s (from rev %ld, %s)\n"
 msgstr "已复制:%s (来自修订版 %ld,%s)\n"
 
-#: svnlook/main.c:941
+#: svnlook/main.c:884
 msgid "Added"
 msgstr "已加入"
 
-#: svnlook/main.c:942
+#: svnlook/main.c:885
 msgid "Deleted"
 msgstr "已删除"
 
-#: svnlook/main.c:943
+#: svnlook/main.c:886
 msgid "Modified"
 msgstr "已修改"
 
-#: svnlook/main.c:944
+#: svnlook/main.c:887
 msgid "Index"
 msgstr "索引"
 
-#: svnlook/main.c:956
+#: svnlook/main.c:899
+#, c-format
 msgid "(Binary files differ)\n"
 msgstr "(二进制文件差异)\n"
 
-#: svnlook/main.c:1085
+#: svnlook/main.c:1028
 msgid "unknown"
 msgstr "未知"
 
-#: svnlook/main.c:1230 svnlook/main.c:1323 svnlook/main.c:1393
+#: svnlook/main.c:1173 svnlook/main.c:1266 svnlook/main.c:1295
 #, c-format
 msgid "Transaction '%s' is not based on a revision; how odd"
 msgstr "事务“%s”并非根基于某个修订版;多神秘啊"
 
-#: svnlook/main.c:1260
+#: svnlook/main.c:1203
 #, c-format
 msgid "'%s' is a URL, probably should be a path"
 msgstr "“%s”是地址(URL),也许该是路径。"
 
-#: svnlook/main.c:1287
+#: svnlook/main.c:1230
 #, c-format
 msgid "Path '%s' is not a file"
 msgstr "路径“%s”不是文件"
 
-#: svnlook/main.c:1373
-msgid "Can't create temporary directory"
-msgstr "无法建立临时目录"
-
-#: svnlook/main.c:1473
+#: svnlook/main.c:1369
+#, c-format
 msgid ""
 "REVISION PATH <ID>\n"
 "-------- ---------\n"
@@ -7592,7 +8237,8 @@
 "ä¿® 订 版 路径 <ID>\n"
 "-------- ---------\n"
 
-#: svnlook/main.c:1478
+#: svnlook/main.c:1374
+#, c-format
 msgid ""
 "REVISION PATH\n"
 "-------- ----\n"
@@ -7600,27 +8246,30 @@
 "ä¿® 订 版 路径\n"
 "-------- ----\n"
 
-#: svnlook/main.c:1523
+#: svnlook/main.c:1419
 #, fuzzy, c-format
 msgid "Property '%s' not found on revision %ld"
 msgstr "属性“%s”在修订版 %ld 中找不到"
 
-#: svnlook/main.c:1527
+#: svnlook/main.c:1423
 #, fuzzy, c-format
 msgid "Property '%s' not found on path '%s' in revision %ld"
 msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”中找不到"
 
-#: svnlook/main.c:1695 svnlook/main.c:1909
+#: svnlook/main.c:1592 svnlook/main.c:1807
+#, c-format
 msgid "Missing repository path argument"
 msgstr "未提供档案库路径参数"
 
-#: svnlook/main.c:1756
+#: svnlook/main.c:1653
+#, fuzzy
 msgid ""
 "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Note: any subcommand which takes the '--revision' and '--transaction'\n"
 " options will, if invoked without one of those options, act on\n"
 " the repository's youngest revision.\n"
 "Type 'svnlook help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnlook --version' to see the program version and FS modules.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7631,12 +8280,12 @@
 "\n"
 "可用的子命令:\n"
 
-#: svnlook/main.c:1811
+#: svnlook/main.c:1709
 #, fuzzy
 msgid "Missing path argument"
 msgstr "未提供档案库路径参数"
 
-#: svnlook/main.c:1836
+#: svnlook/main.c:1734
 #, c-format
 msgid ""
 "Comment (%i lines):\n"
@@ -7645,7 +8294,7 @@
 "注释 (%i 行):\n"
 "%s\n"
 
-#: svnlook/main.c:1837
+#: svnlook/main.c:1735
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -7654,39 +8303,40 @@
 "注释 (%i 行):\n"
 "%s\n"
 
-#: svnlook/main.c:1883
-#, fuzzy
+#: svnlook/main.c:1781
+#, fuzzy, c-format
 msgid "Missing propname argument"
 msgstr "未提供属性名称参数"
 
-#: svnlook/main.c:1884
+#: svnlook/main.c:1782
+#, c-format
 msgid "Missing propname and repository path arguments"
 msgstr "未提供属性名称与档案库路径参数"
 
-#: svnlook/main.c:1890
+#: svnlook/main.c:1788
 msgid "Missing propname or repository path argument"
 msgstr "未提供属性名称或档案库路径参数"
 
-#: svnlook/main.c:2045
+#: svnlook/main.c:1946
 msgid "Invalid revision number supplied"
 msgstr "提供了无效的版本号码"
 
-#: svnlook/main.c:2103
+#: svnlook/main.c:2007
 msgid ""
 "The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
 msgstr "'--transaction' (-t) 与 '--revision' (-r) 参数不能同时存在"
 
-#: svnlook/main.c:2172
-#, fuzzy
+#: svnlook/main.c:2089
+#, fuzzy, c-format
 msgid "Repository argument required\n"
 msgstr "需有档案库参数"
 
-#: svnlook/main.c:2181
+#: svnlook/main.c:2098
 #, c-format
 msgid "'%s' is a URL when it should be a path\n"
 msgstr "“%s”是地址(URL),但是应该是路径\n"
 
-#: svnlook/main.c:2229
+#: svnlook/main.c:2149
 #, fuzzy, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -7695,62 +8345,72 @@
 "子命令“%s”并不接受选项“%s”\n"
 "请使用“svnlook help %s”以了解用法。\n"
 
-#: svnserve/main.c:102
+#: svnserve/main.c:140
 msgid "daemon mode"
 msgstr "后台模式"
 
-#: svnserve/main.c:104
+#: svnserve/main.c:142
 msgid "listen port (for daemon mode)"
 msgstr "监听端口(后台模式)"
 
-#: svnserve/main.c:106
+#: svnserve/main.c:144
 msgid "listen hostname or IP address (for daemon mode)"
 msgstr "监听主机名或IP地址(后台模式)"
 
-#: svnserve/main.c:108
+#: svnserve/main.c:146
 msgid "run in foreground (useful for debugging)"
 msgstr "在前台运行(调试时有用)"
 
-#: svnserve/main.c:109 svnversion/main.c:181
+#: svnserve/main.c:147 svnversion/main.c:123
 msgid "display this help"
 msgstr "显示这个帮助"
 
-#: svnserve/main.c:112
+#: svnserve/main.c:150
 msgid "inetd mode"
 msgstr "inetd 模式"
 
-#: svnserve/main.c:113
+#: svnserve/main.c:151
 msgid "root of directory to serve"
 msgstr "服务根目录"
 
-#: svnserve/main.c:114
-msgid "deprecated; use repository config file"
+#: svnserve/main.c:153
+#, fuzzy
+msgid "force read only, overriding repository config file"
 msgstr "不赞成;使用档案库配置文件"
 
-#: svnserve/main.c:115
+#: svnserve/main.c:154
 msgid "tunnel mode"
 msgstr "隧道模式"
 
-#: svnserve/main.c:117
+#: svnserve/main.c:156
 msgid "tunnel username (default is current uid's name)"
 msgstr "隧道用户名(模式是当前用户UID的名字)"
 
-#: svnserve/main.c:119
+#: svnserve/main.c:158
 msgid "use threads instead of fork"
 msgstr "使用线程代替进程"
 
-#: svnserve/main.c:121
+#: svnserve/main.c:160
 msgid "listen once (useful for debugging)"
 msgstr "监听一次(调试时有用)"
 
-#: svnserve/main.c:132
+#: svnserve/main.c:162
+msgid "write server process ID to file arg"
+msgstr ""
+
+#: svnserve/main.c:165
+msgid "run as a windows service (SCM only)"
+msgstr ""
+
+#: svnserve/main.c:177
 #, c-format
 msgid "Type '%s --help' for usage.\n"
 msgstr "请使用“%s help”以得到用法和帮助。\n"
 
-#: svnserve/main.c:141
+#: svnserve/main.c:186
+#, fuzzy
 msgid ""
-"Usage: svnserve [options]\n"
+"usage: svnserve [options]\n"
 "\n"
 "Valid options:\n"
 msgstr ""
@@ -7758,76 +8418,243 @@
 "\n"
 "有效选项:\n"
 
-#: svnserve/main.c:359
-msgid ""
-"Warning: -R is deprecated.\n"
-"Anonymous access is now read-only by default.\n"
-"To change, use conf/svnserve.conf in repos:\n"
-" [general]\n"
-" anon-access = read|write|none (default read)\n"
-" auth-access = read|write|none (default write)\n"
-"Forcing all access to read-only for now\n"
-msgstr ""
-"警告:-R 不赞成使用。\n"
-"匿名访问默认只读。Anonymous access is now read-only by default.\n"
-"修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
-" [general]\n"
-" anon-access = read|write|none (默认 read)\n"
-" auth-access = read|write|none (默认 write)\n"
-"强制所有访问为只读\n"
-
-#: svnserve/main.c:381
-msgid "Option --tunnel-user is only valid in tunnel mode.\n"
-msgstr "选项 --tunnel-user 只有隧道模式时有效。\n"
-
-#: svnserve/main.c:388
+#: svnserve/main.c:468
 #, fuzzy
 msgid "You must specify exactly one of -d, -i, -t or -X.\n"
 msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
 
-#: svnserve/main.c:429
+#: svnserve/main.c:478
 #, c-format
-msgid "Can't get address info: %s\n"
-msgstr "不能获取地址信息:“%s”\n"
+msgid "Option --tunnel-user is only valid in tunnel mode.\n"
+msgstr "选项 --tunnel-user 只有隧道模式时有效。\n"
 
-#: svnserve/main.c:446
+#: svnserve/main.c:547
 #, c-format
-msgid "Can't create server socket: %s\n"
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+
+#: svnserve/main.c:583
+#, fuzzy, c-format
+msgid "Can't get address info"
+msgstr "不能获取地址信息:“%s”\n"
+
+#: svnserve/main.c:599
+#, fuzzy, c-format
+msgid "Can't create server socket"
 msgstr "无法创建服务器套接字:%s\n"
 
-#: svnserve/main.c:460
-#, c-format
-msgid "Can't bind server socket: %s\n"
+#: svnserve/main.c:612
+#, fuzzy, c-format
+msgid "Can't bind server socket"
 msgstr "不能绑定服务器套接字:“%s”\n"
 
-#: svnserve/main.c:503
+#: svnserve/main.c:680
 #, fuzzy, c-format
-msgid "Can't accept client connection: %s\n"
+msgid "Can't accept client connection"
 msgstr "无法接受客户连接:%s\n"
 
-#: svnserve/main.c:558
+#: svnserve/main.c:734
 #, fuzzy, c-format
-msgid "Can't create threadattr: %s\n"
+msgid "Can't create threadattr"
 msgstr "无法创建线程属性:“%s”\n"
 
 # as-is
-#: svnserve/main.c:567
+#: svnserve/main.c:742
 #, fuzzy, c-format
-msgid "Can't set detached state: %s\n"
+msgid "Can't set detached state"
 msgstr "不能设置分离的状态:“%s”\n"
 
-#: svnserve/main.c:581
+#: svnserve/main.c:755
 #, fuzzy, c-format
-msgid "Can't create thread: %s\n"
+msgid "Can't create thread"
 msgstr "无法创建线程:%s\n"
 
-#: svnversion/main.c:90
+#: svnserve/winservice.c:341
+#, c-format
+msgid "Failed to create winservice_start_event"
+msgstr ""
+
+#: svnserve/winservice.c:352
+#, c-format
+msgid "The service failed to start"
+msgstr ""
+
+#: svnserve/winservice.c:400
+#, c-format
+msgid "Failed to connect to Service Control Manager"
+msgstr ""
+
+#: svnserve/winservice.c:411
+#, c-format
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+
+#: svnsync/main.c:56
+msgid ""
+"usage: svnsync initialize DEST_URL SOURCE_URL\n"
+"\n"
+"Initialize a destination repository for synchronization from\n"
+"another repository.\n"
+"\n"
+"The destination URL must point to the root of a repository with\n"
+"no committed revisions. The destination repository must allow\n"
+"revision property changes.\n"
+"\n"
+"You should not commit to, or make revision property changes in,\n"
+"the destination repository by any method other than 'svnsync'.\n"
+"In other words, the destination repository should be a read-only\n"
+"mirror of the source repository.\n"
+msgstr ""
+
+#: svnsync/main.c:71
+msgid ""
+"usage: svnsync synchronize DEST_URL\n"
+"\n"
+"Transfer all pending revisions from source to destination.\n"
+msgstr ""
+
+#: svnsync/main.c:76
+msgid ""
+"usage: svnsync copy-revprops DEST_URL REV\n"
+"\n"
+"Copy all revision properties for revision REV from source to\n"
+"destination.\n"
+msgstr ""
+
+#: svnsync/main.c:82
+#, fuzzy
+msgid ""
+"usage: svnsync help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+"用法:svnadmin help [SUBCOMMAND...]\n"
+"\n"
+"显示本程序或其子命令的用法。\n"
+
+#: svnsync/main.c:184
+#, fuzzy, c-format
+msgid "Can't get local hostname"
+msgstr "无法获取文件名"
+
+#: svnsync/main.c:206
+#, c-format
+msgid "Failed to get lock on destination repos, currently held by '%s'\n"
+msgstr ""
+
+#: svnsync/main.c:301
+#, c-format
+msgid "Session is rooted at '%s' but the repos root is '%s'"
+msgstr ""
+
+#: svnsync/main.c:341
+#, c-format
+msgid "Copied properties for revision %ld (%s* properties skipped).\n"
+msgstr ""
+
+#: svnsync/main.c:346
+#, fuzzy, c-format
+msgid "Copied properties for revision %ld.\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+
+#: svnsync/main.c:387
+msgid "Cannot initialize a repository with content in it"
+msgstr ""
+
+#: svnsync/main.c:398
+#, c-format
+msgid "Destination repository is already synchronizing from '%s'"
+msgstr ""
+
+#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
+#: svnsync/main.c:1200
+#, fuzzy, c-format
+msgid "Path '%s' is not a URL"
+msgstr "路径“%s”不是文件"
+
+#: svnsync/main.c:838
+#, fuzzy, c-format
+msgid "Committed revision %ld.\n"
+msgstr ""
+"\n"
+"提交后的修订版为 %ld。\n"
+
+#: svnsync/main.c:877
+msgid "Destination repository has not been initialized"
+msgstr ""
+
+#: svnsync/main.c:892
+#, c-format
+msgid "UUID of source repository (%s) does not match expected UUID (%s)"
+msgstr ""
+
+#: svnsync/main.c:954
+#, c-format
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:992
+#, c-format
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:1069
+#, c-format
+msgid "Commit created rev %ld but should have created %ld"
+msgstr ""
+
+#: svnsync/main.c:1171
+msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+msgstr ""
+
+#: svnsync/main.c:1203
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "提供了无效的版本号码"
+
+#: svnsync/main.c:1239
 #, fuzzy
+msgid ""
+"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnsync --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"\n"
+"可用的子命令:\n"
+
+#: svnsync/main.c:1429
+#, fuzzy, c-format
+msgid ""
+"subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnsync help %s' for usage.\n"
+msgstr ""
+"子命令“%s”不接受选项“%s”\n"
+"请输入“svn help %s”以取得用法。\n"
+
+#: svnsync/main.c:1490
+msgid "Not enough arguments provided; try 'svnsync help' for more info"
+msgstr ""
+
+#: svnversion/main.c:39
+#, fuzzy, c-format
 msgid "Type 'svnversion --help' for usage.\n"
 msgstr "请使用“svnversion --help”以得到用法和帮助。\n"
 
-#: svnversion/main.c:101
-#, fuzzy
+#: svnversion/main.c:50
+#, fuzzy, c-format
 msgid ""
 "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
@@ -7880,81 +8707,254 @@
 " 如果调用时没有参数 WC_PATH 会使用当前目录。\n"
 "有效选项:\n"
 
-#: svnversion/main.c:179
+#: svnversion/main.c:121
 msgid "do not output the trailing newline"
 msgstr "不输出其后的换行符"
 
-#: svnversion/main.c:180
+#: svnversion/main.c:122
 msgid "last changed rather than current revisions"
 msgstr "最近一次改变的,而不是目前的修订版"
 
-#: svnversion/main.c:272
+#: svnversion/main.c:229
 #, c-format
 msgid "exported%s"
 msgstr "已导出%s"
 
-#: svnversion/main.c:281
+#: svnversion/main.c:238
 #, c-format
 msgid "'%s' not versioned, and not exported\n"
 msgstr "“%s”未纳入版本控制,并未导出\n"
 
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
+#~ msgid "Finished"
+#~ msgstr "完成"
 
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "无法清除“%s”:不是一个目录"
+#~ msgid "Can't get default file perms for file at '%s' (file close error)"
+#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
 
-#~ msgid "'svn info' only works on working copy paths, not URLs"
-#~ msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+#, fuzzy
+#~ msgid ""
+#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
+#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
 
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0的提交。\n"
+#~ msgid "'%s' is already a file/something else"
+#~ msgstr "“%s”已是文件/其它的东西"
 
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信息\n"
+#~ msgid "No URL target available"
+#~ msgstr "没有提供 URL 目标"
 
-#~ msgid "Working copy not locked"
-#~ msgstr "工作拷贝未锁定"
+#~ msgid "repository argument required\n"
+#~ msgstr "需有档案库参数\n"
 
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
+#~ msgid "unknown command: '%s'\n"
+#~ msgstr "未知的命令:“%s”\n"
+
+#~ msgid "Can't recode string"
+#~ msgstr "无法重新编码字符串"
+
+#~ msgid "native"
+#~ msgstr "本地"
+
+# as-is
+#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
+#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
 
 # as-is
 #~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
 #~ msgstr "不支持ra_davçš„ RA 插件 ABI 版本 (%d)"
 
+#~ msgid "No get_dir() available for URL schema"
+#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
+
+#~ msgid "Working copy not locked"
+#~ msgstr "工作拷贝未锁定"
+
+#~ msgid "Print client version info\n"
+#~ msgstr "输出客户端版本信息\n"
+
+#~ msgid "No commit for revision 0.\n"
+#~ msgstr "没有修订版0的提交。\n"
+
+#~ msgid "Cannot cleanup '%s': not a directory"
+#~ msgstr "无法清除“%s”:不是一个目录"
+
+#~ msgid " %ld => %ld\n"
+#~ msgstr " %ld => %ld\n"
+
+#~ msgid "print client version info"
+#~ msgstr "打印客户端版本信息"
+
+#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
+#~ msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
+
+#, fuzzy
+#~ msgid ""
+#~ "Check out a working copy from a repository.\n"
+#~ "usage: checkout URL[@REV]... [PATH]\n"
+#~ "\n"
+#~ " If specified, REV determines in which revision the URL is first\n"
+#~ " looked up.\n"
+#~ "\n"
+#~ " If PATH is omitted, the basename of the URL will be used as\n"
+#~ " the destination. If multiple URLs are given each will be checked\n"
+#~ " out into a sub-directory of PATH, with the name of the sub-directory\n"
+#~ " being the basename of the URL.\n"
+#~ msgstr ""
+#~ "从档案库签出工作拷贝。\n"
+#~ "用法:checkout 地址[@版本]... [路径]\n"
+#~ "\n"
+#~ " 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
+#~ " 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
+#~ " 以地址(URL)最末目录名为名字的子目录中。\n"
+#~ "\n"
+
+#~ msgid "Wrong number of paths given"
+#~ msgstr "指定了错误数目的路径"
+
+#~ msgid "Not enough args provided"
+#~ msgstr "未提供足够的参数"
+
 # as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
+#~ msgid "Can't seek in '%s'"
+#~ msgstr "不能在“%s”定位"
 
-#~ msgid "native"
-#~ msgstr "本地"
+#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
+#~ msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
 
-#~ msgid "Can't recode string"
-#~ msgstr "无法重新编码字符串"
+#~ msgid "Unrecognized node kind of '%s'"
+#~ msgstr "“%s”的节点种类无法辨识"
 
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%s”\n"
+#~ msgid "'%s' is in the way"
+#~ msgstr "“%s”挡在中间"
 
-#~ msgid "repository argument required\n"
-#~ msgstr "需有档案库参数\n"
+#~ msgid "'%s' is not supported"
+#~ msgstr "“%s”不支持"
 
-#~ msgid "No URL target available"
-#~ msgstr "没有提供 URL 目标"
+#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
+#~ msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
 
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%s”已是文件/其它的东西"
+#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
+#~ msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
+
+#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
+#~ msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
+
+#~ msgid "Search for malformed path '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for reading"
+#~ msgstr "不能打开文件“%s”进行读取"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for writing"
+#~ msgstr "不能打开文件“%s”进行写入"
+
+#, fuzzy
+#~ msgid "Error reading file '%s'"
+#~ msgstr "读取文件“%s”时发生错误"
 
 #, fuzzy
+#~ msgid "Error writing file '%s'"
+#~ msgstr "写入文件“%s”时发生错误"
+
+#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
+
+#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
+#~ msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
+
+#~ msgid "Found malformed header block in dumpfile stream"
+#~ msgstr "在导出文件流中找到有畸形的文件头"
+
+# as-is
+#~ msgid "Creating readme file"
+#~ msgstr "正在创建 readme 文件"
+
+# as-is
+#~ msgid "Can't open config file '%s'"
+#~ msgstr "不能打开配置文件“%s”"
+
+# as-is
+#~ msgid "Can't find config file '%s'"
+#~ msgstr "找不到配置文件“%s”"
+
+#~ msgid "Can't change executability of file '%s'"
+#~ msgstr "不能改变文件“%s”为可执行"
+
+#~ msgid "Can't stat new directory '%s'"
+#~ msgstr "无法获取新目录“%s”的状态"
+
+#~ msgid "Too few arguments"
+#~ msgstr "参数太少"
+
 #~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
+#~ "The entry '%s' is no longer a directory; remove the entry before updating"
+#~ msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
 
-#~ msgid "Error writing to stream: unexpected EOF"
-#~ msgstr "写入流时发生错误:意想不到的 EOF"
+#~ msgid "Error restoring props for '%s'"
+#~ msgstr "还原“%s”的属性时发生错误"
 
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
+#~ msgid "Error removing props for '%s'"
+#~ msgstr "移除“%s”的属性时发生错误"
 
-#~ msgid "Finished"
-#~ msgstr "完成"
+#~ msgid ""
+#~ "'%s' is scheduled for deletion; it must be committed before being "
+#~ "overwritten"
+#~ msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
+
+#, fuzzy
+#~ msgid "Working copy '%s' is missing or not locked"
+#~ msgstr "工作拷贝“%s”丢失或并未锁定"
+
+#~ msgid "Error checking path '%s'"
+#~ msgstr "检查路径“%s”时发生错误"
+
+#~ msgid "Unable to delete temporary file"
+#~ msgstr "无法删除暂存文件"
+
+#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
+#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
+
+#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
+#~ msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
+
+#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
+#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
+
+#~ msgid "Unknown node kind: '%s'"
+#~ msgstr "未知的节点类型:“%s”"
+
+#~ msgid "'%s' has unknown value for svn:eol-style property"
+#~ msgstr "“%s”的 svn:eol-style 属性有不明的数值"
+
+#~ msgid "Move failed"
+#~ msgstr "移动失败"
+
+#~ msgid "Node with dropped parent sneaked in"
+#~ msgstr "其父节点已舍弃的节点偷跑进来"
+
+#, fuzzy
+#~ msgid "Error creating dir '%s' (path exists)"
+#~ msgstr "创建目录“%s”时发生错误(路径已经存在)"
+
+#~ msgid "Can't create temporary directory"
+#~ msgstr "无法建立临时目录"
+
+#~ msgid ""
+#~ "Warning: -R is deprecated.\n"
+#~ "Anonymous access is now read-only by default.\n"
+#~ "To change, use conf/svnserve.conf in repos:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (default read)\n"
+#~ " auth-access = read|write|none (default write)\n"
+#~ "Forcing all access to read-only for now\n"
+#~ msgstr ""
+#~ "警告:-R 不赞成使用。\n"
+#~ "匿名访问默认只读。Anonymous access is now read-only by default.\n"
+#~ "修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (默认 read)\n"
+#~ " auth-access = read|write|none (默认 write)\n"
+#~ "强制所有访问为只读\n"

[[[
* subversion/po/zh_CN.po: msgmerge with latest subversion.pot in 1.4.x branch,
                          untranslated yet.
]]]

diff -u origin\zh_CN.po msgmerged\zh_CN.po
--- origin\zh_CN.po Wed Aug 23 11:00:35 2006
+++ msgmerged\zh_CN.po Wed Aug 23 11:00:59 2006
@@ -5,6763 +5,7265 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.2.0\n"
-"POT-Creation-Date: 2005-08-16 16:28+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
+"POT-Creation-Date: 2006-08-21 10:21-0400\n"
 "PO-Revision-Date: 2004-09-12 22:05+0800\n"
 "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
 "Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
 
-#: clients/cmdline/blame-cmd.c:236 clients/cmdline/ls-cmd.c:316
-msgid "'verbose' option invalid in XML mode"
-msgstr "在XML模式中“详细”选项无效"
+# as-is
+#: include/svn_error_codes.h:154
+msgid "Bad parent pool passed to svn_make_pool()"
+msgstr "无效的内存池(pool)传递到 svn_make_pool()"
 
-#: clients/cmdline/blame-cmd.c:248 clients/cmdline/ls-cmd.c:328
-#: clients/cmdline/status-cmd.c:192
-msgid "'incremental' option only valid in XML mode"
-msgstr "只有在XML模式“增加”选项才有效"
+#: include/svn_error_codes.h:158
+msgid "Bogus filename"
+msgstr "有问题的文件名"
 
-#: clients/cmdline/blame-cmd.c:307
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "跳过二进制文件:“%s”\n"
+#: include/svn_error_codes.h:162
+msgid "Bogus URL"
+msgstr "有问题的地址(URL)"
 
-#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125
-#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "“%s”不像是地址(URL)"
+#: include/svn_error_codes.h:166
+msgid "Bogus date"
+msgstr "有问题的日期"
 
-#: clients/cmdline/copy-cmd.c:106 clients/cmdline/delete-cmd.c:64
-#: clients/cmdline/mkdir-cmd.c:66
-msgid "Local, non-commit operations do not take a log message"
-msgstr "本地操作,非提交的操作不能获取日志信息"
+#: include/svn_error_codes.h:170
+msgid "Bogus mime-type"
+msgstr "有问题的 mime-type"
 
-#: clients/cmdline/diff-cmd.c:65
-msgid "Can't open stdout"
-msgstr "无法打开标准输出 (stdout)"
+#: include/svn_error_codes.h:176
+msgid "Version file format not correct"
+msgstr "版本文件格式不正确"
 
-#: clients/cmdline/diff-cmd.c:67
-msgid "Can't open stderr"
-msgstr "无法打开标准错误 (stderr)"
+#: include/svn_error_codes.h:182
+msgid "No such XML tag attribute"
+msgstr "没有这样的 XML 标签属性"
 
-#: clients/cmdline/diff-cmd.c:156
-msgid "Target lists to diff may not contain both working copy paths and URLs"
-msgstr "差异比较目标不可同时包含工作拷贝路径与地址(URL)"
+#: include/svn_error_codes.h:186
+msgid "<delta-pkg> is missing ancestry"
+msgstr "<delta-pkg> 没有演进历程"
 
-#: clients/cmdline/export-cmd.c:82
-msgid ""
-"Destination directory exists; please remove the directory or use --force to "
-"overwrite"
-msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
+#: include/svn_error_codes.h:190
+msgid "Unrecognized binary data encoding; can't decode"
+msgstr "无法辨识的二进制数据编码:无法解译"
 
-#: clients/cmdline/help-cmd.c:45
-#, c-format
-msgid ""
-"usage: svn <subcommand> [options] [args]\n"
-"Subversion command-line client, version %s.\n"
-"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
-"\n"
-"Most subcommands take file and/or directory arguments, recursing\n"
-"on the directories. If no arguments are supplied to such a\n"
-"command, it recurses on the current directory (inclusive) by default.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"用法:svn <subcommand> [options] [args]\n"
-"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
-"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
-"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
-"行递归存取。\n"
-"\n"
-"可用的子命令:\n"
+#: include/svn_error_codes.h:194
+msgid "XML data was not well-formed"
+msgstr "XML 的数据不合语法"
 
-#: clients/cmdline/help-cmd.c:56
-msgid ""
-"Subversion is a tool for version control.\n"
-"For additional information, see http://subversion.tigris.org/\n"
-msgstr ""
-"Subversion 是个版本控制系统的工具。\n"
-"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+#: include/svn_error_codes.h:198
+msgid "Data cannot be safely XML-escaped"
+msgstr "XML 数据不能正确地解码"
 
-#: clients/cmdline/help-cmd.c:63
-msgid ""
-"The following repository access (RA) modules are available:\n"
-"\n"
-msgstr ""
-"可使用以下的档案库存取 (RA) 模块:\n"
-"\n"
+#: include/svn_error_codes.h:204
+msgid "Inconsistent line ending style"
+msgstr "不一致的行结束样式"
 
-#: clients/cmdline/import-cmd.c:82
-msgid "Repository URL required when importing"
-msgstr "导入时必须提供档案库的地址(URL)"
+#: include/svn_error_codes.h:208
+msgid "Unrecognized line ending style"
+msgstr "无法辨识的行结束样式"
 
-#: clients/cmdline/import-cmd.c:86
-msgid "Too many arguments to import command"
-msgstr "导入命令有太多参数"
+#: include/svn_error_codes.h:213
+msgid "Line endings other than expected"
+msgstr "一行以意料之外的方式结束"
 
-#: clients/cmdline/import-cmd.c:101
-#, c-format
-msgid "Invalid URL '%s'"
-msgstr "无效地址(URL)“%s”"
+#: include/svn_error_codes.h:217
+msgid "Ran out of unique names"
+msgstr "已用完不重复的名称"
 
-#: clients/cmdline/info-cmd.c:56 svnadmin/main.c:1028
-#, c-format
-msgid "Path: %s\n"
-msgstr "路径:%s\n"
+# as-is
+#: include/svn_error_codes.h:222
+msgid "Framing error in pipe protocol"
+msgstr "管道协议帧错误"
 
-# this points to filename according to sunny256
-#: clients/cmdline/info-cmd.c:62 svnlook/main.c:782
-#, c-format
-msgid "Name: %s\n"
-msgstr "文件名:%s\n"
+#: include/svn_error_codes.h:227
+msgid "Read error in pipe"
+msgstr "管道发生读取错误"
 
-#: clients/cmdline/info-cmd.c:66
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
+#: libsvn_subr/cmdline.c:308 svn/util.c:716
 #, c-format
-msgid "URL: %s\n"
-msgstr "地址(URL):%s\n"
+msgid "Write error"
+msgstr "写入错误"
 
-#: clients/cmdline/info-cmd.c:69
-#, fuzzy, c-format
-msgid "Repository Root: %s\n"
-msgstr "档案库根路径:%s\n"
+#: include/svn_error_codes.h:237
+msgid "Unexpected EOF on stream"
+msgstr "流中有意料之外的结束符"
 
-#: clients/cmdline/info-cmd.c:73
-#, c-format
-msgid "Repository UUID: %s\n"
-msgstr "档案库 UUID:%s\n"
+#: include/svn_error_codes.h:241
+msgid "Malformed stream data"
+msgstr "畸形的流数据"
 
-#: clients/cmdline/info-cmd.c:77
-#, c-format
-msgid "Revision: %ld\n"
-msgstr "修订版:%ld\n"
+#: include/svn_error_codes.h:245
+msgid "Unrecognized stream data"
+msgstr "无法辨识的流数据"
 
-#: clients/cmdline/info-cmd.c:82
-msgid "Node Kind: file\n"
-msgstr "节点种类:文件\n"
+#: include/svn_error_codes.h:251
+msgid "Unknown svn_node_kind"
+msgstr "未知的 svn_node_kind"
 
-#: clients/cmdline/info-cmd.c:86
-msgid "Node Kind: directory\n"
-msgstr "节点种类:目录\n"
+#: include/svn_error_codes.h:255
+msgid "Unexpected node kind found"
+msgstr "找到一个意料之外的节点种类"
 
-#: clients/cmdline/info-cmd.c:90
-msgid "Node Kind: none\n"
-msgstr "节点种类:无\n"
+#: include/svn_error_codes.h:261
+msgid "Can't find an entry"
+msgstr "无法找到一个项目"
 
-#: clients/cmdline/info-cmd.c:95
-msgid "Node Kind: unknown\n"
-msgstr "节点种类:未知\n"
+#: include/svn_error_codes.h:267
+msgid "Entry already exists"
+msgstr "项目已存在"
 
-#: clients/cmdline/info-cmd.c:104
-msgid "Schedule: normal\n"
-msgstr "调度:正常\n"
+#: include/svn_error_codes.h:271
+msgid "Entry has no revision"
+msgstr "项目没有修订版"
 
-#: clients/cmdline/info-cmd.c:108
-msgid "Schedule: add\n"
-msgstr "调度:新增\n"
+#: include/svn_error_codes.h:275
+msgid "Entry has no URL"
+msgstr "项目没有地址(URL)"
 
-#: clients/cmdline/info-cmd.c:112
-msgid "Schedule: delete\n"
-msgstr "调度:删除\n"
+#: include/svn_error_codes.h:279
+msgid "Entry has an invalid attribute"
+msgstr "项目有无效的属性"
 
-#: clients/cmdline/info-cmd.c:116
-msgid "Schedule: replace\n"
-msgstr "调度:替换\n"
+#: include/svn_error_codes.h:285
+msgid "Obstructed update"
+msgstr "塞住的更新"
 
-#: clients/cmdline/info-cmd.c:124
-#, c-format
-msgid "Copied From URL: %s\n"
-msgstr "复制自地址(URL):%s\n"
+# as-is
+#: include/svn_error_codes.h:290
+msgid "Mismatch popping the WC unwind stack"
+msgstr "不匹配的弹出工作拷贝(WC)展开堆栈"
 
-#: clients/cmdline/info-cmd.c:128
-#, c-format
-msgid "Copied From Rev: %ld\n"
-msgstr "复制自修订版:%ld\n"
+# as-is
+#: include/svn_error_codes.h:295
+msgid "Attempt to pop empty WC unwind stack"
+msgstr "尝试弹出空的工作拷贝(WC)展开堆栈"
 
-#: clients/cmdline/info-cmd.c:133
-#, c-format
-msgid "Last Changed Author: %s\n"
-msgstr "最后修改的作者:%s\n"
+# as-is
+#: include/svn_error_codes.h:300
+msgid "Attempt to unlock with non-empty unwind stack"
+msgstr "尝试解锁非空展开堆栈"
 
-#: clients/cmdline/info-cmd.c:137
-#, c-format
-msgid "Last Changed Rev: %ld\n"
-msgstr "最后修改的修订版:%ld\n"
+#: include/svn_error_codes.h:304
+msgid "Attempted to lock an already-locked dir"
+msgstr "尝试要锁定一个已锁定的目录"
 
-#: clients/cmdline/info-cmd.c:142
-msgid "Last Changed Date"
-msgstr "最后修改的时间"
+#: include/svn_error_codes.h:308
+msgid "Working copy not locked; this is probably a bug, please report"
+msgstr "工作目录没有被锁定;这可能是一个漏洞,请报告开发者"
 
-#: clients/cmdline/info-cmd.c:148
-msgid "Text Last Updated"
-msgstr "文本最后更新"
+#: include/svn_error_codes.h:313
+msgid "Invalid lock"
+msgstr "无效的锁定"
 
-#: clients/cmdline/info-cmd.c:152
-msgid "Properties Last Updated"
-msgstr "属性最后更新"
+#: include/svn_error_codes.h:317
+msgid "Path is not a working copy directory"
+msgstr "路径不是工作拷贝目录"
 
-#: clients/cmdline/info-cmd.c:155
-#, c-format
-msgid "Checksum: %s\n"
-msgstr "校验和:%s\n"
+#: include/svn_error_codes.h:321
+msgid "Path is not a working copy file"
+msgstr "路径不是工作拷贝文件"
 
-#: clients/cmdline/info-cmd.c:160
-#, c-format
-msgid "Conflict Previous Base File: %s\n"
-msgstr "冲突之前的文件:%s\n"
+#: include/svn_error_codes.h:325
+msgid "Problem running log"
+msgstr "无法执行日志"
 
-#: clients/cmdline/info-cmd.c:166
-#, c-format
-msgid "Conflict Previous Working File: %s\n"
-msgstr "冲突之前的工作文件:%s\n"
+#: include/svn_error_codes.h:329
+msgid "Can't find a working copy path"
+msgstr "找不到工作拷贝路径"
 
-#: clients/cmdline/info-cmd.c:171
-#, c-format
-msgid "Conflict Current Base File: %s\n"
-msgstr "冲突之前的当前文件:%s\n"
+#: include/svn_error_codes.h:333
+msgid "Working copy is not up-to-date"
+msgstr "工作拷贝未更新至最新版"
 
-#: clients/cmdline/info-cmd.c:176
-#, c-format
-msgid "Conflict Properties File: %s\n"
-msgstr "冲突的属性文件:%s\n"
+#: include/svn_error_codes.h:337
+msgid "Left locally modified or unversioned files"
+msgstr "保留本地修改或未纳入版本管理的文件"
 
-#: clients/cmdline/info-cmd.c:184
-#, c-format
-msgid "Lock Token: %s\n"
-msgstr "锁定记号:%s\n"
+#: include/svn_error_codes.h:341
+msgid "Unmergeable scheduling requested on an entry"
+msgstr "该项目有一个无法合并的调度请求"
 
-#: clients/cmdline/info-cmd.c:188
-#, c-format
-msgid "Lock Owner: %s\n"
-msgstr "锁定所有者:%s\n"
+#: include/svn_error_codes.h:345
+msgid "Found a working copy path"
+msgstr "找到一个工作拷贝路径"
 
-#: clients/cmdline/info-cmd.c:193
-msgid "Lock Created"
-msgstr "锁定已创建的"
+#: include/svn_error_codes.h:349
+msgid "A conflict in the working copy obstructs the current operation"
+msgstr "工作拷贝中的冲突阻碍了目前的操作"
 
-#: clients/cmdline/info-cmd.c:197
-msgid "Lock Expires"
-msgstr "锁定过期的"
+#: include/svn_error_codes.h:353
+msgid "Working copy is corrupt"
+msgstr "工作拷贝已损坏"
 
-#: clients/cmdline/info-cmd.c:206
-#, c-format
-msgid ""
-"Lock Comment (%i lines):\n"
-"%s\n"
-msgstr ""
-"锁定注释(%i 行):\n"
-"%s\n"
+#: include/svn_error_codes.h:357
+msgid "Working copy text base is corrupt"
+msgstr "工作拷贝的文件参考基础已损坏"
 
-#: clients/cmdline/info-cmd.c:207
-#, c-format
-msgid ""
-"Lock Comment (%i line):\n"
-"%s\n"
-msgstr ""
-"锁定注释(%i line):\n"
-"%s\n"
+#: include/svn_error_codes.h:361
+msgid "Cannot change node kind"
+msgstr "无法更改节点种类"
 
-#: clients/cmdline/info-cmd.c:281
-#, c-format
-msgid ""
-"%s: (Not a versioned resource)\n"
-"\n"
-msgstr ""
-"%s:(不是受版本控制的资源)\n"
-"\n"
-
-#: clients/cmdline/info-cmd.c:290
-#, fuzzy, c-format
-msgid ""
-"%s: (Not a valid URL)\n"
-"\n"
-msgstr ""
-"%s:(不是有效的地址(URL))\n"
-"\n"
+#: include/svn_error_codes.h:365
+msgid "Invalid operation on the current working directory"
+msgstr "这个操作对目前的工作拷贝目录无效"
 
-#: clients/cmdline/lock-cmd.c:52
-#, fuzzy
-msgid "Lock comment contains a zero byte"
-msgstr "锁定的注释中有一个零字节"
+#: include/svn_error_codes.h:369
+msgid "Problem on first log entry in a working copy"
+msgstr "操作于工作拷贝的第一个日志项目时发生问题"
 
-#: clients/cmdline/log-cmd.c:162
-msgid "(no author)"
-msgstr "(没有作者信息)"
+#: include/svn_error_codes.h:373
+msgid "Unsupported working copy format"
+msgstr "不支持的工作拷贝格式"
 
-#: clients/cmdline/log-cmd.c:173
-msgid "(no date)"
-msgstr "(没有时间)"
+#: include/svn_error_codes.h:377
+msgid "Path syntax not supported in this context"
+msgstr "路径语法在此上下文中并不支持"
 
-#: clients/cmdline/log-cmd.c:203
-msgid "Changed paths:\n"
-msgstr "改变的路径:\n"
+#: include/svn_error_codes.h:382
+msgid "Invalid schedule"
+msgstr "无效的计划任务"
 
-#: clients/cmdline/log-cmd.c:218
-#, c-format
-msgid " (from %s:%ld)"
-msgstr " (从 %s:%ld)"
+#: include/svn_error_codes.h:387
+#, fuzzy
+msgid "Invalid relocation"
+msgstr "无效的锁定"
 
-#: clients/cmdline/log-cmd.c:437
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "当指定工作拷贝路径,只有一个目标会被指定"
+#: include/svn_error_codes.h:392
+#, fuzzy
+msgid "Invalid switch"
+msgstr "无效的计划任务"
 
-#: clients/cmdline/log-cmd.c:449
-msgid "Only relative paths can be specified after a URL"
-msgstr "地址(URL)后只能指定相对路径"
+#: include/svn_error_codes.h:398
+msgid "General filesystem error"
+msgstr "一般性文件系统错误"
 
-#: clients/cmdline/main.c:63
-msgid "force operation to run"
-msgstr "强制操作运行"
+#: include/svn_error_codes.h:402
+msgid "Error closing filesystem"
+msgstr "关闭文件系统发生错误"
 
-#: clients/cmdline/main.c:65
-msgid "force validity of log message source"
-msgstr "强制校验日志信息资源"
+#: include/svn_error_codes.h:406
+msgid "Filesystem is already open"
+msgstr "文件系统已打开"
 
-#: clients/cmdline/main.c:66 clients/cmdline/main.c:67 svnadmin/main.c:227
-#: svnadmin/main.c:230 svndumpfilter/main.c:756 svndumpfilter/main.c:759
-#: svnlook/main.c:92 svnlook/main.c:95
-msgid "show help on a subcommand"
-msgstr "显示子命令帮助"
+#: include/svn_error_codes.h:410
+msgid "Filesystem is not open"
+msgstr "文件系档未打开"
 
-#: clients/cmdline/main.c:68
-msgid "specify commit message ARG"
-msgstr "指定提交信息ARG"
+#: include/svn_error_codes.h:414
+msgid "Filesystem is corrupt"
+msgstr "文件系统损坏"
 
-#: clients/cmdline/main.c:69
-msgid "print as little as possible"
-msgstr "打印尽可能少"
+#: include/svn_error_codes.h:418
+msgid "Invalid filesystem path syntax"
+msgstr "无效的文件系统路径语法"
 
-#: clients/cmdline/main.c:70
-msgid "descend recursively"
-msgstr "向下递归"
+#: include/svn_error_codes.h:422
+msgid "Invalid filesystem revision number"
+msgstr "无效的文件系统修订版号"
 
-#: clients/cmdline/main.c:71
-msgid "operate on single directory only"
-msgstr "只在单个目录操作"
+#: include/svn_error_codes.h:426
+msgid "Invalid filesystem transaction name"
+msgstr "无效的文件系统事务名称"
 
-#: clients/cmdline/main.c:73
-msgid ""
-"ARG (some commands also take ARG1:ARG2 range)\n"
-" A revision argument can be one of:\n"
-" NUMBER revision number\n"
-" \"{\" DATE \"}\" revision at start of the "
-"date\n"
-" \"HEAD\" latest in repository\n"
-" \"BASE\" base rev of item's working "
-"copy\n"
-" \"COMMITTED\" last commit at or before "
-"BASE\n"
-" \"PREV\" revision just before COMMITTED"
-msgstr ""
-"ARG (一些命令需要 ARG1:ARG2 )\n"
-" 修订版参数可以是:\n"
-" 数字 修订版号\n"
-" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作条目 \n"
-" \"COMMITTED\" 最后提交或基线之前\n"
-" \"PREV\" 修订版提交之前"
+#: include/svn_error_codes.h:430
+msgid "Filesystem directory has no such entry"
+msgstr "文件系统目录没有这样的项目"
 
-#: clients/cmdline/main.c:87
-msgid "read data from file ARG"
-msgstr "从文件 ARG 读取数据"
+#: include/svn_error_codes.h:434
+msgid "Filesystem has no such representation"
+msgstr "文件系统没有这样的表现 (representation)"
 
-#: clients/cmdline/main.c:89
-msgid "give output suitable for concatenation"
-msgstr "给予适合输出的"
+#: include/svn_error_codes.h:438
+msgid "Filesystem has no such string"
+msgstr "文件系统没有这样的字串"
 
-#: clients/cmdline/main.c:91
-msgid "treat value as being in charset encoding ARG"
-msgstr "指定的值 ARG 为字符编码"
+#: include/svn_error_codes.h:442
+msgid "Filesystem has no such copy"
+msgstr "文件系统没有这样的拷贝"
 
-#: clients/cmdline/main.c:92
-msgid "print client version info"
-msgstr "打印客户端版本信息"
+#: include/svn_error_codes.h:446
+msgid "The specified transaction is not mutable"
+msgstr "指定的事务不可改变"
 
-#: clients/cmdline/main.c:93
-msgid "print extra information"
-msgstr "打印附加信息"
+#: include/svn_error_codes.h:450
+msgid "Filesystem has no item"
+msgstr "文件系统没有项目"
 
-#: clients/cmdline/main.c:94
-msgid "display update information"
-msgstr "显示更新信息"
+#: include/svn_error_codes.h:454
+msgid "Filesystem has no such node-rev-id"
+msgstr "文件系统没有这样的 node-rev-id"
 
-#: clients/cmdline/main.c:96
-msgid "specify a username ARG"
-msgstr "指定用户 ARG"
+#: include/svn_error_codes.h:458
+msgid "String does not represent a node or node-rev-id"
+msgstr "字串并未表示一个节点或 node-rev-id"
 
-#: clients/cmdline/main.c:98
-msgid "specify a password ARG"
-msgstr "指定密码 ARG"
+#: include/svn_error_codes.h:462
+msgid "Name does not refer to a filesystem directory"
+msgstr "名称没有指向文件系统目录"
 
-#: clients/cmdline/main.c:99
-msgid "pass ARG to --diff-cmd as options (default: '-u')"
-msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
+#: include/svn_error_codes.h:466
+msgid "Name does not refer to a filesystem file"
+msgstr "名称没有指向文件系统文件"
 
-#: clients/cmdline/main.c:101
-msgid "pass contents of file ARG as additional args"
-msgstr "传递文件 ARG 内容为附件参数"
+#: include/svn_error_codes.h:470
+msgid "Name is not a single path component"
+msgstr "名称不是一个单一路径"
 
-#: clients/cmdline/main.c:102
-msgid "output in XML"
-msgstr "输出为 XML"
+#: include/svn_error_codes.h:474
+msgid "Attempt to change immutable filesystem node"
+msgstr "尝试要修改不可改变的文件系统节点"
 
-#: clients/cmdline/main.c:103
-msgid "use strict semantics"
-msgstr "使用严格的语法"
+#: include/svn_error_codes.h:478
+msgid "Item already exists in filesystem"
+msgstr "该项目已存在于文件系统中"
 
-#: clients/cmdline/main.c:105
-msgid "do not cross copies while traversing history"
-msgstr "查看历史不要跨越不同的拷贝"
+#: include/svn_error_codes.h:482
+msgid "Attempt to remove or recreate fs root dir"
+msgstr "尝试要移除或再次建立文件系统的根目录"
 
-#: clients/cmdline/main.c:107
-msgid "disregard default and svn:ignore property ignores"
-msgstr "忽略默认值和 svn:ignore 属性"
+#: include/svn_error_codes.h:486
+msgid "Object is not a transaction root"
+msgstr "物件不是一个事务的根物件"
 
-#: clients/cmdline/main.c:109
-msgid "do not cache authentication tokens"
-msgstr "不要缓冲用户验证"
+#: include/svn_error_codes.h:490
+msgid "Object is not a revision root"
+msgstr "物件不是一个修订版的根物件"
 
-#: clients/cmdline/main.c:111
-msgid "do no interactive prompting"
-msgstr "不要交互提示"
+#: include/svn_error_codes.h:494
+msgid "Merge conflict during commit"
+msgstr "提交时发生合并冲突"
 
-#: clients/cmdline/main.c:113
-msgid "try operation but make no changes"
-msgstr "尝试操作但不修改"
+# as-is
+#: include/svn_error_codes.h:498
+msgid "A representation vanished or changed between reads"
+msgstr "表现消失或读时被改变"
 
-#: clients/cmdline/main.c:115 svnlook/main.c:113
-msgid "do not print differences for deleted files"
-msgstr "不要打印已删除文件的不同处"
+#: include/svn_error_codes.h:502
+msgid "Tried to change an immutable representation"
+msgstr "尝试变更一个不可改变的表现 (representation)"
 
-#: clients/cmdline/main.c:117
-msgid "notice ancestry when calculating differences"
-msgstr "比较差异时提示原始信息"
+#: include/svn_error_codes.h:506
+msgid "Malformed skeleton data"
+msgstr "畸形的框架数据"
 
-#: clients/cmdline/main.c:119
-msgid "ignore ancestry when calculating merges"
-msgstr "合并时忽略原始信息"
+#: include/svn_error_codes.h:510
+msgid "Transaction is out of date"
+msgstr "事务已过时"
 
-#: clients/cmdline/main.c:121
-msgid "ignore externals definitions"
-msgstr "忽略外部定义"
+#: include/svn_error_codes.h:514
+msgid "Berkeley DB error"
+msgstr "Berkeley DB 错误"
 
-#: clients/cmdline/main.c:123
-msgid "use ARG as diff command"
-msgstr "使用 ARG 作为差异比较命令"
+#: include/svn_error_codes.h:518
+msgid "Berkeley DB deadlock error"
+msgstr "Berkeley DB 发生死锁错误"
 
-#: clients/cmdline/main.c:125
-msgid "use ARG as merge command"
-msgstr "使用 ARG 作为合并命令"
+#: include/svn_error_codes.h:522
+msgid "Transaction is dead"
+msgstr "事务已结束"
 
-#: clients/cmdline/main.c:127
-msgid "use ARG as external editor"
-msgstr "使用 ARG 作为外部编辑器"
+#: include/svn_error_codes.h:526
+msgid "Transaction is not dead"
+msgstr "事务未结束"
 
-#: clients/cmdline/main.c:129
-msgid "use ARG as the older target"
-msgstr "使用 ARG 作为旧目标"
+#: include/svn_error_codes.h:531
+msgid "Unknown FS type"
+msgstr "未知的 FS 类别"
 
-#: clients/cmdline/main.c:131
-msgid "use ARG as the newer target"
-msgstr "使用 ARG 作为新目标"
+#: include/svn_error_codes.h:536
+#, fuzzy
+msgid "No user associated with filesystem"
+msgstr "没有用户与文件系统关联"
 
-#: clients/cmdline/main.c:133
-msgid "operate on a revision property (use with -r)"
-msgstr "在修订版属性上作操作(使用-r参数)"
+#: include/svn_error_codes.h:541
+#, fuzzy
+msgid "Path is already locked"
+msgstr "路径“%s”已经被锁定"
 
-#: clients/cmdline/main.c:135
-msgid "relocate via URL-rewriting"
-msgstr "通过URL改写重新部署"
+#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
+#, fuzzy
+msgid "Path is not locked"
+msgstr "路径没有被锁定"
 
-#: clients/cmdline/main.c:137 svnadmin/main.c:269
-msgid "read user configuration files from directory ARG"
-msgstr "从目录 ARG 读取用户配置文件"
+#: include/svn_error_codes.h:551
+msgid "Lock token is incorrect"
+msgstr "锁定标记是不正确的"
 
-#: clients/cmdline/main.c:139
-msgid "enable automatic properties"
-msgstr "使自动属性有效"
+#: include/svn_error_codes.h:556
+#, fuzzy
+msgid "No lock token provided"
+msgstr "没有提供锁定标记"
 
-#: clients/cmdline/main.c:141
-msgid "disable automatic properties"
-msgstr "使自动属性无效"
+#: include/svn_error_codes.h:561
+msgid "Username does not match lock owner"
+msgstr "用户名和锁定所有者不匹配"
 
-#: clients/cmdline/main.c:143
+#: include/svn_error_codes.h:566
 #, fuzzy
-msgid ""
-"use a different EOL marker than the standard\n"
-" system marker for files with the svn:eol-style\n"
-" property set to 'native'.\n"
-" ARG may be one of 'LF', 'CR', 'CRLF'"
-msgstr ""
-"使用一个与标准不同的 EOL 标记\n"
-" 系统为文件标记 svn:eol-style 属"
-"性为 'native'。\n"
-" ARG 可以是以下之一 'LF','CR','CRLF'"
+msgid "Filesystem has no such lock"
+msgstr "文件系统没有这样的锁"
 
-#: clients/cmdline/main.c:151
-msgid "maximum number of log entries"
-msgstr "日值项最大值"
+#: include/svn_error_codes.h:571
+msgid "Lock has expired"
+msgstr "锁过期"
 
-#: clients/cmdline/main.c:153
-msgid "don't unlock the targets"
-msgstr "不要锁定目标"
+#: include/svn_error_codes.h:576
+#, fuzzy
+msgid "Item is out of date"
+msgstr "条目已过时"
 
-#: clients/cmdline/main.c:192
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository. They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"把文件和目录放入版本控制中,\n"
-"通过调度加到档案库。它们会在下一次提交时加入。\n"
-"用法:add 路径...\n"
+#: include/svn_error_codes.h:588
+#, fuzzy
+msgid "Unsupported FS format"
+msgstr "不支持的 FS 格式"
 
-#: clients/cmdline/main.c:200
-msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地址(URL)的内容,每行包含修订版和作者信息。\n"
-"\n"
-"用法:blame 目标[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:594
+msgid "The repository is locked, perhaps for db recovery"
+msgstr "档案库被锁定,也许正在作数据库修复"
 
-#: clients/cmdline/main.c:210
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地址(URL)的内容。\n"
-"用法:cat 目标[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:598
+msgid "A repository hook failed"
+msgstr "档案库外挂错误"
 
-#: clients/cmdline/main.c:218
-#, fuzzy
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-" If specified, REV determines in which revision the URL is first\n"
-" looked up.\n"
-"\n"
-" If PATH is omitted, the basename of the URL will be used as\n"
-" the destination. If multiple URLs are given each will be checked\n"
-" out into a sub-directory of PATH, with the name of the sub-directory\n"
-" being the basename of the URL.\n"
-msgstr ""
-"从档案库签出工作拷贝。\n"
-"用法:checkout 地址[@版本]... [路径]\n"
-"\n"
-" 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
-" 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
-" 以地址(URL)最末目录名为名字的子目录中。\n"
-"\n"
+#: include/svn_error_codes.h:602
+msgid "Incorrect arguments supplied"
+msgstr "使用不正确的参数"
 
-#: clients/cmdline/main.c:232
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [PATH...]\n"
-msgstr ""
-"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
-"\n"
-"用法:cleanup [路径...]\n"
+#: include/svn_error_codes.h:606
+msgid "A report cannot be generated because no data was supplied"
+msgstr "无法产生报告,因为没有提供任何数据"
 
-#: clients/cmdline/main.c:238
-#, fuzzy
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-" A log message must be provided, but it can be empty. If it is not\n"
-" given by a --message or --file option, an editor will be started.\n"
-" If any targets are (or contain) locked items, those will be\n"
-" unlocked after a successful commit.\n"
-msgstr ""
-"把改变从工作拷贝发送到档案库。\n"
-"用法:commit [路径...]\n"
-"\n"
-" 日志信息必须提供,但可以是空的。\n"
-" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
-" 如果一些目标(或包含)锁定了条目,\n"
-" 在一个提交成功后这些条目会被解除锁定。\n"
+#: include/svn_error_codes.h:610
+msgid "Bogus revision report"
+msgstr "有问题的修订版报告"
 
-#: clients/cmdline/main.c:249
-msgid ""
-"Duplicate something in working copy or repository, remembering history.\n"
-"usage: copy SRC DST\n"
-"\n"
-" SRC and DST can each be either a working copy (WC) path or URL:\n"
-" WC -> WC: copy and schedule for addition (with history)\n"
-" WC -> URL: immediately commit a copy of WC to URL\n"
-" URL -> WC: check out URL into WC, schedule for addition\n"
-" URL -> URL: complete server-side copy; used to branch & tag\n"
-msgstr ""
-"在工作拷贝或档案库中复制数据,恢复历史。\n"
-"用法:copy 起源 目的\n"
-"\n"
-" 起源 和 目的 可以是工作拷贝路径或地址(URL):\n"
-" 工作拷贝 -> 工作拷贝 : 复制和通过调度进行增加(包含历史)\n"
-" 工作拷贝 -> 地址(URL) : 马上提交一个工作拷贝到地址(URL)\n"
-" 地址(URL) -> 工作拷贝 : 签出地址(URL)到工作目录,通过调度进行增加\n"
-" 地址(URL) -> 地址(URL) : 完全服务器端复制;一般用于分支和标签\n"
+#: include/svn_error_codes.h:619
+msgid "Unsupported repository version"
+msgstr "不支持的档案库版本"
 
-#: clients/cmdline/main.c:262
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. Each item specified by a PATH is scheduled for deletion upon\n"
-" the next commit. Files, and directories that have not been\n"
-" committed, are immediately removed from the working copy.\n"
-" PATHs that are, or contain, unversioned or modified items will\n"
-" not be removed unless the --force option is given.\n"
-"\n"
-" 2. Each item specified by a URL is deleted from the repository\n"
-" via an immediate commit.\n"
-msgstr ""
-"从版本控制中删除文件和目录。\n"
-"用法:1、delete 路径...\n"
-" 2、delete 地址...\n"
-"\n"
-" 1、每一个通过路径指定的项目会被进行调度删除,下次提交时被真正删除。\n"
-" 文件和目录若未改变将马上从工作拷贝中删除。\n"
-" 路径本身或包含不受版本控制或已修改项目,\n"
-" 不会被删除,除非指定了 --force 选项。\n"
-" \n"
-"\n"
-" 2、每一个地址(URL)指定的项目会被马上从档案库中删除,并提交。\n"
-" \n"
+#: include/svn_error_codes.h:623
+msgid "Disabled repository feature"
+msgstr "关闭了的档案库功能"
 
-#: clients/cmdline/main.c:278
-msgid ""
-"Display the differences between two paths.\n"
-"usage: 1. diff [-r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
-"\\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. Display the changes made to TARGETs as they are seen in REV between\n"
-" two revisions. TARGETs may be working copy paths or URLs.\n"
-"\n"
-" N defaults to BASE if any TARGET is a working copy path, otherwise it\n"
-" must be specified. M defaults to the current working version if any\n"
-" TARGET is a working copy path, otherwise it defaults to HEAD.\n"
-"\n"
-" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
-" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
-"default\n"
-" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-" Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"显示两个路径中的差异。\n"
-"用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
-" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
-"\n"
-" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
-" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
-"\n"
-" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
-" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
-" HEAD。\n"
-"\n"
-" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
-" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
-" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
-" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
-" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
-" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
-"法。\n"
-"\n"
-" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
+#: include/svn_error_codes.h:627
+msgid "Error running post-commit hook"
+msgstr "执行 post-commit 外挂时发生错误"
 
-#: clients/cmdline/main.c:318
+#: include/svn_error_codes.h:632
 #, fuzzy
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. Exports a clean directory tree from the repository specified by\n"
-" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
-"\n"
-" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
-"\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"产生一个无版本控制的目录树拷贝。\n"
-"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
-" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
-" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
-"\n"
-" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
-" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
-" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
-" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
-" 版本控制的文件不会被复制。\n"
-"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
-"\n"
-
-#: clients/cmdline/main.c:347
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"描述本程序或其子命令的用法。\n"
-"用法:help [子命令...]\n"
+msgid "Error running post-lock hook"
+msgstr "执行 post-lock 外挂时发生错误"
 
-#: clients/cmdline/main.c:356
+#: include/svn_error_codes.h:637
 #, fuzzy
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-" Recursively commit a copy of PATH to URL.\n"
-" If PATH is omitted '.' is assumed.\n"
-" Parent directories are created as necessary in the repository.\n"
-" If PATH is a directory, the contents of the directory are added\n"
-" directly under URL.\n"
-msgstr ""
-"提交未纳入版本控制的文件或目录树至档案库。\n"
-"用法:import [PATH] URL\n"
-"\n"
-" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
-" 依需要于档案库内建立。\n"
+msgid "Error running post-unlock hook"
+msgstr "执行 post-unlock 外挂时发生错误"
 
-#: clients/cmdline/main.c:369
-#, fuzzy
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET...]\n"
-"\n"
-" Print information about each TARGET (default: '.')\n"
-" TARGET may be either a working-copy path or URL.\n"
-msgstr ""
-"显示本地或远端条目的信息。\n"
-"用法:info [TARGET...]\n"
-"\n"
-" 显示每个 TARGET 的信息 (默认:'.')。\n"
-" TARGET 可以是工作目录或地址(URL)。\n"
+#: include/svn_error_codes.h:644
+msgid "Bad URL passed to RA layer"
+msgstr "传递至 RA 层的地址(URL)有问题"
 
-#: clients/cmdline/main.c:378
-#, fuzzy
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-" List each TARGET file and the contents of each TARGET directory as\n"
-" they exist in the repository. If TARGET is a working copy path, the\n"
-" corresponding repository URL will be used. If specified, REV determines\n"
-" in which revision the target is first looked up.\n"
-"\n"
-" The default TARGET is '.', meaning the repository URL of the current\n"
-" working directory.\n"
-"\n"
-" With --verbose, the following fields will be shown for each item:\n"
-"\n"
-" Revision number of the last commit\n"
-" Author of the last commit\n"
-" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
-" Size (in bytes)\n"
-" Date and time of the last commit\n"
-msgstr ""
-"列出档案库中的目录项目。\n"
-"用法:list [TARGET[@REV]...]\n"
-"\n"
-" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-"\n"
-" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
-"\n"
-" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
-"\n"
-" 前次提交的修订版号码\n"
-" 前次提交的作者\n"
-" 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
-" 大小 (以字节为单位)\n"
-" 前次提交的日期与时间\n"
+#: include/svn_error_codes.h:648
+msgid "Authorization failed"
+msgstr "授权失败"
 
-#: clients/cmdline/main.c:403
-#, fuzzy
-msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-" Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"在档案库中锁定工作目录或地址(URL),\n"
-"使得其他用户不能向它提交修改。\n"
-"用法:lock TARGET...\n"
-"\n"
-" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
+#: include/svn_error_codes.h:652
+msgid "Unknown authorization method"
+msgstr "未知的授权方法"
 
-#: clients/cmdline/main.c:412
-msgid ""
-"Show the log messages for a set of revision(s) and/or file(s).\n"
-"usage: 1. log [PATH]\n"
-" 2. log URL [PATH...]\n"
-"\n"
-" 1. Print the log messages for a local PATH (default: '.').\n"
-" The default revision range is BASE:1.\n"
-"\n"
-" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
-" The default revision range is HEAD:1.\n"
-"\n"
-" With -v, also print all affected paths with each log message.\n"
-" With -q, don't print the log message body itself (note that this is\n"
-" compatible with -v).\n"
-"\n"
-" Each log message is printed just once, even if more than one of the\n"
-" affected paths for that revision were explicitly requested. Logs\n"
-" follow copy history by default. Use --stop-on-copy to disable this\n"
-" behavior, which can be useful for determining branchpoints.\n"
-"\n"
-" Examples:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-msgstr ""
-"显示一组修订版与/或文件的提交日志信息。\n"
-"用法:1、log [PATH]\n"
-" 2、log URL [PATH...]\n"
-"\n"
-" 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" BASE:1。\n"
-"\n"
-" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
-" HEAD:1。\n"
-"\n"
-" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
-" 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v 并存)。\n"
-"\n"
-" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
-" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
-" 个功能,这在找出分支点的很方便。\n"
-"\n"
-" 范例:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
+#: include/svn_error_codes.h:656
+msgid "Repository access method not implemented"
+msgstr "该档案库存取方法未实作"
 
-#: clients/cmdline/main.c:444
-msgid ""
-"Apply the differences between two sources to a working copy path.\n"
-"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. In the first form, the source URLs are specified at revisions\n"
-" N and M. These are the two sources to be compared. The revisions\n"
-" default to HEAD if omitted.\n"
-"\n"
-" 2. In the second form, the URLs corresponding to the source working\n"
-" copy paths define the sources to be compared. The revisions must\n"
-" be specified.\n"
-"\n"
-" 3. In the third form, SOURCE can be a URL, or working copy item\n"
-" in which case the corresponding URL is used. This URL in\n"
-" revision REV is compared as it existed between revisions N and \n"
-" M. If REV is not specified, HEAD is assumed.\n"
-"\n"
-" WCPATH is the working copy path that will receive the changes.\n"
-" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
-" the sources have identical basenames that match a file within '.':\n"
-" in which case, the differences will be applied to that file.\n"
-msgstr ""
-"将两个来源之间的差异应用至工作拷贝路径。\n"
-"用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
-" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
-"\n"
-" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
-" 进行比较的来源。这里必须指定修订版。\n"
-"\n"
-" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
-" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
-"作\n"
-" 比较。如果未指定 REV,就会假设为 HEAD。\n"
-"\n"
-" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
-" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+#: include/svn_error_codes.h:660
+msgid "Item is out-of-date"
+msgstr "项目已过时"
 
-#: clients/cmdline/main.c:474
-msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" Create version controlled directories.\n"
-"\n"
-" 1. Each directory specified by a working copy PATH is created locally\n"
-" and scheduled for addition upon the next commit.\n"
-"\n"
-" 2. Each directory specified by a URL is created in the repository via\n"
-" an immediate commit.\n"
-"\n"
-" In both cases, all the intermediate directories must already exist.\n"
-msgstr ""
-"建立纳入版本控制下的新目录。\n"
-"用法:1、mkdir PATH...\n"
-" 2、mkdir URL...\n"
-"\n"
-" 建立版本控制的目录。\n"
-"\n"
-" 1、每一个以工作拷贝 PATH 指定的目录,都会建立在本地端,并且加入新增\n"
-" 调度,以待下一次的提交。\n"
-"\n"
-" 2、每个以地址(URL)指定的目录,都会透过立即提交于档案库中建立。\n"
-"\n"
-" 在这两个情况下,所有的中间目录都必须事先存在。\n"
+#: include/svn_error_codes.h:664
+msgid "Repository has no UUID"
+msgstr "档案库没有 UUID"
 
-#: clients/cmdline/main.c:494
-msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC DST\n"
-"\n"
-" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
-"\n"
-" SRC and DST can both be working copy (WC) paths or URLs:\n"
-" WC -> WC: move and schedule for addition (with history)\n"
-" URL -> URL: complete server-side rename.\n"
-msgstr ""
-"移动或更名工作拷贝或档案库里的东西。\n"
-"用法:move SRC DST\n"
-"\n"
-" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
-"\n"
-" SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
-" WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
-" URL -> URL : 完全是服务器端的更名。\n"
+#: include/svn_error_codes.h:668
+msgid "Unsupported RA plugin ABI version"
+msgstr "不支持的 RA 外挂 ABI 版本"
 
-#: clients/cmdline/main.c:506
-msgid ""
-"Remove PROPNAME from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Removes versioned props in working copy.\n"
-" 2. Removes unversioned remote prop on repos revision.\n"
-msgstr ""
-"移除目录,文件,或修订版的属性。\n"
-"用法:1、propdel PROPNAME [PATH...]\n"
-" 2、propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、移除纳入版本控制的工作拷贝属性。\n"
-" 2、移除无版本控制的远端档案库修订版属性。\n"
+#: include/svn_error_codes.h:680
+msgid "RA layer failed to init socket layer"
+msgstr "RA 层无法起始 socket 层"
 
-#: clients/cmdline/main.c:516
-msgid ""
-"Edit property PROPNAME with an external editor on targets.\n"
-"usage: 1. propedit PROPNAME PATH...\n"
-" 2. propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Edits versioned props in working copy.\n"
-" 2. Edits unversioned remote prop on repos revision.\n"
-msgstr ""
-"以外部编辑器编辑目标的属性 PROPNAME。\n"
-"用法:1、propedit PROPNAME PATH...\n"
-" 2、propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、编辑纳入版本控制的工作拷贝属性。\n"
-" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
+#: include/svn_error_codes.h:684
+msgid "RA layer failed to create HTTP request"
+msgstr "RA 层建立 HTTP 请求失败"
 
-#: clients/cmdline/main.c:527
-msgid ""
-"Print value of PROPNAME on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Prints versioned prop. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Prints unversioned remote prop on repos revision.\n"
-"\n"
-" By default, this subcommand will add an extra newline to the end\n"
-" of the property values so that the output looks pretty. Also,\n"
-" whenever there are multiple paths involved, each property value\n"
-" is prefixed with the path with which it is associated. Use\n"
-" the --strict option to disable these beautifications (useful,\n"
-" for example, when redirecting binary property values to a file).\n"
-msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
-"用法:1、propget PROPNAME [TARGET[@REV]...]\n"
-" 2、propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1、显示纳入版本控制的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、显示无版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
-" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
-" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
-" 将二进制属性内容重导至一个文件时就很有用)。\n"
+#: include/svn_error_codes.h:688
+msgid "RA layer request failed"
+msgstr "RA 层请求失败"
 
-#: clients/cmdline/main.c:545
-msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [URL]\n"
-"\n"
-" 1. Lists versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Lists unversioned remote props on repos revision.\n"
-msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
-"用法:1、proplist [TARGET[@REV]...]\n"
-" 2、proplist --revprop -r REV [URL]\n"
-"\n"
-" 1、列出纳入版本管理的工作拷贝属性。\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2、列出无版本控制的远端档案库修订版属性改变。\n"
+#: include/svn_error_codes.h:692
+msgid "RA layer didn't receive requested OPTIONS info"
+msgstr "RA 层无法取得请求的 OPTIONS 信息"
+
+#: include/svn_error_codes.h:696
+msgid "RA layer failed to fetch properties"
+msgstr "RA 层无法取得属性"
+
+#: include/svn_error_codes.h:700
+msgid "RA layer file already exists"
+msgstr "RA 层文件已存在"
+
+#: include/svn_error_codes.h:704
+msgid "Invalid configuration value"
+msgstr "无效的配置值"
+
+#: include/svn_error_codes.h:708
+msgid "HTTP Path Not Found"
+msgstr "找不到 HTTP 路径"
 
-#: clients/cmdline/main.c:556
+#: include/svn_error_codes.h:712
 #, fuzzy
-msgid ""
-"Set PROPNAME to PROPVAL on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-"\n"
-" Note: svn recognizes the following special versioned properties\n"
-" but will store any arbitrary properties set:\n"
-" svn:ignore - A newline separated list of file patterns to ignore.\n"
-" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the "
-"object.\n"
-" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last "
-"modified.\n"
-" Rev, Revision, - The last revision the object changed.\n"
-" LastChangedRevision\n"
-" Id - A compressed summary of the previous\n"
-" 4 keywords.\n"
-" svn:executable - If present, make the file executable.\n"
-" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-" svn:mime-type - The mimetype of the file. Used to determine\n"
-" whether to merge the file, and how to serve it from Apache.\n"
-" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-" treated as text. Anything else is treated as binary.\n"
-" svn:externals - A newline separated list of module specifiers,\n"
-" each of which consists of a relative directory path, optional\n"
-" revision flags, and an URL. For example\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - If present, indicates that the file should be locked\n"
-" before it is modified. Makes the working copy file read-only\n"
-" when it is not locked.\n"
-" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
-" attempt will fail, and a recursive attempt will set the property\n"
-" only on the file children of the directory.\n"
-msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
-" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
-"\n"
-" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
-" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
-" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
-" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
-" Rev, Revision, - 本物件最后一次改变的修订版。\n"
-" LastChangedRevision\n"
-" Id - 前四个关键字的压缩摘要。\n"
-" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
-" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
-" 下的文件子项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
-" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文字,其它则为二进制数据。\n"
-" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
-" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
-"锁定,把工作拷贝文件设置为只读。\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
-"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
-"作只会在目录下的文件设置属性。\n"
+msgid "Failed to execute WebDAV PROPPATCH"
+msgstr "执行 WebDAV PROPPATCH 失败"
 
-#: clients/cmdline/main.c:606
-msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
-"\n"
-" Note: this subcommand does not semantically resolve conflicts or\n"
-" remove conflict markers; it merely removes the conflict-related\n"
-" artifact files and allows PATH to be committed again.\n"
-msgstr ""
-"移除工作拷贝的目录或文件的 '冲突' 状态。\n"
-"用法:resolved PATH...\n"
-"\n"
-" 注意:本子命令不会依语法来解决冲突或是移除冲突标记;它只是移除冲突的\n"
-" 相关文件,然后让 PATH 可以再次提交。\n"
+#: include/svn_error_codes.h:717 include/svn_error_codes.h:753
+#: libsvn_ra_svn/marshal.c:609 libsvn_ra_svn/marshal.c:717
+#: libsvn_ra_svn/marshal.c:744
+msgid "Malformed network data"
+msgstr "畸形的网络数据"
 
-#: clients/cmdline/main.c:615
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
-"\n"
-" Note: this subcommand does not require network access, and resolves\n"
-" any conflicted states. However, it does not restore removed directories.\n"
-msgstr ""
-"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
-"用法:revert PATH...\n"
-"\n"
-" 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
-" 被删除的目录\n"
+#: include/svn_error_codes.h:722
+msgid "Unable to extract data from response header"
+msgstr "不能从回应的头信息中获取数据"
+
+#: include/svn_error_codes.h:728 include/svn_error_codes.h:757
+msgid "Couldn't find a repository"
+msgstr "无法找到档案库"
 
-#: clients/cmdline/main.c:625
+#: include/svn_error_codes.h:732
+msgid "Couldn't open a repository"
+msgstr "无法打开档案库"
+
+# as-is
+#: include/svn_error_codes.h:737
+msgid "Special code for wrapping server errors to report to client"
+msgstr "指定的代码封装服务器错误以便报告客户端"
+
+#: include/svn_error_codes.h:741
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 通讯协定命令"
+
+#: include/svn_error_codes.h:745
+msgid "Network connection closed unexpectedly"
+msgstr "网络连线意想不到地关闭"
+
+#: include/svn_error_codes.h:749
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: include/svn_error_codes.h:761
+msgid "Client/server version mismatch"
+msgstr "客户端/服务器版本不匹配"
+
+#: include/svn_error_codes.h:769
+msgid "Credential data unavailable"
+msgstr "无法取得凭证数据"
+
+#: include/svn_error_codes.h:773
+msgid "No authentication provider available"
+msgstr "无可用的认证提供者"
+
+#: include/svn_error_codes.h:777 include/svn_error_codes.h:781
+msgid "All authentication providers exhausted"
+msgstr "所有的认证提供者已耗尽"
+
+#: include/svn_error_codes.h:787
+msgid "Read access denied for root of edit"
+msgstr "编辑的根目录读取拒绝"
+
+#: include/svn_error_codes.h:792
 #, fuzzy
-msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
-"\n"
-" With no args, print only locally modified items (no network access).\n"
-" With -u, add working revision and server out-of-date information.\n"
-" With -v, print full revision information on every item.\n"
-"\n"
-" The first six columns in the output are each one character wide:\n"
-" First column: Says if item was added, deleted, or otherwise changed\n"
-" ' ' no modifications\n"
-" 'A' Added\n"
-" 'C' Conflicted\n"
-" 'D' Deleted\n"
-" 'I' Ignored\n"
-" 'M' Modified\n"
-" 'R' Replaced\n"
-" 'X' item is unversioned, but is used by an externals definition\n"
-" '?' item is not under version control\n"
-" '!' item is missing (removed by non-svn command) or incomplete\n"
-" '~' versioned item obstructed by some item of a different kind\n"
-" Second column: Modifications of a file's or directory's properties\n"
-" ' ' no modifications\n"
-" 'C' Conflicted\n"
-" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
-" Fourth column: Scheduled commit will contain addition-with-history\n"
-" ' ' no history scheduled with commit\n"
-" '+' history scheduled with commit\n"
-" Fifth column: Whether the item is switched relative to its parent\n"
-" ' ' normal\n"
-" 'S' switched\n"
-" Sixth column: Repository lock token\n"
-" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
-" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
-"\n"
-" The out-of-date information appears in the eighth column (with -u):\n"
-" '*' a newer revision exists on the server\n"
-" ' ' the working copy is up to date\n"
-"\n"
-" Remaining fields are variable width and delimited by spaces:\n"
-" The working revision (with -u or -v)\n"
-" The last committed revision and last committed author (with -v)\n"
-" The working copy path is always the final field, so it can\n"
-" include spaces.\n"
-"\n"
-" Example output:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
-msgstr ""
-"显示工作拷贝目录与文件的状态。\n"
-"用法:status [PATH...]\n"
-"\n"
-" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
-" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
-" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
-"\n"
-" 输出的前五个栏位各为一个字符宽:\n"
-" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
-" ' ' 无修改\n"
-" 'A' 新增\n"
-" 'C' 冲突\n"
-" 'D' 删除\n"
-" 'G' 合并\n"
-" 'I' 忽略\n"
-" 'M' 改变\n"
-" 'R' 替换\n"
-" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
-" '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
-" '~' 版本控制下的项目被不同类型的所替换\n"
-" 第二栏:显示目录或文件的属性状态\n"
-" ' ' 无修改\n"
-" 'C' 冲突\n"
-" 'M' 改变\n"
-" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
-" ' ' 未锁定\n"
-" 'L' 锁定\n"
-" 第四栏:预定要连同历史记录被新增\n"
-" ' ' 预定的提交并不包含历史记录\n"
-" '+' 预定的提交包含历史记录\n"
-" 第五栏:该项目相对其父目录是否已被切换\n"
-" ' ' 正常\n"
-" 'S' 被切换\n"
-" 第六栏:档案库锁定标记 (没有 -u)\n"
-" ' ' 没有锁定标记\n"
-" 'K' 存在锁定标记\n"
-" (有 -u)\n"
-" ' ' 没有在档案库中锁定,没有锁定标记\n"
-" 'K' 在档案库中被锁定,存在锁定标记\n"
-" 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
-" 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
-" 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
-"\n"
-" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
-" '*' 服务器上有更新修订版\n"
-" ' ' 工作拷贝是最新版的\n"
-"\n"
-" 剩余的栏位皆为变动宽度,并以空白隔开:\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
-" 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
-" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
-"\n"
-" 范例输出:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
+msgid "Item is not readable"
+msgstr "项目不能读。"
+
+#: include/svn_error_codes.h:797
+#, fuzzy
+msgid "Item is partially readable"
+msgstr "项目部分可读。"
+
+#: include/svn_error_codes.h:801
+#, fuzzy
+msgid "Invalid authz configuration"
+msgstr "无效的配置值"
+
+#: include/svn_error_codes.h:806
+#, fuzzy
+msgid "Item is not writable"
+msgstr "项目不能写。"
+
+#: include/svn_error_codes.h:812
+msgid "Svndiff data has invalid header"
+msgstr "svndiff 数据包含了无效的档头"
+
+# as-is
+#: include/svn_error_codes.h:816
+msgid "Svndiff data contains corrupt window"
+msgstr "Svndiff 数据包含无效窗口"
+
+# as-is
+#: include/svn_error_codes.h:820
+msgid "Svndiff data contains backward-sliding source view"
+msgstr "Svndiff 数据包含向后变化的资源视图"
+
+#: include/svn_error_codes.h:824
+msgid "Svndiff data contains invalid instruction"
+msgstr "svndiff 数据包含了无效的指令"
+
+#: include/svn_error_codes.h:828
+msgid "Svndiff data ends unexpectedly"
+msgstr "svndiff 数据意想不到地结束"
+
+#: include/svn_error_codes.h:832
+#, fuzzy
+msgid "Svndiff compressed data is invalid"
+msgstr "svndiff 数据包含了无效的档头"
+
+#: include/svn_error_codes.h:838
+#, fuzzy
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff 数据意想不到地结束"
+
+#: include/svn_error_codes.h:844
+msgid "Apache has no path to an SVN filesystem"
+msgstr "Apache 没有指向 SVN 文件系统的路径"
+
+#: include/svn_error_codes.h:848
+msgid "Apache got a malformed URI"
+msgstr "Apache 得到一个畸形的 URI"
+
+# as-is
+#: include/svn_error_codes.h:852
+msgid "Activity not found"
+msgstr "没有找到活动项"
+
+#: include/svn_error_codes.h:856
+msgid "Baseline incorrect"
+msgstr "基线不正确"
+
+#: include/svn_error_codes.h:860
+msgid "Input/output error"
+msgstr "输出入错误"
+
+#: include/svn_error_codes.h:866
+msgid "A path under version control is needed for this operation"
+msgstr "本操作仅能作用于纳入版本控制的路径"
+
+#: include/svn_error_codes.h:870
+msgid "Repository access is needed for this operation"
+msgstr "本操作需要对档案库进行存取"
+
+#: include/svn_error_codes.h:874
+msgid "Bogus revision information given"
+msgstr "使用了有问题的修订版信息"
+
+#: include/svn_error_codes.h:878
+msgid "Attempting to commit to a URL more than once"
+msgstr "尝试对地址(URL)进行一次以上的提交"
+
+#: include/svn_error_codes.h:882
+msgid "Operation does not apply to binary file"
+msgstr "本操作不适用于二进制文件"
+
+#: include/svn_error_codes.h:888
+msgid "Format of an svn:externals property was invalid"
+msgstr "svn:externals 属性的格式是无效的"
+
+#: include/svn_error_codes.h:892
+msgid "Attempting restricted operation for modified resource"
+msgstr "尝试对已修改的资源进行受限的操作"
+
+#: include/svn_error_codes.h:896
+msgid "Operation does not apply to directory"
+msgstr "本操作不适用于目录"
+
+#: include/svn_error_codes.h:900
+msgid "Revision range is not allowed"
+msgstr "不允许的修订版范围"
+
+#: include/svn_error_codes.h:904
+msgid "Inter-repository relocation not allowed"
+msgstr "不支持不同档案库之间的重新安置 (relocation)"
+
+#: include/svn_error_codes.h:908
+msgid "Author name cannot contain a newline"
+msgstr "作者名称不可包含换行符"
+
+#: include/svn_error_codes.h:912
+msgid "Bad property name"
+msgstr "有问题的属性名称"
+
+#: include/svn_error_codes.h:917
+msgid "Two versioned resources are unrelated"
+msgstr "两个纳入版本控制的资源没有相关性"
+
+#: include/svn_error_codes.h:922
+msgid "Path has no lock token"
+msgstr "路径没有锁定标记"
+
+#: include/svn_error_codes.h:928
+msgid "A problem occurred; see later errors for details"
+msgstr "有问题发生;请参阅随附的细节"
+
+#: include/svn_error_codes.h:932
+msgid "Failure loading plugin"
+msgstr "载入外挂失败"
+
+#: include/svn_error_codes.h:936
+msgid "Malformed file"
+msgstr "畸形的文件"
+
+#: include/svn_error_codes.h:940
+msgid "Incomplete data"
+msgstr "不完全的数据"
+
+#: include/svn_error_codes.h:944
+msgid "Incorrect parameters given"
+msgstr "使用不正确的参数"
+
+#: include/svn_error_codes.h:948
+msgid "Tried a versioning operation on an unversioned resource"
+msgstr "尝试对未纳入版本控制的资源进行版本控制操作"
+
+#: include/svn_error_codes.h:952
+msgid "Test failed"
+msgstr "测试失败"
+
+#: include/svn_error_codes.h:956
+msgid "Trying to use an unsupported feature"
+msgstr "尝试要使用不支持的功能"
+
+#: include/svn_error_codes.h:960
+msgid "Unexpected or unknown property kind"
+msgstr "意想不到或未知的属性种类"
+
+#: include/svn_error_codes.h:964
+msgid "Illegal target for the requested operation"
+msgstr "对请求的操作来说是不合法的目标"
+
+#: include/svn_error_codes.h:968
+msgid "MD5 checksum is missing"
+msgstr "没有 MD5 指纹检查值"
+
+#: include/svn_error_codes.h:972
+msgid "Directory needs to be empty but is not"
+msgstr "目录必须为空的,但是结果并非如此"
+
+#: include/svn_error_codes.h:976
+msgid "Error calling external program"
+msgstr "呼叫外部程序时发生错误"
 
-#: clients/cmdline/main.c:702
-#, fuzzy
-msgid ""
-"Update the working copy to a different URL.\n"
-"usage: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\n"
-" move a working copy to a branch or tag within the same repository.\n"
-"\n"
-" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-" This is used when repository's root URL changes (such as a scheme\n"
-" or hostname change) but your working copy still reflects the same\n"
-" directory within the same repository.\n"
-msgstr ""
-"更新工作拷贝至不同的地址(URL)。\n"
-"用法:1、switch URL [PATH]\n"
-" 2、switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
-" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
-"\n"
-" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
-" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
-" 档案库的同一目录时用之。\n"
+#: include/svn_error_codes.h:980
+msgid "Python exception has been set with the error"
+msgstr "Python 异常已被设定为错误"
 
-#: clients/cmdline/main.c:723
-#, fuzzy
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
-"\n"
-" Use --force to break the lock.\n"
-msgstr ""
-"解除工作拷贝或地址(URL)的锁定。\n"
-"用法:unlock TARGET...\n"
-"\n"
-" 使用 -force 中止锁定。\n"
+#: include/svn_error_codes.h:984
+msgid "A checksum mismatch occurred"
+msgstr "总和检查值不符"
 
-#: clients/cmdline/main.c:731
-#, fuzzy
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
-"\n"
-" If no revision given, bring working copy up-to-date with HEAD rev.\n"
-" Else synchronize working copy to revision given by -r.\n"
-"\n"
-" For each updated item a line will start with a character reporting the\n"
-" action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-"\n"
-" A character in the first column signifies an update to the actual file,\n"
-" while updates to the file's properties are shown in the second column.\n"
-" A 'B' in the third column signifies that the lock for the file has\n"
-" been broken or stolen.\n"
+#: include/svn_error_codes.h:988
+msgid "The operation was interrupted"
+msgstr "操作被中断"
+
+#: include/svn_error_codes.h:992
+msgid "The specified diff option is not supported"
+msgstr "指定的 diff 选项不支持"
+
+#: include/svn_error_codes.h:996
+msgid "Property not found"
+msgstr "找不到属性"
+
+#: include/svn_error_codes.h:1000
+msgid "No auth file path available"
+msgstr "未提供 auth 文件路径"
+
+#: include/svn_error_codes.h:1005
+msgid "Incompatible library version"
+msgstr "不相容的程序库版本"
+
+#: include/svn_error_codes.h:1011
+msgid "Client error in parsing arguments"
+msgstr "客户端于剖析参数时发生错误"
+
+#: include/svn_error_codes.h:1015
+msgid "Not enough arguments provided; try 'svn help' for more info"
 msgstr ""
-"将档案库的改变反应至工作拷贝。\n"
-"用法:update [PATH...]\n"
-"\n"
-" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
-" 不然的话,同步至 -r 选项所指定的修订版。\n"
-"\n"
-" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
-" 这些字符代表如下:\n"
-"\n"
-" A 新增\n"
-" D 删除\n"
-" U æ›´æ–°\n"
-" C 冲突\n"
-" G 合并\n"
-"\n"
-" 第一栏的字符表示实际文件的更新,\n"
-" 第二栏显示被操作的文件。\n"
-" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
 
-#: clients/cmdline/main.c:797 svnadmin/main.c:77 svnlook/main.c:284
-msgid "Caught signal"
-msgstr "捕捉到信号(中断)"
+#: include/svn_error_codes.h:1019
+msgid "Mutually exclusive arguments specified"
+msgstr "指定了互斥的参数"
 
-#: clients/cmdline/main.c:895
-msgid "Non-numeric limit argument given"
-msgstr "给了非数字的参数"
+#: include/svn_error_codes.h:1023
+msgid "Attempted command in administrative dir"
+msgstr "尝试于管理目录中执行命令"
 
-#: clients/cmdline/main.c:912 svnadmin/main.c:1219
-msgid ""
-"Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'"
-msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+#: include/svn_error_codes.h:1027
+msgid "The log message file is under version control"
+msgstr "日志信息文件于版本控制之下"
+
+#: include/svn_error_codes.h:1031
+msgid "The log message is a pathname"
+msgstr "日志信息是路径名"
+
+#: include/svn_error_codes.h:1035
+msgid "Committing in directory scheduled for addition"
+msgstr "于预计新增的目录中进行提交"
+
+#: include/svn_error_codes.h:1039
+msgid "No external editor available"
+msgstr "无法使用外部编辑器"
+
+#: include/svn_error_codes.h:1043
+msgid "Something is wrong with the log message's contents"
+msgstr "日志信息的内容有不妥的地方"
+
+#: include/svn_error_codes.h:1047
+msgid "A log message was given where none was necessary"
+msgstr "在没有需要的地方给出一个日志信息"
 
-#: clients/cmdline/main.c:924 svnadmin/main.c:1233
+#: libsvn_client/add.c:376
 #, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "修订版参数“%s”中有语法错误"
+msgid "Error during recursive add of '%s'"
+msgstr "进行“%s”的递归新增时发生错误"
 
-#: clients/cmdline/main.c:1072 clients/cmdline/main.c:1082
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+#: libsvn_client/add.c:387
+#, c-format
+msgid "Can't close directory '%s'"
+msgstr "无法关闭目录“%s”"
 
-#: clients/cmdline/main.c:1098
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
 #, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生换列符号参数“%s”中有语法错误"
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr "无法为二进制文件“%s”计算谴责信息"
 
-#: clients/cmdline/main.c:1144 svndumpfilter/main.c:1167 svnlook/main.c:2121
-msgid "Subcommand argument required\n"
-msgstr "必须提供子命令参数\n"
+#: libsvn_client/blame.c:522
+msgid "blame of the WORKING revision is not supported"
+msgstr ""
+
+#: libsvn_client/blame.c:535
+msgid "Start revision must precede end revision"
+msgstr "起始修订版必须大于结束修订版"
 
-#: clients/cmdline/main.c:1162 svnadmin/main.c:1341 svndumpfilter/main.c:1185
-#: svnlook/main.c:2139
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
 #, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知的命令:“%s”\n"
+msgid "URL '%s' refers to a directory"
+msgstr "地址(URL)“%s”指向一个目录"
 
-#: clients/cmdline/main.c:1195
+#: libsvn_client/blame.c:798
 #, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
-msgstr ""
-"子命令“%s”不接受选项“%s”\n"
-"请输入“svn help %s”以取得用法。\n"
+msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
+msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
 
-#: clients/cmdline/main.c:1232
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
+#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#, fuzzy, c-format
+msgid "'%s' is not under version control or doesn't exist"
+msgstr "“%s”尚未纳入版本控制或不存在"
 
-#: clients/cmdline/main.c:1239
-#, fuzzy
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+#: libsvn_client/cat.c:79
+#, fuzzy, c-format
+msgid "'%s' refers to a directory"
+msgstr "“%s”引用一个目录"
 
-#: clients/cmdline/main.c:1260
-msgid ""
-"The log message is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
+# as-is
+#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+msgid "(local)"
+msgstr "(本地)"
+
+#: libsvn_client/checkout.c:91
+#, c-format
+msgid "URL '%s' doesn't exist"
+msgstr "地址(URL)“%s”不存在"
+
+#: libsvn_client/checkout.c:95
+#, c-format
+msgid "URL '%s' refers to a file, not a directory"
+msgstr "地址(URL)“%s”指向一个文件,而非目录"
+
+#: libsvn_client/checkout.c:163
+#, c-format
+msgid "'%s' is already a working copy for a different URL"
+msgstr "“%s”已是不同地址(URL)的工作拷贝"
 
-#: clients/cmdline/main.c:1267
+#: libsvn_client/checkout.c:167
 #, fuzzy
-msgid ""
-"The lock comment is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
+msgid "; run 'svn update' to complete it"
+msgstr ";请执行“svn update”以完成目前的操作。"
 
-#: clients/cmdline/main.c:1480
-msgid ""
-"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
-"details)\n"
-msgstr ""
-"svn:请执行“svn cleanup”以移去锁定 (输入“svn help cleanup”以取得详细说明)\n"
+#: libsvn_client/checkout.c:177
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a directory"
+msgstr "“%s”已存在,但不是目录"
 
-#: clients/cmdline/merge-cmd.c:61
-msgid "Second revision required"
-msgstr "需要第二个修订版"
+#: libsvn_client/commit.c:198
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr "类型“%s”未知或不可版本控制"
 
-#: clients/cmdline/merge-cmd.c:81 clients/cmdline/merge-cmd.c:106
-msgid "Wrong number of paths given"
-msgstr "指定了错误数目的路径"
+#: libsvn_client/commit.c:511
+msgid "New entry name required when importing a file"
+msgstr "导入文件时,需要一个新的项目名称"
 
-#: clients/cmdline/merge-cmd.c:128
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作拷贝的合并来源需特别指定修订版"
+#: libsvn_client/commit.c:545 libsvn_wc/adm_ops.c:687 libsvn_wc/questions.c:91
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%s”不存在"
 
-#: clients/cmdline/mkdir-cmd.c:84
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替?"
+#: libsvn_client/commit.c:605 libsvn_client/copy.c:76 svnlook/main.c:1206
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径“%s”不存在"
+
+#: libsvn_client/commit.c:735 libsvn_client/copy.c:85 libsvn_client/copy.c:399
+#: libsvn_client/copy.c:608 libsvn_client/copy.c:758
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径“%s”已存在"
+
+#: libsvn_client/commit.c:750
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%s”是一个保留的名称,无法被导入"
+
+#: libsvn_client/commit.c:866 libsvn_client/copy.c:524
+msgid "Commit failed (details follow):"
+msgstr "提交失败(细节见下):"
+
+#: libsvn_client/commit.c:874 libsvn_client/copy.c:532
+msgid "Commit succeeded, but other errors follow:"
+msgstr "提交成功,但是发生了其它的错误,如后:"
+
+#: libsvn_client/commit.c:881 libsvn_client/copy.c:539
+msgid "Error unlocking locked dirs (details follow):"
+msgstr "解除锁定目录时发生错误(细节见下):"
+
+#: libsvn_client/commit.c:892
+msgid "Error bumping revisions post-commit (details follow):"
+msgstr "post-commit 增加修订版时发生错误 (细节见下):"
+
+#: libsvn_client/commit.c:903 libsvn_client/copy.c:550
+msgid "Error in post-commit clean-up (details follow):"
+msgstr "post-commit 清除时发生错误 (细节见下):"
+
+#: libsvn_client/commit.c:1206
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "“%s”是一个地址(URL),但是地址(URL)不可为作提交的目标"
+
+#: libsvn_client/commit.c:1404
+msgid "Are all the targets part of the same working copy?"
+msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+
+#: libsvn_client/commit.c:1419
+msgid "Cannot non-recursively commit a directory deletion"
+msgstr "无法以非递归提交目录删除"
+
+#: libsvn_client/commit_util.c:246 libsvn_client/commit_util.c:257
+#, c-format
+msgid "Unknown entry kind for '%s'"
+msgstr "未知的项目类型“%s”"
 
-#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1215
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移动操作不可指定修订版"
+#: libsvn_client/commit_util.c:274
+#, c-format
+msgid "Entry '%s' has unexpectedly changed special status"
+msgstr "项目“%s”意想不到地变换特殊状态"
 
-#: clients/cmdline/notify.c:69
+#: libsvn_client/commit_util.c:325
 #, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "跳过找不到的目标:“%s”\n"
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "中止提交:“%s”仍处于冲突状态"
 
-#: clients/cmdline/notify.c:76
+#: libsvn_client/commit_util.c:391
 #, c-format
-msgid "Skipped '%s'\n"
-msgstr "跳过“%s”\n"
+msgid "Did not expect '%s' to be a working copy root"
+msgstr "并未预期“%s”是工作拷贝的根目录"
 
-#: clients/cmdline/notify.c:94
+#: libsvn_client/commit_util.c:409 libsvn_client/commit_util.c:1010
 #, c-format
-msgid "Restored '%s'\n"
-msgstr "已还原“%s”\n"
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "提交项目“%s”有复制标志,但是没有复制地址地址(copyfrom URL)"
 
-#: clients/cmdline/notify.c:100
+#: libsvn_client/commit_util.c:686 libsvn_client/commit_util.c:816
+#: libsvn_client/copy.c:1002 libsvn_client/delete.c:67
+#: libsvn_client/diff.c:1409 libsvn_client/diff.c:2141
+#: libsvn_client/diff.c:2736 libsvn_client/diff.c:2865
+#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
+#: libsvn_client/prop_commands.c:213 libsvn_client/prop_commands.c:446
+#: libsvn_client/prop_commands.c:609 libsvn_client/prop_commands.c:958
+#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
+#: libsvn_client/status.c:256 libsvn_client/switch.c:106
+#: libsvn_wc/adm_crawler.c:471 libsvn_wc/adm_crawler.c:764
+#: libsvn_wc/adm_ops.c:1021 libsvn_wc/adm_ops.c:2306 libsvn_wc/adm_ops.c:2332
+#: libsvn_wc/adm_ops.c:2368 libsvn_wc/copy.c:349 libsvn_wc/copy.c:430
+#: libsvn_wc/copy.c:437 libsvn_wc/diff.c:1787 libsvn_wc/entries.c:2225
+#: libsvn_wc/entries.c:2780 libsvn_wc/props.c:479 libsvn_wc/props.c:1088
+#: libsvn_wc/props.c:1506 libsvn_wc/questions.c:182 libsvn_wc/questions.c:291
+#: libsvn_wc/status.c:726 libsvn_wc/translate.c:199
+#: libsvn_wc/update_editor.c:2065 libsvn_wc/update_editor.c:2841
 #, c-format
-msgid "Reverted '%s'\n"
-msgstr "已恢复“%s”\n"
+msgid "'%s' is not under version control"
+msgstr "“%s”尚未纳入版本控制"
 
-#: clients/cmdline/notify.c:106
+#: libsvn_client/commit_util.c:689
 #, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "无法恢复“%s”-- 请改用更新试试。\n"
+msgid "Entry for '%s' has no URL"
+msgstr "“%s”的项目没有地址(URL)"
 
-#: clients/cmdline/notify.c:114
+#: libsvn_client/commit_util.c:722
 #, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "“%s”的已解决的冲突状态\n"
+msgid "'%s' is scheduled for addition within unversioned parent"
+msgstr "“%s”于未纳入版本控制的父路径中被加入新增调度"
 
-#: clients/cmdline/notify.c:195
+#: libsvn_client/commit_util.c:742
 #, c-format
 msgid ""
-"\n"
-"Fetching external item into '%s'\n"
+"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
+"for addition. Perhaps you're committing a target that is\n"
+"inside an unversioned (or not-yet-versioned) directory?"
 msgstr ""
-"\n"
-"正在取得外部项目至“%s”\n"
+"“%s”项目被标记为“已复制”,但是本身尚未加入新增调度。也许您提交的\n"
+"目标是位于未纳入版本控制 (或尚未纳入) 的目录中?"
 
-#: clients/cmdline/notify.c:210
+#: libsvn_client/commit_util.c:782
 #, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "导出修订版 %ld 的外部定义。\n"
+msgid ""
+"'%s' is not under version control and is not part of the commit, yet its "
+"child '%s' is part of the commit"
+msgstr ""
+"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
 
-#: clients/cmdline/notify.c:211
+#: libsvn_client/commit_util.c:865
 #, c-format
-msgid "Exported revision %ld.\n"
-msgstr "导出修订版 %ld。\n"
+msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
+msgstr "无法提交“%s”与“%s”,因为它们都指向同一个地址(URL)"
 
-#: clients/cmdline/notify.c:219
+#: libsvn_client/commit_util.c:1015
 #, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "取出修订版 %ld 的外部定义。\n"
+msgid "Commit item '%s' has copy flag but an invalid revision"
+msgstr "提交项目“%s”有复制标志,但是修订版无效"
 
-#: clients/cmdline/notify.c:220
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "取出修订版 %ld。\n"
+#: libsvn_client/copy.c:95 libsvn_client/copy.c:769
+#, fuzzy, c-format
+msgid "Path '%s' is not a directory"
+msgstr "“%s”不是目录"
+
+#: libsvn_client/copy.c:138
+msgid "Move will not be attempted unless forced"
+msgstr "除非强行操作,否则不会执行移动操作"
 
-#: clients/cmdline/notify.c:230
+#: libsvn_client/copy.c:334
 #, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部定义至修订版 %ld。\n"
+msgid ""
+"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
+"s')"
+msgstr "来源与目的似乎不在同一个档案库中 (来源:“%s”;目的:“%s”)"
 
-#: clients/cmdline/notify.c:231
+#: libsvn_client/copy.c:370
 #, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新至修订版 %ld。\n"
+msgid "Cannot move URL '%s' into itself"
+msgstr "无法移动地址(URL)“%s”至本身"
 
-#: clients/cmdline/notify.c:239
+#: libsvn_client/copy.c:390
 #, c-format
-msgid "External at revision %ld.\n"
-msgstr "于修订版 %ld 的外部定义。\n"
+msgid "Path '%s' does not exist in revision %ld"
+msgstr "路径“%s”不存在于修订版 %ld"
 
-#: clients/cmdline/notify.c:240
+#: libsvn_client/copy.c:745
 #, c-format
-msgid "At revision %ld.\n"
-msgstr "于修订版 %ld。\n"
+msgid "Path '%s' not found in revision %ld"
+msgstr "路径“%s”于修订版 %ld 中找不到"
 
-#: clients/cmdline/notify.c:252
-msgid "External export complete.\n"
-msgstr "外部定义导出完成。\n"
+#: libsvn_client/copy.c:750
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr "路径“%s”于 HEAD 修订版中找不到"
 
-#: clients/cmdline/notify.c:253
-msgid "Export complete.\n"
-msgstr "导出完成。\n"
+#: libsvn_client/copy.c:787
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "存在“%s”的项目 (不过工作文件已丢失)"
 
-#: clients/cmdline/notify.c:260
-msgid "External checkout complete.\n"
-msgstr "外部定义取出完成。\n"
+#: libsvn_client/copy.c:878
+#, c-format
+msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
+msgstr "来源地址(URL)“%s”来自其它的档案库;把它当作是脱离的工作拷贝(WC)"
 
-#: clients/cmdline/notify.c:261
-msgid "Checkout complete.\n"
-msgstr "取出完成。\n"
+#: libsvn_client/copy.c:957
+#, c-format
+msgid "Cannot copy path '%s' into its own child '%s'"
+msgstr "无法复制路径“%s”至其子目录“%s”中"
 
-#: clients/cmdline/notify.c:268
-msgid "External update complete.\n"
-msgstr "外部定义更新完成。\n"
+#: libsvn_client/copy.c:968
+#, c-format
+msgid "Cannot move path '%s' into itself"
+msgstr "无法移动路径“%s”至其本身"
 
-#: clients/cmdline/notify.c:269
-msgid "Update complete.\n"
-msgstr "更新完成。\n"
+#: libsvn_client/copy.c:976
+msgid "No support for repos <--> working copy moves"
+msgstr "不支持档案库 <--> 工作拷贝移动"
 
-#: clients/cmdline/notify.c:285
+#: libsvn_client/copy.c:1008
 #, c-format
-msgid ""
-"\n"
-"Performing status on external item at '%s'\n"
-msgstr ""
-"\n"
-"对外部项目“%s”进行状态检查\n"
+msgid "'%s' does not seem to have a URL associated with it"
+msgstr "“%s”似乎没有关联的地址(URL)"
 
-#: clients/cmdline/notify.c:293
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "状态于修订版:%6ld\n"
+#: libsvn_client/copy.c:1205 svn/move-cmd.c:72
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "移动操作不可指定修订版"
 
-#: clients/cmdline/notify.c:301
+#: libsvn_client/delete.c:62
 #, c-format
-msgid "Sending %s\n"
-msgstr "正在发送 %s\n"
+msgid "'%s' is in the way of the resource actually under version control"
+msgstr "“%s”挡了实际纳入版本控制资源的路"
 
-#: clients/cmdline/notify.c:310
+#: libsvn_client/delete.c:77
 #, c-format
-msgid "Adding (bin) %s\n"
-msgstr "新增 (二进制) %s\n"
+msgid "'%s' has local modifications"
+msgstr "“%s”已有本地修改"
 
-#: clients/cmdline/notify.c:317
+# as-is
+#: libsvn_client/diff.c:99
 #, c-format
-msgid "Adding %s\n"
-msgstr "新增 %s\n"
+msgid "%sProperty changes on: %s%s"
+msgstr "%s 属性改变于:%s%s"
 
-#: clients/cmdline/notify.c:324
+# as-is
+#: libsvn_client/diff.c:127
 #, c-format
-msgid "Deleting %s\n"
-msgstr "删除 %s\n"
+msgid "Name: %s%s"
+msgstr "名字:%s%s"
 
-#: clients/cmdline/notify.c:331
-#, c-format
-msgid "Replacing %s\n"
-msgstr "替换 %s\n"
+#: libsvn_client/diff.c:203
+#, fuzzy, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr ""
+"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
+"s”与“%s”)"
 
-#: clients/cmdline/notify.c:341
-msgid "Transmitting file data "
-msgstr "传输文件数据"
+#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
+#, fuzzy, c-format
+msgid "URL has no scheme: '%s'"
+msgstr ""
+"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
+"s”"
 
-#: clients/cmdline/notify.c:351
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "“%s”被用户“%s”锁定。\n"
+#: libsvn_client/diff.c:222
+#, fuzzy, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
 
-#: clients/cmdline/notify.c:357
+# as-is
+#: libsvn_client/diff.c:287
 #, c-format
-msgid "'%s' unlocked.\n"
-msgstr "“%s”被解除锁定。\n"
-
-#: clients/cmdline/prompt.c:94
-msgid "Can't open stdin"
-msgstr "无法打开标准输入"
-
-#: clients/cmdline/prompt.c:112 clients/cmdline/prompt.c:116
-msgid "Can't read stdin"
-msgstr "无法读取标准输入"
+msgid "%s\t(revision %ld)"
+msgstr "%s\t(修订版 %ld)"
 
-#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:310
-msgid "Can't get password"
-msgstr "无法取得密码"
+# as-is
+#: libsvn_client/diff.c:289
+#, c-format
+msgid "%s\t(working copy)"
+msgstr "%s\t(工作拷贝)"
 
-#: clients/cmdline/prompt.c:175
+#: libsvn_client/diff.c:433
 #, c-format
-msgid "Authentication realm: %s\n"
-msgstr "认证领域:%s\n"
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr "无法显示:文件标记为二进制类型。%s"
 
-#: clients/cmdline/prompt.c:201 clients/cmdline/prompt.c:224
-msgid "Username: "
-msgstr "用户登录名:"
+# as-is
+#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
+#. strings are used to tag onto a filename in case of a merge conflict
+#: libsvn_client/diff.c:772
+msgid ".working"
+msgstr ".working"
 
-#: clients/cmdline/prompt.c:203
+# as-is
+#: libsvn_client/diff.c:774
 #, c-format
-msgid "Password for '%s': "
-msgstr "“%s”的密码:"
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
 
-#: clients/cmdline/prompt.c:246
+# as-is
+#: libsvn_client/diff.c:777
 #, c-format
-msgid "Error validating server certificate for '%s':\n"
-msgstr "验证“%s”的服务器凭证时发生错误:\n"
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
 
-#: clients/cmdline/prompt.c:252
-msgid ""
-" - The certificate is not issued by a trusted authority. Use the\n"
-" fingerprint to validate the certificate manually!\n"
-msgstr ""
-" - 本凭证并不是由受信任的权威机权所核发。请手动利用指纹以验证\n"
-" 凭证的有效性!\n"
+#: libsvn_client/diff.c:1474 libsvn_client/diff.c:1680
+msgid "Not all required revisions are specified"
+msgstr "并未提供全部所需的修订版"
 
-#: clients/cmdline/prompt.c:259
-msgid " - The certificate hostname does not match.\n"
-msgstr " - 本凭证的主机名称不符。\n"
+#: libsvn_client/diff.c:1489
+msgid "At least one revision must be non-local for a pegged diff"
+msgstr "对于 peg 差异,必须至少有一个非本地端的修订版"
 
-#: clients/cmdline/prompt.c:265
-msgid " - The certificate is not yet valid.\n"
-msgstr " - 本凭证尚未进入有效期间。\n"
+#: libsvn_client/diff.c:1601 libsvn_client/diff.c:1613
+#, c-format
+msgid "'%s' was not found in the repository at revision %ld"
+msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
 
-#: clients/cmdline/prompt.c:271
-msgid " - The certificate has expired.\n"
-msgstr " - 本凭证已过期。\n"
+#: libsvn_client/diff.c:1961
+#, fuzzy
+msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
 
-#: clients/cmdline/prompt.c:277
-msgid " - The certificate has an unknown error.\n"
-msgstr " - 本凭证发生不明的错误。\n"
+#: libsvn_client/diff.c:2000
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr "目前只支持路径的文件参考基础与其工作文件之间的文件差异"
 
-#: clients/cmdline/prompt.c:282
+#: libsvn_client/diff.c:2145 libsvn_client/switch.c:110
 #, c-format
-msgid ""
-"Certificate information:\n"
-" - Hostname: %s\n"
-" - Valid: from %s until %s\n"
-" - Issuer: %s\n"
-" - Fingerprint: %s\n"
+msgid "Directory '%s' has no URL"
+msgstr "目录“%s”没有地址(URL)"
+
+#: libsvn_client/diff.c:2352
+msgid "Summarizing diff can only compare repository to repository"
 msgstr ""
-"凭证信息:\n"
-" - 主机名称:%s\n"
-" - 有效期间:自 %s 至 %s\n"
-" - 发行者:%s\n"
-" - 指纹:%s\n"
 
-#: clients/cmdline/prompt.c:297
-msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
-msgstr "(R)拒绝,(t)暂时接受 或 (p)永远接受?"
+#: libsvn_client/diff.c:2709 libsvn_client/diff.c:2715
+#: libsvn_client/diff.c:2850 libsvn_client/locking_commands.c:263
+#: libsvn_client/ra.c:372 libsvn_client/ra.c:738 libsvn_client/ra.c:875
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%s”没有地址(URL)"
 
-#: clients/cmdline/prompt.c:301
-msgid "(R)eject or accept (t)emporarily? "
-msgstr "(R)拒绝 或 (t)暂时接受 ?"
+#: libsvn_client/export.c:87
+#, c-format
+msgid "'%s' is not a valid EOL value"
+msgstr "“%s”不是一个有效的 EOL 值"
 
-#: clients/cmdline/prompt.c:339
-msgid "Client certificate filename: "
-msgstr "用户凭证文件名:"
+#: libsvn_client/export.c:271
+msgid "Destination directory exists, and will not be overwritten unless forced"
+msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
 
-#: clients/cmdline/prompt.c:362
+#: libsvn_client/export.c:369 libsvn_client/export.c:512
 #, c-format
-msgid "Passphrase for '%s': "
-msgstr "“%s”的密码:"
+msgid "'%s' exists and is not a directory"
+msgstr "“%s”已存在,但不是目录"
 
-#: clients/cmdline/propdel-cmd.c:77
+#: libsvn_client/export.c:373 libsvn_client/export.c:516
 #, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "属性“%s”自档案库修订版 %ld 中删除\n"
+msgid "'%s' already exists"
+msgstr "“%s”已存在"
 
-#: clients/cmdline/propdel-cmd.c:86
+#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1601
+#: libsvn_wc/update_editor.c:2194
 #, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "删除纳入版本控制的属性“%s”时不可指定修订版"
+msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
 
-#: clients/cmdline/propdel-cmd.c:116
-#, c-format
-msgid "property '%s' deleted (recursively) from '%s'.\n"
-msgstr "属性“%s”自“%s”删除 (递归)。\n"
+#: libsvn_client/info.c:243
+#, fuzzy, c-format
+msgid "Cannot read entry for '%s'"
+msgstr "不能读“%s”的条目"
+
+#: libsvn_client/info.c:379 libsvn_client/info.c:404 libsvn_client/info.c:414
+#, fuzzy, c-format
+msgid "URL '%s' non-existent in revision '%ld'"
+msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
 
-#: clients/cmdline/propdel-cmd.c:117
+#: libsvn_client/list.c:225
 #, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "属性“%s”自“%s”删除。\n"
+msgid "URL '%s' non-existent in that revision"
+msgstr "地址(URL)“%s”并不存在于该修订版中"
 
-#: clients/cmdline/propedit-cmd.c:101 clients/cmdline/propedit-cmd.c:225
-#: clients/cmdline/propset-cmd.c:85
-msgid "Bad encoding option: prop value not stored as UTF8"
-msgstr "有问题的编码选项:属性内容未以 UTF8 储存"
+#: libsvn_client/locking_commands.c:198
+msgid "No common parent found, unable to operate on disjoint arguments"
+msgstr "没有找到公共父节点,不能在分离的参数上操作"
 
-#: clients/cmdline/propedit-cmd.c:110
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "属性“%s”于修订版 %ld 设为新值\n"
+#: libsvn_client/locking_commands.c:287
+msgid "Unable to lock/unlock across multiple repositories"
+msgstr "不能跨越多个档案库进行 锁定/解锁"
 
-#: clients/cmdline/propedit-cmd.c:116
-#, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "属性“%s”于修订版 %ld 没有改变\n"
+#: libsvn_client/locking_commands.c:328
+#, fuzzy, c-format
+msgid "'%s' is not locked in this working copy"
+msgstr "“%s”没有在工作拷贝中锁定"
 
-#: clients/cmdline/propedit-cmd.c:124
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "编辑纳入版本控制的属性“%s”时不可指定修订版"
+#: libsvn_client/locking_commands.c:376
+#, fuzzy, c-format
+msgid "'%s' is not locked"
+msgstr "“%s”没有被锁定"
 
-#: clients/cmdline/propedit-cmd.c:150 clients/cmdline/propset-cmd.c:158
-msgid "Explicit target argument required"
-msgstr "必须明确地提供目标"
+#: libsvn_client/locking_commands.c:409 libsvn_fs/fs-loader.c:895
+#: libsvn_ra/ra_loader.c:625
+msgid "Lock comment has illegal characters"
+msgstr "锁定注释存在非法字符"
 
-#: clients/cmdline/propedit-cmd.c:173
-#, c-format
-msgid "Editing property on non-local target '%s' not yet supported"
-msgstr "尚不支持编辑非本地目标“%s”的属性"
+#: libsvn_client/log.c:73
+msgid "Missing required revision specification"
+msgstr "未提供请求的修订版规格"
 
-#: clients/cmdline/propedit-cmd.c:200 clients/cmdline/switch-cmd.c:138
+#: libsvn_client/log.c:86
+#, fuzzy
+msgid "Revision type requires a working copy path, not a URL"
+msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+
+#: libsvn_client/log.c:139 libsvn_client/status.c:261
+#: libsvn_client/update.c:86
 #, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "“%s”不像是工作拷贝路径"
+msgid "Entry '%s' has no URL"
+msgstr "项目“%s”没有地址(URL)"
+
+#: libsvn_client/log.c:370
+#, fuzzy
+msgid "No commits in repository"
+msgstr "档案库中没有任何提交"
 
-#: clients/cmdline/propedit-cmd.c:232
+#: libsvn_client/prop_commands.c:104
 #, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "“%2$s”的“%1$s”属性被设为新值\n"
+msgid "'%s' is a wcprop, thus not accessible to clients"
+msgstr "“%s”是一个工作拷贝属性(wcprop),应此不能被客户端存取"
 
-#: clients/cmdline/propedit-cmd.c:239
+#: libsvn_client/prop_commands.c:183
 #, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "“%2$s”的“%1$s”属性没有改变\n"
+msgid "Revision property '%s' not allowed in this context"
+msgstr "修订版属性“%s”在此上下文中并不允许"
+
+#: libsvn_client/prop_commands.c:199
+#, fuzzy, c-format
+msgid "Setting property on non-local target '%s' is not supported"
+msgstr "设定非本地目标“%s”的属性尚不支持"
 
-#: clients/cmdline/proplist-cmd.c:71
+#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
 #, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgid "Bad property name: '%s'"
+msgstr "有问题的属性名称:“%s”"
 
-#: clients/cmdline/props.c:51
-#, fuzzy
-msgid ""
-"Must specify the revision as a number, a date or 'HEAD' when operating on a "
-"revision property"
-msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
+#: libsvn_client/prop_commands.c:276
+msgid "Value will not be set unless forced"
+msgstr "除非强迫为之,否则其值不会被设定"
 
-#: clients/cmdline/props.c:58
-#, fuzzy
-msgid "Wrong number of targets specified"
-msgstr "指定了错误数目的目标"
+#: libsvn_client/prop_commands.c:499
+#, fuzzy, c-format
+msgid "'%s' does not exist in revision '%ld'"
+msgstr "路径“%s”不存在于修订版 %ld"
 
-#: clients/cmdline/props.c:67
-msgid "Either a URL or versioned item is required"
-msgstr "必须提供地址(URL)或纳入版本控制的项目"
+#: libsvn_client/prop_commands.c:506 libsvn_client/prop_commands.c:765
+#, c-format
+msgid "Unknown node kind for '%s'"
+msgstr "“%s”为未知的节点类型"
 
-#: clients/cmdline/propset-cmd.c:111
+#: libsvn_client/ra.c:132
 #, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "设定属性“%s”于档案库修订版 %ld\n"
+msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgstr "试图在非提交操作中,设定工作拷贝属性“%s”于“%s”"
 
-#: clients/cmdline/propset-cmd.c:119
+#: libsvn_client/ra.c:349
 #, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "无法指定修订版以设定版本控制下的属性“%s”"
+msgid "Can't find entry for '%s'"
+msgstr "无法找到“%s”的项目"
 
-#: clients/cmdline/propset-cmd.c:151
+#: libsvn_client/ra.c:493
 #, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "未提供“%s”于修订版 %ld 的 changed-path 信息"
 
-#: clients/cmdline/propset-cmd.c:184
+#: libsvn_client/ra.c:613
 #, c-format
-msgid "property '%s' set (recursively) on '%s'\n"
-msgstr "属性“%s”设定 (递归) 于“%s”\n"
+msgid "path '%s' doesn't exist in revision %ld"
+msgstr "路径“%s”不存在于修订版 %ld 中"
 
-#: clients/cmdline/propset-cmd.c:185
+#: libsvn_client/ra.c:660 libsvn_client/ra.c:823
 #, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "属性“%s”设定于“%s”\n"
+msgid "Unable to find repository location for '%s' in revision %ld"
+msgstr "无法找到“%s”的档案库位置于修订版 %ld"
 
-#: clients/cmdline/revert-cmd.c:61
-#, fuzzy
-msgid "Try 'svn revert --recursive' instead?"
-msgstr "尝试用 “svn revert -recursive” 代替?"
+#: libsvn_client/ra.c:671
+#, c-format
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr "“%s”于修订版 %ld 是一个无关的物件"
 
-#: clients/cmdline/status.c:261
+#: libsvn_client/ra.c:828
 #, c-format
-msgid "'%s' has lock token, but no lock owner"
-msgstr "‘%s’锁被盗取,但没有锁的所有者"
+msgid ""
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
+msgstr ""
+"“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
+
+#: libsvn_client/relocate.c:101
+#, fuzzy, c-format
+msgid "'%s' is not the root of the repository"
+msgstr "”%s“没有在档案库中被锁定"
 
-#: clients/cmdline/switch-cmd.c:58
+#: libsvn_client/relocate.c:108
 #, c-format
-msgid "'%s' to '%s' is not a valid relocation"
-msgstr "“%s”到“%s”不是有效的重定位"
+msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
+msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
+
+#: libsvn_client/revisions.c:99
+#, fuzzy, c-format
+msgid "Path '%s' has no committed revision"
+msgstr "路径“%s”于 HEAD 修订版中找不到"
 
-#: clients/cmdline/util.c:58
+#: libsvn_client/revisions.c:109
 #, c-format
-msgid ""
-"\n"
-"Committed revision %ld.\n"
+msgid "Unrecognized revision type requested for '%s'"
+msgstr "无法辨识请求的“%s”的修订版类别"
+
+#: libsvn_delta/svndiff.c:144
+msgid "Compression of svndiff data failed"
 msgstr ""
-"\n"
-"提交后的修订版为 %ld。\n"
 
-#: clients/cmdline/util.c:126
-msgid ""
-"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
-"no 'editor-cmd' run-time configuration option was found"
+#: libsvn_delta/svndiff.c:407
+msgid "Decompression of svndiff data failed"
 msgstr ""
-"没有一个 SVN_EDITOR,VISUAL 或 EDITOR 环境变数被设定,执行时期的设定中也没有 "
-"'editor-cmd' 选项"
 
-#: clients/cmdline/util.c:153
-msgid "Can't get working directory"
-msgstr "无法取得工作目录"
+#: libsvn_delta/svndiff.c:414
+msgid "Size of uncompressed data does not match stored original length"
+msgstr ""
 
-#: clients/cmdline/util.c:164
+#: libsvn_delta/svndiff.c:484
 #, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "无法更改工作拷贝至“%s”"
+msgid "Invalid diff stream: insn %d cannot be decoded"
+msgstr "无效的差异流:insn %d 不能解码"
 
-#: clients/cmdline/util.c:190
+#: libsvn_delta/svndiff.c:488
 #, c-format
-msgid "Can't write to '%s'"
-msgstr "无法写入至“%s”"
+msgid "Invalid diff stream: insn %d has non-positive length"
+msgstr "无效的差异流:insn %d 出现非正的长度"
 
-# as-is
-#: clients/cmdline/util.c:205 clients/cmdline/util.c:229
-#: libsvn_fs_fs/fs_fs.c:1082 libsvn_fs_fs/fs_fs.c:3590 libsvn_subr/io.c:2359
+#: libsvn_delta/svndiff.c:492
 #, c-format
-msgid "Can't stat '%s'"
-msgstr "不能取得“%s”状态"
+msgid "Invalid diff stream: insn %d overflows the target view"
+msgstr "无效的差异流:insn %d 溢出目标视图"
 
-#: clients/cmdline/util.c:220
+#: libsvn_delta/svndiff.c:501
 #, c-format
-msgid "system('%s') returned %d"
-msgstr "系统(“%s”) 返回 %d"
+msgid "Invalid diff stream: [src] insn %d overflows the source view"
+msgstr "无效的诧异流:[src] insn %d 溢出源视图"
 
-#: clients/cmdline/util.c:285
-msgid "Can't restore working directory"
-msgstr "无法还原工作目录"
+#: libsvn_delta/svndiff.c:508
+#, c-format
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr "无效的差异流:[tgt] insn %d 起点超过目标视图位置"
 
-#: clients/cmdline/util.c:325
-msgid "Log message contains a zero byte"
-msgstr "日志信息中有一个零字节"
+#: libsvn_delta/svndiff.c:515
+#, c-format
+msgid "Invalid diff stream: [new] insn %d overflows the new data section"
+msgstr "无效的差异流:[new] insn %d 溢出新数据区域"
 
-#: clients/cmdline/util.c:385
-msgid "Your commit message was left in a temporary file:"
-msgstr "您的提交信息保留在临时文件中:"
+#: libsvn_delta/svndiff.c:525
+msgid "Delta does not fill the target window"
+msgstr "Delta 不能填充目标窗口"
+
+#: libsvn_delta/svndiff.c:528
+msgid "Delta does not contain enough new data"
+msgstr "Delta不能包含足够的新数据"
+
+#: libsvn_delta/svndiff.c:634
+msgid "Svndiff has invalid header"
+msgstr "Svndiff 数据包含了无效的数据头"
 
 # as-is
-#: clients/cmdline/util.c:437
-msgid "--This line, and those below, will be ignored--"
-msgstr "--此行及以下内容将会被忽略--"
+#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+msgid "Svndiff contains corrupt window header"
+msgstr "Svndiff 数据包含无效窗口"
 
-#: clients/cmdline/util.c:550
-msgid "Cannot invoke editor to get log message when non-interactive"
-msgstr "在非交互式的情况下不能调用编辑器获取日志信息"
+# as-is
+#: libsvn_delta/svndiff.c:698
+msgid "Svndiff has backwards-sliding source views"
+msgstr "Svndiff 数据包含向后变化的资源视图"
 
-#: clients/cmdline/util.c:563
-msgid ""
-"Could not use external editor to fetch log message; consider setting the "
-"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
-"options"
+#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
+#: libsvn_delta/svndiff.c:867
+msgid "Unexpected end of svndiff input"
+msgstr "找到一个意料之外的节点种类"
+
+#: libsvn_diff/diff_file.c:593
+#, c-format
+msgid "The file '%s' changed unexpectedly during diff"
 msgstr ""
-"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
-"message (-m) 或 --file (-F) 选项"
 
-#: clients/cmdline/util.c:598
-msgid ""
-"\n"
-"Log message unchanged or not specified\n"
-"a)bort, c)ontinue, e)dit\n"
+#: libsvn_diff/diff_file.c:714
+#, fuzzy, c-format
+msgid "Error parsing diff options"
+msgstr "分解“%s”时发生错误"
+
+#: libsvn_diff/diff_file.c:737
+#, c-format
+msgid "Invalid argument '%s' in diff options"
 msgstr ""
-"\n"
-"日志信息未改变,或是未指定\n"
-"a)中断,c)继续,e)编辑\n"
 
-#: clients/cmdline/util.c:651
-msgid "Use --force to override this restriction"
-msgstr "请用 --force 来撤销限制"
+#: libsvn_diff/diff_file.c:1019
+#, c-format
+msgid "%s\\ No newline at end of file%s"
+msgstr "%s\\ 在文件 %s 末尾没有新行"
 
-#: clients/cmdline/util.c:673 include/svn_error_codes.h:229
-#: libsvn_subr/cmdline.c:278 libsvn_subr/cmdline.c:295
-msgid "Write error"
-msgstr "写入错误"
+#: libsvn_diff/diff_file.c:1608
+#, c-format
+msgid "Failed to delete mmap '%s'"
+msgstr "删除mmap ”%s“失败"
 
-# as-is
-#: include/svn_error_codes.h:152
-msgid "Bad parent pool passed to svn_make_pool()"
-msgstr "无效的内存池(pool)传递到 svn_make_pool()"
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
+#: libsvn_ra/ra_loader.c:171
+#, c-format
+msgid "'%s' does not define '%s()'"
+msgstr "“%s”未定义 '%s()'"
 
-#: include/svn_error_codes.h:156
-msgid "Bogus filename"
-msgstr "有问题的文件名"
+#: libsvn_fs/fs-loader.c:131
+#, fuzzy, c-format
+msgid "Failed to load module for FS type '%s'"
+msgstr "装载FS类别“%s”模块失败"
 
-#: include/svn_error_codes.h:160
-msgid "Bogus URL"
-msgstr "有问题的地址(URL)"
+#: libsvn_fs/fs-loader.c:138
+#, c-format
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "对“%s”有不符合的 FS 模块版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: include/svn_error_codes.h:164
-msgid "Bogus date"
-msgstr "有问题的日期"
+#: libsvn_fs/fs-loader.c:163
+#, c-format
+msgid "Unknown FS type '%s'"
+msgstr "未知的文件系统(FS)类别“%s”"
 
-#: include/svn_error_codes.h:168
-msgid "Bogus mime-type"
-msgstr "有问题的 mime-type"
+#: libsvn_fs/fs-loader.c:253
+#, fuzzy, c-format
+msgid "Can't allocate FS mutex"
+msgstr "不能分配文件系统(FS)互斥体"
 
-#: include/svn_error_codes.h:174
-msgid "Version file format not correct"
-msgstr "版本文件格式不正确"
+#: libsvn_fs/fs-loader.c:289
+#, fuzzy, c-format
+msgid "Can't grab FS mutex"
+msgstr "无法获取文件系统(FS)互斥体"
 
-#: include/svn_error_codes.h:180
-msgid "No such XML tag attribute"
-msgstr "没有这样的 XML 标签属性"
+#: libsvn_fs/fs-loader.c:295
+#, c-format
+msgid "Can't ungrab FS mutex"
+msgstr "不能释放文件系统(FS)互斥体"
 
-#: include/svn_error_codes.h:184
-msgid "<delta-pkg> is missing ancestry"
-msgstr "<delta-pkg> 没有演进历程"
+#: libsvn_fs/fs-loader.c:901
+msgid "Negative expiration date passed to svn_fs_lock"
+msgstr "不能接受的有效期传递到 svn_fs_lock"
 
-#: include/svn_error_codes.h:188
-msgid "Unrecognized binary data encoding; can't decode"
-msgstr "无法辨识的二进制数据编码:无法解译"
+#: libsvn_fs_base/bdb/bdb-err.c:101
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while %s:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: include/svn_error_codes.h:192
-msgid "XML data was not well-formed"
-msgstr "XML 的数据不合语法"
+#: libsvn_fs_base/bdb/changes-table.c:87
+msgid "creating change"
+msgstr "正在创建更改"
 
-#: include/svn_error_codes.h:196
-msgid "Data cannot be safely XML-escaped"
-msgstr "XML 数据不能正确地解码"
+#: libsvn_fs_base/bdb/changes-table.c:113
+msgid "deleting changes"
+msgstr "正在删除更改"
 
-#: include/svn_error_codes.h:202
-msgid "Inconsistent line ending style"
-msgstr "不一致的行结束样式"
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2017
+msgid "Missing required node revision ID"
+msgstr "未提供必须的节点修订版 ID"
 
-#: include/svn_error_codes.h:206
-msgid "Unrecognized line ending style"
-msgstr "无法辨识的行结束样式"
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2027
+msgid "Invalid change ordering: new node revision ID without delete"
+msgstr "无效的改变顺序:有新的节点修订版 ID 而没删除"
 
-#: include/svn_error_codes.h:211
-msgid "Line endings other than expected"
-msgstr "一行以意料之外的方式结束"
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2038
+msgid "Invalid change ordering: non-add change on deleted path"
+msgstr "无效的改变顺序:对删除路径进行非新增的改变"
 
-#: include/svn_error_codes.h:215
-msgid "Ran out of unique names"
-msgstr "已用完不重复的名称"
+#: libsvn_fs_base/bdb/changes-table.c:256
+#: libsvn_fs_base/bdb/changes-table.c:380
+msgid "creating cursor for reading changes"
+msgstr "正在为读取更改创建指针"
 
-# as-is
-#: include/svn_error_codes.h:220
-msgid "Framing error in pipe protocol"
-msgstr "管道协议帧错误"
+#: libsvn_fs_base/bdb/changes-table.c:282
+#: libsvn_fs_base/bdb/changes-table.c:401
+#, fuzzy, c-format
+msgid "Error reading changes for key '%s'"
+msgstr "读关键字“%s”的更改时发生错误"
 
-#: include/svn_error_codes.h:225
-msgid "Read error in pipe"
-msgstr "管道发生读取错误"
+#: libsvn_fs_base/bdb/changes-table.c:341
+#: libsvn_fs_base/bdb/changes-table.c:424
+msgid "fetching changes"
+msgstr "正在获取更改"
 
-#: include/svn_error_codes.h:235
-msgid "Unexpected EOF on stream"
-msgstr "流中有意料之外的结束符"
+#: libsvn_fs_base/bdb/changes-table.c:354
+#: libsvn_fs_base/bdb/changes-table.c:437
+msgid "closing changes cursor"
+msgstr "正在关闭更改指针"
 
-#: include/svn_error_codes.h:239
-msgid "Malformed stream data"
-msgstr "畸形的流数据"
+#: libsvn_fs_base/bdb/copies-table.c:85
+#, fuzzy
+msgid "storing copy record"
+msgstr "正在存储拷贝记录"
 
-#: include/svn_error_codes.h:243
-msgid "Unrecognized stream data"
-msgstr "无法辨识的流数据"
+#: libsvn_fs_base/bdb/copies-table.c:110
+msgid "allocating new copy ID (getting 'next-key')"
+msgstr "正在分配新拷贝ID (正在获取'next-key')"
 
-#: include/svn_error_codes.h:249
-msgid "Unknown svn_node_kind"
-msgstr "未知的 svn_node_kind"
+#: libsvn_fs_base/bdb/copies-table.c:128
+msgid "bumping next copy key"
+msgstr "正在提取下一个拷贝关键字"
 
-#: include/svn_error_codes.h:253
-msgid "Unexpected node kind found"
-msgstr "找到一个意料之外的节点种类"
+#: libsvn_fs_base/bdb/copies-table.c:167
+msgid "deleting entry from 'copies' table"
+msgstr "正在从 'copies' 表中删除条目"
 
-#: include/svn_error_codes.h:259
-msgid "Can't find an entry"
-msgstr "无法找到一个项目"
+# as-is
+#: libsvn_fs_base/bdb/copies-table.c:195
+#, fuzzy
+msgid "reading copy"
+msgstr "正在读取拷贝"
 
-#: include/svn_error_codes.h:265
-msgid "Entry already exists"
-msgstr "项目已存在"
+#: libsvn_fs_base/bdb/nodes-table.c:97
+msgid "allocating new node ID (getting 'next-key')"
+msgstr "正在分配新的节点 ID (正在获取 'next-key')"
 
-#: include/svn_error_codes.h:269
-msgid "Entry has no revision"
-msgstr "项目没有修订版"
+#: libsvn_fs_base/bdb/nodes-table.c:115
+msgid "bumping next node ID key"
+msgstr "正在提取下一个节点 ID 关键字"
 
-#: include/svn_error_codes.h:273
-msgid "Entry has no URL"
-msgstr "项目没有地址(URL)"
+#: libsvn_fs_base/bdb/nodes-table.c:152
+#, fuzzy, c-format
+msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
+msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
 
-#: include/svn_error_codes.h:277
-msgid "Entry has an invalid attribute"
-msgstr "项目有无效的属性"
+#: libsvn_fs_base/bdb/nodes-table.c:178
+msgid "deleting entry from 'nodes' table"
+msgstr "正在从 'nodes' 表删除条目"
 
-#: include/svn_error_codes.h:283
-msgid "Obstructed update"
-msgstr "塞住的更新"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/nodes-table.c:218
+#, fuzzy
+msgid "reading node revision"
+msgstr "正在读取节点修订版"
 
-# as-is
-#: include/svn_error_codes.h:288
-msgid "Mismatch popping the WC unwind stack"
-msgstr "不匹配的弹出工作拷贝(WC)展开堆栈"
+#: libsvn_fs_base/bdb/nodes-table.c:250
+#, fuzzy
+msgid "storing node revision"
+msgstr "正在存储节点修订版"
 
-# as-is
-#: include/svn_error_codes.h:293
-msgid "Attempt to pop empty WC unwind stack"
-msgstr "尝试弹出空的工作拷贝(WC)展开堆栈"
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
+#, fuzzy, c-format
+msgid "No such representation '%s'"
+msgstr "没有这样的请求 “%s”"
 
-# as-is
-#: include/svn_error_codes.h:298
-msgid "Attempt to unlock with non-empty unwind stack"
-msgstr "尝试解锁非空展开堆栈"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:96
+#, fuzzy
+msgid "reading representation"
+msgstr "正在读取请求"
 
-#: include/svn_error_codes.h:302
-msgid "Attempted to lock an already-locked dir"
-msgstr "尝试要锁定一个已锁定的目录"
+#: libsvn_fs_base/bdb/reps-table.c:124
+#, fuzzy
+msgid "storing representation"
+msgstr "正在存储请求"
 
-#: include/svn_error_codes.h:306
-msgid "Working copy not locked; this is probably a bug, please report"
-msgstr "工作目录没有被锁定;这可能是一个漏洞,请报告开发者"
+#: libsvn_fs_base/bdb/reps-table.c:154
+msgid "allocating new representation (getting next-key)"
+msgstr "正在分配新请求 (正在获取 next-key)"
 
-#: include/svn_error_codes.h:311
-msgid "Invalid lock"
-msgstr "无效的锁定"
+#: libsvn_fs_base/bdb/reps-table.c:175
+#, fuzzy
+msgid "bumping next representation key"
+msgstr "正在提取下一个请求关键字"
 
-#: include/svn_error_codes.h:315
-msgid "Path is not a working copy directory"
-msgstr "路径不是工作拷贝目录"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:203
+#, fuzzy
+msgid "deleting representation"
+msgstr "正在删除请求"
 
-#: include/svn_error_codes.h:319
-msgid "Path is not a working copy file"
-msgstr "路径不是工作拷贝文件"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/rev-table.c:87
+#, fuzzy
+msgid "reading filesystem revision"
+msgstr "正在读取文件系统修订版号"
 
-#: include/svn_error_codes.h:323
-msgid "Problem running log"
-msgstr "无法执行日志"
+#: libsvn_fs_base/bdb/strings-table.c:89
+msgid "creating cursor for reading a string"
+msgstr "正在为读取一个字符串创建指针"
 
-#: include/svn_error_codes.h:327
-msgid "Can't find a working copy path"
-msgstr "找不到工作拷贝路径"
+#: libsvn_fs_base/bdb/txn-table.c:92
+#, fuzzy
+msgid "storing transaction record"
+msgstr "正在存储事务记录"
 
-#: include/svn_error_codes.h:331
-msgid "Working copy is not up-to-date"
-msgstr "工作拷贝未更新至最新版"
+#: libsvn_fs_base/bdb/uuids-table.c:114
+#, fuzzy
+msgid "get repository uuid"
+msgstr "获取档案库唯一标记(uuid)"
 
-#: include/svn_error_codes.h:335
-msgid "Left locally modified or unversioned files"
-msgstr "保留本地修改或未纳入版本管理的文件"
+#: libsvn_fs_base/bdb/uuids-table.c:142
+#, fuzzy
+msgid "set repository uuid"
+msgstr "设置档案库唯一标记(uuid)"
 
-#: include/svn_error_codes.h:339
-msgid "Unmergeable scheduling requested on an entry"
-msgstr "该项目有一个无法合并的调度请求"
+#: libsvn_fs_base/dag.c:239
+#, fuzzy, c-format
+msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
 
-#: include/svn_error_codes.h:343
-msgid "Found a working copy path"
-msgstr "找到一个工作拷贝路径"
+#: libsvn_fs_base/dag.c:247
+#, fuzzy, c-format
+msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
 
-#: include/svn_error_codes.h:347
-msgid "A conflict in the working copy obstructs the current operation"
-msgstr "工作拷贝中的冲突阻碍了目前的操作"
+#: libsvn_fs_base/dag.c:256
+#, fuzzy, c-format
+msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
+msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
 
-#: include/svn_error_codes.h:351
-msgid "Working copy is corrupt"
-msgstr "工作拷贝已损坏"
+#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:317
+#, fuzzy
+msgid "Attempted to create entry in non-directory parent"
+msgstr "企图在非目录的父节点创建条目"
 
-#: include/svn_error_codes.h:355
-msgid "Working copy text base is corrupt"
-msgstr "工作拷贝的文件参考基础已损坏"
+#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:311
+#, c-format
+msgid "Attempted to create a node with an illegal name '%s'"
+msgstr "企图用一个非法的名字“%s”创建节点"
 
-#: include/svn_error_codes.h:359
-msgid "Cannot change node kind"
-msgstr "无法更改节点种类"
+#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:323
+#, fuzzy, c-format
+msgid "Attempted to clone child of non-mutable node"
+msgstr "企图克隆非可变节点的子节点"
 
-#: include/svn_error_codes.h:363
-msgid "Invalid operation on the current working directory"
-msgstr "这个操作对目前的工作拷贝目录无效"
+#: libsvn_fs_base/dag.c:494
+#, fuzzy, c-format
+msgid "Attempted to create entry that already exists"
+msgstr "企图创建已经存在的子条目"
 
-#: include/svn_error_codes.h:367
-msgid "Problem on first log entry in a working copy"
-msgstr "操作于工作拷贝的第一个日志项目时发生问题"
+#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:385
+#, fuzzy
+msgid "Attempted to set entry in non-directory node"
+msgstr "企图在非目录节点中设置条目"
 
-#: include/svn_error_codes.h:371
-msgid "Unsupported working copy format"
-msgstr "不支持的工作拷贝格式"
+#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:391
+#, fuzzy
+msgid "Attempted to set entry in immutable node"
+msgstr "企图在不可改变的节点设置条目"
 
-#: include/svn_error_codes.h:375
-msgid "Path syntax not supported in this context"
-msgstr "路径语法在此上下文中并不支持"
+#: libsvn_fs_base/dag.c:615
+#, c-format
+msgid "Can't set proplist on *immutable* node-revision %s"
+msgstr "不能在不可更改节点修订版 %s 设置属性列表"
 
-#: include/svn_error_codes.h:380
-msgid "Invalid schedule"
-msgstr "无效的计划任务"
+#: libsvn_fs_base/dag.c:727
+#, c-format
+msgid "Attempted to make a child clone with an illegal name '%s'"
+msgstr "企图以非法名字“%s”建立子克隆"
 
-#: include/svn_error_codes.h:386
-msgid "General filesystem error"
-msgstr "一般性文件系统错误"
+#: libsvn_fs_base/dag.c:852
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from *non*-directory node"
+msgstr "企图从非目录节点删除条目“%s”"
 
-#: include/svn_error_codes.h:390
-msgid "Error closing filesystem"
-msgstr "关闭文件系统发生错误"
+#: libsvn_fs_base/dag.c:858
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from immutable directory node"
+msgstr "企图从不可更改目录节点删除条目“%s”"
 
-#: include/svn_error_codes.h:394
-msgid "Filesystem is already open"
-msgstr "文件系统已打开"
+#: libsvn_fs_base/dag.c:865
+#, c-format
+msgid "Attempted to delete a node with an illegal name '%s'"
+msgstr "企图删除一个非法名字“%s”的节点"
 
-#: include/svn_error_codes.h:398
-msgid "Filesystem is not open"
-msgstr "文件系档未打开"
+#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
+#, fuzzy, c-format
+msgid "Delete failed: directory has no entry '%s'"
+msgstr "删除失败:目录没有项目“%s”"
 
-#: include/svn_error_codes.h:402
-msgid "Filesystem is corrupt"
-msgstr "文件系统损坏"
+#: libsvn_fs_base/dag.c:962
+#, fuzzy, c-format
+msgid "Attempted removal of immutable node"
+msgstr "企图删除不可改变的节点"
 
-#: include/svn_error_codes.h:406
-msgid "Invalid filesystem path syntax"
-msgstr "无效的文件系统路径语法"
+#: libsvn_fs_base/dag.c:1082
+#, c-format
+msgid "Attempted to get textual contents of a *non*-file node"
+msgstr "企图获取非文件节点的文本内容"
 
-#: include/svn_error_codes.h:410
-msgid "Invalid filesystem revision number"
-msgstr "无效的文件系统修订版号"
+#: libsvn_fs_base/dag.c:1117
+#, c-format
+msgid "Attempted to get length of a *non*-file node"
+msgstr "企图获取非文件节点的长度"
 
-#: include/svn_error_codes.h:414
-msgid "Invalid filesystem transaction name"
-msgstr "无效的文件系统事务名称"
+#: libsvn_fs_base/dag.c:1143
+#, c-format
+msgid "Attempted to get checksum of a *non*-file node"
+msgstr "企图获取非文件节点的校验和"
 
-#: include/svn_error_codes.h:418
-msgid "Filesystem directory has no such entry"
-msgstr "文件系统目录没有这样的项目"
+#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of a *non*-file node"
+msgstr "企图设置非文件节点文本内容"
 
-#: include/svn_error_codes.h:422
-msgid "Filesystem has no such representation"
-msgstr "文件系统没有这样的表现 (representation)"
+#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of an immutable node"
+msgstr "企图设置不可改变节点文本内容"
 
-#: include/svn_error_codes.h:426
-msgid "Filesystem has no such string"
-msgstr "文件系统没有这样的字串"
+#: libsvn_fs_base/dag.c:1257
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"校验和不匹配,报告“%s”:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:430
-msgid "Filesystem has no such copy"
-msgstr "文件系统没有这样的拷贝"
+#: libsvn_fs_base/dag.c:1312
+#, c-format
+msgid "Attempted to open non-existent child node '%s'"
+msgstr "企图打开不存在的子节点“%s”"
 
-#: include/svn_error_codes.h:434
-msgid "The specified transaction is not mutable"
-msgstr "指定的事务不可改变"
+#: libsvn_fs_base/dag.c:1318
+#, c-format
+msgid "Attempted to open node with an illegal name '%s'"
+msgstr "企图以不合法的名字“%s”打开节点"
 
-#: include/svn_error_codes.h:438
-msgid "Filesystem has no item"
-msgstr "文件系统没有项目"
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
+msgid "Filesystem object has not been opened yet"
+msgstr "文件系统对象尚未打开"
 
-#: include/svn_error_codes.h:442
-msgid "Filesystem has no such node-rev-id"
-msgstr "文件系统没有这样的 node-rev-id"
+#: libsvn_fs_base/err.c:51
+#, c-format
+msgid "Corrupt filesystem revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$s”中的文件系统修订版 %1$ld 损坏"
 
-#: include/svn_error_codes.h:446
-msgid "String does not represent a node or node-rev-id"
-msgstr "字串并未表示一个节点或 node-rev-id"
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
+#, c-format
+msgid "Reference to non-existent node '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”中引用不存在的节点“%1$s”"
 
-#: include/svn_error_codes.h:450
-msgid "Name does not refer to a filesystem directory"
-msgstr "名称没有指向文件系统目录"
+#: libsvn_fs_base/err.c:72
+#, c-format
+msgid "Reference to non-existent revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$s”中引用不存在的修订版“%1$ld”"
 
-#: include/svn_error_codes.h:454
-msgid "Name does not refer to a filesystem file"
-msgstr "名称没有指向文件系统文件"
+#: libsvn_fs_base/err.c:84
+#, c-format
+msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%1$s”的 'transactions' 表格有无效的项目"
 
-#: include/svn_error_codes.h:458
-msgid "Name is not a single path component"
-msgstr "名称不是一个单一路径"
+#: libsvn_fs_base/err.c:95
+#, c-format
+msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%1$s”的 'copies' 表格有无效的项目"
 
-#: include/svn_error_codes.h:462
-msgid "Attempt to change immutable filesystem node"
-msgstr "尝试要修改不可改变的文件系统节点"
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件无法变更:文件系统“%s”,修订版 %ld,路径“%s”"
 
-#: include/svn_error_codes.h:466
-msgid "Item already exists in filesystem"
-msgstr "该项目已存在于文件系统中"
+#: libsvn_fs_base/err.c:117
+#, c-format
+msgid "No transaction named '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”中不存在名为“%1$s”的事务"
 
-#: include/svn_error_codes.h:470
-msgid "Attempt to remove or recreate fs root dir"
-msgstr "尝试要移除或再次建立文件系统的根目录"
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
+#, c-format
+msgid "Cannot modify transaction named '%s' in filesystem '%s'"
+msgstr "无法在文件系统“%2$s”中修改名为“%1$s”的事务"
 
-#: include/svn_error_codes.h:474
-msgid "Object is not a transaction root"
-msgstr "物件不是一个事务的根物件"
+#: libsvn_fs_base/err.c:139
+#, c-format
+msgid "No copy with id '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中没有编号“%1$s”的拷贝"
 
-#: include/svn_error_codes.h:478
-msgid "Object is not a revision root"
-msgstr "物件不是一个修订版的根物件"
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-#: include/svn_error_codes.h:482
-msgid "Merge conflict during commit"
-msgstr "提交时发生合并冲突"
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
+#, fuzzy, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-# as-is
-#: include/svn_error_codes.h:486
-msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改变"
+#: libsvn_fs_base/err.c:171
+#, fuzzy, c-format
+msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
+msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
 
-#: include/svn_error_codes.h:490
-msgid "Tried to change an immutable representation"
-msgstr "尝试变更一个不可改变的表现 (representation)"
+#: libsvn_fs_base/err.c:181
+#, fuzzy, c-format
+msgid "No token given for path '%s' in filesystem '%s'"
+msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
 
-#: include/svn_error_codes.h:494
-msgid "Malformed skeleton data"
-msgstr "畸形的框架数据"
+#: libsvn_fs_base/err.c:190
+#, fuzzy, c-format
+msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
 
-#: include/svn_error_codes.h:498
-msgid "Transaction is out of date"
-msgstr "事务已过时"
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
+#, fuzzy, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
 
-#: include/svn_error_codes.h:502
-msgid "Berkeley DB error"
-msgstr "Berkeley DB 错误"
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
 
-#: include/svn_error_codes.h:506
-msgid "Berkeley DB deadlock error"
-msgstr "Berkeley DB 发生死锁错误"
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "文件系统“%s”当前没有用户名关联"
 
-#: include/svn_error_codes.h:510
-msgid "Transaction is dead"
-msgstr "事务已结束"
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
+#, fuzzy, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
 
-#: include/svn_error_codes.h:514
-msgid "Transaction is not dead"
-msgstr "事务未结束"
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
+#, fuzzy, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
 
-#: include/svn_error_codes.h:519
-msgid "Unknown FS type"
-msgstr "未知的 FS 类别"
+#: libsvn_fs_base/fs.c:79
+#, c-format
+msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
+msgstr "不正确的数据库版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
 
-#: include/svn_error_codes.h:524
-#, fuzzy
-msgid "No user associated with filesystem"
-msgstr "没有用户与文件系统关联"
+#: libsvn_fs_base/fs.c:90
+#, c-format
+msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
+msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
 
-#: include/svn_error_codes.h:529
+#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
 #, fuzzy
-msgid "Path is already locked"
-msgstr "路径“%s”已经被锁定"
+msgid "Filesystem object already open"
+msgstr "文件系统对象已经打开"
 
-#: include/svn_error_codes.h:534 include/svn_error_codes.h:661
-#, fuzzy
-msgid "Path is not locked"
-msgstr "路径没有被锁定"
+#: libsvn_fs_base/fs.c:189
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: include/svn_error_codes.h:539
-msgid "Lock token is incorrect"
-msgstr "锁定标记是不正确的"
+#: libsvn_fs_base/fs.c:539
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: include/svn_error_codes.h:544
-#, fuzzy
-msgid "No lock token provided"
-msgstr "没有提供锁定标记"
+#: libsvn_fs_base/fs.c:545
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
 
-#: include/svn_error_codes.h:549
-msgid "Username does not match lock owner"
-msgstr "用户名和锁定所有者不匹配"
+#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:277
+#, c-format
+msgid "Expected FS format '%d'; found format '%d'"
+msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
 
-#: include/svn_error_codes.h:554
+#: libsvn_fs_base/fs.c:1094
 #, fuzzy
-msgid "Filesystem has no such lock"
-msgstr "文件系统没有这样的锁"
-
-#: include/svn_error_codes.h:559
-msgid "Lock has expired"
-msgstr "锁过期"
+msgid ""
+"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
+"may be interfering with the hotcopy algorithm. If \n"
+"the problem persists, try deactivating this feature \n"
+"in DB_CONFIG"
+msgstr ""
+"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
+"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
+"在 DB_CONFIG 中取消这个功能。"
 
-#: include/svn_error_codes.h:564
+#: libsvn_fs_base/fs.c:1113
 #, fuzzy
-msgid "Item is out of date"
-msgstr "条目已过时"
+msgid ""
+"Error running catastrophic recovery on hotcopy; the \n"
+"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
+"hotcopy algorithm. If the problem persists, try deactivating \n"
+"this feature in DB_CONFIG"
+msgstr ""
+"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
+"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
+"尝试在 DB_CONFIG 中取消这个功能。"
 
-#: include/svn_error_codes.h:576
-#, fuzzy
-msgid "Unsupported FS format"
-msgstr "不支持的 FS 格式"
+#: libsvn_fs_base/fs.c:1222
+msgid "Module for working with a Berkeley DB repository."
+msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
 
-#: include/svn_error_codes.h:582
-msgid "The repository is locked, perhaps for db recovery"
-msgstr "档案库被锁定,也许正在作数据库修复"
+#: libsvn_fs_base/fs.c:1255
+#, c-format
+msgid "Unsupported FS loader version (%d) for bdb"
+msgstr "不支持的 bdb 的 FS 载入器版本 (%d)"
 
-#: include/svn_error_codes.h:586
-msgid "A repository hook failed"
-msgstr "档案库外挂错误"
+#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#, c-format
+msgid "Cannot verify lock on path '%s'; no username available"
+msgstr "不能在路径“%s”校验锁;没有有效的用户名"
 
-#: include/svn_error_codes.h:590
-msgid "Incorrect arguments supplied"
-msgstr "使用不正确的参数"
+#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#, c-format
+msgid "User %s does not own lock on path '%s' (currently locked by %s)"
+msgstr "用户 %s 不是路径“%s”锁的所有者(当前由用户 %s 锁定)"
 
-#: include/svn_error_codes.h:594
-msgid "A report cannot be generated because no data was supplied"
-msgstr "无法产生报告,因为没有提供任何数据"
+#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#, c-format
+msgid "Cannot verify lock on path '%s'; no matching lock-token available"
+msgstr "不能校验路径“%s”上的锁;没有匹配的可用锁标识"
 
-#: include/svn_error_codes.h:598
-msgid "Bogus revision report"
-msgstr "有问题的修订版报告"
+#. Helper macro that evaluates to an error message indicating that
+#. the representation referred to by X has an unknown node kind.
+#: libsvn_fs_base/reps-strings.c:57
+#, fuzzy, c-format
+msgid "Unknown node kind for representation '%s'"
+msgstr "“%s”为未知的节点类型"
 
-#: include/svn_error_codes.h:607
-msgid "Unsupported repository version"
-msgstr "不支持的档案库版本"
+#: libsvn_fs_base/reps-strings.c:108
+#, fuzzy
+msgid "Representation is not of type 'delta'"
+msgstr "请求不是 “delta” 类型"
 
-#: include/svn_error_codes.h:611
-msgid "Disabled repository feature"
-msgstr "关闭了的档案库功能"
+#: libsvn_fs_base/reps-strings.c:379
+msgid "Svndiff source length inconsistency"
+msgstr ""
 
-#: include/svn_error_codes.h:615
-msgid "Error running post-commit hook"
-msgstr "执行 post-commit 外挂时发生错误"
+#: libsvn_fs_base/reps-strings.c:506
+#, c-format
+msgid "Diff version inconsistencies in representation '%s'"
+msgstr "在“%s”请求Diff 的版本冲突"
 
-#: include/svn_error_codes.h:620
-#, fuzzy
-msgid "Error running post-lock hook"
-msgstr "执行 post-lock 外挂时发生错误"
+#: libsvn_fs_base/reps-strings.c:532
+#, c-format
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to '%"
+"s'"
+msgstr ""
 
-#: include/svn_error_codes.h:625
-#, fuzzy
-msgid "Error running post-unlock hook"
-msgstr "执行 post-unlock 外挂时发生错误"
+#: libsvn_fs_base/reps-strings.c:780
+#, c-format
+msgid "Rep contents are too large: got %s, limit is %s"
+msgstr "报告内容太大:得到 %s,限制是 %s"
 
-#: include/svn_error_codes.h:632
-msgid "Bad URL passed to RA layer"
-msgstr "传递至 RA 层的地址(URL)有问题"
+#: libsvn_fs_base/reps-strings.c:796
+#, fuzzy, c-format
+msgid "Failure reading rep '%s'"
+msgstr "读取报告“%s”失败"
 
-#: include/svn_error_codes.h:636
-msgid "Authorization failed"
-msgstr "授权失败"
+#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch on rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"报告“%s”的校验和不匹配:\n"
+" 预期: %s\n"
+" 实际: %s\n"
 
-#: include/svn_error_codes.h:640
-msgid "Unknown authorization method"
-msgstr "未知的授权方法"
+#: libsvn_fs_base/reps-strings.c:912
+msgid "Null rep, but offset past zero already"
+msgstr "空的报告,偏移已经超过零值"
 
-#: include/svn_error_codes.h:644
-msgid "Repository access method not implemented"
-msgstr "该档案库存取方法未实作"
+#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
+#, fuzzy, c-format
+msgid "Rep '%s' is not mutable"
+msgstr "报告“%s”是不可变的"
 
-#: include/svn_error_codes.h:648
-msgid "Item is out-of-date"
-msgstr "项目已过时"
+#: libsvn_fs_base/reps-strings.c:1040
+#, c-format
+msgid "Rep '%s' both mutable and non-fulltext"
+msgstr "报告 “%s” 可变并且非全文本"
 
-#: include/svn_error_codes.h:652
-msgid "Repository has no UUID"
-msgstr "档案库没有 UUID"
+#: libsvn_fs_base/reps-strings.c:1340
+msgid "Failed to get new string key"
+msgstr "取新的字符串关键字失败"
 
-#: include/svn_error_codes.h:656
-msgid "Unsupported RA plugin ABI version"
-msgstr "不支持的 RA 外挂 ABI 版本"
+#: libsvn_fs_base/reps-strings.c:1416
+#, c-format
+msgid "Attempt to deltify '%s' against itself"
+msgstr "企图 deltify “%s” 自身"
 
-#: include/svn_error_codes.h:668
-msgid "RA layer failed to init socket layer"
-msgstr "RA 层无法起始 socket 层"
+#: libsvn_fs_base/reps-strings.c:1487
+#, fuzzy, c-format
+msgid "Failed to calculate MD5 digest for '%s'"
+msgstr "计算“%s”的MD5指纹失败"
 
-#: include/svn_error_codes.h:672
-msgid "RA layer failed to create HTTP request"
-msgstr "RA 层建立 HTTP 请求失败"
+#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
+#, fuzzy, c-format
+msgid "Transaction is not dead: '%s'"
+msgstr "事务未结束:“%s”"
 
-#: include/svn_error_codes.h:676
-msgid "RA layer request failed"
-msgstr "RA 层请求失败"
+#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
+#, fuzzy, c-format
+msgid "Transaction is dead: '%s'"
+msgstr "事务已结束:“%s”"
 
-#: include/svn_error_codes.h:680
-msgid "RA layer didn't receive requested OPTIONS info"
-msgstr "RA 层无法取得请求的 OPTIONS 信息"
+#: libsvn_fs_base/revs-txns.c:981
+#, fuzzy
+msgid "Transaction aborted, but cleanup failed"
+msgstr "事务中止,但清除失败"
 
-#: include/svn_error_codes.h:684
-msgid "RA layer failed to fetch properties"
-msgstr "RA 层无法取得属性"
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT.
+#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
+#, fuzzy, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "文件找不到:事务“%s” ,路径“%s”"
 
-#: include/svn_error_codes.h:688
-msgid "RA layer file already exists"
-msgstr "RA 层文件已存在"
+#: libsvn_fs_base/tree.c:393 libsvn_fs_fs/tree.c:317
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "文件找不到:修订版 %ld,路径“%s”"
 
-#: include/svn_error_codes.h:692
-msgid "Invalid configuration value"
-msgstr "无效的配置值"
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
+#, fuzzy, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
 
-#: include/svn_error_codes.h:696
-msgid "HTTP Path Not Found"
-msgstr "找不到 HTTP 路径"
+#: libsvn_fs_base/tree.c:408 libsvn_fs_fs/tree.c:338
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
 
-#: include/svn_error_codes.h:700
+#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
 #, fuzzy
-msgid "Failed to execute WebDAV PROPPATCH"
-msgstr "执行 WebDAV PROPPATCH 失败"
+msgid "Root object must be a transaction root"
+msgstr "根对象必须是一个事务的根对象"
 
-#: include/svn_error_codes.h:705 include/svn_error_codes.h:741
-#: libsvn_ra_svn/marshal.c:600 libsvn_ra_svn/marshal.c:708
-#: libsvn_ra_svn/marshal.c:735
-msgid "Malformed network data"
-msgstr "畸形的网络数据"
+#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
+#, fuzzy, c-format
+msgid "Failure opening '%s'"
+msgstr "打开“%s”失败"
 
-#: include/svn_error_codes.h:710
-msgid "Unable to extract data from response header"
-msgstr "不能从回应的头信息中获取数据"
+#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
+#, fuzzy
+msgid "Cannot compare property value between two different filesystems"
+msgstr "在两个不同的文件系统之间比较属性值"
 
-#: include/svn_error_codes.h:716 include/svn_error_codes.h:745
-msgid "Couldn't find a repository"
-msgstr "无法找到档案库"
+#: libsvn_fs_base/tree.c:1735
+msgid "Corrupt DB: faulty predecessor count"
+msgstr "无效的数据库:先前的数目不完整"
 
-#: include/svn_error_codes.h:720
-msgid "Couldn't open a repository"
-msgstr "无法打开档案库"
+#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
+#, fuzzy, c-format
+msgid "Unexpected immutable node at '%s'"
+msgstr "在“%s”有未知或意想不到的不可改变节点"
 
 # as-is
-#: include/svn_error_codes.h:725
-msgid "Special code for wrapping server errors to report to client"
-msgstr "指定的代码封装服务器错误以便报告客户端"
+#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
+#, fuzzy, c-format
+msgid "Conflict at '%s'"
+msgstr "在“%s”冲突"
 
-#: include/svn_error_codes.h:729
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 通讯协定命令"
+#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
+#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1751
+msgid "Bad merge; ancestor, source, and target not all in same fs"
+msgstr "错误的合并;最初的,原始,目标不是全部在同一个文件系统(fs)"
 
-#: include/svn_error_codes.h:733
-msgid "Network connection closed unexpectedly"
-msgstr "网络连线意想不到地关闭"
+#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1280
+#, c-format
+msgid "Bad merge; target '%s' has id '%s', same as ancestor"
+msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
 
-#: include/svn_error_codes.h:737
-msgid "Network read/write error"
-msgstr "网络读写错误"
+#: libsvn_fs_base/tree.c:2373
+#, fuzzy, c-format
+msgid "Transaction '%s' out of date with respect to revision '%s'"
+msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
 
-#: include/svn_error_codes.h:749
-msgid "Client/server version mismatch"
-msgstr "客户端/服务器版本不匹配"
+#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
+#, fuzzy
+msgid "The root directory cannot be deleted"
+msgstr "根目录不能删除"
 
-#: include/svn_error_codes.h:757
-msgid "Credential data unavailable"
-msgstr "无法取得凭证数据"
+#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
+#, fuzzy, c-format
+msgid "Cannot copy between two different filesystems ('%s' and '%s')"
+msgstr "在两个不同的文件系统之间比较属性值"
 
-#: include/svn_error_codes.h:761
-msgid "No authentication provider available"
-msgstr "无可用的认证提供者"
+#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
+msgid "Copy from mutable tree not currently supported"
+msgstr "当前不支持从可变的树复制"
 
-#: include/svn_error_codes.h:765 include/svn_error_codes.h:769
-msgid "All authentication providers exhausted"
-msgstr "所有的认证提供者已耗尽"
+#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
+#, fuzzy, c-format
+msgid ""
+"Base checksum mismatch on '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"基本校验和在“%s”不匹配:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:775
-msgid "Read access denied for root of edit"
-msgstr "编辑的根目录读取拒绝"
+#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
+#, fuzzy
+msgid "Cannot compare file contents between two different filesystems"
+msgstr "在两个不同的文件系统询问内容的更改"
+
+#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
+#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
+#: libsvn_repos/rev_hunt.c:605
+#, fuzzy, c-format
+msgid "'%s' is not a file"
+msgstr "“%s”不是一个文件"
+
+#: libsvn_fs_fs/dag.c:367
+#, fuzzy
+msgid "Can't get entries of non-directory"
+msgstr "不能获取非目录的条目"
+
+#: libsvn_fs_fs/dag.c:914
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, file '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"校验和不匹配,文件“%s”:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: include/svn_error_codes.h:780
-#, fuzzy
-msgid "Item is not readable"
-msgstr "项目不能读。"
+#: libsvn_fs_fs/err.c:107
+#, fuzzy, c-format
+msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
 
-#: include/svn_error_codes.h:785
-#, fuzzy
-msgid "Item is partially readable"
-msgstr "项目部分可读。"
+#: libsvn_fs_fs/fs.c:97
+#, c-format
+msgid "Can't fetch FSFS mutex"
+msgstr "不能获取文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:789
-#, fuzzy
-msgid "Invalid authz configuration"
-msgstr "无效的配置值"
+#: libsvn_fs_fs/fs.c:104
+#, fuzzy, c-format
+msgid "Can't create FSFS mutex"
+msgstr "无法创建文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:794
-#, fuzzy
-msgid "Item is not writable"
-msgstr "项目不能写。"
+#: libsvn_fs_fs/fs.c:108
+#, c-format
+msgid "Can't store FSFS mutex"
+msgstr "不能存储文件系统(FSFS)互斥体"
 
-#: include/svn_error_codes.h:800
-msgid "Svndiff data has invalid header"
-msgstr "svndiff 数据包含了无效的档头"
+#: libsvn_fs_fs/fs.c:334
+msgid "Module for working with a plain file (FSFS) repository."
+msgstr "模块与纯文本文件(FSFS)档案库一起工作。"
 
-# as-is
-#: include/svn_error_codes.h:804
-msgid "Svndiff data contains corrupt window"
-msgstr "Svndiff 数据包含无效窗口"
+#: libsvn_fs_fs/fs.c:367
+#, c-format
+msgid "Unsupported FS loader version (%d) for fsfs"
+msgstr "不支持的 fsfs 的 FS 载入器版本 (%d)"
 
-# as-is
-#: include/svn_error_codes.h:808
-msgid "Svndiff data contains backward-sliding source view"
-msgstr "Svndiff 数据包含向后变化的资源视图"
+#: libsvn_fs_fs/fs_fs.c:467 libsvn_fs_fs/fs_fs.c:481
+msgid "Found malformed header in revision file"
+msgstr "在修订版文件中找到畸形的文件头"
 
-#: include/svn_error_codes.h:812
-msgid "Svndiff data contains invalid instruction"
-msgstr "svndiff 数据包含了无效的指令"
+#: libsvn_fs_fs/fs_fs.c:583 libsvn_fs_fs/fs_fs.c:597 libsvn_fs_fs/fs_fs.c:604
+#: libsvn_fs_fs/fs_fs.c:611 libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627
+msgid "Malformed text rep offset line in node-rev"
+msgstr "node-rev 中没有 text rep offset 列"
 
-#: include/svn_error_codes.h:816
-msgid "Svndiff data ends unexpectedly"
-msgstr "svndiff 数据意想不到地结束"
+#: libsvn_fs_fs/fs_fs.c:696
+msgid "Missing kind field in node-rev"
+msgstr "node-rev 中没有 kind 栏位"
 
-#: include/svn_error_codes.h:822
-msgid "Apache has no path to an SVN filesystem"
-msgstr "Apache 没有指向 SVN 文件系统的路径"
+#: libsvn_fs_fs/fs_fs.c:727
+msgid "Missing cpath in node-rev"
+msgstr "node-rev 中没有 cpath"
 
-#: include/svn_error_codes.h:826
-msgid "Apache got a malformed URI"
-msgstr "Apache 得到一个畸形的 URI"
+#: libsvn_fs_fs/fs_fs.c:754 libsvn_fs_fs/fs_fs.c:760
+msgid "Malformed copyroot line in node-rev"
+msgstr "node-rev 中的 copyroot 行畸形"
 
-# as-is
-#: include/svn_error_codes.h:830
-msgid "Activity not found"
-msgstr "没有找到活动项"
+#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:784
+msgid "Malformed copyfrom line in node-rev"
+msgstr "node-rev 中的 copyfrom 行畸形"
 
-#: include/svn_error_codes.h:834
-msgid "Baseline incorrect"
-msgstr "基线不正确"
+#: libsvn_fs_fs/fs_fs.c:883 libsvn_fs_fs/fs_fs.c:3243
+msgid "Attempted to write to non-transaction"
+msgstr "企图写至非事务"
 
-#: include/svn_error_codes.h:838
-msgid "Input/output error"
-msgstr "输出入错误"
+#: libsvn_fs_fs/fs_fs.c:967
+msgid "Malformed representation header"
+msgstr "畸形的描述文件头"
 
-#: include/svn_error_codes.h:844
-msgid "A path under version control is needed for this operation"
-msgstr "本操作仅能作用于纳入版本控制的路径"
+#: libsvn_fs_fs/fs_fs.c:991
+msgid "Missing node-id in node-rev"
+msgstr "node-rev 中没有 node-id"
 
-#: include/svn_error_codes.h:848
-msgid "Repository access is needed for this operation"
-msgstr "本操作需要对档案库进行存取"
+#: libsvn_fs_fs/fs_fs.c:997
+msgid "Corrupt node-id in node-rev"
+msgstr "node-rev 中的 node-id 损坏"
 
-#: include/svn_error_codes.h:852
-msgid "Bogus revision information given"
-msgstr "使用了有问题的修订版信息"
+#: libsvn_fs_fs/fs_fs.c:1042
+#, c-format
+msgid "Revision file lacks trailing newline"
+msgstr "修订版文件缺少结尾换行符"
 
-#: include/svn_error_codes.h:856
-msgid "Attempting to commit to a URL more than once"
-msgstr "尝试对地址(URL)进行一次以上的提交"
+#: libsvn_fs_fs/fs_fs.c:1054
+#, c-format
+msgid "Final line in revision file longer than 64 characters"
+msgstr "修订版文件的最后一列大于 64 个字符长"
 
-#: include/svn_error_codes.h:860
-msgid "Operation does not apply to binary file"
-msgstr "本操作不适用于二进制文件"
+#: libsvn_fs_fs/fs_fs.c:1069
+msgid "Final line in revision file missing space"
+msgstr "修订版文件的最后一列少掉空白字符"
 
-#: include/svn_error_codes.h:866
-msgid "Format of an svn:externals property was invalid"
-msgstr "svn:externals 属性的格式是无效的"
+#: libsvn_fs_fs/fs_fs.c:1098 libsvn_fs_fs/fs_fs.c:1156 libsvn_repos/log.c:514
+#: libsvn_repos/log.c:518
+#, c-format
+msgid "No such revision %ld"
+msgstr "没有这个修订版 %ld"
 
-#: include/svn_error_codes.h:870
-msgid "Attempting restricted operation for modified resource"
-msgstr "尝试对已修改的资源进行受限的操作"
+#: libsvn_fs_fs/fs_fs.c:1216
+msgid "Malformed svndiff data in representation"
+msgstr "请求的svndiff 数据畸形"
 
-#: include/svn_error_codes.h:874
-msgid "Operation does not apply to directory"
-msgstr "本操作不适用于目录"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:1359 libsvn_fs_fs/fs_fs.c:1372
+msgid "Reading one svndiff window read beyond the end of the representation"
+msgstr "正在读取请求的一个 svndiff 窗口最末端"
 
-#: include/svn_error_codes.h:878
-msgid "Revision range is not allowed"
-msgstr "不允许的修订版范围"
+#: libsvn_fs_fs/fs_fs.c:1508
+msgid "svndiff data requested non-existent source"
+msgstr "svndiff 数据请求不存在的来源"
 
-#: include/svn_error_codes.h:882
-msgid "Inter-repository relocation not allowed"
-msgstr "不支持不同档案库之间的重新安置 (relocation)"
+#: libsvn_fs_fs/fs_fs.c:1514
+msgid "svndiff requested position beyond end of stream"
+msgstr "svndiff 请求的位置超出了流的结尾"
 
-#: include/svn_error_codes.h:886
-msgid "Author name cannot contain a newline"
-msgstr "作者名称不可包含换行符"
+#: libsvn_fs_fs/fs_fs.c:1537 libsvn_fs_fs/fs_fs.c:1554
+msgid "svndiff window length is corrupt"
+msgstr "svndiff 的窗格长度已毁损"
 
-#: include/svn_error_codes.h:890
-msgid "Bad property name"
-msgstr "有问题的属性名称"
+#: libsvn_fs_fs/fs_fs.c:1602
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch while reading representation:\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"当读取请求时校验和不匹配:\n"
+" 预期: %s\n"
+" 实际: %s\n"
 
-#: include/svn_error_codes.h:895
-msgid "Two versioned resources are unrelated"
-msgstr "两个纳入版本控制的资源没有相关性"
+#: libsvn_fs_fs/fs_fs.c:1825 libsvn_fs_fs/fs_fs.c:1838
+#: libsvn_fs_fs/fs_fs.c:1844
+msgid "Directory entry corrupt"
+msgstr "目录条目损坏"
 
-#: include/svn_error_codes.h:900
-msgid "Path has no lock token"
-msgstr "路径没有锁定标记"
+#: libsvn_fs_fs/fs_fs.c:2180 libsvn_fs_fs/fs_fs.c:2188
+#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:2240
+#: libsvn_fs_fs/fs_fs.c:2274 libsvn_fs_fs/fs_fs.c:2279
+msgid "Invalid changes line in rev-file"
+msgstr "rev-file 中有无效的变更行"
 
-#: include/svn_error_codes.h:906
-msgid "A problem occurred; see later errors for details"
-msgstr "有问题发生;请参阅随附的细节"
+#: libsvn_fs_fs/fs_fs.c:2213
+msgid "Invalid change kind in rev file"
+msgstr "rev 文件中有无效的改变种类"
 
-#: include/svn_error_codes.h:910
-msgid "Failure loading plugin"
-msgstr "载入外挂失败"
+#: libsvn_fs_fs/fs_fs.c:2233
+msgid "Invalid text-mod flag in rev-file"
+msgstr "rev-file 中有无效的 text-mod 标志"
 
-#: include/svn_error_codes.h:914
-msgid "Malformed file"
-msgstr "畸形的文件"
+#: libsvn_fs_fs/fs_fs.c:2253
+msgid "Invalid prop-mod flag in rev-file"
+msgstr "rev-file 中有无效的 prop-mod 标志"
 
-#: include/svn_error_codes.h:918
-msgid "Incomplete data"
-msgstr "不完全的数据"
+#: libsvn_fs_fs/fs_fs.c:2436
+msgid "Copying from transactions not allowed"
+msgstr "自事务进行复制是不被允许的"
 
-#: include/svn_error_codes.h:922
-msgid "Incorrect parameters given"
-msgstr "使用不正确的参数"
+#: libsvn_fs_fs/fs_fs.c:2492
+#, fuzzy, c-format
+msgid "Unable to create transaction directory in '%s' for revision %ld"
+msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
 
-#: include/svn_error_codes.h:926
-msgid "Tried a versioning operation on an unversioned resource"
-msgstr "尝试对未纳入版本控制的资源进行版本控制操作"
+#: libsvn_fs_fs/fs_fs.c:2671 libsvn_fs_fs/fs_fs.c:2678
+msgid "next-id file corrupt"
+msgstr "next-id 文件损坏"
 
-#: include/svn_error_codes.h:930
-msgid "Test failed"
-msgstr "测试失败"
+#: libsvn_fs_fs/fs_fs.c:2763
+#, fuzzy
+msgid "Transaction cleanup failed"
+msgstr "事务清除失败"
 
-#: include/svn_error_codes.h:934
-msgid "Trying to use an unsupported feature"
-msgstr "尝试要使用不支持的功能"
+#: libsvn_fs_fs/fs_fs.c:2931
+msgid "Invalid change type"
+msgstr "无效的变更类型"
 
-#: include/svn_error_codes.h:938
-msgid "Unexpected or unknown property kind"
-msgstr "意想不到或未知的属性种类"
+#: libsvn_fs_fs/fs_fs.c:3262
+msgid "Can't set text contents of a directory"
+msgstr "无法设定目录的文字内容"
 
-#: include/svn_error_codes.h:942
-msgid "Illegal target for the requested operation"
-msgstr "对请求的操作来说是不合法的目标"
+#: libsvn_fs_fs/fs_fs.c:3352 libsvn_fs_fs/fs_fs.c:3357
+#: libsvn_fs_fs/fs_fs.c:3364
+msgid "Corrupt current file"
+msgstr "当前文件损坏"
 
-#: include/svn_error_codes.h:946
-msgid "MD5 checksum is missing"
-msgstr "没有 MD5 指纹检查值"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:3654 libsvn_subr/io.c:2658 svn/util.c:236
+#: svn/util.c:260
+#, c-format
+msgid "Can't stat '%s'"
+msgstr "不能取得“%s”状态"
 
-#: include/svn_error_codes.h:950
-msgid "Directory needs to be empty but is not"
-msgstr "目录必须为空的,但是结果并非如此"
+#: libsvn_fs_fs/fs_fs.c:3658
+#, c-format
+msgid "Can't chmod '%s'"
+msgstr "无法 chmod“%s”"
 
-#: include/svn_error_codes.h:954
-msgid "Error calling external program"
-msgstr "呼叫外部程序时发生错误"
+#: libsvn_fs_fs/fs_fs.c:3797
+#, c-format
+msgid "Can't grab FSFS repository mutex"
+msgstr "不能获取文件(FSFS)档案库互斥体"
 
-#: include/svn_error_codes.h:958
-msgid "Python exception has been set with the error"
-msgstr "Python 异常已被设定为错误"
+#: libsvn_fs_fs/fs_fs.c:3811
+#, c-format
+msgid "Can't ungrab FSFS repository mutex"
+msgstr "不能是否文件(FSFS)档案库互斥体"
 
-#: include/svn_error_codes.h:962
-msgid "A checksum mismatch occurred"
-msgstr "总和检查值不符"
+#: libsvn_fs_fs/fs_fs.c:3928
+msgid "Transaction out of date"
+msgstr "事务过时"
 
-#: include/svn_error_codes.h:966
-msgid "The operation was interrupted"
-msgstr "操作被中断"
+#: libsvn_fs_fs/fs_fs.c:4225
+msgid "No such transaction"
+msgstr "无此事务"
 
-#: include/svn_error_codes.h:970
-msgid "The specified diff option is not supported"
-msgstr "指定的 diff 选项不支持"
+#: libsvn_fs_fs/lock.c:230
+#, fuzzy, c-format
+msgid "Cannot write lock/entries hashfile '%s'"
+msgstr "无法写入锁/条目的混杂文件“%s”"
 
-#: include/svn_error_codes.h:974
-msgid "Property not found"
-msgstr "找不到属性"
+#: libsvn_fs_fs/lock.c:286
+#, fuzzy, c-format
+msgid "Can't parse lock/entries hashfile '%s'"
+msgstr "不能分析锁/条目的混杂文件“%s“"
 
-#: include/svn_error_codes.h:978
-msgid "No auth file path available"
-msgstr "未提供 auth 文件路径"
+#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr "路径“%s”不存在于最新修订版中"
 
-#: include/svn_error_codes.h:983
-msgid "Incompatible library version"
-msgstr "不相容的程序库版本"
+#: libsvn_fs_fs/lock.c:741
+#, c-format
+msgid "Lock failed: newer version of '%s' exists"
+msgstr "锁失败:新的版本“%s”已经存在"
 
-#: include/svn_error_codes.h:989
-msgid "Client error in parsing arguments"
-msgstr "客户端于剖析参数时发生错误"
+#: libsvn_ra/ra_loader.c:213
+#, fuzzy, c-format
+msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: include/svn_error_codes.h:993
-msgid "Not enough args provided"
-msgstr "未提供足够的参数"
+#: libsvn_ra/ra_loader.c:285
+#, fuzzy, c-format
+msgid "Unrecognized URL scheme for '%s'"
+msgstr ""
+"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%s”"
 
-#: include/svn_error_codes.h:997
-msgid "Mutually exclusive arguments specified"
-msgstr "指定了互斥的参数"
+#: libsvn_ra/ra_loader.c:336
+#, fuzzy, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr ""
+"“%s”\n"
+"与\n"
+"“%s”\n"
+"并不在同一个档案库中"
 
-#: include/svn_error_codes.h:1001
-msgid "Attempted command in administrative dir"
-msgstr "尝试于管理目录中执行命令"
+# as-is
+#: libsvn_ra/ra_loader.c:707
+#, fuzzy, c-format
+msgid " - handles '%s' scheme\n"
+msgstr " - 处理“%s”规则\n"
 
-#: include/svn_error_codes.h:1005
-msgid "The log message file is under version control"
-msgstr "日志信息文件于版本控制之下"
+#: libsvn_ra/ra_loader.c:793
+#, c-format
+msgid "Unrecognized URL scheme '%s'"
+msgstr ""
+"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%s”"
 
-#: include/svn_error_codes.h:1009
-msgid "The log message is a pathname"
-msgstr "日志信息是路径名"
+#: libsvn_ra_dav/commit.c:199
+#, c-format
+msgid "Could not create a request (%s '%s')"
+msgstr "无法建立请求 (%s“%s”)"
 
-#: include/svn_error_codes.h:1013
-msgid "Committing in directory scheduled for addition"
-msgstr "于预计新增的目录中进行提交"
+#: libsvn_ra_dav/commit.c:298
+msgid ""
+"Could not fetch the Version Resource URL (needed during an import or when it "
+"is missing from the local, cached props)"
+msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
 
-#: include/svn_error_codes.h:1017
-msgid "No external editor available"
-msgstr "无法使用外部编辑器"
+#: libsvn_ra_dav/commit.c:487
+#, fuzzy, c-format
+msgid "Could not create a CHECKOUT request (%s)"
+msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
 
-#: include/svn_error_codes.h:1021
-msgid "Something is wrong with the log message's contents"
-msgstr "日志信息的内容有不妥的地方"
+#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
+#: libsvn_ra_serf/commit.c:436
+#, fuzzy, c-format
+msgid "Your file or directory '%s' is probably out-of-date"
+msgstr "您的文件或目录”%s“或许已经过时"
 
-#: include/svn_error_codes.h:1025
-msgid "A log message was given where none was necessary"
-msgstr "在没有需要的地方给出一个日志信息"
+#: libsvn_ra_dav/commit.c:582
+msgid "The CHECKOUT response did not contain a 'Location:' header"
+msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
 
-#: libsvn_client/add.c:371
-#, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "进行“%s”的递归新增时发生错误"
+#: libsvn_ra_dav/commit.c:881
+#, fuzzy, c-format
+msgid "Could not create a DELETE request (%s)"
+msgstr "无法产生一个删除(DELETE)请求 (%s)"
 
-#: libsvn_client/add.c:382
+#: libsvn_ra_dav/commit.c:1169 libsvn_ra_serf/commit.c:1395
 #, c-format
-msgid "Can't close directory '%s'"
-msgstr "无法关闭目录“%s”"
+msgid "File '%s' already exists"
+msgstr "文件“%s”已存在"
 
-#: libsvn_client/blame.c:382 libsvn_client/blame.c:774
+#: libsvn_ra_dav/commit.c:1307
 #, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "无法为二进制文件“%s”计算谴责信息"
-
-#: libsvn_client/blame.c:543
-msgid "Start revision must precede end revision"
-msgstr "起始修订版必须大于结束修订版"
+msgid "Could not write svndiff to temp file"
+msgstr "无法写 svndiff 至临时文件"
 
-#: libsvn_client/blame.c:659 libsvn_client/cat.c:205
+#: libsvn_ra_dav/commit.c:1397
 #, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "地址(URL)“%s”指向一个目录"
+msgid "Could not create a PUT request (%s)"
+msgstr "无法产生一个加入(PUT)请求 (%s)"
 
-#: libsvn_client/blame.c:732
+#: libsvn_ra_dav/commit.c:1559
 #, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "修订版动作 '%c' 对修订版 %ld 于“%s”缺少前一个修订版"
+msgid "applying log message to %s"
+msgstr "应用日志信息至“%s”"
 
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "“%s”尚未纳入版本控制或不存在"
+#: libsvn_ra_dav/fetch.c:285
+msgid "Could not save the URL of the version resource"
+msgstr "无法储存版本资源的地址(URL)"
 
-#: libsvn_client/cat.c:79
+#: libsvn_ra_dav/fetch.c:406
 #, fuzzy, c-format
-msgid "'%s' refers to a directory"
-msgstr "“%s”引用一个目录"
-
-# as-is
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
-msgid "(local)"
-msgstr "(本地)"
+msgid "Could not get content-type from response"
+msgstr "不能从回应中获得内容类型(content-type)"
 
-# as-is
-#: libsvn_client/cat.c:245
+#: libsvn_ra_dav/fetch.c:451
 #, c-format
-msgid "Can't seek in '%s'"
-msgstr "不能在“%s”定位"
+msgid "Could not create a GET request for '%s'"
+msgstr "无法为“%s”创建 GET 请求"
 
-#: libsvn_client/checkout.c:88
+#: libsvn_ra_dav/fetch.c:526
 #, c-format
-msgid "URL '%s' doesn't exist"
-msgstr "地址(URL)“%s”不存在"
+msgid "GET request failed for '%s'"
+msgstr "对“%s”的 GET 请求失败"
 
-#: libsvn_client/checkout.c:92
-#, c-format
-msgid "URL '%s' refers to a file, not a directory"
-msgstr "地址(URL)“%s”指向一个文件,而非目录"
+#: libsvn_ra_dav/fetch.c:665
+msgid "Could not save file"
+msgstr "无法储存文件"
 
-#: libsvn_client/checkout.c:152
+#: libsvn_ra_dav/fetch.c:906 libsvn_ra_svn/client.c:1002
 #, c-format
-msgid "'%s' is already a working copy for a different URL"
-msgstr "“%s”已是不同地址(URL)的工作拷贝"
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%s”的总和检查值不符合:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: libsvn_client/checkout.c:156
-#, fuzzy
-msgid "; run 'svn update' to complete it"
-msgstr ";请执行“svn update”以完成目前的操作。"
+#: libsvn_ra_dav/fetch.c:1151
+msgid "Server response missing the expected deadprop-count property"
+msgstr ""
 
-#: libsvn_client/checkout.c:166
-#, fuzzy, c-format
-msgid "'%s' already exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+#: libsvn_ra_dav/fetch.c:1324
+msgid "Server does not support date-based operations"
+msgstr "服务器不支持基于日期的操作"
 
-#: libsvn_client/commit.c:209
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "类型“%s”未知或不可版本控制"
+#: libsvn_ra_dav/fetch.c:1331
+msgid "Invalid server response to dated-rev request"
+msgstr "对 dated-rev 请求的无效服务器回应"
 
-#: libsvn_client/commit.c:522
-msgid "New entry name required when importing a file"
-msgstr "导入文件时,需要一个新的项目名称"
+# as-is
+#: libsvn_ra_dav/fetch.c:1470
+#, fuzzy
+msgid "'get-locations' REPORT not implemented"
+msgstr "get-locations REPORT 未实现"
 
-#: libsvn_client/commit.c:556 libsvn_wc/props.c:1197 libsvn_wc/questions.c:62
-#, c-format
-msgid "'%s' does not exist"
-msgstr "“%s”不存在"
+#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
+#: libsvn_ra_dav/session.c:1474
+#, fuzzy
+msgid "Incomplete lock data returned"
+msgstr "返回了不完全的锁数据"
+
+#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
+#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
+#, fuzzy
+msgid "Server does not support locking features"
+msgstr "服务器不支持锁定特性"
+
+#: libsvn_ra_dav/fetch.c:1908
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr ""
+"DAV 请求失败;可能是档案库的 pre-revprop-change 外挂执行失败;或是不存在"
 
-#: libsvn_client/commit.c:616 libsvn_client/copy.c:81 svnlook/main.c:1263
+#: libsvn_ra_dav/fetch.c:2643
 #, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径“%s”不存在"
+msgid "Error writing to '%s': unexpected EOF"
+msgstr "写入“%s”时发生错误:意外的 EOF"
 
-#: libsvn_client/commit.c:746 libsvn_client/copy.c:398
-#: libsvn_client/copy.c:414
+#: libsvn_ra_dav/fetch.c:2788
 #, c-format
-msgid "Path '%s' already exists"
-msgstr "路径“%s”已存在"
+msgid "Unknown XML encoding: '%s'"
+msgstr "未知的 XML 编码:“%s”"
 
-#: libsvn_client/commit.c:756
+# as-is
+#: libsvn_ra_dav/fetch.c:3075
 #, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%s”是一个保留的名称,无法被导入"
+msgid "REPORT response handling failed to complete the editor drive"
+msgstr "报告响应处理失败不能完成编辑驱动"
 
-#: libsvn_client/commit.c:869 libsvn_client/copy.c:544
-msgid "Commit failed (details follow):"
-msgstr "提交失败(细节见下):"
+# as-is
+#: libsvn_ra_dav/file_revs.c:363
+#, fuzzy
+msgid "'get-file-revs' REPORT not implemented"
+msgstr "get-file-revs REPORT 未实现"
 
-#: libsvn_client/commit.c:877 libsvn_client/copy.c:552
-msgid "Commit succeeded, but other errors follow:"
-msgstr "提交成功,但是发生了其它的错误,如后:"
+#: libsvn_ra_dav/file_revs.c:379
+msgid "The file-revs report didn't contain any revisions"
+msgstr "file-revs 报告中没有任何修订版"
 
-#: libsvn_client/commit.c:884 libsvn_client/copy.c:559
-msgid "Error unlocking locked dirs (details follow):"
-msgstr "解除锁定目录时发生错误(细节见下):"
+#: libsvn_ra_dav/merge.c:220
+#, c-format
+msgid ""
+"Protocol error: we told the server not to auto-merge any resources, but it "
+"said that '%s' was merged"
+msgstr ""
+"通讯协定错误:我们告知服务器不要自动合并任何资源,但是它报告“%s”已被合并"
 
-#: libsvn_client/commit.c:895
-msgid "Error bumping revisions post-commit (details follow):"
-msgstr "post-commit 增加修订版时发生错误 (细节见下):"
+#: libsvn_ra_dav/merge.c:229
+#, c-format
+msgid ""
+"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
+"element within the MERGE response"
+msgstr "内部错误:在 MERGE 回应中,“DAV:response”元素有个未知的父项目 (%d)"
 
-#: libsvn_client/commit.c:906 libsvn_client/copy.c:570
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "post-commit 清除时发生错误 (细节见下):"
+#: libsvn_ra_dav/merge.c:244
+#, c-format
+msgid ""
+"Protocol error: the MERGE response for the '%s' resource did not return all "
+"of the properties that we asked for (and need to complete the commit)"
+msgstr ""
+"通讯协定错误:对“%s”的 MERGE 回应并未返回所有我们请求的属性 (这些是完成提交操"
+"作所不可缺少的)"
 
-#: libsvn_client/commit.c:1220
+#: libsvn_ra_dav/merge.c:263
 #, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "“%s”是一个地址(URL),但是地址(URL)不可为作提交的目标"
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr "对“%s”的 MERGE 回应并不是目标 (“%s”) 的子项目"
 
-#: libsvn_client/commit.c:1412
-msgid "Are all the targets part of the same working copy?"
-msgstr "是否所有的目标都是同一个工作拷贝的一部份?"
+#: libsvn_ra_dav/merge.c:485
+msgid "The MERGE property response had an error status"
+msgstr "MERGE 属性回应包含错误状态"
 
-#: libsvn_client/commit.c:1427
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr "无法以非递归提交目录删除"
+#: libsvn_ra_dav/options.c:130
+msgid ""
+"The OPTIONS response did not include the requested activity-collection-set; "
+"this often means that the URL is not WebDAV-enabled"
+msgstr ""
+"OPTIONS 回应并不包含请求的 activity-collection-set;通常这表示该地址(URL)并不"
+"支持 WebDAV"
 
-#: libsvn_client/commit_util.c:243 libsvn_client/commit_util.c:254
+#: libsvn_ra_dav/props.c:588
 #, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "未知的项目类型“%s”"
+msgid "Failed to find label '%s' for URL '%s'"
+msgstr "无法找到标记“%s”于地址(URL)“%s”"
 
-#: libsvn_client/commit_util.c:271
+#: libsvn_ra_dav/props.c:617
 #, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "项目“%s”意想不到地变换特殊状态"
+msgid "'%s' was not present on the resource"
+msgstr "“%s”不存在于本资源上"
 
-#: libsvn_client/commit_util.c:322
+#: libsvn_ra_dav/props.c:656
 #, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "中止提交:“%s”仍处于冲突状态"
+msgid "Neon was unable to parse URL '%s'"
+msgstr "Neon 不能分析地址(URL)”%s“"
 
-#: libsvn_client/commit_util.c:388
-#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "并未预期“%s”是工作拷贝的根目录"
+#: libsvn_ra_dav/props.c:685
+msgid "The path was not part of a repository"
+msgstr "路径不是档案库的一部份"
 
-#: libsvn_client/commit_util.c:406
+#: libsvn_ra_dav/props.c:696
 #, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
+msgid "No part of path '%s' was found in repository HEAD"
+msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
 
-#: libsvn_client/commit_util.c:678 libsvn_client/commit_util.c:808
-#: libsvn_client/copy.c:1073 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1390 libsvn_client/diff.c:1988
-#: libsvn_client/diff.c:2510 libsvn_client/diff.c:2619
-#: libsvn_client/locking_commands.c:248 libsvn_client/locking_commands.c:272
-#: libsvn_client/log.c:129 libsvn_client/prop_commands.c:213
-#: libsvn_client/prop_commands.c:446 libsvn_client/prop_commands.c:602
-#: libsvn_client/prop_commands.c:951 libsvn_client/ra.c:180
-#: libsvn_client/revisions.c:89 libsvn_client/status.c:256
-#: libsvn_client/switch.c:104 libsvn_wc/adm_ops.c:2261
-#: libsvn_wc/adm_ops.c:2287 libsvn_wc/adm_ops.c:2324 libsvn_wc/copy.c:448
-#: libsvn_wc/entries.c:1498 libsvn_wc/entries.c:1990 libsvn_wc/props.c:286
-#: libsvn_wc/props.c:1124 libsvn_wc/questions.c:171
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "“%s”尚未纳入版本控制"
+#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
+msgid "The VCC property was not found on the resource"
+msgstr "本资源找不到 VCC 属性"
 
-#: libsvn_client/commit_util.c:681
-#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "“%s”的项目没有地址(URL)"
+#: libsvn_ra_dav/props.c:798
+msgid "The relative-path property was not found on the resource"
+msgstr "本资源上找不到相对路径属性"
+
+#: libsvn_ra_dav/props.c:919
+msgid "'DAV:baseline-collection' was not present on the baseline resource"
+msgstr "'DAV:baseline-collection' 不存在于基线资源"
+
+#: libsvn_ra_dav/props.c:938
+msgid "'DAV:version-name' was not present on the baseline resource"
+msgstr "'DAV:version-name' 不存在于基线资源"
+
+#: libsvn_ra_dav/props.c:1106 libsvn_ra_serf/commit.c:719
+msgid "At least one property change failed; repository is unchanged"
+msgstr "至少有一个属性变更失败;档案库未改变"
+
+#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
+#, fuzzy
+msgid "Missing revision attr in target-revision element"
+msgstr "“%s”丢失了 'revision' 属性"
+
+#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
+#, fuzzy
+msgid "Missing revision attr in open-root element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/commit_util.c:714
-#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "“%s”于未纳入版本控制的父路径中被加入新增调度"
+#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
+msgid "Missing name attr in delete-entry element"
+msgstr ""
 
-#: libsvn_client/commit_util.c:734
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
+#: libsvn_ra_dav/replay.c:176
+msgid "Missing rev attr in delete-entry element"
 msgstr ""
-"“%s”项目被标记为“已复制”,但是本身尚未加入新增调度。也许您提交的\n"
-"目标是位于未纳入版本控制 (或尚未纳入) 的目录中?"
 
-#: libsvn_client/commit_util.c:774
-#, c-format
-msgid ""
-"'%s' is not under version control and is not part of the commit, yet its "
-"child '%s' is part of the commit"
+#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
+#, fuzzy
+msgid "Missing name attr in open-directory element"
+msgstr "未提供属性名称与档案库路径参数"
+
+#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
+#: libsvn_ra_serf/replay.c:371
+#, fuzzy, c-format
+msgid "Missing name attr in %s element"
+msgstr "未提供属性名称参数"
+
+#: libsvn_ra_dav/replay.c:288
+msgid "Got apply-textdelta element without preceding add-file or open-file"
 msgstr ""
-"“%s”尚未纳入版本控制,也不是提交的一部份,但是它的子路径“%s”是提交的一部份"
 
-#: libsvn_client/commit_util.c:857
-#, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr "无法提交“%s”与“%s”,因为它们都指向同一个地址(URL)"
+#: libsvn_ra_dav/replay.c:314
+msgid "Got close-file element without preceding add-file or open-file"
+msgstr ""
 
-#: libsvn_client/commit_util.c:1002
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "提交项目“%s”有复制标志,但是没有复制地址地址(copyfrom URL)"
+#: libsvn_ra_dav/replay.c:329
+msgid "Got close-directory element without ever opening a directory"
+msgstr ""
 
-#: libsvn_client/commit_util.c:1007
-#, c-format
-msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "提交项目“%s”有复制标志,但是修订版无效"
+#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
+#, fuzzy, c-format
+msgid "Error writing stream: unexpected EOF"
+msgstr "写入流时发生错误:意想不到的 EOF"
 
-#: libsvn_client/copy.c:101 libsvn_client/copy.c:646 libsvn_client/copy.c:832
-#: libsvn_ra_dav/commit.c:1172
+#: libsvn_ra_dav/replay.c:463
 #, c-format
-msgid "File '%s' already exists"
-msgstr "文件“%s”已存在"
+msgid "Got cdata content for a prop delete"
+msgstr ""
 
-#: libsvn_client/copy.c:144
-msgid "Move will not be attempted unless forced"
-msgstr "除非强行操作,否则不会执行移动操作"
+#: libsvn_ra_dav/session.c:444
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr "无效的地址(URL):代理(proxy)通信端口编号中有不合法的字符"
 
-#: libsvn_client/copy.c:328
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "无法移动地址(URL)“%s”至本身"
+#: libsvn_ra_dav/session.c:448
+msgid "Invalid URL: negative proxy port number"
+msgstr "无效的地址(URL):负的代理(proxy)通信端口数值"
 
-#: libsvn_client/copy.c:359
-#, c-format
+#: libsvn_ra_dav/session.c:451
 msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
-msgstr "来源与目的似乎不在同一个档案库中 (来源:“%s”;目的:“%s”)"
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+"无效的地址(URL):代理(proxy)通信端口数值大于最大值的 TCP 通信端口数值 65535"
 
-#: libsvn_client/copy.c:385
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "路径“%s”不存在于修订版 %ld"
+#: libsvn_ra_dav/session.c:465
+msgid "Invalid config: illegal character in timeout value"
+msgstr "无效的配置:超时数值中有不合法的字符"
 
-#: libsvn_client/copy.c:419
-#, c-format
-msgid "Unrecognized node kind of '%s'"
-msgstr "“%s”的节点种类无法辨识"
+#: libsvn_ra_dav/session.c:469
+msgid "Invalid config: negative timeout value"
+msgstr "无效的配置:负的超时数值"
 
-#: libsvn_client/copy.c:790
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "路径“%s”于修订版 %ld 中找不到"
+#: libsvn_ra_dav/session.c:482
+msgid "Invalid config: illegal character in debug mask value"
+msgstr "无效的配置:除错遮罩值中有不合法的字符"
 
-#: libsvn_client/copy.c:795
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "路径“%s”于 HEAD 修订版中找不到"
+# as-is
+#: libsvn_ra_dav/session.c:545
+msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
+msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
 
-#: libsvn_client/copy.c:841
-#, c-format
-msgid "'%s' is in the way"
-msgstr "“%s”挡在中间"
+#: libsvn_ra_dav/session.c:600
+msgid "Malformed URL for repository"
+msgstr "档案库的地址(URL)畸形"
 
-#: libsvn_client/copy.c:858
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "存在“%s”的项目 (不过工作文件已丢失)"
+#: libsvn_ra_dav/session.c:636
+msgid "Network socket initialization failed"
+msgstr "网络 socket 启始失败"
 
-#: libsvn_client/copy.c:949
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "来源地址(URL)“%s”来自其它的档案库;把它当作是脱离的工作拷贝(WC)"
+#: libsvn_ra_dav/session.c:662
+msgid "SSL is not supported"
+msgstr "不支持 SSL"
 
-#: libsvn_client/copy.c:1028
+#: libsvn_ra_dav/session.c:803
 #, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "无法复制路径“%s”至其子目录“%s”中"
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr "无效的配置:无法载入凭证文件“%s”"
 
-#: libsvn_client/copy.c:1039
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "无法移动路径“%s”至其本身"
+#: libsvn_ra_dav/session.c:910
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr "无法在本资源或任何其父项目中找到 UUID 属性"
 
-#: libsvn_client/copy.c:1047
-msgid "No support for repos <--> working copy moves"
-msgstr "不支持档案库 <--> 工作拷贝移动"
+#: libsvn_ra_dav/session.c:918
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "请将服务器升级至 0.19 或更新的版本"
 
-#: libsvn_client/copy.c:1079
-#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "“%s”似乎没有关联的地址(URL)"
+#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
+#, fuzzy
+msgid "Failed to parse URI"
+msgstr "分析地址(URI)失败"
 
-#: libsvn_client/delete.c:62
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "“%s”挡了实际纳入版本控制资源的路"
+#: libsvn_ra_dav/session.c:1183
+#, fuzzy
+msgid "Lock request failed"
+msgstr "锁请求失败"
 
-#: libsvn_client/delete.c:77
-#, c-format
-msgid "'%s' has local modifications"
-msgstr "“%s”已有本地修改"
+#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
+#, fuzzy, c-format
+msgid "'%s' is not locked in the repository"
+msgstr "”%s“没有在档案库中被锁定"
 
-# as-is
-#: libsvn_client/diff.c:94
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%s 属性改变于:%s%s"
+#: libsvn_ra_dav/session.c:1349
+#, fuzzy
+msgid "Unlock request failed"
+msgstr "解除锁请求失败"
 
-# as-is
-#: libsvn_client/diff.c:122
-#, c-format
-msgid "Name: %s%s"
-msgstr "名字:%s%s"
+#: libsvn_ra_dav/session.c:1560
+#, fuzzy
+msgid "Failed to fetch lock information"
+msgstr "获取锁信息失败"
 
-#: libsvn_client/diff.c:198
+#: libsvn_ra_dav/session.c:1633
 #, fuzzy, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"s”与“%s”)"
+msgid "Unsupported RA loader version (%d) for ra_dav"
+msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
 
-#: libsvn_client/diff.c:204 libsvn_client/diff.c:210
-#, fuzzy, c-format
-msgid "URL has no scheme: '%s'"
-msgstr ""
-"地�(URL)中没有规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"s”"
+#: libsvn_ra_dav/util.c:275
+msgid "authorization failed"
+msgstr "授权失败"
 
-#: libsvn_client/diff.c:217
-#, fuzzy, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "尚不支持混合的存取规则 (“%s”与“%s”)"
+#: libsvn_ra_dav/util.c:279
+msgid "could not connect to server"
+msgstr "无法连接到服务器"
 
-# as-is
-#: libsvn_client/diff.c:282
-#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(修订版 %ld)"
+#: libsvn_ra_dav/util.c:283
+msgid "timed out waiting for server"
+msgstr "等待服务器超时"
 
-# as-is
-#: libsvn_client/diff.c:284
+#: libsvn_ra_dav/util.c:489
 #, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(工作拷贝)"
+msgid "Can't calculate the request body size"
+msgstr "无法算出请求的主体大小"
 
-#: libsvn_client/diff.c:428
+#: libsvn_ra_dav/util.c:726
 #, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "无法显示:文件标记为二进制类型。%s"
+msgid "Error spooling the %s request response to disk"
+msgstr "请求 %s 的响应脱机保存到磁盘时出现错误"
 
-#: libsvn_client/diff.c:501
+#: libsvn_ra_dav/util.c:774
 #, c-format
-msgid "'%s' is not supported"
-msgstr "“%s”不支持"
-
-# as-is
-#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
-#. strings are used to tag onto a filename in case of a merge conflict
-#: libsvn_client/diff.c:771
-msgid ".working"
-msgstr ".working"
+msgid "'%s' path not found"
+msgstr "找不到路径“%s”"
 
-# as-is
-#: libsvn_client/diff.c:773
+#. We either have a neon error, or some other error
+#. that we didn't expect.
+#: libsvn_ra_dav/util.c:779 libsvn_ra_dav/util.c:1014
 #, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
+msgid "%s of '%s'"
+msgstr "%s 的结果 “%s”"
 
-# as-is
-#: libsvn_client/diff.c:776
+#: libsvn_ra_dav/util.c:797
 #, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
-
-#: libsvn_client/diff.c:1446 libsvn_client/diff.c:2088
-#: libsvn_client/diff.c:2168
-msgid "Not all required revisions are specified"
-msgstr "并未提供全部所需的修订版"
-
-#: libsvn_client/diff.c:1717
-#, fuzzy
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱歉,svn_client_diff3 以不支持的方式被调用"
-
-#: libsvn_client/diff.c:1756
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr "目前只支持路径的文件参考基础与其工作文件之间的文件差异"
+msgid "Error reading spooled %s request response"
+msgstr "读取请求 %s 回应的脱机数据时出现错误"
 
-#: libsvn_client/diff.c:1871 libsvn_client/diff.c:1876
+#: libsvn_ra_dav/util.c:808
 #, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "在档案库的修订版 %2$ld 中找不到“%1$s”"
+msgid "The %s request returned invalid XML in the response: %s (%s)"
+msgstr "%s 请求的回应返回无效的 XML:%s (%s)"
 
-#: libsvn_client/diff.c:1992 libsvn_client/switch.c:108
+#: libsvn_ra_dav/util.c:828
 #, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录“%s”没有地址(URL)"
-
-#: libsvn_client/diff.c:2179
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于 peg 差异,必须至少有一个非本地端的修订版"
+msgid "%s request failed on '%s'"
+msgstr "%s 请求“%s”失败"
 
-#: libsvn_client/diff.c:2483 libsvn_client/diff.c:2489
-#: libsvn_client/diff.c:2604 libsvn_client/locking_commands.c:252
-#: libsvn_client/locking_commands.c:276 libsvn_client/ra.c:368
-#: libsvn_client/ra.c:729 libsvn_client/ra.c:865
+#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:587
+#: libsvn_wc/update_editor.c:2355
 #, c-format
-msgid "'%s' has no URL"
-msgstr "“%s”没有地址(URL)"
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"“%s”\n"
+"与\n"
+"“%s”\n"
+"并不在同一个档案库中"
 
-#: libsvn_client/export.c:87
-#, c-format
-msgid "'%s' is not a valid EOL value"
-msgstr "“%s”不是一个有效的 EOL 值"
+# as-is
+#. ----------------------------------------------------------------
+#. * The RA vtable routines *
+#: libsvn_ra_local/ra_plugin.c:245
+msgid "Module for accessing a repository on local disk."
+msgstr "访问本地磁盘的档案库模块。"
 
-#: libsvn_client/export.c:271
-msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
+#: libsvn_ra_local/ra_plugin.c:285
+msgid "Unable to open an ra_local session to URL"
+msgstr "无法打开地址(URL)的 ra_local 会话"
 
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+# as-is
+#: libsvn_ra_local/ra_plugin.c:1340
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
+
+#: libsvn_ra_local/split_url.c:44
 #, c-format
-msgid "'%s' exists and is not a directory"
-msgstr "“%s”已存在,但不是目录"
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
 
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_ra_local/split_url.c:55
 #, c-format
-msgid "'%s' already exists"
-msgstr "“%s”已存在"
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr "本地地址(URL)“%s”仅含主机名称,没有路径"
 
-#: libsvn_client/export.c:686 libsvn_wc/update_editor.c:1634
-#: libsvn_wc/update_editor.c:2407
+#: libsvn_ra_local/split_url.c:117
 #, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不符合;预期:“%s”,实际:“%s”"
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr "本地地址(URL)“%s”包含未支持的主机名称"
 
-#: libsvn_client/info.c:234
-#, fuzzy, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "不能读“%s”的条目"
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#, c-format
+msgid "Unable to open repository '%s'"
+msgstr "无法打开档案库“%s”"
 
-#: libsvn_client/info.c:321 libsvn_client/info.c:346 libsvn_client/info.c:356
+#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
+#: libsvn_repos/commit.c:393
 #, fuzzy, c-format
-msgid "URL '%s' non-existent in revision '%ld'"
-msgstr "地址(URL)“%s”并不存在于修订版“%ld”中"
+msgid "Path '%s' not present"
+msgstr "路径“%s”不存在"
 
-#: libsvn_client/locking_commands.c:198
-msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "没有找到公共父节点,不能在分离的参数上操作"
+#: libsvn_ra_serf/commit.c:910
+#, c-format
+msgid "Failed writing updated file"
+msgstr ""
 
-#: libsvn_client/locking_commands.c:300
-msgid "Unable to lock/unlock across multiple repositories"
-msgstr "不能跨越多个档案库进行 锁定/解锁"
+#: libsvn_ra_serf/getlocations.c:289
+#, fuzzy
+msgid "File doesn't exist on HEAD"
+msgstr "路径“%s”不存在于最新修订版中"
 
-#: libsvn_client/locking_commands.c:341
+#: libsvn_ra_serf/locks.c:354
 #, fuzzy, c-format
-msgid "'%s' is not locked in this working copy"
-msgstr "“%s”没有在工作拷贝中锁定"
+msgid "Lock request failed: %d %s"
+msgstr "锁请求失败"
 
-#: libsvn_client/locking_commands.c:389
+#: libsvn_ra_serf/locks.c:703
 #, fuzzy, c-format
-msgid "'%s' is not locked"
-msgstr "“%s”没有被锁定"
+msgid "Unlock request failed: %d %s"
+msgstr "解除锁请求失败"
 
-#: libsvn_client/locking_commands.c:425 libsvn_fs/fs-loader.c:896
-#: libsvn_ra/ra_loader.c:512
-msgid "Lock comment has illegal characters"
-msgstr "锁定注释存在非法字符"
+#: libsvn_ra_serf/replay.c:204
+#, fuzzy
+msgid "Missing revision attr in delete-entry element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/log.c:72
-msgid "Missing required revision specification"
-msgstr "未提供请求的修订版规格"
+#: libsvn_ra_serf/replay.c:230
+#, fuzzy
+msgid "Missing revision attr in open-directory element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/log.c:135 libsvn_client/status.c:261
-#: libsvn_client/update.c:86
-#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "项目“%s”没有地址(URL)"
+#: libsvn_ra_serf/replay.c:250
+#, fuzzy
+msgid "Missing name attr in add-directory element"
+msgstr "未提供属性名称与档案库路径参数"
 
-#: libsvn_client/log.c:321
+#: libsvn_ra_serf/replay.c:285
 #, fuzzy
-msgid "No commits in repository"
-msgstr "档案库中没有任何提交"
+msgid "Missing name attr in open-file element"
+msgstr "未提供属性名称参数"
 
-#: libsvn_client/ls.c:140 libsvn_client/ls.c:148
-#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "地址(URL)“%s”并不存在于该修订版中"
+#: libsvn_ra_serf/replay.c:291
+#, fuzzy
+msgid "Missing revision attr in open-file element"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_client/prop_commands.c:104
-#, c-format
-msgid "'%s' is a wcprop, thus not accessible to clients"
-msgstr "“%s”是一个工作拷贝属性(wcprop),应此不能被客户端存取"
+#: libsvn_ra_serf/replay.c:311
+#, fuzzy
+msgid "Missing name attr in add-file element"
+msgstr "未提供属性名称参数"
 
-#: libsvn_client/prop_commands.c:183
+# as-is
+#: libsvn_ra_serf/serf.c:52
+#, fuzzy
+msgid "Access repository via WebDAV protocol through serf."
+msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
+
+#: libsvn_ra_serf/serf.c:155
 #, c-format
-msgid "Revision property '%s' not allowed in this context"
-msgstr "修订版属性“%s”在此上下文中并不允许"
+msgid "Could not lookup hostname: %s://%s"
+msgstr ""
 
-#: libsvn_client/prop_commands.c:199
+#: libsvn_ra_serf/serf.c:741
 #, fuzzy, c-format
-msgid "Setting property on non-local target '%s' is not supported"
-msgstr "设定非本地目标“%s”的属性尚不支持"
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
 
-#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
+#: libsvn_ra_serf/update.c:2112
 #, c-format
-msgid "Bad property name: '%s'"
-msgstr "有问题的属性名称:“%s”"
+msgid "Error retrieving REPORT (%d)"
+msgstr ""
 
-#: libsvn_client/prop_commands.c:276
-msgid "Value will not be set unless forced"
-msgstr "除非强迫为之,否则其值不会被设定"
+#: libsvn_ra_serf/util.c:743
+msgid "Premature EOF seen from server"
+msgstr ""
 
-#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:758
+#: libsvn_ra_svn/client.c:127
 #, c-format
-msgid "Unknown node kind for '%s'"
-msgstr "“%s”为未知的节点类型"
+msgid "Unknown hostname '%s'"
+msgstr "未知的主机名称“%s”"
 
-#: libsvn_client/ra.c:131
+#: libsvn_ra_svn/client.c:139
 #, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr "试图在非提交操作中,设定工作拷贝属性“%s”于“%s”"
+msgid "Can't create socket"
+msgstr "无法建立 socket"
 
-#: libsvn_client/ra.c:345
+#: libsvn_ra_svn/client.c:143
 #, c-format
-msgid "Can't find entry for '%s'"
-msgstr "无法找到“%s”的项目"
+msgid "Can't connect to host '%s'"
+msgstr "无法连线至主机“%s”"
 
-#: libsvn_client/ra.c:489
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未提供“%s”于修订版 %ld 的 changed-path 信息"
+# as-is
+#: libsvn_ra_svn/client.c:164
+msgid "Proplist element not a list"
+msgstr "属性列表元素不是一个列表"
 
-#: libsvn_client/ra.c:609
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
-msgstr "路径“%s”不存在于修订版 %ld 中"
+# as-is
+#: libsvn_ra_svn/client.c:188
+msgid "Prop diffs element not a list"
+msgstr "Prop diffs 元素不是一个列表"
 
-#: libsvn_client/ra.c:656 libsvn_client/ra.c:813
+#: libsvn_ra_svn/client.c:226
 #, c-format
-msgid "Unable to find repository location for '%s' in revision %ld"
-msgstr "无法找到“%s”的档案库位置于修订版 %ld"
+msgid "Unrecognized node kind '%s' from server"
+msgstr "无法辨识来自服务器的节点种类“%s”"
 
-#: libsvn_client/ra.c:667
+#: libsvn_ra_svn/client.c:273 libsvn_ra_svn/client.c:327
 #, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "“%s”于修订版 %ld 是一个无关的物件"
+msgid "Authentication error from server: %s"
+msgstr "来自服务器的认证错误:%s"
 
-#: libsvn_client/ra.c:818
-#, c-format
-msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
-msgstr ""
-"“%s”的位置对应至修订版 %ld 并不存在于档案库之中,或是指向一个无关的物件"
+#: libsvn_ra_svn/client.c:276 libsvn_ra_svn/cram.c:194
+#: libsvn_ra_svn/cram.c:212
+msgid "Unexpected server response to authentication"
+msgstr "意想不到的认证时服务器回应"
 
-#: libsvn_client/relocate.c:53
+#: libsvn_ra_svn/client.c:314 libsvn_subr/prompt.c:156
 #, c-format
-msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "于“%s”的档案库有 uuid “%s”,但是工作拷贝的是“%s”"
+msgid "Can't get password"
+msgstr "无法取得密码"
+
+#: libsvn_ra_svn/client.c:334
+msgid "Cannot negotiate authentication mechanism"
+msgstr "无法协商出认识机制"
 
-#: libsvn_client/revisions.c:105
+#: libsvn_ra_svn/client.c:466
 #, c-format
-msgid "Unrecognized revision type requested for '%s'"
-msgstr "无法辨识请求的“%s”的修订版类别"
+msgid "Undefined tunnel scheme '%s'"
+msgstr "无法辨识的隧道规则“%s”"
 
-#: libsvn_delta/svndiff.c:350
+#: libsvn_ra_svn/client.c:483
 #, c-format
-msgid "Invalid diff stream: insn %d cannot be decoded"
-msgstr "无效的差异流:insn %d 不能解码"
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr "隧道规则 %s 需要设定环境变数 %s"
 
-#: libsvn_delta/svndiff.c:354
+# as-is
+#: libsvn_ra_svn/client.c:494
 #, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
-msgstr "无效的差异流:insn %d 出现非正的长度"
+msgid "Can't tokenize command '%s'"
+msgstr "不能 tokenize 命令“%s”"
 
-#: libsvn_delta/svndiff.c:358
+#: libsvn_ra_svn/client.c:525
 #, c-format
-msgid "Invalid diff stream: insn %d overflows the target view"
-msgstr "无效的差异流:insn %d 溢出目标视图"
+msgid "Error in child process: %s"
+msgstr "子程序错误:%s"
 
-#: libsvn_delta/svndiff.c:367
+#: libsvn_ra_svn/client.c:549
 #, c-format
-msgid "Invalid diff stream: [src] insn %d overflows the source view"
-msgstr "无效的诧异流:[src] insn %d 溢出源视图"
+msgid "Can't create tunnel"
+msgstr "无法建立 tunnel"
 
-#: libsvn_delta/svndiff.c:374
+#: libsvn_ra_svn/client.c:588
 #, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr "无效的差异流:[tgt] insn %d 起点超过目标视图位置"
+msgid "Illegal svn repository URL '%s'"
+msgstr "不合法的 svn 档案库地址(URL)“%s”"
 
-#: libsvn_delta/svndiff.c:381
+#: libsvn_ra_svn/client.c:627
 #, c-format
-msgid "Invalid diff stream: [new] insn %d overflows the new data section"
-msgstr "无效的差异流:[new] insn %d 溢出新数据区域"
+msgid "Server requires minimum version %d"
+msgstr "服务器最低要求的版号为 %d"
 
-#: libsvn_delta/svndiff.c:391
-msgid "Delta does not fill the target window"
-msgstr "Delta 不能填充目标窗口"
+#: libsvn_ra_svn/client.c:682
+msgid "Impossibly long repository root from server"
+msgstr "服务器回传的档案库根路径长得太夸张"
 
-#: libsvn_delta/svndiff.c:394
-msgid "Delta does not contain enough new data"
-msgstr "Delta不能包含足够的新数据"
+# as-is
+#: libsvn_ra_svn/client.c:693
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr "使用svn网络协议访问档案库的模块。"
 
-#: libsvn_delta/svndiff.c:471
-msgid "Svndiff has invalid header"
-msgstr "Svndiff 数据包含了无效的数据头"
+#: libsvn_ra_svn/client.c:841
+msgid "Server did not send repository root"
+msgstr "服务器没有返回档案库根路径"
+
+#: libsvn_ra_svn/client.c:982
+msgid "Non-string as part of file contents"
+msgstr "文件内容的一部份不是字串"
 
 # as-is
-#: libsvn_delta/svndiff.c:526 libsvn_delta/svndiff.c:681
-msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff 数据包含无效窗口"
+#: libsvn_ra_svn/client.c:1081
+msgid "Dirlist element not a list"
+msgstr "目录列表元素不是一个列表"
 
 # as-is
-#: libsvn_delta/svndiff.c:535
-msgid "Svndiff has backwards-sliding source views"
-msgstr "Svndiff 数据包含向后变化的资源视图"
+#: libsvn_ra_svn/client.c:1238
+msgid "Log entry not a list"
+msgstr "日志条目不是一个列表"
 
-#: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630
-#: libsvn_delta/svndiff.c:703
-msgid "Unexpected end of svndiff input"
-msgstr "找到一个意料之外的节点种类"
+# as-is
+#: libsvn_ra_svn/client.c:1251
+msgid "Changed-path entry not a list"
+msgstr "已修改路径条目不是一个列表"
 
-#: libsvn_diff/diff_file.c:666
-#, c-format
-msgid "%s\\ No newline at end of file%s"
-msgstr "%s\\ 在文件 %s 末尾没有新行"
+# as-is
+#: libsvn_ra_svn/client.c:1327
+#, fuzzy
+msgid "'stat' not implemented"
+msgstr "get-locations 未实现"
 
-#: libsvn_diff/diff_file.c:1225
-#, c-format
-msgid "Failed to delete mmap '%s'"
-msgstr "删除mmap ”%s“失败"
+# as-is
+#: libsvn_ra_svn/client.c:1384
+#, fuzzy
+msgid "'get-locations' not implemented"
+msgstr "get-locations 未实现"
 
-#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:157
-#: libsvn_ra/ra_loader.c:170
-#, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "“%s”未定义 '%s()'"
+# as-is
+#: libsvn_ra_svn/client.c:1396
+msgid "Location entry not a list"
+msgstr "区域条目不是一个列表"
 
-#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
-msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%s”模块失败"
+# as-is
+#: libsvn_ra_svn/client.c:1446
+#, fuzzy
+msgid "'get-file-revs' not implemented"
+msgstr "get-file-revs 未实现"
 
-#: libsvn_fs/fs-loader.c:138
-#, c-format
-msgid ""
-"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "对“%s”有不符合的 FS 模块版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+# as-is
+#: libsvn_ra_svn/client.c:1459
+msgid "Revision entry not a list"
+msgstr "修订版条目不是一个列表"
 
-#: libsvn_fs/fs-loader.c:163
-#, c-format
-msgid "Unknown FS type '%s'"
-msgstr "未知的文件系统(FS)类别“%s”"
+#: libsvn_ra_svn/client.c:1472 libsvn_ra_svn/client.c:1497
+msgid "Text delta chunk not a string"
+msgstr "文字差异区段并非字串"
 
-#: libsvn_fs/fs-loader.c:244
+#: libsvn_ra_svn/client.c:1509
+msgid "The get-file-revs command didn't return any revisions"
+msgstr "get-file-revs 命令没有返回任何修订版"
+
+#: libsvn_ra_svn/client.c:1557
 #, fuzzy
-msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统(FS)互斥体"
+msgid "Server doesn't support the lock command"
+msgstr "服务器不支持锁命令"
 
-#: libsvn_fs/fs-loader.c:280
+#: libsvn_ra_svn/client.c:1621
 #, fuzzy
-msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统(FS)互斥体"
+msgid "Server doesn't support the unlock command"
+msgstr "服务器不支持解除锁命令"
 
-#: libsvn_fs/fs-loader.c:286
-msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统(FS)互斥体"
+# as-is
+#: libsvn_ra_svn/client.c:1718
+#, fuzzy
+msgid "Lock response not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_fs/fs-loader.c:902
-msgid "Negative expiration date passed to svn_fs_lock"
-msgstr "不能接受的有效期传递到 svn_fs_lock"
+#: libsvn_ra_svn/client.c:1732
+#, fuzzy
+msgid "Unknown status for lock command"
+msgstr "未知的 svn 通讯协定命令"
 
-#: libsvn_fs_base/bdb/bdb-err.c:101
-#, c-format
-msgid "Berkeley DB error for filesystem %s while %s:\n"
-msgstr "文件系统 %s 上的伯克利数据库(Berkeley DB)当 %s 时错误:\n"
+#: libsvn_ra_svn/client.c:1754
+msgid "Didn't receive end marker for lock responses"
+msgstr ""
 
-#: libsvn_fs_base/bdb/changes-table.c:88
-msgid "creating change"
-msgstr "正在创建更改"
+# as-is
+#: libsvn_ra_svn/client.c:1841
+#, fuzzy
+msgid "Unlock response not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_fs_base/bdb/changes-table.c:114
-msgid "deleting changes"
-msgstr "正在删除更改"
+#: libsvn_ra_svn/client.c:1855
+#, fuzzy
+msgid "Unknown status for unlock command"
+msgstr "命令回应中的未知状态“%s”"
 
-#: libsvn_fs_base/bdb/changes-table.c:146 libsvn_fs_fs/fs_fs.c:1965
-msgid "Missing required node revision ID"
-msgstr "未提供必须的节点修订版 ID"
+#: libsvn_ra_svn/client.c:1876
+msgid "Didn't receive end marker for unlock responses"
+msgstr ""
 
-#: libsvn_fs_base/bdb/changes-table.c:157 libsvn_fs_fs/fs_fs.c:1975
-msgid "Invalid change ordering: new node revision ID without delete"
-msgstr "无效的改变顺序:有新的节点修订版 ID 而没删除"
+#: libsvn_ra_svn/client.c:1900 libsvn_ra_svn/client.c:1928
+#, fuzzy
+msgid "Server doesn't support the get-lock command"
+msgstr "服务器不支持获取锁命令get-lock"
 
-#: libsvn_fs_base/bdb/changes-table.c:167 libsvn_fs_fs/fs_fs.c:1986
-msgid "Invalid change ordering: non-add change on deleted path"
-msgstr "无效的改变顺序:对删除路径进行非新增的改变"
+# as-is
+#: libsvn_ra_svn/client.c:1941
+#, fuzzy
+msgid "Lock element not a list"
+msgstr "锁元素不是一个列表"
 
-#: libsvn_fs_base/bdb/changes-table.c:257
-#: libsvn_fs_base/bdb/changes-table.c:381
-msgid "creating cursor for reading changes"
-msgstr "正在为读取更改创建指针"
+#: libsvn_ra_svn/client.c:1964
+#, fuzzy
+msgid "Server doesn't support the replay command"
+msgstr "服务器不支持锁命令"
 
-#: libsvn_fs_base/bdb/changes-table.c:283
-#: libsvn_fs_base/bdb/changes-table.c:402
+#: libsvn_ra_svn/client.c:2028
 #, fuzzy, c-format
-msgid "Error reading changes for key '%s'"
-msgstr "读关键字“%s”的更改时发生错误"
+msgid "Unsupported RA loader version (%d) for ra_svn"
+msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
 
-#: libsvn_fs_base/bdb/changes-table.c:342
-#: libsvn_fs_base/bdb/changes-table.c:425
-msgid "fetching changes"
-msgstr "正在获取更改"
+# as-is
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
+msgid "Invalid file or dir token during edit"
+msgstr "编辑时遇到无效的文件或目录"
 
-#: libsvn_fs_base/bdb/changes-table.c:355
-#: libsvn_fs_base/bdb/changes-table.c:438
-msgid "closing changes cursor"
-msgstr "正在关闭更改指针"
+#: libsvn_ra_svn/editor.c:621
+msgid "Non-string as part of text delta"
+msgstr "文件差异的一部份不是字串"
 
-#: libsvn_fs_base/bdb/copies-table.c:87
-#, fuzzy
-msgid "storing copy record"
-msgstr "正在存储拷贝记录"
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
+msgstr ""
 
-#: libsvn_fs_base/bdb/copies-table.c:112
-msgid "allocating new copy ID (getting 'next-key')"
-msgstr "正在分配新拷贝ID (正在获取'next-key')"
+# as-is
+#: libsvn_ra_svn/editorp.c:129
+msgid "Successful edit status returned too soon"
+msgstr "成功修改状态返回太快"
 
-#: libsvn_fs_base/bdb/copies-table.c:130
-msgid "bumping next copy key"
-msgstr "正在提取下一个拷贝关键字"
+# as-is
+#: libsvn_ra_svn/editorp.c:665
+msgid "Apply-textdelta already active"
+msgstr "Apply-textdelta 已经激活"
 
-#: libsvn_fs_base/bdb/copies-table.c:169
-msgid "deleting entry from 'copies' table"
-msgstr "正在从 'copies' 表中删除条目"
+# as-is
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
+msgid "Apply-textdelta not active"
+msgstr "Apply-textdelta 没有激活"
+
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:842
+#, c-format
+msgid "Unknown command '%s'"
+msgstr "未知的命令:“%s”"
 
 # as-is
-#: libsvn_fs_base/bdb/copies-table.c:197
-#, fuzzy
-msgid "reading copy"
-msgstr "正在读取拷贝"
+#: libsvn_ra_svn/marshal.c:78
+msgid "Capability entry is not a word"
+msgstr "容量条目不是一个 word"
 
-#: libsvn_fs_base/bdb/nodes-table.c:99
-msgid "allocating new node ID (getting 'next-key')"
-msgstr "正在分配新的节点 ID (正在获取 'next-key')"
+#: libsvn_ra_svn/marshal.c:166
+#, c-format
+msgid "Can't write to connection"
+msgstr "无法写入连线"
 
-#: libsvn_fs_base/bdb/nodes-table.c:117
-msgid "bumping next node ID key"
-msgstr "正在提取下一个节点 ID 关键字"
+#: libsvn_ra_svn/marshal.c:259
+#, c-format
+msgid "Can't read from connection"
+msgstr "无法读取连线"
 
-#: libsvn_fs_base/bdb/nodes-table.c:154
-#, fuzzy, c-format
-msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
-msgstr "后续 id “%s”(对于%s)已存在于文件系统“%s”中"
+#: libsvn_ra_svn/marshal.c:262
+msgid "Connection closed unexpectedly"
+msgstr "网络连线意想不到地关闭"
 
-#: libsvn_fs_base/bdb/nodes-table.c:180
-msgid "deleting entry from 'nodes' table"
-msgstr "正在从 'nodes' 表删除条目"
+#: libsvn_ra_svn/marshal.c:506
+msgid "String length larger than maximum"
+msgstr "字串长度超出上限"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:220
-#, fuzzy
-msgid "reading node revision"
-msgstr "正在读取节点修订版"
+#: libsvn_ra_svn/marshal.c:543
+msgid "Too many nested items"
+msgstr "太多嵌套的项目"
 
-#: libsvn_fs_base/bdb/nodes-table.c:252
-#, fuzzy
-msgid "storing node revision"
-msgstr "正在存储节点修订版"
+#: libsvn_ra_svn/marshal.c:562
+msgid "Number is larger than maximum"
+msgstr "数字大小超过上限"
 
-#: libsvn_fs_base/bdb/reps-table.c:95 libsvn_fs_base/bdb/reps-table.c:202
-#, fuzzy, c-format
-msgid "No such representation '%s'"
-msgstr "没有这样的请求 “%s”"
+#: libsvn_ra_svn/marshal.c:765
+msgid "Empty error list"
+msgstr "空的错误列表"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:98
-#, fuzzy
-msgid "reading representation"
-msgstr "正在读取请求"
+#: libsvn_ra_svn/marshal.c:774
+msgid "Malformed error list"
+msgstr "畸形的错误列表"
 
-#: libsvn_fs_base/bdb/reps-table.c:126
-#, fuzzy
-msgid "storing representation"
-msgstr "正在存储请求"
+#: libsvn_ra_svn/marshal.c:813
+#, c-format
+msgid "Unknown status '%s' in command response"
+msgstr "命令回应中的未知状态“%s”"
 
-#: libsvn_fs_base/bdb/reps-table.c:156
-msgid "allocating new representation (getting next-key)"
-msgstr "正在分配新请求 (正在获取 next-key)"
+#: libsvn_repos/commit.c:128
+#, c-format
+msgid "Out of date: '%s' in transaction '%s'"
+msgstr "过期:”%s“在事务”%s“"
 
-#: libsvn_fs_base/bdb/reps-table.c:177
-#, fuzzy
-msgid "bumping next representation key"
-msgstr "正在提取下一个请求关键字"
+#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#, c-format
+msgid "Got source path but no source revision for '%s'"
+msgstr "获得源路径,但”%s“没有源修订版"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:205
-#, fuzzy
-msgid "deleting representation"
-msgstr "正在删除请求"
+#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#, c-format
+msgid "Source url '%s' is from different repository"
+msgstr "来源地址(URL)“%s”来自其它的档案库"
 
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/rev-table.c:88
-#, fuzzy
-msgid "reading filesystem revision"
-msgstr "正在读取文件系统修订版号"
+#: libsvn_repos/commit.c:609
+#, c-format
+msgid ""
+"Checksum mismatch for resulting fulltext\n"
+"(%s):\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%s”的总和检查值不符合:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
 
-#: libsvn_fs_base/bdb/strings-table.c:91
-msgid "creating cursor for reading a string"
-msgstr "正在为读取一个字符串创建指针"
+#: libsvn_repos/delta.c:180
+msgid "Unable to open root of edit"
+msgstr "无法打开编辑"
 
-#: libsvn_fs_base/bdb/txn-table.c:94
-#, fuzzy
-msgid "storing transaction record"
-msgstr "正在存储事务记录"
+#: libsvn_repos/delta.c:231
+msgid "Invalid target path"
+msgstr "无效的目标路径"
 
-#: libsvn_fs_base/bdb/uuids-table.c:112
-#, fuzzy
-msgid "get repository uuid"
-msgstr "获取档案库唯一标记(uuid)"
+#: libsvn_repos/delta.c:257
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr "无效的编辑器定位;至少一个输入路径不是目录并且没有源入口"
 
-#: libsvn_fs_base/bdb/uuids-table.c:140
-#, fuzzy
-msgid "set repository uuid"
-msgstr "设置档案库唯一标记(uuid)"
+# as-is
+#: libsvn_repos/dump.c:416
+#, c-format
+msgid ""
+"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
+"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
+"WARNING: will fail.\n"
+msgstr ""
+"警告:修订版 %ld 的参考数据比最旧的转存数据修订版 (%ld)还旧。\n"
+"警告: 装载这个转存到空的档案库会失败。\n"
+"\n"
 
-#: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
-msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的事务编号在文件系统“%s”中不是'0'"
+#: libsvn_repos/dump.c:933
+#, c-format
+msgid "Start revision %ld is greater than end revision %ld"
+msgstr "起始修订版 %ld 比结束修订版号 %ld 为大"
 
-#: libsvn_fs_base/dag.c:247
+#: libsvn_repos/dump.c:938
+#, c-format
+msgid "End revision %ld is invalid (youngest revision is %ld)"
+msgstr "结束修订版 %ld 无效 (最新的修订版为 %ld)"
+
+# as-is
+#: libsvn_repos/dump.c:1045
 #, fuzzy, c-format
-msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的复制编号在文件系统“%s”中不是'0'"
+msgid "* Dumped revision %ld.\n"
+msgstr "* 导出修订版 %ld。\n"
 
-#: libsvn_fs_base/dag.c:256
+# as-is
+#: libsvn_repos/dump.c:1046
 #, fuzzy, c-format
-msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
-msgstr "损坏的数据库:初始的修订版本号在文件系统“%s”中不是'0'"
+msgid "* Verified revision %ld.\n"
+msgstr "* 校验修订版 %ld。\n"
 
-#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:386
-#, fuzzy
-msgid "Attempted to create entry in non-directory parent"
-msgstr "企图在非目录的父节点创建条目"
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1207
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr "提交成功,但是发送提交外挂(post-commit)失败"
 
-#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:380
+#: libsvn_repos/fs-wrap.c:157
 #, c-format
-msgid "Attempted to create a node with an illegal name '%s'"
-msgstr "企图用一个非法的名字“%s”创建节点"
-
-#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:392
-#, fuzzy
-msgid "Attempted to clone child of non-mutable node"
-msgstr "企图克隆非可变节点的子节点"
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
 
-#: libsvn_fs_base/dag.c:494
-#, fuzzy
-msgid "Attempted to create entry that already exists"
-msgstr "企图创建已经存在的子条目"
+#: libsvn_repos/fs-wrap.c:296
+#, fuzzy, c-format
+msgid "Write denied: not authorized to read all of revision %ld"
+msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
 
-#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:454
-#, fuzzy
-msgid "Attempted to set entry in non-directory node"
-msgstr "企图在非目录节点中设置条目"
+#: libsvn_repos/fs-wrap.c:484
+#, c-format
+msgid "Cannot unlock path '%s', no authenticated username available"
+msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
 
-#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:460
+#: libsvn_repos/fs-wrap.c:498
 #, fuzzy
-msgid "Attempted to set entry in immutable node"
-msgstr "企图在不可改变的节点设置条目"
+msgid "Unlock succeeded, but post-unlock hook failed"
+msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
 
-#: libsvn_fs_base/dag.c:615
+#: libsvn_repos/hooks.c:71
 #, c-format
-msgid "Can't set proplist on *immutable* node-revision %s"
-msgstr "不能在不可更改节点修订版 %s 设置属性列表"
+msgid "Can't create pipe for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
 
-#: libsvn_fs_base/dag.c:727
+#: libsvn_repos/hooks.c:83
+#, fuzzy, c-format
+msgid "Can't make pipe read handle non-inherited for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
+
+#: libsvn_repos/hooks.c:89
+#, fuzzy, c-format
+msgid "Can't make pipe write handle non-inherited for hook '%s'"
+msgstr "无法为外挂“%s”创建管道"
+
+#: libsvn_repos/hooks.c:98
 #, c-format
-msgid "Attempted to make a child clone with an illegal name '%s'"
-msgstr "企图以非法名字“%s”建立子克隆"
+msgid "Can't create null stdout for hook '%s'"
+msgstr "无法为外挂“%s”创建空的标准输出"
 
-#: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from *non*-directory node"
-msgstr "企图从非目录节点删除条目“%s”"
+#: libsvn_repos/hooks.c:110
+#, c-format
+msgid "Error closing write end of stderr pipe"
+msgstr "关闭标准错误管道末尾发生错误"
 
-#: libsvn_fs_base/dag.c:858
+#: libsvn_repos/hooks.c:115
 #, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from immutable directory node"
-msgstr "企图从不可更改目录节点删除条目“%s”"
+msgid "Failed to start '%s' hook"
+msgstr "运行外挂“%s”失败"
 
-#: libsvn_fs_base/dag.c:865
+#: libsvn_repos/hooks.c:137
 #, c-format
-msgid "Attempted to delete a node with an illegal name '%s'"
-msgstr "企图删除一个非法名字“%s”的节点"
+msgid ""
+"'%s' hook failed with error output:\n"
+"%s"
+msgstr ""
+"外挂“%s”失败,错误输出:\n"
+"%s"
 
-#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
+#: libsvn_repos/hooks.c:144
 #, fuzzy, c-format
-msgid "Delete failed: directory has no entry '%s'"
-msgstr "删除失败:目录没有项目“%s”"
+msgid "'%s' hook failed; no error output available"
+msgstr "外挂“%s”失败;没有可用的错误输出"
 
-#: libsvn_fs_base/dag.c:962
-#, fuzzy
-msgid "Attempted removal of immutable node"
-msgstr "企图删除不可改变的节点"
+#: libsvn_repos/hooks.c:163
+#, c-format
+msgid "Error closing read end of stderr pipe"
+msgstr "关闭读标准错误管道末尾发生错误"
 
-#: libsvn_fs_base/dag.c:1082
-msgid "Attempted to get textual contents of a *non*-file node"
-msgstr "企图获取非文件节点的文本内容"
+#: libsvn_repos/hooks.c:167
+#, c-format
+msgid "Error closing null file"
+msgstr "关闭空文件发生错误"
 
-#: libsvn_fs_base/dag.c:1117
-msgid "Attempted to get length of a *non*-file node"
-msgstr "企图获取非文件节点的长度"
+#: libsvn_repos/hooks.c:465
+#, c-format
+msgid "Failed to run '%s' hook; broken symlink"
+msgstr "运行外挂“%s”失败;无效的符号连接"
 
-#: libsvn_fs_base/dag.c:1143
-msgid "Attempted to get checksum of a *non*-file node"
-msgstr "企图获取非文件节点的校验和"
+#: libsvn_repos/hooks.c:606
+msgid ""
+"Repository has not been enabled to accept revision propchanges;\n"
+"ask the administrator to create a pre-revprop-change hook"
+msgstr ""
+"档案库未激活接受修订版属性改变;请管理员创建一个 pre-revprop-change 外挂"
 
-#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy
-msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "企图设置非文件节点文本内容"
+#: libsvn_repos/load.c:117
+msgid "Premature end of content data in dumpstream"
+msgstr "导出流中内容数据过早结束"
 
-#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
-#, fuzzy
-msgid "Attempted to set textual contents of an immutable node"
-msgstr "企图设置不可改变节点文本内容"
+#: libsvn_repos/load.c:124
+msgid "Dumpstream data appears to be malformed"
+msgstr "导出流数据中出现畸形"
 
-#: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
+#: libsvn_repos/load.c:173
+#, c-format
+msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
 msgstr ""
-"校验和不匹配,报告“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
 
-#: libsvn_fs_base/dag.c:1312
+#: libsvn_repos/load.c:186
 #, c-format
-msgid "Attempted to open non-existent child node '%s'"
-msgstr "企图打开不存在的子节点“%s”"
+msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
+msgstr ""
 
-#: libsvn_fs_base/dag.c:1318
-#, c-format
-msgid "Attempted to open node with an illegal name '%s'"
-msgstr "企图以不合法的名字“%s”打开节点"
+#: libsvn_repos/load.c:270
+msgid "Incomplete or unterminated property block"
+msgstr "不完整或未结束的属性块"
 
-#: libsvn_fs_base/err.c:37 libsvn_fs_fs/err.c:39
-msgid "Filesystem object has not been opened yet"
-msgstr "文件系统对象尚未打开"
+#: libsvn_repos/load.c:407
+msgid "Unexpected EOF writing contents"
+msgstr "写内容时有意料之外的结束符"
+
+#: libsvn_repos/load.c:436
+msgid "Malformed dumpfile header"
+msgstr "畸形的导出文件头"
 
-#: libsvn_fs_base/err.c:68 libsvn_fs_fs/err.c:70
+#: libsvn_repos/load.c:442 libsvn_repos/load.c:484
 #, c-format
-msgid "Corrupt filesystem revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$s”中的文件系统修订版 %1$ld 损坏"
+msgid "Unsupported dumpfile version: %d"
+msgstr "不支持的导出文件版本:%d"
+
+#: libsvn_repos/load.c:587
+msgid "Unrecognized record type in stream"
+msgstr "流中有无法辨识的记录类型"
+
+#: libsvn_repos/load.c:699
+msgid "Sum of subblock sizes larger than total block content length"
+msgstr "子块大小总数大于块内容长度总数"
 
-#: libsvn_fs_base/err.c:81 libsvn_fs_fs/err.c:83
+# as-is
+#: libsvn_repos/load.c:880
 #, c-format
-msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
+msgid "<<< Started new transaction, based on original revision %ld\n"
+msgstr "<<< 开始新的事务,基于最初的修订版 %ld\n"
 
-#: libsvn_fs_base/err.c:101 libsvn_fs_fs/err.c:103
+#: libsvn_repos/load.c:925
 #, c-format
-msgid "Reference to non-existent node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中引用不存在的节点“%1$s”"
+msgid "Relative source revision %ld is not available in current repository"
+msgstr "相对来源修订版 %ld 不存在于目前档案库之中"
+
+#: libsvn_repos/load.c:974
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr "畸形的导出流:修订版 0 不能包含节点记录"
 
-#: libsvn_fs_base/err.c:111 libsvn_fs_fs/err.c:113
+#: libsvn_repos/load.c:984
 #, c-format
-msgid "Reference to non-existent revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$s”中引用不存在的修订版“%1$ld”"
+msgid " * editing path : %s ..."
+msgstr " * 正在修改路径:%s ..."
 
-#: libsvn_fs_base/err.c:122 libsvn_fs_fs/err.c:124
+#: libsvn_repos/load.c:991
 #, c-format
-msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
+msgid " * deleting path : %s ..."
+msgstr " * 正在删除路径:%s ..."
 
-#: libsvn_fs_base/err.c:132 libsvn_fs_fs/err.c:134
+#: libsvn_repos/load.c:999
 #, c-format
-msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
+msgid " * adding path : %s ..."
+msgstr " * 正在添加路径:%s ..."
 
-#: libsvn_fs_base/err.c:144 libsvn_fs_fs/err.c:146
+#: libsvn_repos/load.c:1008
 #, c-format
-msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'transactions' 表格有无效的项目"
+msgid " * replacing path : %s ..."
+msgstr " * 正在替换路径:%s ..."
 
-#: libsvn_fs_base/err.c:155 libsvn_fs_fs/err.c:157
+#: libsvn_repos/load.c:1018
 #, c-format
-msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%1$s”的 'copies' 表格有无效的项目"
+msgid "Unrecognized node-action on node '%s'"
+msgstr "“%s”的节点种动作法辨识"
+
+#: libsvn_repos/load.c:1154
+#, fuzzy
+msgid " done.\n"
+msgstr "完成。\n"
 
-#: libsvn_fs_base/err.c:166 libsvn_fs_fs/err.c:190
+# as-is
+#: libsvn_repos/load.c:1229
 #, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件无法变更:文件系统“%s”,修订版 %ld,路径“%s”"
+msgid ""
+"\n"
+"------- Committed revision %ld >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- 提交后的修订版 %ld >>>\n"
+"\n"
 
-#: libsvn_fs_base/err.c:177 libsvn_fs_fs/err.c:201
+# as-is
+#: libsvn_repos/load.c:1235
 #, c-format
-msgid "Search for malformed path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
+msgid ""
+"\n"
+"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- 提交新修订版 %ld (从原始修订版 %ld 装载) >>>\n"
+"\n"
 
-#: libsvn_fs_base/err.c:188 libsvn_fs_fs/err.c:212
+#: libsvn_repos/node_tree.c:238
 #, c-format
-msgid "No transaction named '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中不存在名为“%1$s”的事务"
+msgid "'%s' not found in filesystem"
+msgstr "在文件系统中找不到“%s”"
 
-#: libsvn_fs_base/err.c:199 libsvn_fs_fs/err.c:223
+#: libsvn_repos/replay.c:359
 #, c-format
-msgid "Cannot modify transaction named '%s' in filesystem '%s'"
-msgstr "无法在文件系统“%2$s”中修改名为“%1$s”的事务"
+msgid "Filesystem path '%s' is neither a file nor a directory"
+msgstr "文件系统中路径“%s”既不是文件也不是目录"
 
-#: libsvn_fs_base/err.c:210 libsvn_fs_fs/err.c:234
+#: libsvn_repos/reporter.c:603
 #, c-format
-msgid "No copy with id '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中没有编号“%1$s”的拷贝"
+msgid "Working copy path '%s' does not exist in repository"
+msgstr "工作拷贝路径“%s”不存在档案库中"
+
+#: libsvn_repos/reporter.c:824
+msgid "Not authorized to open root of edit operation"
+msgstr "未授权打开根进行编辑操作"
+
+#: libsvn_repos/reporter.c:843
+#, fuzzy
+msgid "Target path does not exist"
+msgstr "路径“%s”不存在"
+
+#: libsvn_repos/reporter.c:850
+msgid "Cannot replace a directory from within"
+msgstr "不能在目录中替换"
+
+#: libsvn_repos/reporter.c:893
+msgid "Invalid report for top level of working copy"
+msgstr "无效的最上层工作拷贝报告"
+
+#: libsvn_repos/reporter.c:908
+msgid "Two top-level reports with no target"
+msgstr "两个最上层报告没有目标"
 
-#: libsvn_fs_base/err.c:220 libsvn_fs_fs/err.c:266
+#: libsvn_repos/repos.c:176
 #, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+msgid "'%s' exists and is non-empty"
+msgstr "“%s”已存在并且非空"
 
-#: libsvn_fs_base/err.c:231 libsvn_fs_fs/err.c:288
-#, fuzzy, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%s”不是文件系统“%s”的目录"
+#: libsvn_repos/repos.c:238
+msgid "Creating db logs lock file"
+msgstr "正在创建数据库日值锁文件"
 
-#: libsvn_fs_base/err.c:242 libsvn_fs_fs/err.c:277
-#, fuzzy, c-format
-msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
-msgstr "标识“%s”没有指向文件系统“%s”中存在的锁"
+#: libsvn_repos/repos.c:256
+msgid "Creating db lock file"
+msgstr "正在创建数据库锁文件"
 
-#: libsvn_fs_base/err.c:252
-#, fuzzy, c-format
-msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$s”中的路径“%1$s”标识"
+#: libsvn_repos/repos.c:266
+msgid "Creating lock dir"
+msgstr "正在创建锁文件目录"
 
-#: libsvn_fs_base/err.c:261
-#, fuzzy, c-format
-msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中“%s”的 'locks' 表格有无效的锁"
+#: libsvn_repos/repos.c:307
+msgid "Creating hook directory"
+msgstr "正在创建外挂目录"
 
-#: libsvn_fs_base/err.c:271 libsvn_fs_fs/err.c:244
-#, fuzzy, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "文件系统“%2$s”中的路径“%1$s”中没有锁"
+#: libsvn_repos/repos.c:413
+msgid "Creating start-commit hook"
+msgstr "正在创建 start-commit 外挂时发生错误"
 
-#: libsvn_fs_base/err.c:282 libsvn_fs_fs/err.c:179
-#, fuzzy, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr "锁已过期:文件系统“%2$s”中的锁标识“%1$s”"
+#: libsvn_repos/repos.c:550
+msgid "Creating pre-commit hook"
+msgstr "正在创建 pre-commit 外挂"
 
-#: libsvn_fs_base/err.c:293 libsvn_fs_fs/err.c:255
-#, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "文件系统“%s”当前没有用户名关联"
+#: libsvn_repos/repos.c:682
+msgid "Creating pre-revprop-change hook"
+msgstr "正在创建 pre-revprop-change 外挂"
 
-#: libsvn_fs_base/err.c:305 libsvn_fs_fs/err.c:312
-#, fuzzy, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$s”尝试在文件系统“%3$s”中使用属于“%2$s”的锁"
+#: libsvn_repos/repos.c:1057
+msgid "Creating post-commit hook"
+msgstr "正在创建 post-commit 外挂"
 
-#: libsvn_fs_base/err.c:317 libsvn_fs_fs/err.c:299
-#, fuzzy, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "路径“%1$s”已经在文件系统“%3$s”中被用户“%2$s”锁定"
+#: libsvn_repos/repos.c:1377
+msgid "Creating post-revprop-change hook"
+msgstr "正在创建 post-revprop-change 外挂"
 
-#: libsvn_fs_base/fs.c:79
-#, c-format
-msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
-msgstr "不正确的数据库版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
+#: libsvn_repos/repos.c:1387
+msgid "Creating conf directory"
+msgstr "正在创建 conf 目录"
 
-#: libsvn_fs_base/fs.c:90
-#, c-format
-msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "不正确的数据库版本:用 %d.%d.%d 版本编译,正在运行版本 %d.%d.%d"
+#: libsvn_repos/repos.c:1453
+msgid "Creating svnserve.conf file"
+msgstr "正在创建 svnserve.conf 文件"
+
+#: libsvn_repos/repos.c:1478
+msgid "Creating passwd file"
+msgstr "正在创建 passwd 文件"
 
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:57
+#: libsvn_repos/repos.c:1527
 #, fuzzy
-msgid "Filesystem object already open"
-msgstr "文件系统对象已经打开"
+msgid "Creating authz file"
+msgstr "正在创建 passwd 文件"
+
+#: libsvn_repos/repos.c:1560
+msgid "Could not create top-level directory"
+msgstr "无法创建最上层目录"
+
+#: libsvn_repos/repos.c:1564
+msgid "Creating DAV sandbox dir"
+msgstr "正在创建 DAV sandbox 目录"
 
-#: libsvn_fs_base/fs.c:676 libsvn_fs_fs/fs_fs.c:252
-#, c-format
-msgid "Expected FS format '%d'; found format '%d'"
-msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
+#: libsvn_repos/repos.c:1645
+msgid "Error opening db lockfile"
+msgstr "打开数据库锁文件错误"
 
-# as-is
-#: libsvn_fs_base/fs.c:1055
-#, fuzzy, c-format
-msgid "Can't open file '%s' for reading"
-msgstr "不能打开文件“%s”进行读取"
+#: libsvn_repos/repos.c:1682
+msgid "Repository creation failed"
+msgstr "档案库创建失败"
 
-# as-is
-#: libsvn_fs_base/fs.c:1064
+#: libsvn_repos/repos.c:1763
 #, fuzzy, c-format
-msgid "Can't open file '%s' for writing"
-msgstr "不能打开文件“%s”进行写入"
+msgid "Expected repository format '%d' or '%d'; found format '%d'"
+msgstr "期待文件系统(FS)格式 “%d”;找到格式“%d”"
 
-#: libsvn_fs_base/fs.c:1084
-#, fuzzy, c-format
-msgid "Error reading file '%s'"
-msgstr "读取文件“%s”时发生错误"
+#: libsvn_repos/rev_hunt.c:64
+#, c-format
+msgid "Failed to find time on revision %ld"
+msgstr "无法找到修订版 %ld 的时间"
 
-#: libsvn_fs_base/fs.c:1095
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
-msgstr "写入文件“%s”时发生错误"
+#: libsvn_repos/rev_hunt.c:219
+#, c-format
+msgid "Invalid start revision %ld"
+msgstr "无效的起始修订版 %ld"
 
-#: libsvn_fs_base/fs.c:1103 libsvn_fs_base/fs.c:1107 libsvn_subr/io.c:2210
+#: libsvn_repos/rev_hunt.c:223
 #, c-format
-msgid "Can't close file '%s'"
-msgstr "无法关闭文件“%s”"
+msgid "Invalid end revision %ld"
+msgstr "无效的结束修订版 %ld"
 
-#: libsvn_fs_base/fs.c:1216
+#: libsvn_repos/rev_hunt.c:315
 #, fuzzy
-msgid ""
-"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
-"may be interfering with the hotcopy algorithm. If \n"
-"the problem persists, try deactivating this feature \n"
-"in DB_CONFIG"
-msgstr ""
-"复制日志文件时发生错误;DB_LOG_AUTOREMOVE 可能对制作\n"
-"即时拷贝的演算法有所影响。如果问题依旧存在,请尝试\n"
-"在 DB_CONFIG 中取消这个功能。"
+msgid "Unreadable path encountered; access denied"
+msgstr "遇到不能读的路径;访问拒绝。"
 
-#: libsvn_fs_base/fs.c:1235
-#, fuzzy
-msgid ""
-"Error running catastrophic recovery on hotcopy; the \n"
-"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
-"hotcopy algorithm. If the problem persists, try deactivating \n"
-"this feature in DB_CONFIG"
+#: libsvn_subr/cmdline.c:481
+#, c-format
+msgid "Error initializing command line arguments"
 msgstr ""
-"对即时拷贝执行灾后重建时发生错误;DB_LOG_AUTOREMOVE 功能\n"
-"可能对制作即时拷贝的演算法有所影响。如果问题依旧存在,请\n"
-"尝试在 DB_CONFIG 中取消这个功能。"
-
-#: libsvn_fs_base/fs.c:1345
-msgid "Module for working with a Berkeley DB repository."
-msgstr "模块与伯克利数据库(Berkeley DB)档案库一起工作。"
 
-#: libsvn_fs_base/fs.c:1379
+#: libsvn_subr/config.c:630
 #, c-format
-msgid "Unsupported FS loader version (%d) for bdb"
-msgstr "不支持的 bdb 的 FS 载入器版本 (%d)"
+msgid "Config error: invalid boolean value '%s'"
+msgstr "配置错误:无效的布尔值“%s”"
 
-#: libsvn_fs_base/lock.c:449 libsvn_fs_fs/lock.c:615
+#: libsvn_subr/config.c:880
 #, c-format
-msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "不能在路径“%s”校验锁;没有有效的用户名"
+msgid "Config error: invalid integer value '%s'"
+msgstr "配置错误:无效的整数值“%s”"
+
+#: libsvn_subr/config_auth.c:94
+msgid "Unable to open auth file for reading"
+msgstr "不能打开认证文件读取数据"
 
-#: libsvn_fs_base/lock.c:455 libsvn_fs_fs/lock.c:621
+#: libsvn_subr/config_auth.c:99
 #, c-format
-msgid "User %s does not own lock on path '%s' (currently locked by %s)"
-msgstr "用户 %s 不是路径“%s”锁的所有者(当前由用户 %s 锁定)"
+msgid "Error parsing '%s'"
+msgstr "分解“%s”时发生错误"
+
+#: libsvn_subr/config_auth.c:123
+msgid "Unable to locate auth file"
+msgstr "无法定位认证文件文件"
+
+#: libsvn_subr/config_auth.c:134
+msgid "Unable to open auth file for writing"
+msgstr "无法打开认证文件写入数据"
 
-#: libsvn_fs_base/lock.c:462 libsvn_fs_fs/lock.c:628
+#: libsvn_subr/config_auth.c:137
 #, c-format
-msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "不能校验路径“%s”上的锁;没有匹配的可用锁标识"
+msgid "Error writing hash to '%s'"
+msgstr "写哈希数据至“%s”时发生错误"
 
-#: libsvn_fs_base/reps-strings.c:103
-#, fuzzy
-msgid "Representation is not of type 'delta'"
-msgstr "请求不是 “delta” 类型"
+#: libsvn_subr/date.c:204
+#, c-format
+msgid "Can't manipulate current date"
+msgstr "不能获得当前日期"
 
-#: libsvn_fs_base/reps-strings.c:495
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
 #, c-format
-msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%s”请求Diff 的版本冲突"
+msgid "Can't calculate requested date"
+msgstr "无法计算被请求的日期"
 
-#: libsvn_fs_base/reps-strings.c:758
+#: libsvn_subr/date.c:281
 #, c-format
-msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,限制是 %s"
+msgid "Can't expand time"
+msgstr "无法明确时间"
 
-#: libsvn_fs_base/reps-strings.c:774
+#: libsvn_subr/dso.c:70
 #, fuzzy, c-format
-msgid "Failure reading rep '%s'"
-msgstr "读取报告“%s”失败"
+msgid "Can't grab DSO mutex"
+msgstr "无法获取文件系统(FS)互斥体"
 
-#: libsvn_fs_base/reps-strings.c:790 libsvn_fs_base/reps-strings.c:876
+#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
 #, fuzzy, c-format
-msgid ""
-"Checksum mismatch on rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"报告“%s”的校验和不匹配:\n"
-" 预期: %s\n"
-" 实际: %s\n"
-
-#: libsvn_fs_base/reps-strings.c:890
-msgid "Null rep, but offset past zero already"
-msgstr "空的报告,偏移已经超过零值"
+msgid "Can't ungrab DSO mutex"
+msgstr "不能释放文件系统(FS)互斥体"
 
-#: libsvn_fs_base/reps-strings.c:1003 libsvn_fs_base/reps-strings.c:1199
-#, fuzzy, c-format
-msgid "Rep '%s' is not mutable"
-msgstr "报告“%s”是不可变的"
+#: libsvn_subr/error.c:326
+msgid "Can't recode error string from APR"
+msgstr "无法自 APR 将错误信息重新编码"
 
-#: libsvn_fs_base/reps-strings.c:1018
+#: libsvn_subr/error.c:417
 #, c-format
-msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s” 可变并且非全文本"
+msgid "%swarning: %s\n"
+msgstr "%s警告:%s\n"
 
-#: libsvn_fs_base/reps-strings.c:1318
-msgid "Failed to get new string key"
-msgstr "取新的字符串关键字失败"
+#: libsvn_subr/io.c:122
+#, c-format
+msgid "Can't check path '%s'"
+msgstr "无法检查路径“%s”"
 
-#: libsvn_fs_base/reps-strings.c:1393
+#: libsvn_subr/io.c:376 libsvn_subr/io.c:507
 #, c-format
-msgid "Attempt to deltify '%s' against itself"
-msgstr "企图 deltify “%s” 自身"
+msgid "Can't open '%s'"
+msgstr "不能打开“%s”"
 
-#: libsvn_fs_base/reps-strings.c:1459
-#, fuzzy, c-format
-msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%s”的MD5指纹失败"
+#: libsvn_subr/io.c:398 libsvn_subr/io.c:520
+#, c-format
+msgid "Unable to make name for '%s'"
+msgstr "不能使用名字“%s”"
 
-#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
-msgid "Transaction is not dead: '%s'"
-msgstr "事务未结束:“%s”"
+#: libsvn_subr/io.c:524 libsvn_subr/io.c:578 libsvn_subr/io.c:606
+msgid "Symbolic links are not supported on this platform"
+msgstr "此平台不支持符号链接"
 
-#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
-#, fuzzy, c-format
-msgid "Transaction is dead: '%s'"
-msgstr "事务已结束:“%s”"
+#: libsvn_subr/io.c:557
+#, c-format
+msgid "Can't read contents of link"
+msgstr "不能读取连接的内容"
 
-#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
-msgid "Transaction aborted, but cleanup failed"
-msgstr "事务中止,但清除失败"
+#: libsvn_subr/io.c:619
+#, c-format
+msgid "Can't find a temporary directory"
+msgstr "无法找到临时目录"
 
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "文件找不到:事务“%s” ,路径“%s”"
+#: libsvn_subr/io.c:752
+#, c-format
+msgid "Can't copy '%s' to '%s'"
+msgstr "不能复制“%s”到“%s”"
 
-#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:317
+# as-is
+#: libsvn_subr/io.c:786
 #, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "文件找不到:修订版 %ld,路径“%s”"
+msgid "Can't set permissions on '%s'"
+msgstr "不能在“%s”设置许可权限"
 
-#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "文件已存在:文件系统“%s”,事务 “%s”,路径“%s”"
+#: libsvn_subr/io.c:808
+#, c-format
+msgid "Can't append '%s' to '%s'"
+msgstr "不能附加“%s”到“%s”"
 
-#: libsvn_fs_base/tree.c:418 libsvn_fs_fs/tree.c:338
+#: libsvn_subr/io.c:842
 #, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件已存在:文件系统“%s”,修订版 %ld,路径“%s”"
+msgid "Source '%s' is not a directory"
+msgstr "源“%s”不是目录"
 
-#: libsvn_fs_base/tree.c:428 libsvn_fs_fs/tree.c:348
-#, fuzzy
-msgid "Root object must be a transaction root"
-msgstr "根对象必须是一个事务的根对象"
+#: libsvn_subr/io.c:848
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的“%s”不是目录"
 
-#: libsvn_fs_base/tree.c:837 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
-msgid "Failure opening '%s'"
-msgstr "打开“%s”失败"
+#: libsvn_subr/io.c:854
+#, c-format
+msgid "Destination '%s' already exists"
+msgstr "目的“%s”已存在"
 
-#: libsvn_fs_base/tree.c:1407 libsvn_fs_fs/tree.c:1155
-#, fuzzy
-msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个不同的文件系统之间比较属性值"
+#: libsvn_subr/io.c:923 libsvn_subr/io.c:1816 libsvn_subr/io.c:1867
+#: libsvn_subr/io.c:1930
+#, c-format
+msgid "Can't read directory '%s'"
+msgstr "无法读取目录“%s”"
 
-#: libsvn_fs_base/tree.c:1741
-msgid "Corrupt DB: faulty predecessor count"
-msgstr "无效的数据库:先前的数目不完整"
+#: libsvn_subr/io.c:928 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
+#: libsvn_subr/io.c:1935 libsvn_subr/io.c:2982
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "关闭目录“%s”时发生错误"
 
-#: libsvn_fs_base/tree.c:1796 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
-msgid "Unexpected immutable node at '%s'"
-msgstr "在“%s”有未知或意想不到的不可改变节点"
+#: libsvn_subr/io.c:954
+#, c-format
+msgid "Can't make directory '%s'"
+msgstr "无法创建目录“%s”"
 
 # as-is
-#: libsvn_fs_base/tree.c:1817 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
-msgid "Conflict at '%s'"
-msgstr "在“%s”冲突"
-
-#: libsvn_fs_base/tree.c:1867 libsvn_fs_base/tree.c:2570
-#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1753
-msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "错误的合并;最初的,原始,目标不是全部在同一个文件系统(fs)"
+#: libsvn_subr/io.c:1041
+#, c-format
+msgid "Can't set access time of '%s'"
+msgstr "不能设置“%s”的存取时间"
 
-#: libsvn_fs_base/tree.c:1883 libsvn_fs_fs/tree.c:1280
+#: libsvn_subr/io.c:1181
 #, c-format
-msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "错误的合并:目标“%s”拥有编号“%s”,与初始的相同"
+msgid "Can't get default file perms for file at '%s' (file stat error)"
+msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
 
-#: libsvn_fs_base/tree.c:2377
+# as-is
+#: libsvn_subr/io.c:1192
 #, fuzzy, c-format
-msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$s”的事务“%s”已经过时"
-
-#: libsvn_fs_base/tree.c:2753 libsvn_fs_fs/tree.c:1892
-#, fuzzy
-msgid "The root directory cannot be deleted"
-msgstr "根目录不能删除"
+msgid "Can't open file at '%s'"
+msgstr "不能打开文件“%s”"
 
-#: libsvn_fs_base/tree.c:2912 libsvn_fs_fs/tree.c:1939
-msgid "Copy from mutable tree not currently supported"
-msgstr "当前不支持从可变的树复制"
+#: libsvn_subr/io.c:1196
+#, fuzzy, c-format
+msgid "Can't get file perms for file at '%s' (file stat error)"
+msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
 
-#: libsvn_fs_base/tree.c:3407 libsvn_fs_fs/tree.c:2363
+#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
 #, fuzzy, c-format
-msgid ""
-"Base checksum mismatch on '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"基本校验和在“%s”不匹配:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+msgid "Can't change perms of file '%s'"
+msgstr "不能改变文件“%s”为可读写权限"
 
-#: libsvn_fs_base/tree.c:3660 libsvn_fs_fs/tree.c:2599
-#, fuzzy
-msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个不同的文件系统询问内容的更改"
+#: libsvn_subr/io.c:1370
+#, c-format
+msgid "Can't set file '%s' read-only"
+msgstr "无法设置文件“%s”只读"
 
-#: libsvn_fs_base/tree.c:3669 libsvn_fs_base/tree.c:3674
-#: libsvn_fs_fs/tree.c:2608 libsvn_fs_fs/tree.c:2613
-#: libsvn_repos/rev_hunt.c:540
-#, fuzzy, c-format
-msgid "'%s' is not a file"
-msgstr "“%s”不是一个文件"
+#: libsvn_subr/io.c:1402
+#, c-format
+msgid "Can't set file '%s' read-write"
+msgstr "无法设置文件“%s”可读写"
+
+#: libsvn_subr/io.c:1446
+#, c-format
+msgid "Error getting UID of process"
+msgstr "获取进程用户ID(UID)时发生错误"
 
-#: libsvn_fs_fs/dag.c:436
-#, fuzzy
-msgid "Can't get entries of non-directory"
-msgstr "不能获取非目录的条目"
+#: libsvn_subr/io.c:1527
+#, c-format
+msgid "Can't get shared lock on file '%s'"
+msgstr "不能获取文件“%s“的共享锁"
 
-#: libsvn_fs_fs/dag.c:952
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, file '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"校验和不匹配,文件“%s”:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:1531
+#, c-format
+msgid "Can't get exclusive lock on file '%s'"
+msgstr "不能获取文件“%s”的排他锁"
 
-#: libsvn_fs_fs/err.c:60
+# as-is
+#: libsvn_subr/io.c:1562
 #, c-format
-msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
+msgid "Can't flush file '%s'"
+msgstr "不能写入文件“%s”"
 
-#: libsvn_fs_fs/err.c:92
+#: libsvn_subr/io.c:1563
 #, c-format
-msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
+msgid "Can't flush stream"
+msgstr "不能写入流"
 
-#: libsvn_fs_fs/err.c:168
-#, fuzzy, c-format
-msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$s”的路径“%s”有损坏的锁文件"
+#: libsvn_subr/io.c:1575 libsvn_subr/io.c:1592
+#, c-format
+msgid "Can't flush file to disk"
+msgstr "不能把文件写入磁盘"
 
-#: libsvn_fs_fs/fs.c:98
-msgid "Can't fetch FSFS mutex"
-msgstr "不能获取文件系统(FSFS)互斥体"
+#: libsvn_subr/io.c:1613
+msgid "Reading from stdin is currently broken, so disabled"
+msgstr "从标准输入设备读取数据时被中断,所以把它禁止"
 
-#: libsvn_fs_fs/fs.c:105
-#, fuzzy
-msgid "Can't create FSFS mutex"
-msgstr "无法创建文件系统(FSFS)互斥体"
+#: libsvn_subr/io.c:1634
+#, c-format
+msgid "Can't get file name"
+msgstr "无法获取文件名"
 
-#: libsvn_fs_fs/fs.c:109
-msgid "Can't store FSFS mutex"
-msgstr "不能存储文件系统(FSFS)互斥体"
+# as-is
+#: libsvn_subr/io.c:1702
+#, c-format
+msgid "Can't remove file '%s'"
+msgstr "不能移动文件“%s”"
 
-#: libsvn_fs_fs/fs.c:334
-msgid "Module for working with a plain file (FSFS) repository."
-msgstr "模块与纯文本文件(FSFS)档案库一起工作。"
+#: libsvn_subr/io.c:1731
+#, c-format
+msgid "Can't rewind directory '%s'"
+msgstr "无法返回目录“%s”"
 
-#: libsvn_fs_fs/fs.c:368
+#: libsvn_subr/io.c:1766 libsvn_subr/io.c:2833 libsvn_subr/io.c:2919
 #, c-format
-msgid "Unsupported FS loader version (%d) for fsfs"
-msgstr "不支持的 fsfs 的 FS 载入器版本 (%d)"
+msgid "Can't open directory '%s'"
+msgstr "无法打开目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:455 libsvn_fs_fs/fs_fs.c:469
-msgid "Found malformed header in revision file"
-msgstr "在修订版文件中找到畸形的文件头"
+#: libsvn_subr/io.c:1805 libsvn_subr/io.c:1827
+#, c-format
+msgid "Can't remove '%s'"
+msgstr "无法删除“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:571 libsvn_fs_fs/fs_fs.c:585 libsvn_fs_fs/fs_fs.c:592
-#: libsvn_fs_fs/fs_fs.c:599 libsvn_fs_fs/fs_fs.c:607 libsvn_fs_fs/fs_fs.c:615
-msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 中没有 text rep offset 列"
+#: libsvn_subr/io.c:1999
+#, c-format
+msgid "Can't create process '%s' attributes"
+msgstr "无法建立进程“%s”的属性"
 
-#: libsvn_fs_fs/fs_fs.c:684
-msgid "Missing kind field in node-rev"
-msgstr "node-rev 中没有 kind 栏位"
+#: libsvn_subr/io.c:2005
+#, c-format
+msgid "Can't set process '%s' cmdtype"
+msgstr "无法设置进程“%s”的命令类型"
 
-#: libsvn_fs_fs/fs_fs.c:715
-msgid "Missing cpath in node-rev"
-msgstr "node-rev 中没有 cpath"
+#: libsvn_subr/io.c:2017
+#, c-format
+msgid "Can't set process '%s' directory"
+msgstr "无法设定进程“%s”目录"
 
-#: libsvn_fs_fs/fs_fs.c:742 libsvn_fs_fs/fs_fs.c:748
-msgid "Malformed copyroot line in node-rev"
-msgstr "node-rev 中的 copyroot 行畸形"
+#: libsvn_subr/io.c:2030
+#, c-format
+msgid "Can't set process '%s' child input"
+msgstr "无法设置子进程“%s”输入"
 
-#: libsvn_fs_fs/fs_fs.c:766 libsvn_fs_fs/fs_fs.c:772
-msgid "Malformed copyfrom line in node-rev"
-msgstr "node-rev 中的 copyfrom 行畸形"
+#: libsvn_subr/io.c:2037
+#, c-format
+msgid "Can't set process '%s' child outfile"
+msgstr "无法设置子进程“%s”输出文件"
 
-#: libsvn_fs_fs/fs_fs.c:871 libsvn_fs_fs/fs_fs.c:3184
-msgid "Attempted to write to non-transaction"
-msgstr "企图写至非事务"
+#: libsvn_subr/io.c:2044
+#, c-format
+msgid "Can't set process '%s' child errfile"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_fs/fs_fs.c:955
-msgid "Malformed representation header"
-msgstr "畸形的描述文件头"
+#: libsvn_subr/io.c:2051
+#, fuzzy, c-format
+msgid "Can't set process '%s' child errfile for error handler"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_fs/fs_fs.c:979
-msgid "Missing node-id in node-rev"
-msgstr "node-rev 中没有 node-id"
+#: libsvn_subr/io.c:2057
+#, fuzzy, c-format
+msgid "Can't set process '%s' error handler"
+msgstr "无法设置子进程“%s”错误输出文件"
 
-#: libsvn_fs_fs/fs_fs.c:985
-msgid "Corrupt node-id in node-rev"
-msgstr "node-rev 中的 node-id 损坏"
+# as-is
+#: libsvn_subr/io.c:2080
+#, c-format
+msgid "Can't start process '%s'"
+msgstr "不能取得进程“%s”状态"
 
-#: libsvn_fs_fs/fs_fs.c:1030
-msgid "Revision file lacks trailing newline"
-msgstr "修订版文件缺少结尾换行符"
+#: libsvn_subr/io.c:2104
+#, c-format
+msgid "Error waiting for process '%s'"
+msgstr "为进程“%s”写入时发生错误"
 
-#: libsvn_fs_fs/fs_fs.c:1042
-msgid "Final line in revision file longer than 64 characters"
-msgstr "修订版文件的最后一列大于 64 个字符长"
+#: libsvn_subr/io.c:2112
+#, c-format
+msgid "Process '%s' failed (exitwhy %d)"
+msgstr "进程“%s”失败(返回 %d)"
 
-#: libsvn_fs_fs/fs_fs.c:1055
-msgid "Final line in revision file missing space"
-msgstr "修订版文件的最后一列少掉空白字符"
+#: libsvn_subr/io.c:2119
+#, c-format
+msgid "Process '%s' returned error exitcode %d"
+msgstr "进程“%s”返回错误退出码 %d"
 
-#: libsvn_fs_fs/fs_fs.c:1085 libsvn_fs_fs/fs_fs.c:3593
+#: libsvn_subr/io.c:2230
 #, c-format
-msgid "Can't chmod '%s'"
-msgstr "无法 chmod“%s”"
+msgid "'%s' returned %d"
+msgstr "“%s” 返回 %d"
 
-#: libsvn_fs_fs/fs_fs.c:1143 libsvn_fs_fs/fs_fs.c:1200 libsvn_repos/log.c:480
-#: libsvn_repos/log.c:484
+#: libsvn_subr/io.c:2353
 #, c-format
-msgid "No such revision %ld"
-msgstr "没有这个修订版 %ld"
+msgid ""
+"Error running '%s': exitcode was %d, args were:\n"
+"in directory '%s', basenames:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"运行“%s”时发生错误:退出码是 %d,参数是:\n"
+"在目录“%s”,名字:\n"
+"%s\n"
+"%s\n"
+"%s"
 
-#: libsvn_fs_fs/fs_fs.c:1275
-msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff 数据畸形"
+#: libsvn_subr/io.c:2406
+#, c-format
+msgid "Can't detect MIME type of non-file '%s'"
+msgstr "不能检测非文件的“%s”的MIME类型"
 
 # as-is
-#: libsvn_fs_fs/fs_fs.c:1386 libsvn_fs_fs/fs_fs.c:1399
-#: libsvn_fs_fs/fs_fs.c:1430
-msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "正在读取请求的一个 svndiff 窗口最末端"
+#: libsvn_subr/io.c:2473
+#, c-format
+msgid "Can't open file '%s'"
+msgstr "不能打开文件“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:1543
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff 数据请求不存在的来源"
+#: libsvn_subr/io.c:2509
+#, c-format
+msgid "Can't close file '%s'"
+msgstr "无法关闭文件“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:1549
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 请求的位置超出了流的结尾"
+#: libsvn_subr/io.c:2510
+#, c-format
+msgid "Can't close stream"
+msgstr "无法关闭流"
 
-#: libsvn_fs_fs/fs_fs.c:1572 libsvn_fs_fs/fs_fs.c:1589
-msgid "svndiff window length is corrupt"
-msgstr "svndiff 的窗格长度已毁损"
+# as-is
+#: libsvn_subr/io.c:2520 libsvn_subr/io.c:2544 libsvn_subr/io.c:2557
+#, c-format
+msgid "Can't read file '%s'"
+msgstr "不能读取文件“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:1637
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch while reading representation:\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"当读取请求时校验和不匹配:\n"
-" 预期: %s\n"
-" 实际: %s\n"
+#: libsvn_subr/io.c:2521 libsvn_subr/io.c:2545 libsvn_subr/io.c:2558
+#, c-format
+msgid "Can't read stream"
+msgstr "无法读取流"
 
-#: libsvn_fs_fs/fs_fs.c:1773 libsvn_fs_fs/fs_fs.c:1786
-#: libsvn_fs_fs/fs_fs.c:1792
-msgid "Directory entry corrupt"
-msgstr "目录条目损坏"
+#: libsvn_subr/io.c:2532
+#, c-format
+msgid "Can't get attribute information from file '%s'"
+msgstr "无法从文件“%s”获取属性信息"
 
-#: libsvn_fs_fs/fs_fs.c:2128 libsvn_fs_fs/fs_fs.c:2136
-#: libsvn_fs_fs/fs_fs.c:2168 libsvn_fs_fs/fs_fs.c:2188
-#: libsvn_fs_fs/fs_fs.c:2222 libsvn_fs_fs/fs_fs.c:2227
-msgid "Invalid changes line in rev-file"
-msgstr "rev-file 中有无效的变更行"
+#: libsvn_subr/io.c:2533
+#, c-format
+msgid "Can't get attribute information from stream"
+msgstr "无法从流获取属性信息"
 
-#: libsvn_fs_fs/fs_fs.c:2161
-msgid "Invalid change kind in rev file"
-msgstr "rev 文件中有无效的改变种类"
+#: libsvn_subr/io.c:2569
+#, c-format
+msgid "Can't set position pointer in file '%s'"
+msgstr "无法在文件“%s”设置定位指针"
 
-#: libsvn_fs_fs/fs_fs.c:2181
-msgid "Invalid text-mod flag in rev-file"
-msgstr "rev-file 中有无效的 text-mod 标志"
+#: libsvn_subr/io.c:2570
+#, c-format
+msgid "Can't set position pointer in stream"
+msgstr "无法在流中设置定位指针"
 
-#: libsvn_fs_fs/fs_fs.c:2201
-msgid "Invalid prop-mod flag in rev-file"
-msgstr "rev-file 中有无效的 prop-mod 标志"
+#: libsvn_subr/io.c:2581 libsvn_subr/io.c:2594
+#, c-format
+msgid "Can't write to file '%s'"
+msgstr "无法写入文件“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:2384
-msgid "Copying from transactions not allowed"
-msgstr "自事务进行复制是不被允许的"
+#: libsvn_subr/io.c:2582 libsvn_subr/io.c:2595
+#, c-format
+msgid "Can't write to stream"
+msgstr "无法写入流"
 
-#: libsvn_fs_fs/fs_fs.c:2440
+# as-is
+#: libsvn_subr/io.c:2635
 #, fuzzy, c-format
-msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "无法为修订版 %2$ld 在“%s”创建事务目录"
-
-#: libsvn_fs_fs/fs_fs.c:2629 libsvn_fs_fs/fs_fs.c:2636
-msgid "next-id file corrupt"
-msgstr "next-id 文件损坏"
+msgid "Can't read length line in file '%s'"
+msgstr "不能从文件“%s”读取长度行"
 
-#: libsvn_fs_fs/fs_fs.c:2721
+#: libsvn_subr/io.c:2639
 #, fuzzy
-msgid "Transaction cleanup failed"
-msgstr "事务清除失败"
+msgid "Can't read length line in stream"
+msgstr "无法从数据流读取长度行"
 
-#: libsvn_fs_fs/fs_fs.c:2884
-msgid "Invalid change type"
-msgstr "无效的变更类型"
+#: libsvn_subr/io.c:2686
+#, c-format
+msgid "Can't move '%s' to '%s'"
+msgstr "不能移动“%s”到“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:3203
-msgid "Can't set text contents of a directory"
-msgstr "无法设定目录的文字内容"
+#: libsvn_subr/io.c:2764
+#, c-format
+msgid "Can't create directory '%s'"
+msgstr "无法创建目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:3293 libsvn_fs_fs/fs_fs.c:3298
-#: libsvn_fs_fs/fs_fs.c:3305
-msgid "Corrupt current file"
-msgstr "当前文件损坏"
+#: libsvn_subr/io.c:2775 libsvn_wc/copy.c:204
+#, c-format
+msgid "Can't hide directory '%s'"
+msgstr "无法隐藏目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:3731
-msgid "Can't grab FSFS repository mutex"
-msgstr "不能获取文件(FSFS)档案库互斥体"
+#: libsvn_subr/io.c:2787
+#, c-format
+msgid "Can't stat directory '%s'"
+msgstr "无法获取目录“%s”的状态"
 
-#: libsvn_fs_fs/fs_fs.c:3745
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "不能是否文件(FSFS)档案库互斥体"
+#: libsvn_subr/io.c:2851
+#, c-format
+msgid "Can't remove directory '%s'"
+msgstr "无法删除目录“%s”"
+
+#: libsvn_subr/io.c:2869
+#, c-format
+msgid "Can't read directory"
+msgstr "无法读取目录"
+
+#: libsvn_subr/io.c:2938
+#, c-format
+msgid "Can't read directory entry in '%s'"
+msgstr "无法在目录“%s”读取内容"
+
+#: libsvn_subr/io.c:3063
+#, c-format
+msgid "Can't check directory '%s'"
+msgstr "无法检查目录“%s”"
 
-#: libsvn_fs_fs/fs_fs.c:3861
-msgid "Transaction out of date"
-msgstr "事务过时"
+#: libsvn_subr/io.c:3085
+#, c-format
+msgid "Version %d is not non-negative"
+msgstr "版本 %d 未被确认"
 
-#: libsvn_fs_fs/fs_fs.c:4133
-msgid "No such transaction"
-msgstr "无此事务"
+#: libsvn_subr/io.c:3135
+#, c-format
+msgid "Reading '%s'"
+msgstr "正在读取“%s”"
 
-#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
-msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "无法写入锁/条目的混杂文件“%s”"
+#: libsvn_subr/io.c:3151
+#, c-format
+msgid "First line of '%s' contains non-digit"
+msgstr "“%s”的第一行包含了非阿拉伯数字"
 
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_subr/nls.c:79
 #, fuzzy, c-format
-msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "不能分析锁/条目的混杂文件“%s“"
+msgid "Can't convert string to UCS-2: '%s'"
+msgstr "不能把字符串转换为UCS-2:“%s”。"
 
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%s”不存在于最新修订版中"
+#: libsvn_subr/nls.c:86
+#, fuzzy
+msgid "Can't get module file name"
+msgstr "无法获取模块文件名"
 
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_subr/nls.c:101
 #, c-format
-msgid "Lock failed: newer version of '%s' exists"
-msgstr "锁失败:新的版本“%s”已经存在"
-
-#: libsvn_ra/ra_loader.c:212
-#, fuzzy, c-format
-msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的 RA 外挂版本不符合:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
+msgstr "不能把模块路径从UCS-2转换为UTF-8:“%s”"
 
-#: libsvn_ra/ra_loader.c:268
-#, fuzzy, c-format
-msgid "Unrecognized URL scheme for '%s'"
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
+msgid ""
+"\n"
+"Valid options:\n"
 msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+"\n"
+"有效选项:\n"
 
-# as-is
-#: libsvn_ra/ra_loader.c:582
-#, fuzzy, c-format
-msgid " - handles '%s' scheme\n"
-msgstr " - 处理“%s”规则\n"
+#: libsvn_subr/opt.c:424
+msgid " arg"
+msgstr " 参数"
 
-#: libsvn_ra/ra_loader.c:668
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
 #, c-format
-msgid "Unrecognized URL scheme '%s'"
+msgid ""
+"\"%s\": unknown command.\n"
+"\n"
 msgstr ""
-"无法辨识的地�(URL)规则(一般需�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%s”"
+"“%s”:未知的命令。\n"
+"\n"
 
-#: libsvn_ra_dav/commit.c:193
+#: libsvn_subr/opt.c:740
 #, c-format
-msgid "Could not create a request (%s '%s')"
-msgstr "无法建立请求 (%s“%s”)"
+msgid "Syntax error parsing revision '%s'"
+msgstr "剖析修订版“%s”时发生语法错误"
 
-#: libsvn_ra_dav/commit.c:292
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
-msgstr "不能获取版本资源地址(URL)(导入时需要或本地,缓存属性中缺少)"
+#: libsvn_subr/opt.c:817
+#, c-format
+msgid "URL '%s' is not properly URI-encoded"
+msgstr "地址(URL)“%s”不是正确地以 URI 编码"
 
-#: libsvn_ra_dav/commit.c:485
-#, fuzzy, c-format
-msgid "Could not create a CHECKOUT request (%s)"
-msgstr "无法产生一个签出(CHECKOUT) 请求 (%s)"
+#: libsvn_subr/opt.c:823
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr "地址(URL)“%s”包含 '..' 元素"
 
-#: libsvn_ra_dav/commit.c:572
-#, fuzzy, c-format
-msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录”%s“或许已经过时"
+#: libsvn_subr/opt.c:852
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr "解析“%s”时发生错误"
 
-#: libsvn_ra_dav/commit.c:580
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "签出(CHECKOUT)的回应没有包含一个 'Location:' 的头信息"
+#: libsvn_subr/opt.c:954
+#, c-format
+msgid ""
+"%s, version %s\n"
+" compiled %s, %s\n"
+"\n"
+msgstr ""
+"%s,版本 %s\n"
+" 编译于 %s,%s\n"
+"\n"
 
-#: libsvn_ra_dav/commit.c:879
-#, fuzzy, c-format
-msgid "Could not create a DELETE request (%s)"
-msgstr "无法产生一个删除(DELETE)请求 (%s)"
+# as-is
+#: libsvn_subr/opt.c:957
+#, fuzzy
+msgid ""
+"Copyright (C) 2000-2006 CollabNet.\n"
+"Subversion is open source software, see http://subversion.tigris.org/\n"
+"This product includes software developed by CollabNet (http://www.Collab."
+"Net/).\n"
+"\n"
+msgstr ""
+"版权所有 (C) 2000-2004 CollabNet.\n"
+"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
+"此产�包�的软件由 CollabNet (http://www.Collab.Net/)开�。\n"
+"\n"
 
-#: libsvn_ra_dav/commit.c:1310
-msgid "Could not write svndiff to temp file"
-msgstr "无法写 svndiff 至临时文件"
+#: libsvn_subr/opt.c:1010 libsvn_subr/opt.c:1053
+#, c-format
+msgid "Type '%s help' for usage.\n"
+msgstr "请使用“%s help”以得到用法和帮助。\n"
 
-#: libsvn_ra_dav/commit.c:1400
+#: libsvn_subr/path.c:1054
 #, c-format
-msgid "Could not create a PUT request (%s)"
-msgstr "无法产生一个加入(PUT)请求 (%s)"
+msgid "Couldn't determine absolute path of '%s'"
+msgstr "不能确定“%s”的绝对路径"
 
-#: libsvn_ra_dav/commit.c:1564
+#: libsvn_subr/path.c:1093
 #, c-format
-msgid "applying log message to %s"
-msgstr "应用日志信息至“%s”"
+msgid "'%s' is neither a file nor a directory name"
+msgstr "“%s”不是文件名也不是目录名"
 
-#: libsvn_ra_dav/fetch.c:277
-msgid "Could not save the URL of the version resource"
-msgstr "无法储存版本资源的地址(URL)"
+#: libsvn_subr/path.c:1199
+#, c-format
+msgid "Can't determine the native path encoding"
+msgstr "不能确定本地路径编码"
 
-#: libsvn_ra_dav/fetch.c:398
-msgid "Could not get content-type from response."
-msgstr "不能从回应中获得内容类型(content-type)"
+#: libsvn_subr/path.c:1253
+#, fuzzy, c-format
+msgid "Invalid control character '0x%02x' in path '%s'"
+msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
 
-#: libsvn_ra_dav/fetch.c:443
+#: libsvn_subr/prompt.c:97 svnserve/main.c:475
 #, c-format
-msgid "Could not create a GET request for '%s'"
-msgstr "无法为“%s”创建 GET 请求"
+msgid "Can't open stdin"
+msgstr "无法打开标准输入"
 
-#: libsvn_ra_dav/fetch.c:518
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
 #, c-format
-msgid "GET request failed for '%s'"
-msgstr "对“%s”的 GET 请求失败"
+msgid "Can't read stdin"
+msgstr "无法读取标准输入"
 
-#: libsvn_ra_dav/fetch.c:657
-msgid "Could not save file"
-msgstr "无法储存文件"
+#: libsvn_subr/prompt.c:178
+#, c-format
+msgid "Authentication realm: %s\n"
+msgstr "认证领域:%s\n"
+
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+msgid "Username: "
+msgstr "用户登录名:"
 
-#: libsvn_ra_dav/fetch.c:898 libsvn_ra_svn/client.c:912
+#: libsvn_subr/prompt.c:206
 #, c-format
+msgid "Password for '%s': "
+msgstr "“%s”的密码:"
+
+#: libsvn_subr/prompt.c:249
+#, c-format
+msgid "Error validating server certificate for '%s':\n"
+msgstr "验证“%s”的服务器凭证时发生错误:\n"
+
+#: libsvn_subr/prompt.c:255
 msgid ""
-"Checksum mismatch for '%s':\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+" - The certificate is not issued by a trusted authority. Use the\n"
+" fingerprint to validate the certificate manually!\n"
 msgstr ""
-"“%s”的总和检查值不符合:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
-
-#: libsvn_ra_dav/fetch.c:1163
-msgid "Server does not support date-based operations"
-msgstr "服务器不支持基于日期的操作"
+" - 本凭证并不是由受信任的权威机权所核发。请手动利用指纹以验证\n"
+" 凭证的有效性!\n"
 
-#: libsvn_ra_dav/fetch.c:1170
-msgid "Invalid server response to dated-rev request"
-msgstr "对 dated-rev 请求的无效服务器回应"
+#: libsvn_subr/prompt.c:262
+msgid " - The certificate hostname does not match.\n"
+msgstr " - 本凭证的主机名称不符。\n"
 
-# as-is
-#: libsvn_ra_dav/fetch.c:1309
-#, fuzzy
-msgid "'get-locations' REPORT not implemented"
-msgstr "get-locations REPORT 未实现"
+#: libsvn_subr/prompt.c:268
+msgid " - The certificate is not yet valid.\n"
+msgstr " - 本凭证尚未进入有效期间。\n"
 
-#: libsvn_ra_dav/fetch.c:1482 libsvn_ra_dav/session.c:1129
-#: libsvn_ra_dav/session.c:1415
-#, fuzzy
-msgid "Incomplete lock data returned"
-msgstr "返回了不完全的锁数据"
+#: libsvn_subr/prompt.c:274
+msgid " - The certificate has expired.\n"
+msgstr " - 本凭证已过期。\n"
 
-#: libsvn_ra_dav/fetch.c:1651 libsvn_ra_dav/fetch.c:1659
-#: libsvn_ra_dav/fetch.c:1663
-#, fuzzy
-msgid "Server does not support locking features"
-msgstr "服务器不支持锁定特性"
+#: libsvn_subr/prompt.c:280
+msgid " - The certificate has an unknown error.\n"
+msgstr " - 本凭证发生不明的错误。\n"
 
-#: libsvn_ra_dav/fetch.c:1740
+#: libsvn_subr/prompt.c:285
+#, c-format
 msgid ""
-"DAV request failed; it's possible that the repository's pre-revprop-change "
-"hook either failed or is non-existent"
+"Certificate information:\n"
+" - Hostname: %s\n"
+" - Valid: from %s until %s\n"
+" - Issuer: %s\n"
+" - Fingerprint: %s\n"
 msgstr ""
-"DAV 请求失败;可能是档案库的 pre-revprop-change 外挂执行失败;或是不存在"
+"凭证信息:\n"
+" - 主机名称:%s\n"
+" - 有效期间:自 %s 至 %s\n"
+" - 发行者:%s\n"
+" - 指纹:%s\n"
+
+#: libsvn_subr/prompt.c:300
+msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
+msgstr "(R)拒绝,(t)暂时接受 或 (p)永远接受?"
+
+#: libsvn_subr/prompt.c:304
+msgid "(R)eject or accept (t)emporarily? "
+msgstr "(R)拒绝 或 (t)暂时接受 ?"
 
-#: libsvn_ra_dav/fetch.c:2474
+#: libsvn_subr/prompt.c:343
+msgid "Client certificate filename: "
+msgstr "用户凭证文件名:"
+
+#: libsvn_subr/prompt.c:366
 #, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "写入“%s”时发生错误:意外的 EOF"
+msgid "Passphrase for '%s': "
+msgstr "“%s”的密码:"
+
+#: libsvn_subr/subst.c:1559
+#, fuzzy, c-format
+msgid "'%s' has unsupported special file type '%s'"
+msgstr "“%s”不是文件系统“%s”的目录"
 
-#: libsvn_ra_dav/fetch.c:2619
+#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
 #, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML 编码:“%s”"
+msgid "File '%s' has inconsistent newlines"
+msgstr "文件“%s”内的换行符不一致"
 
-# as-is
-#: libsvn_ra_dav/fetch.c:2901
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "报告响应处理失败不能完成编辑驱动"
+#: libsvn_subr/utf.c:194
+msgid "Can't lock charset translation mutex"
+msgstr "不能锁定字符转换互斥体"
+
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
+msgid "Can't unlock charset translation mutex"
+msgstr "不能解锁字符转换互斥体"
+
+#: libsvn_subr/utf.c:271
+#, fuzzy, c-format
+msgid "Can't create a character converter from native encoding to '%s'"
+msgstr "不能创建从本地编码到“%s”的字符转换器"
+
+#: libsvn_subr/utf.c:275
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to native encoding"
+msgstr "不能创建从“%s”到本地编码的字符转换器"
+
+#: libsvn_subr/utf.c:279
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to '%s'"
+msgstr "不能创建从“%s”到“%s”的字符转换器"
+
+#: libsvn_subr/utf.c:285
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%i' to '%i'"
+msgstr "不能创建从“%s”到“%s”的字符转换器"
+
+#: libsvn_subr/utf.c:513
+#, fuzzy, c-format
+msgid "Can't convert string from native encoding to '%s':"
+msgstr "不能把字符串从本地编码转换为”%s“编码。"
+
+#: libsvn_subr/utf.c:517
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to native encoding:"
+msgstr "不能把字符串从”%s“编码转换为本地编码。"
 
-# as-is
-#: libsvn_ra_dav/file_revs.c:360
-#, fuzzy
-msgid "'get-file-revs' REPORT not implemented"
-msgstr "get-file-revs REPORT 未实现"
+#: libsvn_subr/utf.c:521
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to '%s':"
+msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
 
-#: libsvn_ra_dav/file_revs.c:376
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs 报告中没有任何修订版"
+#: libsvn_subr/utf.c:527
+#, fuzzy, c-format
+msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
+msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
 
-#: libsvn_ra_dav/merge.c:217
-#, c-format
+#: libsvn_subr/utf.c:572
+#, fuzzy, c-format
 msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr ""
-"通讯协定错误:我们告知服务器不要自动合并任何资源,但是它报告“%s”已被合并"
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
+msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
 
-#: libsvn_ra_dav/merge.c:226
+#: libsvn_subr/utf.c:580
 #, c-format
 msgid ""
-"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
-"element within the MERGE response"
-msgstr "内部错误:在 MERGE 回应中,“DAV:response”元素有个未知的父项目 (%d)"
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr "检测到非ASCII字符 (代码 %d),并且不能转换到UTF-8(或从UTF-8转换)"
 
-#: libsvn_ra_dav/merge.c:241
+#: libsvn_subr/utf.c:622
 #, c-format
 msgid ""
-"Protocol error: the MERGE response for the '%s' resource did not return all "
-"of the properties that we asked for (and need to complete the commit)"
+"Valid UTF-8 data\n"
+"(hex:%s)\n"
+"followed by invalid UTF-8 sequence\n"
+"(hex:%s)"
 msgstr ""
-"通讯协定错误:对“%s”的 MERGE 回应并未返回所有我们请求的属性 (这些是完成提交操"
-"作所不可缺少的)"
+"有效 UTF-8 数据\n"
+"(16进制:%s)\n"
+"后接无效 UTF-8 序列\n"
+"(16进制:%s)"
 
-#: libsvn_ra_dav/merge.c:260
+#: libsvn_subr/validate.c:48
 #, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "对“%s”的 MERGE 回应并不是目标 (“%s”) 的子项目"
-
-#: libsvn_ra_dav/merge.c:481
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 属性回应包含错误状态"
-
-#: libsvn_ra_dav/options.c:130
-msgid ""
-"The OPTIONS response did not include the requested activity-collection-set; "
-"this often means that the URL is not WebDAV-enabled"
-msgstr ""
-"OPTIONS 回应并不包含请求的 activity-collection-set;通常这表示该地址(URL)并不"
-"支持 WebDAV"
+msgid "MIME type '%s' has empty media type"
+msgstr "MIME 类别“%s”含有空的媒体类别"
 
-#: libsvn_ra_dav/props.c:585
+#: libsvn_subr/validate.c:53
 #, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "无法找到标记“%s”于地址(URL)“%s”"
+msgid "MIME type '%s' does not contain '/'"
+msgstr "MIME 类别“%s”没包含 '/'"
 
-#: libsvn_ra_dav/props.c:614
+#: libsvn_subr/validate.c:58
 #, c-format
-msgid "'%s' was not present on the resource"
-msgstr "“%s”不存在于本资源上"
+msgid "MIME type '%s' ends with non-alphanumeric character"
+msgstr "MIME 类别“%s”以非字母与数字字符结束"
 
-#: libsvn_ra_dav/props.c:653
+#: libsvn_subr/version.c:74
 #, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon 不能分析地址(URL)”%s“"
-
-#: libsvn_ra_dav/props.c:682
-msgid "The path was not part of a repository"
-msgstr "路径不是档案库的一部份"
+msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%s”的版本不一致:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
 
-#: libsvn_ra_dav/props.c:693
+#: libsvn_subr/xml.c:400
 #, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%s”的任何一部份在档案库 HEAD 中都找不到"
-
-#: libsvn_ra_dav/props.c:727 libsvn_ra_dav/props.c:782
-msgid "The VCC property was not found on the resource"
-msgstr "本资源找不到 VCC 属性"
+msgid "Malformed XML: %s at line %d"
+msgstr "畸形的XML:%s 在第 %d 行"
 
-#: libsvn_ra_dav/props.c:795
-msgid "The relative-path property was not found on the resource"
-msgstr "本资源上找不到相对路径属性"
+#: libsvn_wc/adm_crawler.c:599
+msgid "Error aborting report"
+msgstr "取消报告时发生错误"
 
-#: libsvn_ra_dav/props.c:916
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' 不存在于基线资源"
+#: libsvn_wc/adm_crawler.c:794
+msgid "Error opening local file"
+msgstr "打开本地文件时发生错误"
 
-#: libsvn_ra_dav/props.c:935
-msgid "'DAV:version-name' was not present on the baseline resource"
-msgstr "'DAV:version-name' 不存在于基线资源"
+#: libsvn_wc/adm_crawler.c:859
+#, c-format
+msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
 
-#: libsvn_ra_dav/props.c:1103
-msgid "At least one property change failed; repository is unchanged"
-msgstr "至少有一个属性变更失败;档案库未改变"
+#: libsvn_wc/adm_files.c:100
+#, fuzzy, c-format
+msgid "'%s' is not a valid administrative directory name"
+msgstr "“%s”不是文件名也不是目录名"
 
-#: libsvn_ra_dav/session.c:442
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "无效的地址(URL):代理(proxy)通信端口编号中有不合法的字符"
+# plz leave this as-is
+#: libsvn_wc/adm_files.c:260
+msgid "Bad type indicator"
+msgstr "错误的类型"
 
-#: libsvn_ra_dav/session.c:446
-msgid "Invalid URL: negative proxy port number"
-msgstr "无效的地址(URL):负的代理(proxy)通信端口数值"
+#: libsvn_wc/adm_files.c:501
+msgid "APR_APPEND not supported for adm files"
+msgstr "APR_APPEND 不支持管理文件"
 
-#: libsvn_ra_dav/session.c:449
+#: libsvn_wc/adm_files.c:544
 msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr ""
-"无效的地址(URL):代理(proxy)通信端口数值大于最大值的 TCP 通信端口数值 65535"
-
-#: libsvn_ra_dav/session.c:463
-msgid "Invalid config: illegal character in timeout value"
-msgstr "无效的配置:超时数值中有不合法的字符"
-
-#: libsvn_ra_dav/session.c:467
-msgid "Invalid config: negative timeout value"
-msgstr "无效的配置:负的超时数值"
-
-#: libsvn_ra_dav/session.c:480
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "无效的配置:除错遮罩值中有不合法的字符"
-
-# as-is
-#: libsvn_ra_dav/session.c:543
-msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
-msgstr "通过WebDAV (DeltaV) 协议访问档案库的模块。"
-
-#: libsvn_ra_dav/session.c:593
-msgid "Malformed URL for repository"
-msgstr "档案库的地址(URL)畸形"
+"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
+"again"
+msgstr "您的 .svn/tmp 目录可能丢失或损坏;请执行“svn cleanup”,然后再试一次"
 
-#: libsvn_ra_dav/session.c:601
-msgid "Network socket initialization failed"
-msgstr "网络 socket 启始失败"
+#: libsvn_wc/adm_files.c:687 libsvn_wc/lock.c:592 libsvn_wc/lock.c:855
+#, c-format
+msgid "'%s' is not a working copy"
+msgstr "“%s”不是工作拷贝"
 
-#: libsvn_ra_dav/session.c:618
-msgid "SSL is not supported"
-msgstr "不支持 SSL"
+#: libsvn_wc/adm_files.c:694 libsvn_wc/adm_files.c:762
+#: libsvn_wc/adm_files.c:824
+msgid "No such thing as 'base' working copy properties!"
+msgstr "没有 '基础' 工作拷贝属性这样的东西"
 
-#: libsvn_ra_dav/session.c:764
+#: libsvn_wc/adm_files.c:893 libsvn_wc/util.c:51
 #, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "无效的配置:无法载入凭证文件“%s”"
+msgid "'%s' is not a directory"
+msgstr "“%s”不是目录"
 
-#: libsvn_ra_dav/session.c:852
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "无法在本资源或任何其父项目中找到 UUID 属性"
+#: libsvn_wc/adm_files.c:955
+#, c-format
+msgid "No entry for '%s'"
+msgstr "没有“%s”的项目"
 
-#: libsvn_ra_dav/session.c:860
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "请将服务器升级至 0.19 或更新的版本"
+#: libsvn_wc/adm_files.c:968
+#, c-format
+msgid "Revision %ld doesn't match existing revision %ld in '%s'"
+msgstr "修订版 %ld 不符合现有的修订版 %ld 于“%s”中"
 
-#: libsvn_ra_dav/session.c:1101 libsvn_ra_dav/session.c:1238
-#, fuzzy
-msgid "Failed to parse URI"
-msgstr "分析地址(URI)失败"
+#: libsvn_wc/adm_files.c:976
+#, c-format
+msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
+msgstr "地址(URL)“%s”不符合现有的地址(URL)“%s”于“%s”中"
 
-#: libsvn_ra_dav/session.c:1124
-#, fuzzy
-msgid "Lock request failed"
-msgstr "锁请求失败"
+#: libsvn_wc/adm_ops.c:258
+#, c-format
+msgid "Unrecognized node kind: '%s'"
+msgstr "无法确认的节点种类:“%s”"
 
-#: libsvn_ra_dav/session.c:1253
-#, fuzzy, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "”%s“没有在档案库中被锁定"
+#: libsvn_wc/adm_ops.c:1059
+#, c-format
+msgid "'%s' not found"
+msgstr "找不到“%s”"
 
-#: libsvn_ra_dav/session.c:1290
-#, fuzzy
-msgid "Unlock request failed"
-msgstr "解除锁请求失败"
+#: libsvn_wc/adm_ops.c:1063
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr "路径“%s”为不支持的节点种类"
 
-#: libsvn_ra_dav/session.c:1501
-#, fuzzy
-msgid "Failed to fetch lock information"
-msgstr "获取锁信息失败"
+#: libsvn_wc/adm_ops.c:1093
+#, c-format
+msgid "'%s' is already under version control"
+msgstr "“%s”已纳入版本控制"
 
-#: libsvn_ra_dav/session.c:1572
+#: libsvn_wc/adm_ops.c:1105
 #, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "不支持的 ra_dav 的 RA 载入器版本 (%d)"
-
-#: libsvn_ra_dav/util.c:275
-msgid "authorization failed"
-msgstr "授权失败"
-
-#: libsvn_ra_dav/util.c:279
-msgid "could not connect to server"
-msgstr "无法连接到服务器"
-
-#: libsvn_ra_dav/util.c:283
-msgid "timed out waiting for server"
-msgstr "等待服务器超时"
-
-#: libsvn_ra_dav/util.c:489
-msgid "Can't calculate the request body size"
-msgstr "无法算出请求的主体大小"
+msgid ""
+"Can't replace '%s' with a node of a differing type; the deletion must be "
+"committed and the parent updated before adding '%s'"
+msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
 
-#: libsvn_ra_dav/util.c:725
+#: libsvn_wc/adm_ops.c:1122
 #, c-format
-msgid "Error spooling the %s request response to disk"
-msgstr "请求 %s 的响应脱机保存到磁盘时出现错误"
+msgid "Can't find parent directory's entry while trying to add '%s'"
+msgstr "在尝试新增“%s”时,无法找到父目录的项目"
 
-#: libsvn_ra_dav/util.c:773
+#: libsvn_wc/adm_ops.c:1127
 #, c-format
-msgid "'%s' path not found"
-msgstr "找不到路径“%s”"
+msgid "Can't add '%s' to a parent directory scheduled for deletion"
+msgstr "无法新增“%s”至已预定要删除的父目录"
 
-#. We either have a neon error, or some other error
-#. that we didn't expect.
-#: libsvn_ra_dav/util.c:778 libsvn_ra_dav/util.c:1008
-#, c-format
-msgid "%s of '%s'"
-msgstr "%s 的结果 “%s”"
+#: libsvn_wc/adm_ops.c:1143
+#, fuzzy, c-format
+msgid "The URL '%s' has a different repository root than its parent"
+msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
 
-#: libsvn_ra_dav/util.c:796
+#: libsvn_wc/adm_ops.c:1472
 #, c-format
-msgid "Error reading spooled %s request response"
-msgstr "读取请求 %s 回应的脱机数据时出现错误"
+msgid "Error restoring text for '%s'"
+msgstr "还原“%s”文字时发生错误"
 
-#: libsvn_ra_dav/util.c:807
+#: libsvn_wc/adm_ops.c:1603
 #, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s 请求的回应返回无效的 XML:%s (%s)"
+msgid "Cannot revert: '%s' is not under version control"
+msgstr "无法恢复:“%s”未纳入版本控制"
 
-#: libsvn_ra_dav/util.c:827
+#: libsvn_wc/adm_ops.c:1631
 #, c-format
-msgid "%s request failed on '%s'"
-msgstr "%s 请求“%s”失败"
+msgid "Cannot revert '%s': unsupported entry node kind"
+msgstr "无法恢复“%s”:不支持的项目节点种类"
 
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:576
+#: libsvn_wc/adm_ops.c:1642
 #, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
-msgstr ""
-"“%s”\n"
-"与\n"
-"“%s”\n"
-"并不在同一个档案库中"
-
-# as-is
-#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
-msgid "Module for accessing a repository on local disk."
-msgstr "访问本地磁盘的档案库模块。"
-
-#: libsvn_ra_local/ra_plugin.c:285
-msgid "Unable to open an ra_local session to URL"
-msgstr "无法打开地址(URL)的 ra_local 会话"
+msgid "Cannot revert '%s': unsupported node kind in working copy"
+msgstr "无法恢复“%s”:工作拷贝中有不支持的节点种类"
 
-# as-is
-#: libsvn_ra_local/ra_plugin.c:1286
-#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "不支持的 ra_local 的 RA 载入器版本 (%d) for ra_local"
+#: libsvn_wc/adm_ops.c:1689
+msgid ""
+"Cannot revert addition of current directory; please try again from the "
+"parent directory"
+msgstr "无法恢复目前目录的新增;请从父目录再试一次"
 
-#: libsvn_ra_local/split_url.c:44
+#: libsvn_wc/adm_ops.c:1711
 #, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
+msgid "Unknown or unexpected kind for path '%s'"
+msgstr "路径“%s”有未知或意想不到的种类"
 
-#: libsvn_ra_local/split_url.c:55
+#: libsvn_wc/adm_ops.c:1873
 #, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "本地地址(URL)“%s”仅含主机名称,没有路径"
+msgid "File '%s' has local modifications"
+msgstr "文件“%s”有本地的修改"
 
-#: libsvn_ra_local/split_url.c:74
+#: libsvn_wc/copy.c:77
 #, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "本地地址(URL)“%s”包含未支持的主机名称"
+msgid "'%s' already exists and is in the way"
+msgstr "“%s”已存在,变成路中间的大石头"
 
-#: libsvn_ra_local/split_url.c:128 libsvn_ra_local/split_url.c:135
+#: libsvn_wc/copy.c:89
 #, c-format
-msgid "Unable to open repository '%s'"
-msgstr "无法打开档案库“%s”"
+msgid "There is already a versioned item '%s'"
+msgstr "已有纳入版本控制项目“%s”"
 
-#: libsvn_ra_svn/client.c:125
+#: libsvn_wc/copy.c:100
 #, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主机名称“%s”"
-
-#: libsvn_ra_svn/client.c:137
-msgid "Can't create socket"
-msgstr "无法建立 socket"
+msgid "Cannot copy or move '%s': it's not under version control"
+msgstr "无法复制或移动“%s”:它尚未纳入版本控制"
 
-#: libsvn_ra_svn/client.c:141
+#: libsvn_wc/copy.c:107
 #, c-format
-msgid "Can't connect to host '%s'"
-msgstr "无法连线至主机“%s”"
+msgid ""
+"Cannot copy or move '%s': it's not in the repository yet; try committing "
+"first"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-# as-is
-#: libsvn_ra_svn/client.c:162
-msgid "Proplist element not a list"
-msgstr "属性列表元素不是一个列表"
+#: libsvn_wc/copy.c:356
+#, c-format
+msgid ""
+"Cannot copy or move '%s': it is not in the repository yet; try committing "
+"first"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-# as-is
-#: libsvn_ra_svn/client.c:186
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs 元素不是一个列表"
+#: libsvn_wc/copy.c:444
+#, fuzzy, c-format
+msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
+msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
 
-#: libsvn_ra_svn/client.c:224
+#: libsvn_wc/copy.c:451
 #, c-format
-msgid "Unrecognized node kind '%s' from server"
-msgstr "无法辨识来自服务器的节点种类“%s”"
+msgid "Cannot copy to '%s' as it is scheduled for deletion"
+msgstr "无法复制到“%s”至因为它已预定为要删除"
 
-#: libsvn_ra_svn/client.c:269 libsvn_ra_svn/client.c:323
+#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:558
+#: libsvn_wc/entries.c:806
 #, c-format
-msgid "Authentication error from server: %s"
-msgstr "来自服务器的认证错误:%s"
+msgid "Entry '%s' has invalid '%s' value"
+msgstr "项目“%s”有无效的“%s”值"
 
-#: libsvn_ra_svn/client.c:272 libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-msgid "Unexpected server response to authentication"
-msgstr "意想不到的认证时服务器回应"
+#: libsvn_wc/entries.c:111
+#, fuzzy
+msgid "Invalid escape sequence"
+msgstr "无效的计划任务"
 
-#: libsvn_ra_svn/client.c:330
-msgid "Cannot negotiate authentication mechanism"
-msgstr "无法协商出认识机制"
+#: libsvn_wc/entries.c:118
+#, fuzzy
+msgid "Invalid escaped character"
+msgstr "无效的变更类型"
 
-#: libsvn_ra_svn/client.c:461
-#, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "无法辨识的隧道规则“%s”"
+#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
+#: libsvn_wc/entries.c:203
+#, fuzzy
+msgid "Unexpected end of entry"
+msgstr "找到一个意料之外的节点种类"
 
-#: libsvn_ra_svn/client.c:478
+#: libsvn_wc/entries.c:225
 #, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "隧道规则 %s 需要设定环境变数 %s"
+msgid "Invalid value for field '%s'"
+msgstr ""
 
-# as-is
-#: libsvn_ra_svn/client.c:489
+#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:533
 #, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "不能 tokenize 命令“%s”"
+msgid "Entry '%s' has invalid node kind"
+msgstr "项目“%s”有无效的节点种类"
+
+#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:510
+#, fuzzy, c-format
+msgid "Entry for '%s' has invalid repository root"
+msgstr "“%s”的入口档案库根目录无效"
 
-#: libsvn_ra_svn/client.c:518
+#: libsvn_wc/entries.c:931
 #, c-format
-msgid "Error in child process: %s"
-msgstr "子程序错误:%s"
+msgid "XML parser failed in '%s'"
+msgstr "XML 剖析器无法处理“%s”"
 
-#: libsvn_ra_svn/client.c:541
-msgid "Can't create tunnel"
-msgstr "无法建立 tunnel"
+#: libsvn_wc/entries.c:990
+msgid "Missing default entry"
+msgstr "丢失默认项目"
 
-# as-is
-#: libsvn_ra_svn/client.c:570
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "使用svn网络协议访问档案库的模块。"
+#: libsvn_wc/entries.c:995
+msgid "Default entry has no revision number"
+msgstr "默认项目没有修订版编号"
+
+#: libsvn_wc/entries.c:1000
+msgid "Default entry is missing URL"
+msgstr "默认项目没有地址(URL)"
+
+#: libsvn_wc/entries.c:1076
+#, fuzzy, c-format
+msgid "Invalid version line in entries file of '%s'"
+msgstr "写入“%s”的项目文件时发生错误"
+
+#: libsvn_wc/entries.c:1093
+#, fuzzy
+msgid "Missing entry terminator"
+msgstr "丢失默认项目"
+
+#: libsvn_wc/entries.c:1096
+#, fuzzy
+msgid "Invalid entry terminator"
+msgstr "无效的目标路径"
+
+#: libsvn_wc/entries.c:1100
+#, fuzzy, c-format
+msgid "Error at entry %d in entries file for '%s':"
+msgstr "写入“%s”的项目文件时发生错误"
 
-#: libsvn_ra_svn/client.c:607
+#: libsvn_wc/entries.c:1196
 #, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "不合法的 svn 档案库地址(URL)“%s”"
+msgid "Corrupt working copy: '%s' has no default entry"
+msgstr "损坏的工作拷贝:目录“%s”没有默认的项目"
 
-#: libsvn_ra_svn/client.c:633
+#: libsvn_wc/entries.c:1213
 #, c-format
-msgid "Server requires minimum version %d"
-msgstr "服务器最低要求的版号为 %d"
+msgid "Corrupt working copy: directory '%s' has an invalid schedule"
+msgstr "损坏的工作拷贝:目录“%s”有无效的调度"
 
-#: libsvn_ra_svn/client.c:683
-msgid "Impossibly long repository root from server"
-msgstr "服务器回传的档案库根路径长得太夸张"
+#: libsvn_wc/entries.c:1247
+#, c-format
+msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
+msgstr "损坏的工作拷贝:“%s”于目录“%s”中有无效的调度"
 
-#: libsvn_ra_svn/client.c:750
-msgid "Server did not send repository root"
-msgstr "服务器没有返回档案库根路径"
+#: libsvn_wc/entries.c:1256
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"addition) is not itself scheduled for addition"
+msgstr ""
+"损坏的工作拷贝:“%s”于目录“%s”中 (已加入新增调度) 与加入新增调度的不一致"
 
-#: libsvn_ra_svn/client.c:892
-msgid "Non-string as part of file contents"
-msgstr "文件内容的一部份不是字串"
+#: libsvn_wc/entries.c:1264
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"deletion) is not itself scheduled for deletion"
+msgstr ""
+"损坏的工作拷贝:“%s”于目录“%s”中 (已加入删除调度) 与加入删除调度的不一致"
 
-# as-is
-#: libsvn_ra_svn/client.c:960
-msgid "Dirlist element not a list"
-msgstr "目录列表元素不是一个列表"
+#: libsvn_wc/entries.c:1272
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"replacement) has an invalid schedule"
+msgstr "损坏的工作拷贝:“%s”于目录“%s”中 (已加入替换调度) 有无效的调度"
 
-# as-is
-#: libsvn_ra_svn/client.c:1116
-msgid "Log entry not a list"
-msgstr "日志条目不是一个列表"
+#: libsvn_wc/entries.c:1890
+#, c-format
+msgid "No default entry in directory '%s'"
+msgstr "在目录“%s”中没有默认的项目"
 
-# as-is
-#: libsvn_ra_svn/client.c:1129
-msgid "Changed-path entry not a list"
-msgstr "已修改路径条目不是一个列表"
+#: libsvn_wc/entries.c:1945
+#, c-format
+msgid "Error writing to '%s'"
+msgstr "写至“%s”时发生错误"
 
-# as-is
-#: libsvn_ra_svn/client.c:1208
-#, fuzzy
-msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/entries.c:2252
+#, c-format
+msgid ""
+"Can't add '%s' to deleted directory; try undeleting its parent directory "
+"first"
+msgstr "无法新增“%s”至已删除的目录;请先尝试恢复其父目录"
 
-# as-is
-#: libsvn_ra_svn/client.c:1265
-#, fuzzy
-msgid "'get-locations' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/entries.c:2258
+#, c-format
+msgid ""
+"Can't replace '%s' in deleted directory; try undeleting its parent directory "
+"first"
+msgstr "无法在已删除的目录中替换“%s”;请先尝试恢复其父目录"
 
-# as-is
-#: libsvn_ra_svn/client.c:1277
-msgid "Location entry not a list"
-msgstr "区域条目不是一个列表"
+#: libsvn_wc/entries.c:2267
+#, c-format
+msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
+msgstr "“%s”被标记为不存在,所以无法加入新增调度"
 
-# as-is
-#: libsvn_ra_svn/client.c:1327
-#, fuzzy
-msgid "'get-file-revs' not implemented"
-msgstr "get-file-revs 未实现"
+#: libsvn_wc/entries.c:2296
+#, c-format
+msgid "Entry '%s' is already under version control"
+msgstr "项目“%s”已纳入版本控制"
 
-# as-is
-#: libsvn_ra_svn/client.c:1340
-msgid "Revision entry not a list"
-msgstr "修订版条目不是一个列表"
+#: libsvn_wc/entries.c:2393
+#, c-format
+msgid "Entry '%s' has illegal schedule"
+msgstr "项目“%s”有不合法的调度"
 
-#: libsvn_ra_svn/client.c:1353 libsvn_ra_svn/client.c:1378
-msgid "Text delta chunk not a string"
-msgstr "文字差异区段并非字串"
+#: libsvn_wc/entries.c:2537
+#, c-format
+msgid "No such entry: '%s'"
+msgstr "没有这样的项目:“%s”"
 
-#: libsvn_ra_svn/client.c:1390
-msgid "The get-file-revs command didn't return any revisions"
-msgstr "get-file-revs 命令没有返回任何修订版"
+#: libsvn_wc/entries.c:2664
+#, c-format
+msgid "Error writing entries file for '%s'"
+msgstr "写入“%s”的项目文件时发生错误"
 
-#: libsvn_ra_svn/client.c:1438
-#, fuzzy
-msgid "Server doesn't support the lock command"
-msgstr "服务器不支持锁命令"
+#: libsvn_wc/entries.c:2703
+#, c-format
+msgid "Directory '%s' has no THIS_DIR entry"
+msgstr "目录“%s”没有 THIS_DIR 项目"
 
-#: libsvn_ra_svn/client.c:1502
-#, fuzzy
-msgid "Server doesn't support the unlock command"
-msgstr "服务器不支持解除锁命令"
+#: libsvn_wc/entries.c:2792
+#, c-format
+msgid "'%s' has an unrecognized node kind"
+msgstr "“%s”的节点种类无法辨识"
 
-# as-is
-#: libsvn_ra_svn/client.c:1602 libsvn_ra_svn/client.c:1755
-#, fuzzy
-msgid "Lock element not a list"
-msgstr "锁元素不是一个列表"
+#: libsvn_wc/entries.c:2828
+#, c-format
+msgid "Unexpectedly found '%s': path is marked 'missing'"
+msgstr "意想不到地找到了“%s”:路径已被标记为 '丢失'"
 
-#: libsvn_ra_svn/client.c:1607
-#, fuzzy
-msgid "Unable to parse lock data"
-msgstr "无法打开编辑"
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
+#, c-format
+msgid "Working copy '%s' locked"
+msgstr "工作拷贝“%s”被锁定了"
 
-#: libsvn_ra_svn/client.c:1714 libsvn_ra_svn/client.c:1742
-#, fuzzy
-msgid "Server doesn't support the get-lock command"
-msgstr "服务器不支持获取锁命令get-lock"
+#: libsvn_wc/lock.c:481
+#, c-format
+msgid "Path '%s' ends in '%s', which is unsupported for this operation"
+msgstr "路径“%s”以“%s”结束,本操作不支持"
 
-#: libsvn_ra_svn/client.c:1814
+#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
 #, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "不支持的 ra_svn 的 RA 载入器版本 (%d)"
-
-# as-is
-#: libsvn_ra_svn/editor.c:383 libsvn_ra_svn/editorp.c:418
-msgid "Invalid file or dir token during edit"
-msgstr "编辑时遇到无效的文件或目录"
-
-#: libsvn_ra_svn/editor.c:616
-msgid "Non-string as part of text delta"
-msgstr "文件差异的一部份不是字串"
+msgid "Unable to check path existence for '%s'"
+msgstr "不能使用名字“%s”"
 
-# as-is
-#: libsvn_ra_svn/editorp.c:128
-msgid "Successful edit status returned too soon"
-msgstr "成功修改状态返回太快"
+#: libsvn_wc/lock.c:937
+#, c-format
+msgid "Expected '%s' to be a directory but found a file"
+msgstr ""
 
-# as-is
-#: libsvn_ra_svn/editorp.c:609
-msgid "Apply-textdelta already active"
-msgstr "Apply-textdelta 已经激活"
+#: libsvn_wc/lock.c:944
+#, fuzzy, c-format
+msgid "Expected '%s' to be a file but found a directory"
+msgstr "地址(URL)“%s”指向一个文件,而非目录"
 
-# as-is
-#: libsvn_ra_svn/editorp.c:631 libsvn_ra_svn/editorp.c:649
-msgid "Apply-textdelta not active"
-msgstr "Apply-textdelta 没有激活"
+#: libsvn_wc/lock.c:963
+#, fuzzy, c-format
+msgid "Directory '%s' is missing"
+msgstr "目录“%s”没有地址(URL)"
 
-#: libsvn_ra_svn/editorp.c:797 libsvn_ra_svn/marshal.c:833
+#: libsvn_wc/lock.c:968
 #, c-format
-msgid "Unknown command '%s'"
-msgstr "未知的命令:“%s”"
+msgid "Directory '%s' containing working copy admin area is missing"
+msgstr ""
 
-# as-is
-#: libsvn_ra_svn/marshal.c:78
-msgid "Capability entry is not a word"
-msgstr "容量条目不是一个 word"
+#: libsvn_wc/lock.c:973
+#, fuzzy, c-format
+msgid "Unable to lock '%s'"
+msgstr "无法打开编辑"
 
-#: libsvn_ra_svn/marshal.c:160
-msgid "Can't write to connection"
-msgstr "无法写入连线"
+#: libsvn_wc/lock.c:978
+#, fuzzy, c-format
+msgid "Working copy '%s' is not locked"
+msgstr "工作拷贝“%s”被锁定了"
 
-#: libsvn_ra_svn/marshal.c:250
-msgid "Can't read from connection"
-msgstr "无法读取连线"
+#: libsvn_wc/lock.c:1371
+#, c-format
+msgid "Write-lock stolen in '%s'"
+msgstr "“%s”中的写入锁定被偷走了"
 
-#: libsvn_ra_svn/marshal.c:253
-msgid "Connection closed unexpectedly"
-msgstr "网络连线意想不到地关闭"
+#: libsvn_wc/lock.c:1379
+#, c-format
+msgid "No write-lock in '%s'"
+msgstr "“%s”中没有写入锁定"
 
-#: libsvn_ra_svn/marshal.c:497
-msgid "String length larger than maximum"
-msgstr "字串长度超出上限"
+#: libsvn_wc/lock.c:1401
+#, c-format
+msgid "Lock file '%s' is not a regular file"
+msgstr "锁定文件“%s”不是一般的文件"
 
-#: libsvn_ra_svn/marshal.c:534
-msgid "Too many nested items"
-msgstr "太多嵌套的项目"
+#: libsvn_wc/log.c:334
+msgid "Can't move source to dest"
+msgstr "无法移动来源至目的"
 
-#: libsvn_ra_svn/marshal.c:553
-msgid "Number is larger than maximum"
-msgstr "数字大小超过上限"
+#: libsvn_wc/log.c:495
+#, c-format
+msgid "In directory '%s'"
+msgstr "在目录“%s”中"
 
-#: libsvn_ra_svn/marshal.c:756
-msgid "Empty error list"
-msgstr "空的错误列表"
+#: libsvn_wc/log.c:523
+#, c-format
+msgid "Missing 'left' attribute in '%s'"
+msgstr "“%s”丢失了 'left' 属性"
 
-#: libsvn_ra_svn/marshal.c:765
-msgid "Malformed error list"
-msgstr "畸形的错误列表"
+#: libsvn_wc/log.c:530
+#, c-format
+msgid "Missing 'right' attribute in '%s'"
+msgstr "“%s”丢失了 'right' 属性"
 
-#: libsvn_ra_svn/marshal.c:804
+#: libsvn_wc/log.c:598
 #, c-format
-msgid "Unknown status '%s' in command response"
-msgstr "命令回应中的未知状态“%s”"
+msgid "Missing 'dest' attribute in '%s'"
+msgstr "“%s”丢失了 'dest' 属性"
 
-#: libsvn_repos/commit.c:128
+#: libsvn_wc/log.c:679
 #, c-format
-msgid "Out of date: '%s' in transaction '%s'"
-msgstr "过期:”%s“在事务”%s“"
+msgid "Missing 'timestamp' attribute in '%s'"
+msgstr "“%s”丢失 'timestamp' 属性"
 
-#: libsvn_repos/commit.c:295 libsvn_repos/commit.c:460
+#: libsvn_wc/log.c:775 libsvn_wc/log.c:815
 #, c-format
-msgid "Got source path but no source revision for '%s'"
-msgstr "获得源路径,但”%s“没有源修订版"
+msgid "Error getting 'affected time' on '%s'"
+msgstr "取得“%s”的“affected time”时发生错误"
 
-#: libsvn_repos/commit.c:327 libsvn_repos/commit.c:491
+#: libsvn_wc/log.c:826
 #, c-format
-msgid "Source url '%s' is from different repository"
-msgstr "来源地址(URL)“%s”来自其它的档案库"
+msgid "Error modifying entry for '%s'"
+msgstr "修改“%s”的项目时发生错误"
 
-#: libsvn_repos/commit.c:400
+#: libsvn_wc/log.c:852
 #, fuzzy, c-format
-msgid "Path '%s' not present"
-msgstr "路径“%s”不存在"
+msgid "Error removing lock from entry for '%s'"
+msgstr "移除条目“%s”的锁时发生错误"
 
-#: libsvn_repos/commit.c:616
+#: libsvn_wc/log.c:982
 #, c-format
-msgid ""
-"Checksum mismatch for resulting fulltext\n"
-"(%s):\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
-msgstr ""
-"“%s”的总和检查值不符合:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+msgid "Missing 'revision' attribute for '%s'"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_repos/delta.c:180
-msgid "Unable to open root of edit"
-msgstr "无法打开编辑"
+#: libsvn_wc/log.c:1006
+#, c-format
+msgid "Log command for directory '%s' is mislocated"
+msgstr "对目录“%s”的日志命令被错置"
 
-#: libsvn_repos/delta.c:231
-msgid "Invalid target path"
-msgstr "无效的目标路径"
+#: libsvn_wc/log.c:1181 libsvn_wc/log.c:1257
+#, c-format
+msgid "Error checking existence of '%s'"
+msgstr "检查“%s”是否存在时发生错误"
 
-#: libsvn_repos/delta.c:257
-msgid ""
-"Invalid editor anchoring; at least one of the input paths is not a directory "
-"and there was no source entry"
-msgstr "无效的编辑器定位;至少一个输入路径不是目录并且没有源入口"
+#: libsvn_wc/log.c:1191 libsvn_wc/log.c:1197
+#, c-format
+msgid "Error getting 'affected time' for '%s'"
+msgstr "取得“%s”的 'affected time' 时发生错误"
 
-# as-is
-#: libsvn_repos/dump.c:416
+#: libsvn_wc/log.c:1207
 #, c-format
-msgid ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-msgstr ""
-"警告:修订版 %ld 的参考数据比最旧的转存数据修订版 (%ld)还旧。\n"
-"警告: 装载这个转存到空的档案库会失败。\n"
-"\n"
+msgid "Error comparing '%s' and '%s'"
+msgstr "比较“%s”与“%s”时发生错误"
 
-#: libsvn_repos/dump.c:934
+#: libsvn_wc/log.c:1317
 #, c-format
-msgid "Start revision %ld is greater than end revision %ld"
-msgstr "起始修订版 %ld 比结束修订版号 %ld 为大"
+msgid "Error replacing text-base of '%s'"
+msgstr "替换“%s”的文件参考基础时发生错误"
 
-#: libsvn_repos/dump.c:939
+#: libsvn_wc/log.c:1326
 #, c-format
-msgid "End revision %ld is invalid (youngest revision is %ld)"
-msgstr "结束修订版 %ld 无效 (最新的修订版为 %ld)"
+msgid "Error getting 'affected time' of '%s'"
+msgstr "取得“%s”的 'affected time' 时发生错误"
 
-# as-is
-#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
-msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+#: libsvn_wc/log.c:1364 libsvn_wc/log.c:1431
+#, c-format
+msgid "Error modifying entry of '%s'"
+msgstr "修改“%s”的项目时发生错误"
 
-# as-is
-#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
-msgid "* Verified revision %ld.\n"
-msgstr "* 校验修订版 %ld。\n"
+#: libsvn_wc/log.c:1486
+#, fuzzy
+msgid "Invalid 'format' attribute"
+msgstr "无效的配置值"
 
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1218
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "提交成功,但是发送提交外挂(post-commit)失败"
+#: libsvn_wc/log.c:1521
+#, c-format
+msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
+msgstr "日志文件项目丢失 'name' 属性 (项目“%s”对应至目录“%s”)"
 
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_wc/log.c:1589
 #, c-format
-msgid ""
-"Storage of non-regular property '%s' is disallowed through the repository "
-"interface, and could indicate a bug in your client"
-msgstr "不允许通过档案库接口存储非正规的属性“%s”,并且您的客户端有漏洞"
+msgid "Unrecognized logfile element '%s' in '%s'"
+msgstr "无法确认的日志文件元素“%s”于“%s”中"
 
-#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
-msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "拒绝写入:未授权阅读所有修订版 %ld。"
+#: libsvn_wc/log.c:1600
+#, c-format
+msgid "Error processing command '%s' in '%s'"
+msgstr "在“%2$s”中处理命令“%1$s”时发生错误"
 
-#: libsvn_repos/fs-wrap.c:484
+#: libsvn_wc/log.c:1778
+msgid "Couldn't open log"
+msgstr "无法打开日志文件"
+
+#: libsvn_wc/log.c:1789
 #, c-format
-msgid "Cannot unlock path '%s', no authenticated username available"
-msgstr "不能解除路径”%s“的锁定,没有可用的已授权用户名"
+msgid "Error reading administrative log file in '%s'"
+msgstr "于“%s”中读取管理日志文件时发生错误"
 
-#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
-msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除锁定成功,但是发送解除锁定外挂(post-unlock)失败"
+#: libsvn_wc/log.c:2416
+#, c-format
+msgid "Error writing log for '%s'"
+msgstr "为“%s”写入日志时发生错误"
 
-#: libsvn_repos/hooks.c:66
+#: libsvn_wc/log.c:2464
 #, c-format
-msgid "Can't create pipe for hook '%s'"
-msgstr "无法为外挂“%s”创建管道"
+msgid "'%s' is not a working copy directory"
+msgstr "“%s”并不是工作拷贝目录"
 
-#: libsvn_repos/hooks.c:73
+#: libsvn_wc/props.c:93
 #, c-format
-msgid "Can't create null stdout for hook '%s'"
-msgstr "无法为外挂“%s”创建空的标准输出"
+msgid "Can't parse '%s'"
+msgstr "无法剖析“%s”"
 
-#: libsvn_repos/hooks.c:85
-msgid "Error closing write end of stderr pipe"
-msgstr "关闭标准错误管道末尾发生错误"
+#: libsvn_wc/props.c:120
+#, c-format
+msgid "Can't write property hash to '%s'"
+msgstr "无法写入属性集到“%s”"
 
-#: libsvn_repos/hooks.c:90
-#, fuzzy, c-format
-msgid "Failed to start '%s' hook"
-msgstr "运行外挂“%s”失败"
+#: libsvn_wc/props.c:213
+#, c-format
+msgid "Can't find entry '%s' in '%s'"
+msgstr "无法在“%2$s”中找到项目“%1$s”"
 
-#: libsvn_repos/hooks.c:108
+#: libsvn_wc/props.c:628
 #, c-format
 msgid ""
-"'%s' hook failed with error output:\n"
-"%s"
+"Trying to add new property '%s' with value '%s',\n"
+"but property already exists with value '%s'."
 msgstr ""
-"外挂“%s”失败,错误输出:\n"
-"%s"
-
-#: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
-msgid "'%s' hook failed; no error output available"
-msgstr "外挂“%s”失败;没有可用的错误输出"
-
-#: libsvn_repos/hooks.c:134
-msgid "Error closing read end of stderr pipe"
-msgstr "关闭读标准错误管道末尾发生错误"
-
-#: libsvn_repos/hooks.c:138
-msgid "Error closing null file"
-msgstr "关闭空文件发生错误"
+"尝试添加新属性“%s”的值为“%s”,\n"
+"但是属性已经存在,值为“%s”。"
 
-#: libsvn_repos/hooks.c:220
+#: libsvn_wc/props.c:651
 #, c-format
-msgid "Failed to run '%s' hook; broken symlink"
-msgstr "运行外挂“%s”失败;无效的符号连接"
-
-#: libsvn_repos/hooks.c:361
 msgid ""
-"Repository has not been enabled to accept revision propchanges;\n"
-"ask the administrator to create a pre-revprop-change hook"
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but the property does not exist."
 msgstr ""
-"档案库未激活接受修订版属性改变;请管理员创建一个 pre-revprop-change 外挂"
-
-#: libsvn_repos/load.c:157 libsvn_repos/load.c:169
-msgid "Found malformed header block in dumpfile stream"
-msgstr "在导出文件流中找到有畸形的文件头"
-
-#: libsvn_repos/load.c:187
-msgid "Premature end of content data in dumpstream"
-msgstr "导出流中内容数据过早结束"
-
-#: libsvn_repos/load.c:194
-msgid "Dumpstream data appears to be malformed"
-msgstr "导出流数据中出现畸形"
-
-#: libsvn_repos/load.c:232
-msgid "Incomplete or unterminated property block"
-msgstr "不完整或未结束的属性块"
-
-#: libsvn_repos/load.c:425
-msgid "Unexpected EOF writing contents"
-msgstr "写内容时有意料之外的结束符"
+"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
+"但是属性并不存在。"
 
-#: libsvn_repos/load.c:454
-msgid "Malformed dumpfile header"
-msgstr "畸形的导出文件头"
+#: libsvn_wc/props.c:679
+#, fuzzy, c-format
+msgid ""
+"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+msgstr ""
+"尝试添加新属性“%s”的值为“%s”,\n"
+"但是属性已经存在,值为“%s”。"
 
-#: libsvn_repos/load.c:460 libsvn_repos/load.c:502
+#: libsvn_wc/props.c:697
 #, c-format
-msgid "Unsupported dumpfile version: %d"
-msgstr "不支持的导出文件版本:%d"
+msgid ""
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but property already exists with value '%s'."
+msgstr ""
+"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
+"但是属性的值已经是“%s”了。"
 
-#: libsvn_repos/load.c:600
-msgid "Unrecognized record type in stream"
-msgstr "流中有无法辨识的记录类型"
+#: libsvn_wc/props.c:880
+#, fuzzy, c-format
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr "“%s”丢失了 'revision' 属性"
 
-#: libsvn_repos/load.c:712
-msgid "Sum of subblock sizes larger than total block content length"
-msgstr "子块大小总数大于块内容长度总数"
+#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
+#: libsvn_wc/props.c:1626
+msgid "Failed to load properties from disk"
+msgstr "无法从磁碟装载属性"
 
-# as-is
-#: libsvn_repos/load.c:891
+#: libsvn_wc/props.c:1128
 #, c-format
-msgid "<<< Started new transaction, based on original revision %ld\n"
-msgstr "<<< 开始新的事务,基于最初的修订版 %ld\n"
+msgid "Cannot write property hash for '%s'"
+msgstr "无法写入“%s”的属性杂凑"
 
-#: libsvn_repos/load.c:936
+#: libsvn_wc/props.c:1362 libsvn_wc/props.c:1498
 #, c-format
-msgid "Relative source revision %ld is not available in current repository"
-msgstr "相对来源修订版 %ld 不存在于目前档案库之中"
+msgid "Property '%s' is an entry property"
+msgstr "属性“%s”是项目属性"
 
-#: libsvn_repos/load.c:985
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "畸形的导出流:修订版 0 不能包含节点记录"
+#: libsvn_wc/props.c:1407
+#, c-format
+msgid "Cannot set '%s' on a directory ('%s')"
+msgstr "无法设定“%s”于目录 (“%s”)"
 
-#: libsvn_repos/load.c:995
+#: libsvn_wc/props.c:1415
 #, c-format
-msgid " * editing path : %s ..."
-msgstr " * 正在修改路径:%s ..."
+msgid "Cannot set '%s' on a file ('%s')"
+msgstr "无法设定“%s”于文件 (“%s”)"
 
-#: libsvn_repos/load.c:1002
+#: libsvn_wc/props.c:1421
 #, c-format
-msgid " * deleting path : %s ..."
-msgstr " * 正在删除路径:%s ..."
+msgid "'%s' is not a file or directory"
+msgstr "“%s”不是文件或目录"
 
-#: libsvn_repos/load.c:1010
+#: libsvn_wc/props.c:1445
 #, c-format
-msgid " * adding path : %s ..."
-msgstr " * 正在添加路径:%s ..."
+msgid "File '%s' has binary mime type property"
+msgstr "文件“%s”有二进制的 mime 型别属性"
 
-#: libsvn_repos/load.c:1019
+#: libsvn_wc/props.c:2101
 #, c-format
-msgid " * replacing path : %s ..."
-msgstr " * 正在替换路径:%s ..."
+msgid "Error parsing %s property on '%s': '%s'"
+msgstr "剖析 %s 属性于“%s”发生错误:“%s”"
 
-#: libsvn_repos/load.c:1029
+#: libsvn_wc/props.c:2114
 #, c-format
-msgid "Unrecognized node-action on node '%s'"
-msgstr "“%s”的节点种动作法辨识"
+msgid ""
+"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
+"path"
+msgstr "无效属性 %s 于“%s”:目录牵涉到 '.' 或 '..' 或是绝对路径"
 
-#: libsvn_repos/load.c:1165
-#, fuzzy
-msgid " done.\n"
-msgstr "完成。\n"
+#: libsvn_wc/questions.c:120
+#, c-format
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr "“%s”的工作拷贝格式已过时(%d);请重新取出您的工作拷贝"
 
-# as-is
-#: libsvn_repos/load.c:1240
+#: libsvn_wc/questions.c:128
 #, c-format
 msgid ""
-"\n"
-"------- Committed revision %ld >>>\n"
-"\n"
-msgstr ""
-"\n"
-"------- 提交后的修订版 %ld >>>\n"
-"\n"
+"This client is too old to work with working copy '%s'; please get a newer "
+"Subversion client"
+msgstr "本客户端已过时,无法存取工作拷贝“%s”;请取得更新版的 Subversion 客户端"
 
-# as-is
-#: libsvn_repos/load.c:1246
+#: libsvn_wc/questions.c:337
 #, c-format
 msgid ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
+"Checksum mismatch indicates corrupt text base: '%s'\n"
+" expected: %s\n"
+" actual: %s\n"
 msgstr ""
-"\n"
-"------- 提交新修订版 %ld (从原始修订版 %ld 装载) >>>\n"
-"\n"
+"总和检查值不一致,表示文件参考基础损坏:“%s”\n"
+" 预期: %s\n"
+" 实际: %s\n"
 
-#: libsvn_repos/node_tree.c:238
+#: libsvn_wc/relocate.c:69
+msgid "Relocate can only change the repository part of an URL"
+msgstr ""
+
+#: libsvn_wc/update_editor.c:387
 #, c-format
-msgid "'%s' not found in filesystem"
-msgstr "在文件系统中找不到“%s”"
+msgid "No '.' entry in: '%s'"
+msgstr "不存在 '.' 项目:“%s”"
 
-#: libsvn_repos/replay.c:159
+#: libsvn_wc/update_editor.c:888
 #, c-format
-msgid "Filesystem path '%s' is neither a file nor a directory"
-msgstr "文件系统中路径“%s”既不是文件也不是目录"
+msgid "Won't delete locally modified directory '%s'"
+msgstr "无法删除本地修改的目录“%s”"
 
-#: libsvn_repos/reporter.c:603
+#: libsvn_wc/update_editor.c:962
 #, c-format
-msgid "Working copy path '%s' does not exist in repository"
-msgstr "工作拷贝路径“%s”不存在档案库中"
+msgid "Error writing log file for '%s'"
+msgstr "写入“%s”的日志文件时发生错误"
 
-#: libsvn_repos/reporter.c:824
-msgid "Not authorized to open root of edit operation"
-msgstr "未授权打开根进行编辑操作"
+#: libsvn_wc/update_editor.c:1065
+#, c-format
+msgid "Failed to add directory '%s': object of the same name already exists"
+msgstr "无法新增目录“%s”:同名物件已存在"
 
-#: libsvn_repos/reporter.c:845
-msgid "Cannot replace a directory from within"
-msgstr "不能在目录中替换"
+#: libsvn_wc/update_editor.c:1073
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
+msgstr "无法新增目录“%s”:物件与管理目录同名"
 
-#: libsvn_repos/reporter.c:888
-msgid "Invalid report for top level of working copy"
-msgstr "无效的最上层工作拷贝报告"
+#: libsvn_wc/update_editor.c:1087
+#, c-format
+msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
+msgstr "无法新增文件“%s”:copyfrom 参数尚不支持"
 
-#: libsvn_repos/reporter.c:903
-msgid "Two top-level reports with no target"
-msgstr "两个最上层报告没有目标"
+#: libsvn_wc/update_editor.c:1108
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name is already scheduled "
+"for addition"
+msgstr "无法新增目录“%s”:同名物件已加入新增调度"
 
-#: libsvn_repos/repos.c:176
+#: libsvn_wc/update_editor.c:1312
+msgid "Couldn't do property merge"
+msgstr "无法进行属性合并"
+
+#: libsvn_wc/update_editor.c:1376
 #, c-format
-msgid "'%s' exists and is non-empty"
-msgstr "“%s”已存在并且非空"
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr "无法将“%s”标记为不存在:同名项目已加入新增调度"
 
-#: libsvn_repos/repos.c:200
-msgid "Creating db logs lock file"
-msgstr "正在创建数据库日值锁文件"
+#: libsvn_wc/update_editor.c:1468
+#, c-format
+msgid "Failed to add file '%s': object of the same name already exists"
+msgstr "无法新增文件“%s”:同名物件已存在"
 
-#: libsvn_repos/repos.c:225
-msgid "Creating db lock file"
-msgstr "正在创建数据库锁文件"
+#: libsvn_wc/update_editor.c:1489
+#, c-format
+msgid ""
+"Failed to add file '%s': object of the same name is already scheduled for "
+"addition"
+msgstr "无法新增文件“%s”:同名物件已加入新增调度"
 
-#: libsvn_repos/repos.c:235
-msgid "Creating lock dir"
-msgstr "正在创建锁文件目录"
+#: libsvn_wc/update_editor.c:1497
+#, c-format
+msgid "File '%s' in directory '%s' is not a versioned resource"
+msgstr "文件“%s”于目录“%s”中的并不是纳入版本控制的资源"
 
-#: libsvn_repos/repos.c:276
-msgid "Creating hook directory"
-msgstr "正在创建外挂目录"
+#: libsvn_wc/update_editor.c:1609
+#, c-format
+msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
+msgstr "“%s”的总和检查值不符合;记录:“%s”,实际:“%s”"
 
-#: libsvn_repos/repos.c:382
-msgid "Creating start-commit hook"
-msgstr "正在创建 start-commit 外挂时发生错误"
+#: libsvn_wc/update_editor.c:2686
+#, c-format
+msgid "'%s' has no ancestry information"
+msgstr "“%s”没有演进历程信息"
 
-#: libsvn_repos/repos.c:519
-msgid "Creating pre-commit hook"
-msgstr "正在创建 pre-commit 外挂"
+#: libsvn_wc/update_editor.c:2849
+#, fuzzy, c-format
+msgid "Copyfrom-url '%s' has different repository root than '%s'"
+msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
 
-#: libsvn_repos/repos.c:651
-msgid "Creating pre-revprop-change hook"
-msgstr "正在创建 pre-revprop-change 外挂"
+#: libsvn_wc/util.c:83
+msgid "Unable to make any directories"
+msgstr "无法建立任何目录"
 
-#: libsvn_repos/repos.c:1026
-msgid "Creating post-commit hook"
-msgstr "正在创建 post-commit 外挂"
+#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+msgid "'verbose' option invalid in XML mode"
+msgstr "在XML模式中“详细”选项无效"
 
-#: libsvn_repos/repos.c:1346
-msgid "Creating post-revprop-change hook"
-msgstr "正在创建 post-revprop-change 外挂"
+#: svn/blame-cmd.c:246 svn/info-cmd.c:473 svn/list-cmd.c:264
+#: svn/status-cmd.c:219
+msgid "'incremental' option only valid in XML mode"
+msgstr "只有在XML模式“增加”选项才有效"
 
-#: libsvn_repos/repos.c:1356
-msgid "Creating conf directory"
-msgstr "正在创建 conf 目录"
+#: svn/blame-cmd.c:313
+#, c-format
+msgid "Skipping binary file: '%s'\n"
+msgstr "跳过二进制文件:“%s”\n"
 
-#: libsvn_repos/repos.c:1408
-msgid "Creating svnserve.conf file"
-msgstr "正在创建 svnserve.conf 文件"
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#, c-format
+msgid "'%s' does not appear to be a URL"
+msgstr "“%s”不像是地址(URL)"
 
-#: libsvn_repos/repos.c:1433
-msgid "Creating passwd file"
-msgstr "正在创建 passwd 文件"
+#: svn/copy-cmd.c:108 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
+msgid "Local, non-commit operations do not take a log message"
+msgstr "本地操作,非提交的操作不能获取日志信息"
 
-#: libsvn_repos/repos.c:1459
-msgid "Could not create top-level directory"
-msgstr "无法创建最上层目录"
+#: svn/diff-cmd.c:117 svnserve/main.c:484
+#, c-format
+msgid "Can't open stdout"
+msgstr "无法打开标准输出 (stdout)"
 
-#: libsvn_repos/repos.c:1463
-msgid "Creating DAV sandbox dir"
-msgstr "正在创建 DAV sandbox 目录"
+#: svn/diff-cmd.c:119
+#, c-format
+msgid "Can't open stderr"
+msgstr "无法打开标准错误 (stderr)"
 
-# as-is
-#: libsvn_repos/repos.c:1506
-msgid "Creating readme file"
-msgstr "正在创建 readme 文件"
+#: svn/diff-cmd.c:184
+#, fuzzy
+msgid "'--new' option only valid with '--old' option"
+msgstr "只有在XML模式“增加”选项才有效"
 
-#: libsvn_repos/repos.c:1538
-msgid "Repository creation failed"
-msgstr "档案库创建失败"
+#: svn/diff-cmd.c:214
+#, c-format
+msgid "Target lists to diff may not contain both working copy paths and URLs"
+msgstr "差异比较目标不可同时包含工作拷贝路径与地址(URL)"
+
+#: svn/export-cmd.c:84
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr "目的目录已存在;请删除目录或用 --force 来覆盖目录"
 
-#: libsvn_repos/repos.c:1610
+#: svn/help-cmd.c:45
 #, fuzzy, c-format
-msgid "Expected format '%d' of repository; found format '%d'"
-msgstr "预期档案库格式“%d”;找到格式“%d”"
+msgid ""
+"usage: svn <subcommand> [options] [args]\n"
+"Subversion command-line client, version %s.\n"
+"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svn --version' to see the program version and RA modules\n"
+" or 'svn --version --quiet' to see just the version number.\n"
+"\n"
+"Most subcommands take file and/or directory arguments, recursing\n"
+"on the directories. If no arguments are supplied to such a\n"
+"command, it recurses on the current directory (inclusive) by default.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"用法:svn <subcommand> [options] [args]\n"
+"Subversion 命令行客户端,版本 %s。\n"
+"请使用 “svn help <subcommand>” 显示子命令的辅助说明。\n"
+"大多数的子命令可接受文件或目录参数,对目录进行递回存取。\n"
+"如无指定参数给命令,默认将会自当前的目录 (包含) 进\n"
+"行递归存取。\n"
+"\n"
+"可用的子命令:\n"
 
-#: libsvn_repos/repos.c:1658
-msgid "Error opening db lockfile"
-msgstr "打开数据库锁文件错误"
+#: svn/help-cmd.c:58
+msgid ""
+"Subversion is a tool for version control.\n"
+"For additional information, see http://subversion.tigris.org/\n"
+msgstr ""
+"Subversion 是个版本控制系统的工具。\n"
+"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
 
-#: libsvn_repos/rev_hunt.c:63
-#, c-format
-msgid "Failed to find time on revision %ld"
-msgstr "无法找到修订版 %ld 的时间"
+#: svn/help-cmd.c:65 svnsync/main.c:1246
+msgid ""
+"The following repository access (RA) modules are available:\n"
+"\n"
+msgstr ""
+"可使用以下的档案库存取 (RA) 模块:\n"
+"\n"
 
-#: libsvn_repos/rev_hunt.c:218
-#, c-format
-msgid "Invalid start revision %ld"
-msgstr "无效的起始修订版 %ld"
+#: svn/import-cmd.c:82
+msgid "Repository URL required when importing"
+msgstr "导入时必须提供档案库的地址(URL)"
+
+#: svn/import-cmd.c:86
+msgid "Too many arguments to import command"
+msgstr "导入命令有太多参数"
 
-#: libsvn_repos/rev_hunt.c:222
+#: svn/import-cmd.c:101
 #, c-format
-msgid "Invalid end revision %ld"
-msgstr "无效的结束修订版 %ld"
+msgid "Invalid URL '%s'"
+msgstr "无效地址(URL)“%s”"
 
-#: libsvn_repos/rev_hunt.c:314
-#, fuzzy
-msgid "Unreadable path encountered; access denied"
-msgstr "遇到不能读的路径;访问拒绝。"
+#: svn/info-cmd.c:111
+#, fuzzy, c-format
+msgid "'%s' has invalid revision"
+msgstr "项目“%s”有无效的节点种类"
 
-#: libsvn_subr/config.c:632
+#: svn/info-cmd.c:263 svnadmin/main.c:1046
 #, c-format
-msgid "Config error: invalid boolean value '%s'"
-msgstr "配置错误:无效的布尔值“%s”"
+msgid "Path: %s\n"
+msgstr "路径:%s\n"
 
-#: libsvn_subr/config.c:882
+# this points to filename according to sunny256
+#: svn/info-cmd.c:269 svnlook/main.c:734
 #, c-format
-msgid "Config error: invalid integer value '%s'"
-msgstr "配置错误:无效的整数值“%s”"
-
-#: libsvn_subr/config_auth.c:94
-msgid "Unable to open auth file for reading"
-msgstr "不能打开认证文件读取数据"
+msgid "Name: %s\n"
+msgstr "文件名:%s\n"
 
-#: libsvn_subr/config_auth.c:99
+#: svn/info-cmd.c:273
 #, c-format
-msgid "Error parsing '%s'"
-msgstr "分解“%s”时发生错误"
+msgid "URL: %s\n"
+msgstr "地址(URL):%s\n"
 
-#: libsvn_subr/config_auth.c:123
-msgid "Unable to locate auth file"
-msgstr "无法定位认证文件文件"
+#: svn/info-cmd.c:276
+#, fuzzy, c-format
+msgid "Repository Root: %s\n"
+msgstr "档案库根路径:%s\n"
 
-#: libsvn_subr/config_auth.c:134
-msgid "Unable to open auth file for writing"
-msgstr "无法打开认证文件写入数据"
+#: svn/info-cmd.c:280
+#, c-format
+msgid "Repository UUID: %s\n"
+msgstr "档案库 UUID:%s\n"
 
-#: libsvn_subr/config_auth.c:137
+#: svn/info-cmd.c:284
 #, c-format
-msgid "Error writing hash to '%s'"
-msgstr "写哈希数据至“%s”时发生错误"
+msgid "Revision: %ld\n"
+msgstr "修订版:%ld\n"
 
-# as-is
-#: libsvn_subr/config_file.c:393
+#: svn/info-cmd.c:289
 #, c-format
-msgid "Can't open config file '%s'"
-msgstr "不能打开配置文件“%s”"
+msgid "Node Kind: file\n"
+msgstr "节点种类:文件\n"
 
-# as-is
-#: libsvn_subr/config_file.c:397
+#: svn/info-cmd.c:293
 #, c-format
-msgid "Can't find config file '%s'"
-msgstr "找不到配置文件“%s”"
+msgid "Node Kind: directory\n"
+msgstr "节点种类:目录\n"
 
-#: libsvn_subr/date.c:204
-msgid "Can't manipulate current date"
-msgstr "不能获得当前日期"
+#: svn/info-cmd.c:297
+#, c-format
+msgid "Node Kind: none\n"
+msgstr "节点种类:无\n"
 
-#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
-msgid "Can't calculate requested date"
-msgstr "无法计算被请求的日期"
+#: svn/info-cmd.c:302
+#, c-format
+msgid "Node Kind: unknown\n"
+msgstr "节点种类:未知\n"
 
-#: libsvn_subr/date.c:281
-msgid "Can't expand time"
-msgstr "无法明确时间"
+#: svn/info-cmd.c:311
+#, c-format
+msgid "Schedule: normal\n"
+msgstr "调度:正常\n"
 
-#: libsvn_subr/error.c:326
-msgid "Can't recode error string from APR"
-msgstr "无法自 APR 将错误信息重新编码"
+#: svn/info-cmd.c:315
+#, c-format
+msgid "Schedule: add\n"
+msgstr "调度:新增\n"
 
-#: libsvn_subr/error.c:414
+#: svn/info-cmd.c:319
 #, c-format
-msgid "%swarning: %s\n"
-msgstr "%s警告:%s\n"
+msgid "Schedule: delete\n"
+msgstr "调度:删除\n"
 
-#: libsvn_subr/io.c:129
+#: svn/info-cmd.c:323
 #, c-format
-msgid "Can't check path '%s'"
-msgstr "无法检查路径“%s”"
+msgid "Schedule: replace\n"
+msgstr "调度:替换\n"
 
-#: libsvn_subr/io.c:248 libsvn_subr/io.c:337
+#: svn/info-cmd.c:331
 #, c-format
-msgid "Can't open '%s'"
-msgstr "不能打开“%s”"
+msgid "Copied From URL: %s\n"
+msgstr "复制自地址(URL):%s\n"
 
-#: libsvn_subr/io.c:262 libsvn_subr/io.c:350
+#: svn/info-cmd.c:335
 #, c-format
-msgid "Unable to make name for '%s'"
-msgstr "不能使用名字“%s”"
+msgid "Copied From Rev: %ld\n"
+msgstr "复制自修订版:%ld\n"
 
-#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418
-msgid "Symbolic links are not supported on this platform"
-msgstr "此平台不支持符号链接"
+#: svn/info-cmd.c:340
+#, c-format
+msgid "Last Changed Author: %s\n"
+msgstr "最后修改的作者:%s\n"
 
-#: libsvn_subr/io.c:377
-msgid "Can't read contents of link"
-msgstr "不能读取连接的内容"
+#: svn/info-cmd.c:344
+#, c-format
+msgid "Last Changed Rev: %ld\n"
+msgstr "最后修改的修订版:%ld\n"
 
-#: libsvn_subr/io.c:519 libsvn_subr/io.c:529
-msgid "Can't find a temporary directory"
-msgstr "无法找到临时目录"
+#: svn/info-cmd.c:349
+msgid "Last Changed Date"
+msgstr "最后修改的时间"
 
-#: libsvn_subr/io.c:566
-#, c-format
-msgid "Can't copy '%s' to '%s'"
-msgstr "不能复制“%s”到“%s”"
+#: svn/info-cmd.c:355
+msgid "Text Last Updated"
+msgstr "文本最后更新"
 
-# as-is
-#: libsvn_subr/io.c:599
-#, c-format
-msgid "Can't set permissions on '%s'"
-msgstr "不能在“%s”设置许可权限"
+#: svn/info-cmd.c:359
+msgid "Properties Last Updated"
+msgstr "属性最后更新"
 
-#: libsvn_subr/io.c:621
+#: svn/info-cmd.c:362
 #, c-format
-msgid "Can't append '%s' to '%s'"
-msgstr "不能附加“%s”到“%s”"
+msgid "Checksum: %s\n"
+msgstr "校验和:%s\n"
 
-#: libsvn_subr/io.c:655
+#: svn/info-cmd.c:367
 #, c-format
-msgid "Source '%s' is not a directory"
-msgstr "源“%s”不是目录"
+msgid "Conflict Previous Base File: %s\n"
+msgstr "冲突之前的文件:%s\n"
 
-#: libsvn_subr/io.c:661
+#: svn/info-cmd.c:373
 #, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目的“%s”不是目录"
+msgid "Conflict Previous Working File: %s\n"
+msgstr "冲突之前的工作文件:%s\n"
 
-#: libsvn_subr/io.c:667
+#: svn/info-cmd.c:378
 #, c-format
-msgid "Destination '%s' already exists"
-msgstr "目的“%s”已存在"
+msgid "Conflict Current Base File: %s\n"
+msgstr "冲突之前的当前文件:%s\n"
 
-#: libsvn_subr/io.c:736 libsvn_subr/io.c:1636 libsvn_subr/io.c:1707
+#: svn/info-cmd.c:383
 #, c-format
-msgid "Can't read directory '%s'"
-msgstr "无法读取目录“%s”"
+msgid "Conflict Properties File: %s\n"
+msgstr "冲突的属性文件:%s\n"
 
-#: libsvn_subr/io.c:741 libsvn_subr/io.c:1641 libsvn_subr/io.c:1712
-#: libsvn_subr/io.c:2695
+#: svn/info-cmd.c:391
 #, c-format
-msgid "Error closing directory '%s'"
-msgstr "关闭目录“%s”时发生错误"
+msgid "Lock Token: %s\n"
+msgstr "锁定记号:%s\n"
 
-#: libsvn_subr/io.c:767
+#: svn/info-cmd.c:395
 #, c-format
-msgid "Can't make directory '%s'"
-msgstr "无法创建目录“%s”"
+msgid "Lock Owner: %s\n"
+msgstr "锁定所有者:%s\n"
 
-# as-is
-#: libsvn_subr/io.c:835
-#, c-format
-msgid "Can't set access time of '%s'"
-msgstr "不能设置“%s”的存取时间"
+#: svn/info-cmd.c:400
+msgid "Lock Created"
+msgstr "锁定已创建的"
 
-#: libsvn_subr/io.c:950
-#, c-format
-msgid "Can't set file '%s' read-only"
-msgstr "无法设置文件“%s”只读"
+#: svn/info-cmd.c:404
+msgid "Lock Expires"
+msgstr "锁定过期的"
 
-#: libsvn_subr/io.c:975
+#: svn/info-cmd.c:413
 #, c-format
-msgid "Can't set file '%s' read-write"
-msgstr "无法设置文件“%s”可读写"
+msgid ""
+"Lock Comment (%i lines):\n"
+"%s\n"
+msgstr ""
+"锁定注释(%i 行):\n"
+"%s\n"
 
-#: libsvn_subr/io.c:1025
+#: svn/info-cmd.c:414
 #, c-format
-msgid "Can't get default file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+msgid ""
+"Lock Comment (%i line):\n"
+"%s\n"
+msgstr ""
+"锁定注释(%i line):\n"
+"%s\n"
 
-# as-is
-#: libsvn_subr/io.c:1035
-#, fuzzy, c-format
-msgid "Can't open file at '%s'"
-msgstr "不能打开文件“%s”"
+#: svn/info-cmd.c:505
+#, c-format
+msgid ""
+"%s: (Not a versioned resource)\n"
+"\n"
+msgstr ""
+"%s:(不是受版本控制的资源)\n"
+"\n"
 
-#: libsvn_subr/io.c:1039
+#: svn/info-cmd.c:514
 #, fuzzy, c-format
-msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "不能获取”%s“文件的默认文件权限(文件 stat 错误)"
+msgid ""
+"%s: (Not a valid URL)\n"
+"\n"
+msgstr ""
+"%s:(不是有效的地址(URL))\n"
+"\n"
 
-#: libsvn_subr/io.c:1072 libsvn_subr/io.c:1132
-#, fuzzy, c-format
-msgid "Can't change read-write perms of file '%s'"
-msgstr "不能改变文件“%s”为可读写权限"
+#: svn/lock-cmd.c:52
+#, fuzzy
+msgid "Lock comment contains a zero byte"
+msgstr "锁定的注释中有一个零字节"
 
-#: libsvn_subr/io.c:1171 libsvn_subr/io.c:1215 libsvn_subr/io.c:1239
-#, c-format
-msgid "Can't change executability of file '%s'"
-msgstr "不能改变文件“%s”为可执行"
+#: svn/log-cmd.c:162
+msgid "(no author)"
+msgstr "(没有作者信息)"
 
-#: libsvn_subr/io.c:1266
-msgid "Error getting UID of process"
-msgstr "获取进程用户ID(UID)时发生错误"
+#: svn/log-cmd.c:173
+msgid "(no date)"
+msgstr "(没有时间)"
 
-#: libsvn_subr/io.c:1347
+#: svn/log-cmd.c:203
 #, c-format
-msgid "Can't get shared lock on file '%s'"
-msgstr "不能获取文件“%s“的共享锁"
+msgid "Changed paths:\n"
+msgstr "改变的路径:\n"
 
-#: libsvn_subr/io.c:1351
+#: svn/log-cmd.c:218
 #, c-format
-msgid "Can't get exclusive lock on file '%s'"
-msgstr "不能获取文件“%s”的排他锁"
+msgid " (from %s:%ld)"
+msgstr " (从 %s:%ld)"
 
-# as-is
-#: libsvn_subr/io.c:1382
-#, c-format
-msgid "Can't flush file '%s'"
-msgstr "不能写入文件“%s”"
+#: svn/log-cmd.c:450
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "当指定工作拷贝路径,只有一个目标会被指定"
 
-#: libsvn_subr/io.c:1383
-msgid "Can't flush stream"
-msgstr "不能写入流"
+#: svn/log-cmd.c:462
+msgid "Only relative paths can be specified after a URL"
+msgstr "地址(URL)后只能指定相对路径"
 
-#: libsvn_subr/io.c:1395 libsvn_subr/io.c:1412
-msgid "Can't flush file to disk"
-msgstr "不能把文件写入磁盘"
+#: svn/main.c:60
+msgid "force operation to run"
+msgstr "强制操作运行"
 
-#: libsvn_subr/io.c:1433
-msgid "Reading from stdin is currently broken, so disabled"
-msgstr "从标准输入设备读取数据时被中断,所以把它禁止"
+#: svn/main.c:62
+msgid "force validity of log message source"
+msgstr "强制校验日志信息资源"
 
-#: libsvn_subr/io.c:1454
-msgid "Can't get file name"
-msgstr "无法获取文件名"
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:227 svnadmin/main.c:230
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+msgid "show help on a subcommand"
+msgstr "显示子命令帮助"
 
-# as-is
-#: libsvn_subr/io.c:1522
-#, c-format
-msgid "Can't remove file '%s'"
-msgstr "不能移动文件“%s”"
+#: svn/main.c:65
+#, fuzzy
+msgid "specify log message ARG"
+msgstr "指定提交信息ARG"
 
-#: libsvn_subr/io.c:1551
-#, c-format
-msgid "Can't rewind directory '%s'"
-msgstr "无法返回目录“%s”"
+#: svn/main.c:66
+msgid "print as little as possible"
+msgstr "打印尽可能少"
+
+#: svn/main.c:67
+msgid "descend recursively"
+msgstr "向下递归"
+
+#: svn/main.c:68
+msgid "operate on single directory only"
+msgstr "只在单个目录操作"
+
+#: svn/main.c:70
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+" If ARG is negative this is like -r ARG:ARG-1"
+msgstr ""
+
+#: svn/main.c:74
+#, fuzzy
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" '{' DATE '}' revision at start of the date\n"
+" 'HEAD' latest in repository\n"
+" 'BASE' base rev of item's working "
+"copy\n"
+" 'COMMITTED' last commit at or before BASE\n"
+" 'PREV' revision just before COMMITTED"
+msgstr ""
+"ARG (一些命令需要 ARG1:ARG2 )\n"
+" 修订版参数可以是:\n"
+" 数字 修订版号\n"
+" \"{\" 日期 \"}\" 在指定时间以后的修订版date\n"
+" \"HEAD\" 最近的档案库\n"
+" \"BASE\" 基线,基于修订版的工作条目 \n"
+" \"COMMITTED\" 最后提交或基线之前\n"
+" \"PREV\" 修订版提交之前"
 
-#: libsvn_subr/io.c:1586 libsvn_subr/io.c:2544 libsvn_subr/io.c:2632
-#, c-format
-msgid "Can't open directory '%s'"
-msgstr "无法打开目录“%s”"
+#: svn/main.c:84
+#, fuzzy
+msgid "read log message from file ARG"
+msgstr "从文件 ARG 读取数据"
 
-#: libsvn_subr/io.c:1625 libsvn_subr/io.c:1647
-#, c-format
-msgid "Can't remove '%s'"
-msgstr "无法删除“%s”"
+#: svn/main.c:86
+msgid "give output suitable for concatenation"
+msgstr "给予适合输出的"
 
-#: libsvn_subr/io.c:1751
-#, c-format
-msgid "Can't create process '%s' attributes"
-msgstr "无法建立进程“%s”的属性"
+#: svn/main.c:89
+msgid "treat value as being in charset encoding ARG"
+msgstr "指定的值 ARG 为字符编码"
 
-#: libsvn_subr/io.c:1757
-#, c-format
-msgid "Can't set process '%s' cmdtype"
-msgstr "无法设置进程“%s”的命令类型"
+#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
+#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
+#: svnversion/main.c:125
+#, fuzzy
+msgid "show program version information"
+msgstr "显示版本信息"
 
-#: libsvn_subr/io.c:1769
-#, c-format
-msgid "Can't set process '%s' directory"
-msgstr "无法设定进程“%s”目录"
+#: svn/main.c:93
+msgid "print extra information"
+msgstr "打印附加信息"
 
-#: libsvn_subr/io.c:1782
-#, c-format
-msgid "Can't set process '%s' child input"
-msgstr "无法设置子进程“%s”输入"
+#: svn/main.c:94
+msgid "display update information"
+msgstr "显示更新信息"
 
-#: libsvn_subr/io.c:1789
-#, c-format
-msgid "Can't set process '%s' child outfile"
-msgstr "无法设置子进程“%s”输出文件"
+#: svn/main.c:96 svnsync/main.c:96
+msgid "specify a username ARG"
+msgstr "指定用户 ARG"
 
-#: libsvn_subr/io.c:1796
-#, c-format
-msgid "Can't set process '%s' child errfile"
-msgstr "无法设置子进程“%s”错误输出文件"
+#: svn/main.c:98 svnsync/main.c:98
+msgid "specify a password ARG"
+msgstr "指定密码 ARG"
 
-# as-is
-#: libsvn_subr/io.c:1820
-#, c-format
-msgid "Can't start process '%s'"
-msgstr "不能取得进程“%s”状态"
+#: svn/main.c:101
+msgid ""
+"Default: '-u'. When Subversion is invoking an\n"
+" external diff program, ARG is simply passed "
+"along\n"
+" to the program. But when Subversion is using "
+"its\n"
+" default internal diff implementation, or when\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
+" could be any of the following:\n"
+" -u (--unified):\n"
+" Output 3 lines of unified context.\n"
+" -b (--ignore-space-change):\n"
+" Ignore changes in the amount of white "
+"space.\n"
+" -w (--ignore-all-space):\n"
+" Ignore all white space.\n"
+" --ignore-eol-style:\n"
+" Ignore changes in EOL style"
+msgstr ""
 
-#: libsvn_subr/io.c:1842
-#, c-format
-msgid "Error waiting for process '%s'"
-msgstr "为进程“%s”写入时发生错误"
+#: svn/main.c:130
+msgid "pass contents of file ARG as additional args"
+msgstr "传递文件 ARG 内容为附件参数"
 
-#: libsvn_subr/io.c:1850
-#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "进程“%s”失败(返回 %d)"
+#: svn/main.c:131
+msgid "output in XML"
+msgstr "输出为 XML"
 
-#: libsvn_subr/io.c:1857
-#, c-format
-msgid "Process '%s' returned error exitcode %d"
-msgstr "进程“%s”返回错误退出码 %d"
+#: svn/main.c:132
+msgid "use strict semantics"
+msgstr "使用严格的语法"
 
-#: libsvn_subr/io.c:1968
-#, c-format
-msgid "'%s' returned %d"
-msgstr "“%s” 返回 %d"
+#: svn/main.c:134
+msgid "do not cross copies while traversing history"
+msgstr "查看历史不要跨越不同的拷贝"
 
-#: libsvn_subr/io.c:2071
-#, c-format
-msgid ""
-"Error running '%s': exitcode was %d, args were:\n"
-"in directory '%s', basenames:\n"
-"%s\n"
-"%s\n"
-"%s"
-msgstr ""
-"运行“%s”时发生错误:退出码是 %d,参数是:\n"
-"在目录“%s”,名字:\n"
-"%s\n"
-"%s\n"
-"%s"
+#: svn/main.c:136
+msgid "disregard default and svn:ignore property ignores"
+msgstr "忽略默认值和 svn:ignore 属性"
 
-#: libsvn_subr/io.c:2107
-#, c-format
-msgid "Can't detect MIME type of non-file '%s'"
-msgstr "不能检测非文件的“%s”的MIME类型"
+#: svn/main.c:138 svnsync/main.c:94
+msgid "do not cache authentication tokens"
+msgstr "不要缓冲用户验证"
 
-# as-is
-#: libsvn_subr/io.c:2174
-#, c-format
-msgid "Can't open file '%s'"
-msgstr "不能打开文件“%s”"
+#: svn/main.c:140 svnsync/main.c:92
+msgid "do no interactive prompting"
+msgstr "不要交互提示"
 
-#: libsvn_subr/io.c:2211
-msgid "Can't close stream"
-msgstr "无法关闭流"
+#: svn/main.c:142
+msgid "try operation but make no changes"
+msgstr "尝试操作但不修改"
 
-# as-is
-#: libsvn_subr/io.c:2221 libsvn_subr/io.c:2245 libsvn_subr/io.c:2258
-#, c-format
-msgid "Can't read file '%s'"
-msgstr "不能读取文件“%s”"
+#: svn/main.c:144 svnlook/main.c:111
+msgid "do not print differences for deleted files"
+msgstr "不要打印已删除文件的不同处"
 
-#: libsvn_subr/io.c:2222 libsvn_subr/io.c:2246 libsvn_subr/io.c:2259
-msgid "Can't read stream"
-msgstr "无法读取流"
+#: svn/main.c:146
+msgid "notice ancestry when calculating differences"
+msgstr "比较差异时提示原始信息"
 
-#: libsvn_subr/io.c:2233
-#, c-format
-msgid "Can't get attribute information from file '%s'"
-msgstr "无法从文件“%s”获取属性信息"
+#: svn/main.c:148
+msgid "ignore ancestry when calculating merges"
+msgstr "合并时忽略原始信息"
 
-#: libsvn_subr/io.c:2234
-msgid "Can't get attribute information from stream"
-msgstr "无法从流获取属性信息"
+#: svn/main.c:150
+msgid "ignore externals definitions"
+msgstr "忽略外部定义"
 
-#: libsvn_subr/io.c:2270
-#, c-format
-msgid "Can't set position pointer in file '%s'"
-msgstr "无法在文件“%s”设置定位指针"
+#: svn/main.c:153
+msgid "use ARG as diff command"
+msgstr "使用 ARG 作为差异比较命令"
 
-#: libsvn_subr/io.c:2271
-msgid "Can't set position pointer in stream"
-msgstr "无法在流中设置定位指针"
+#: svn/main.c:155
+msgid "use ARG as merge command"
+msgstr "使用 ARG 作为合并命令"
 
-#: libsvn_subr/io.c:2282 libsvn_subr/io.c:2295
-#, c-format
-msgid "Can't write to file '%s'"
-msgstr "无法写入文件“%s”"
+#: svn/main.c:157
+msgid "use ARG as external editor"
+msgstr "使用 ARG 作为外部编辑器"
 
-#: libsvn_subr/io.c:2283 libsvn_subr/io.c:2296
-msgid "Can't write to stream"
-msgstr "无法写入流"
+#: svn/main.c:160
+msgid "use ARG as the older target"
+msgstr "使用 ARG 作为旧目标"
 
-# as-is
-#: libsvn_subr/io.c:2336
-#, fuzzy, c-format
-msgid "Can't read length line in file '%s'"
-msgstr "不能从文件“%s”读取长度行"
+#: svn/main.c:162
+msgid "use ARG as the newer target"
+msgstr "使用 ARG 作为新目标"
 
-#: libsvn_subr/io.c:2340
-#, fuzzy
-msgid "Can't read length line in stream"
-msgstr "无法从数据流读取长度行"
+#: svn/main.c:164
+msgid "operate on a revision property (use with -r)"
+msgstr "在修订版属性上作操作(使用-r参数)"
 
-#: libsvn_subr/io.c:2415
-#, c-format
-msgid "Can't move '%s' to '%s'"
-msgstr "不能移动“%s”到“%s”"
+#: svn/main.c:166
+msgid "relocate via URL-rewriting"
+msgstr "通过URL改写重新部署"
 
-#: libsvn_subr/io.c:2460
-#, c-format
-msgid "Can't create directory '%s'"
-msgstr "无法创建目录“%s”"
+#: svn/main.c:168 svnadmin/main.c:269 svnsync/main.c:100
+msgid "read user configuration files from directory ARG"
+msgstr "从目录 ARG 读取用户配置文件"
 
-#: libsvn_subr/io.c:2471 libsvn_wc/copy.c:303
-#, c-format
-msgid "Can't hide directory '%s'"
-msgstr "无法隐藏目录“%s”"
+#: svn/main.c:170
+msgid "enable automatic properties"
+msgstr "使自动属性有效"
 
-#: libsvn_subr/io.c:2484
-#, c-format
-msgid "Can't stat directory '%s'"
-msgstr "无法获取目录“%s”的状态"
+#: svn/main.c:172
+msgid "disable automatic properties"
+msgstr "使自动属性无效"
 
-#: libsvn_subr/io.c:2500
-#, c-format
-msgid "Can't stat new directory '%s'"
-msgstr "无法获取新目录“%s”的状态"
+#: svn/main.c:174
+#, fuzzy
+msgid ""
+"use a different EOL marker than the standard\n"
+" system marker for files with the svn:eol-style\n"
+" property set to 'native'.\n"
+" ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+"使用一个与标准不同的 EOL 标记\n"
+" 系统为文件标记 svn:eol-style 属性为 'native'。\n"
+" ARG 可以是以下之一 'LF','CR','CRLF'"
 
-#: libsvn_subr/io.c:2562
-#, c-format
-msgid "Can't remove directory '%s'"
-msgstr "无法删除目录“%s”"
+#: svn/main.c:182
+msgid "maximum number of log entries"
+msgstr "日值项最大值"
 
-#: libsvn_subr/io.c:2580
-msgid "Can't read directory"
-msgstr "无法读取目录"
+#: svn/main.c:184
+msgid "don't unlock the targets"
+msgstr "不要锁定目标"
 
-#: libsvn_subr/io.c:2651
-#, c-format
-msgid "Can't read directory entry in '%s'"
-msgstr "无法在目录“%s”读取内容"
+#: svn/main.c:186
+msgid "show a summary of the results"
+msgstr ""
 
-#: libsvn_subr/io.c:2776
-#, c-format
-msgid "Can't check directory '%s'"
-msgstr "无法检查目录“%s”"
+#: svn/main.c:225
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository. They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+"把文件和目录放入版本控制中,\n"
+"通过调度加到档案库。它们会在下一次提交时加入。\n"
+"用法:add 路径...\n"
 
-#: libsvn_subr/io.c:2798
-#, c-format
-msgid "Version %d is not non-negative"
-msgstr "版本 %d 未被确认"
+#: svn/main.c:233
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地址(URL)的内容,每行包含修订版和作者信息。\n"
+"\n"
+"用法:blame 目标[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
 
-#: libsvn_subr/io.c:2845
-#, c-format
-msgid "Reading '%s'"
-msgstr "正在读取“%s”"
+#: svn/main.c:243
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地址(URL)的内容。\n"
+"用法:cat 目标[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
 
-#: libsvn_subr/io.c:2861
-#, c-format
-msgid "First line of '%s' contains non-digit"
-msgstr "“%s”的第一行包含了非阿拉伯数字"
+#: svn/main.c:251
+#, fuzzy
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
+"\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up.\n"
+"\n"
+" If PATH is omitted, the basename of the URL will be used as\n"
+" the destination. If multiple URLs are given each will be checked\n"
+" out into a sub-directory of PATH, with the name of the sub-directory\n"
+" being the basename of the URL.\n"
+msgstr ""
+"从档案库签出工作拷贝。\n"
+"用法:checkout 地址[@版本]... [路径]\n"
+"\n"
+" 注意:如果路径忽略路径,地址(URL)最末目录名作为目标路径。\n"
+" 如果给定了多个地址(URL),每个地址(URL)将签出到指定路径中\n"
+" 以地址(URL)最末目录名为名字的子目录中。\n"
+"\n"
 
-#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
-msgid "Can't convert string to UCS-2: '%s'"
-msgstr "不能把字符串转换为UCS-2:“%s”。"
+#: svn/main.c:265
+msgid ""
+"Recursively clean up the working copy, removing locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [PATH...]\n"
+msgstr ""
+"递归清理工作拷贝,去除锁,记录未完成操作,等等。\n"
+"\n"
+"用法:cleanup [路径...]\n"
 
-#: libsvn_subr/nls.c:86
+#: svn/main.c:272
 #, fuzzy
-msgid "Can't get module file name"
-msgstr "无法获取模块文件名"
-
-#: libsvn_subr/nls.c:101
-#, c-format
-msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
-msgstr "不能把模块路径从UCS-2转换为UTF-8:“%s”"
-
-#: libsvn_subr/opt.c:146
 msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
 "\n"
-"Valid options:\n"
+" A log message must be provided, but it can be empty. If it is not\n"
+" given by a --message or --file option, an editor will be started.\n"
+" If any targets are (or contain) locked items, those will be\n"
+" unlocked after a successful commit.\n"
 msgstr ""
+"把改变从工作拷贝发送到档案库。\n"
+"用法:commit [路径...]\n"
 "\n"
-"有效选项:\n"
-
-#: libsvn_subr/opt.c:236
-msgid " arg"
-msgstr " 参数"
+" 日志信息必须提供,但可以是空的。\n"
+" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
+" 如果一些目标(或包含)锁定了条目,\n"
+" 在一个提交成功后这些条目会被解除锁定。\n"
 
-#: libsvn_subr/opt.c:259
-#, c-format
+#: svn/main.c:280
+#, fuzzy
 msgid ""
-"\"%s\": unknown command.\n"
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
 "\n"
+" A log message must be provided, but it can be empty.\n"
+" OS400 does not support the starting of an editor,\n"
+" so --message or --file must be used. If any targets are\n"
+" (or contain) locked items, those will be unlocked after a\n"
+" successful commit.\n"
 msgstr ""
-"“%s”:未知的命令。\n"
+"把改变从工作拷贝发送到档案库。\n"
+"用法:commit [路径...]\n"
 "\n"
+" 日志信息必须提供,但可以是空的。\n"
+" 如果没有指定 --message 或 --file 选项,会启动一个编辑器。\n"
+" 如果一些目标(或包含)锁定了条目,\n"
+" 在一个提交成功后这些条目会被解除锁定。\n"
 
-#: libsvn_subr/opt.c:449
-msgid "Too few arguments"
-msgstr "参数太少"
-
-#: libsvn_subr/opt.c:530
-#, c-format
-msgid "Syntax error parsing revision '%s'"
-msgstr "剖析修订版“%s”时发生语法错误"
-
-#: libsvn_subr/opt.c:607
-#, c-format
-msgid "URL '%s' is not properly URI-encoded"
-msgstr "地址(URL)“%s”不是正确地以 URI 编码"
-
-#: libsvn_subr/opt.c:613
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "地址(URL)“%s”包含 '..' 元素"
-
-#: libsvn_subr/opt.c:642
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "解析“%s”时发生错误"
+#: svn/main.c:293
+msgid ""
+"Duplicate something in working copy or repository, remembering history.\n"
+"usage: copy SRC DST\n"
+"\n"
+" SRC and DST can each be either a working copy (WC) path or URL:\n"
+" WC -> WC: copy and schedule for addition (with history)\n"
+" WC -> URL: immediately commit a copy of WC to URL\n"
+" URL -> WC: check out URL into WC, schedule for addition\n"
+" URL -> URL: complete server-side copy; used to branch & tag\n"
+msgstr ""
+"在工作拷贝或档案库中复制数据,恢复历史。\n"
+"用法:copy 起源 目的\n"
+"\n"
+" 起源 和 目的 可以是工作拷贝路径或地址(URL):\n"
+" 工作拷贝 -> 工作拷贝 : 复制和通过调度进行增加(包含历史)\n"
+" 工作拷贝 -> 地址(URL) : 马上提交一个工作拷贝到地址(URL)\n"
+" 地址(URL) -> 工作拷贝 : 签出地址(URL)到工作目录,通过调度进行增加\n"
+" 地址(URL) -> 地址(URL) : 完全服务器端复制;一般用于分支和标签\n"
 
-#: libsvn_subr/opt.c:738
-#, c-format
+#: svn/main.c:305
 msgid ""
-"%s, version %s\n"
-" compiled %s, %s\n"
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+" 2. delete URL...\n"
+"\n"
+" 1. Each item specified by a PATH is scheduled for deletion upon\n"
+" the next commit. Files, and directories that have not been\n"
+" committed, are immediately removed from the working copy.\n"
+" PATHs that are, or contain, unversioned or modified items will\n"
+" not be removed unless the --force option is given.\n"
 "\n"
+" 2. Each item specified by a URL is deleted from the repository\n"
+" via an immediate commit.\n"
 msgstr ""
-"%s,版本 %s\n"
-" 编译于 %s,%s\n"
+"从版本控制中删除文件和目录。\n"
+"用法:1、delete 路径...\n"
+" 2、delete 地址...\n"
+"\n"
+" 1、每一个通过路径指定的项目会被进行调度删除,下次提交时被真正删除。\n"
+" 文件和目录若未改变将马上从工作拷贝中删除。\n"
+" 路径本身或包含不受版本控制或已修改项目,\n"
+" 不会被删除,除非指定了 --force 选项。\n"
+" \n"
 "\n"
+" 2、每一个地址(URL)指定的项目会被马上从档案库中删除,并提交。\n"
+" \n"
 
-# as-is
-#: libsvn_subr/opt.c:741
+#: svn/main.c:321
 #, fuzzy
 msgid ""
-"Copyright (C) 2000-2005 CollabNet.\n"
-"Subversion is open source software, see http://subversion.tigris.org/\n"
-"This product includes software developed by CollabNet (http://www.Collab."
-"Net/).\n"
+"Display the differences between two revisions or paths.\n"
+"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
+" [PATH...]\n"
+" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+"\n"
+" 1. Display the changes made to TARGETs as they are seen in REV between\n"
+" two revisions. TARGETs may be all working copy paths or all URLs.\n"
+" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
+" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
+" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+"\n"
+" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
 "\n"
+" Use just 'svn diff' to display local modifications in a working copy.\n"
 msgstr ""
-"版权所有 (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放�代�软件,请看 http://subversion.tigris.org/\n"
-"此产�包�的软件由 CollabNet (http://www.Collab.Net/)开�。\n"
+"显示两个路径中的差异。\n"
+"用法:1、diff [-r N[:M]] [目标[@REV]...]\n"
+" 2、diff [-r N[:M]] --old=旧目标[@OLDREV] [--new=新目标[@NEWREV]] \\\n"
+" [PATH...]\n"
+" 3、diff 旧URL[@OLDREV] 新URL[@NEWREV]\n"
 "\n"
+" 1、显示在修订版中存在的 目标,它 (们) 在两个不同的修订版之间的\n"
+" 差异。目标 可以为工作拷贝路径,或是地址(URL)。\n"
+"\n"
+" 如果任何的 目标 是工作拷贝的话,N 默认为 BASE,否则就必须加以指定。\n"
+" 如果任何的 目标 是工作拷贝路径,M 默认为目前的工作版本,否则默认为\n"
+" HEAD。\n"
+"\n"
+" 2、显示于旧修订版的旧目标与于新修订版的新目标之间的\n"
+" 差异。如果有指定路径的话,它们是相对于旧目标与新目标,而差异\n"
+" 的输出会限制在这些路径中。旧目标与新目标可为工作路径或\n"
+" 地址URL[@REV]。没有指定新目标时,默认为 旧目标。-r N 使得 旧目标 \n"
+" 默认为 N,而 -r N:M 让 旧目标 默认为 N,新目标 默认为 M。\n"
+" 3、“svn diff --old=旧地址URL[@OLDREV] --new=新地址URL[@NEWREV]”的便捷用"
+"法。\n"
+"\n"
+" 仅在使用“svn diff”时,会显示工作拷贝中的本地修改。\n"
 
-#: libsvn_subr/opt.c:794
-#, c-format
-msgid "Type '%s help' for usage.\n"
-msgstr "请使用“%s help”以得到用法和帮助。\n"
-
-#: libsvn_subr/path.c:1059
-#, c-format
-msgid "Couldn't determine absolute path of '%s'"
-msgstr "不能确定“%s”的绝对路径"
-
-#: libsvn_subr/path.c:1098
-#, c-format
-msgid "'%s' is neither a file nor a directory name"
-msgstr "“%s”不是文件名也不是目录名"
-
-#: libsvn_subr/path.c:1204
-msgid "Can't determine the native path encoding"
-msgstr "不能确定本地路径编码"
-
-#: libsvn_subr/path.c:1258
-#, fuzzy, c-format
-msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$s”存在无效的控制字符”0x%1$02x“"
-
-#: libsvn_subr/subst.c:1013 libsvn_wc/props.c:1441
-#, c-format
-msgid "File '%s' has inconsistent newlines"
-msgstr "文件“%s”内的换行符不一致"
-
-#: libsvn_subr/utf.c:157
-msgid "Can't lock charset translation mutex"
-msgstr "不能锁定字符转换互斥体"
-
-#: libsvn_subr/utf.c:175 libsvn_subr/utf.c:263
-msgid "Can't unlock charset translation mutex"
-msgstr "不能解锁字符转换互斥体"
-
-#: libsvn_subr/utf.c:222
-#, fuzzy, c-format
-msgid "Can't create a character converter from native encoding to '%s'"
-msgstr "不能创建从本地编码到“%s”的字符转换器"
-
-#: libsvn_subr/utf.c:226
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to native encoding"
-msgstr "不能创建从“%s”到本地编码的字符转换器"
-
-#: libsvn_subr/utf.c:230
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to '%s'"
-msgstr "不能创建从“%s”到“%s”的字符转换器"
-
-#: libsvn_subr/utf.c:454
-#, fuzzy, c-format
-msgid "Can't convert string from native encoding to '%s':"
-msgstr "不能把字符串从本地编码转换为”%s“编码。"
+#: svn/main.c:351
+#, fuzzy
+msgid ""
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1. Exports a clean directory tree from the repository specified by\n"
+" URL, at revision REV if it is given, otherwise at HEAD, into\n"
+" PATH. If PATH is omitted, the last component of the URL is used\n"
+" for the local directory name.\n"
+"\n"
+" 2. Exports a clean directory tree from the working copy specified by\n"
+" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
+" for the local directory name. If REV is not specified, all local\n"
+" changes will be preserved. Files not under version control will\n"
+" not be copied.\n"
+"\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"产生一个无版本控制的目录树拷贝。\n"
+"用法:1、export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2、export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1、从 URL 指定的档案库,导出一个干净的目录树到 PATH。如果有指定\n"
+" REV 的话,内容即为该修订版的,否则就是 HEAD 修订版。如果 PATH\n"
+" 被省略的话,地址(URL)的最后部份会被用来当成本地的目录名称。\n"
+"\n"
+" 2、在工作拷贝中,从指定的 PATH1 导出一个干净的目录树到 PATH2。如果\n"
+" 有指定 REV 的话,会从指定的修订版导出,否则从 WORKING 导出。如果\n"
+" PATH2 被省略的话,PATH1 的最后部份会被用来当成本地的目录名称。\n"
+" 如果没有指定 REV 的话,所有的本地修改都还会保持著,但是未纳入\n"
+" 版本控制的文件不会被复制。\n"
+"\n"
+" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+"\n"
 
-#: libsvn_subr/utf.c:458
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to native encoding:"
-msgstr "不能把字符串从”%s“编码转换为本地编码。"
+#: svn/main.c:374
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+"描述本程序或其子命令的用法。\n"
+"用法:help [子命令...]\n"
 
-#: libsvn_subr/utf.c:462
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to '%s':"
-msgstr "不能把字符串从”%s“编码转换为”%s“编码。"
+#: svn/main.c:380
+#, fuzzy
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
+"\n"
+" Recursively commit a copy of PATH to URL.\n"
+" If PATH is omitted '.' is assumed.\n"
+" Parent directories are created as necessary in the repository.\n"
+" If PATH is a directory, the contents of the directory are added\n"
+" directly under URL.\n"
+msgstr ""
+"提交未纳入版本控制的文件或目录树至档案库。\n"
+"用法:import [PATH] URL\n"
+"\n"
+" 递归地提交 PATH 的拷贝至地址(URL)。如果省略 PATH,默认为 '.'。父目录会\n"
+" 依需要于档案库内建立。\n"
 
-#: libsvn_subr/utf.c:506
-#, fuzzy, c-format
+#: svn/main.c:393
+#, fuzzy
 msgid ""
-"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
-"UTF-8"
-msgstr "安全数据”%s“是后接非ASCII字节%d:不能转换到/从 UTF-8"
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
+"\n"
+" Print information about each TARGET (default: '.')\n"
+" TARGET may be either a working-copy path or URL. If specified, REV\n"
+" determines in which revision the target is first looked up.\n"
+msgstr ""
+"显示本地或远端条目的信息。\n"
+"用法:info [TARGET...]\n"
+"\n"
+" 显示每个 TARGET 的信息 (默认:'.')。\n"
+" TARGET 可以是工作目录或地址(URL)。\n"
 
-#: libsvn_subr/utf.c:514
-#, c-format
+#: svn/main.c:403
+#, fuzzy
 msgid ""
-"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "检测到非ASCII字符 (代码 %d),并且不能转换到UTF-8(或从UTF-8转换)"
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
+"\n"
+" List each TARGET file and the contents of each TARGET directory as\n"
+" they exist in the repository. If TARGET is a working copy path, the\n"
+" corresponding repository URL will be used. If specified, REV determines\n"
+" in which revision the target is first looked up.\n"
+"\n"
+" The default TARGET is '.', meaning the repository URL of the current\n"
+" working directory.\n"
+"\n"
+" With --verbose, the following fields will be shown for each item:\n"
+"\n"
+" Revision number of the last commit\n"
+" Author of the last commit\n"
+" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
+" Size (in bytes)\n"
+" Date and time of the last commit\n"
+msgstr ""
+"列出档案库中的目录项目。\n"
+"用法:list [TARGET[@REV]...]\n"
+"\n"
+" 列出每个 TARGET 文件与每个档案库里的 TARGET 目录。如果 TARGET 是\n"
+" 工作拷贝的路径,那么相对应的档案库地址(URL)就会被拿来使用。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+"\n"
+" 默认的 TARGET 是 '.',表示目前工作拷贝目录的档案库地址(URL)。\n"
+"\n"
+" 加上 --verbose 的话,以下的栏位会显示出每个条目的信息:\n"
+"\n"
+" 前次提交的修订版号码\n"
+" 前次提交的作者\n"
+" 如果被锁定,显示字母 'O'。(使用‘svn info URL’来查看详细信息)\n"
+" 大小 (以字节为单位)\n"
+" 前次提交的日期与时间\n"
 
-#: libsvn_subr/utf.c:556
-#, c-format
+#: svn/main.c:425
+#, fuzzy
 msgid ""
-"Valid UTF-8 data\n"
-"(hex:%s)\n"
-"followed by invalid UTF-8 sequence\n"
-"(hex:%s)"
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
+"\n"
+" Use --force to steal the lock from another user or working copy.\n"
 msgstr ""
-"有效 UTF-8 数据\n"
-"(16进制:%s)\n"
-"后接无效 UTF-8 序列\n"
-"(16进制:%s)"
-
-#: libsvn_subr/validate.c:48
-#, c-format
-msgid "MIME type '%s' has empty media type"
-msgstr "MIME 类别“%s”含有空的媒体类别"
-
-#: libsvn_subr/validate.c:53
-#, c-format
-msgid "MIME type '%s' does not contain '/'"
-msgstr "MIME 类别“%s”没包含 '/'"
-
-#: libsvn_subr/validate.c:58
-#, c-format
-msgid "MIME type '%s' ends with non-alphanumeric character"
-msgstr "MIME 类别“%s”以非字母与数字字符结束"
+"在档案库中锁定工作目录或地址(URL),\n"
+"使得其他用户不能向它提交修改。\n"
+"用法:lock TARGET...\n"
+"\n"
+" 使用 -force 可以从其他用户或工作拷贝窃取到锁。\n"
 
-#: libsvn_subr/version.c:74
-#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%s”的版本不一致:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+#: svn/main.c:433
+#, fuzzy
+msgid "read lock comment from file ARG"
+msgstr "从文件 ARG 读取数据"
 
-#: libsvn_subr/xml.c:400
-#, c-format
-msgid "Malformed XML: %s at line %d"
-msgstr "畸形的XML:%s 在第 %d 行"
+#: svn/main.c:434
+#, fuzzy
+msgid "specify lock comment ARG"
+msgstr "指定提交信息ARG"
 
-#: libsvn_wc/adm_crawler.c:379
-#, c-format
+#: svn/main.c:437
+#, fuzzy
 msgid ""
-"The entry '%s' is no longer a directory; remove the entry before updating"
-msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
-
-#: libsvn_wc/adm_crawler.c:633
-msgid "Error aborting report"
-msgstr "取消报告时发生错误"
-
-#: libsvn_wc/adm_crawler.c:823
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不一致:预期“%s”,实际:“%s”"
-
-#: libsvn_wc/adm_crawler.c:849
-msgid "Error opening local file"
-msgstr "打开本地文件时发生错误"
-
-# plz leave this as-is
-#: libsvn_wc/adm_files.c:202
-msgid "Bad type indicator"
-msgstr "错误的类型"
-
-#: libsvn_wc/adm_files.c:394
-msgid "APR_APPEND not supported for adm files"
-msgstr "APR_APPEND 不支持管理文件"
+"Show the log messages for a set of revision(s) and/or file(s).\n"
+"usage: 1. log [PATH]\n"
+" 2. log URL[@REV] [PATH...]\n"
+"\n"
+" 1. Print the log messages for a local PATH (default: '.').\n"
+" The default revision range is BASE:1.\n"
+"\n"
+" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up. The default revision range is HEAD:1.\n"
+"\n"
+" With -v, also print all affected paths with each log message.\n"
+" With -q, don't print the log message body itself (note that this is\n"
+" compatible with -v).\n"
+"\n"
+" Each log message is printed just once, even if more than one of the\n"
+" affected paths for that revision were explicitly requested. Logs\n"
+" follow copy history by default. Use --stop-on-copy to disable this\n"
+" behavior, which can be useful for determining branchpoints.\n"
+"\n"
+" Examples:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
+msgstr ""
+"显示一组修订版与/或文件的提交日志信息。\n"
+"用法:1、log [PATH]\n"
+" 2、log URL [PATH...]\n"
+"\n"
+" 1、显示本地 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
+" BASE:1。\n"
+"\n"
+" 2、显示 URL 下的 PATH (默认:'.') 的日志信息。默认的修订版范围为\n"
+" HEAD:1。\n"
+"\n"
+" 使用 -v 时,一并于每个日志信息中显示受影响的路径。\n"
+" 使用 -q 时,不显示日志信息主体 (请注意,这可和 -v 并存)。\n"
+"\n"
+" 每一个日志信息只会显示一次而已,就算明确地指定多个被它所影响的路径\n"
+" 亦同。默认的显示信息会追溯复制历史;使用 --stop-on-copy 可以关闭这\n"
+" 个功能,这在找出分支点的很方便。\n"
+"\n"
+" 范例:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
 
-#: libsvn_wc/adm_files.c:437
+#: svn/main.c:467
+#, fuzzy
 msgid ""
-"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
-"again"
-msgstr "您的 .svn/tmp 目录可能丢失或损坏;请执行“svn cleanup”,然后再试一次"
-
-#: libsvn_wc/adm_files.c:612 libsvn_wc/lock.c:378 libsvn_wc/lock.c:631
-#, c-format
-msgid "'%s' is not a working copy"
-msgstr "“%s”不是工作拷贝"
-
-#: libsvn_wc/adm_files.c:619 libsvn_wc/adm_files.c:687
-#: libsvn_wc/adm_files.c:749
-msgid "No such thing as 'base' working copy properties!"
-msgstr "没有 '基础' 工作拷贝属性这样的东西"
-
-#: libsvn_wc/adm_files.c:818 libsvn_wc/util.c:51
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "“%s”不是目录"
-
-#: libsvn_wc/adm_files.c:872
-#, c-format
-msgid "No entry for '%s'"
-msgstr "没有“%s”的项目"
-
-#: libsvn_wc/adm_files.c:884
-#, c-format
-msgid "Revision %ld doesn't match existing revision %ld in '%s'"
-msgstr "修订版 %ld 不符合现有的修订版 %ld 于“%s”中"
-
-#: libsvn_wc/adm_files.c:893
-#, c-format
-msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
-msgstr "地址(URL)“%s”不符合现有的地址(URL)“%s”于“%s”中"
-
-#: libsvn_wc/adm_ops.c:223
-#, c-format
-msgid "Unrecognized node kind: '%s'"
-msgstr "无法确认的节点种类:“%s”"
-
-#: libsvn_wc/adm_ops.c:443 libsvn_wc/update_editor.c:946
-#: libsvn_wc/update_editor.c:1347
-#, c-format
-msgid "Error writing log file for '%s'"
-msgstr "写入“%s”的日志文件时发生错误"
-
-#: libsvn_wc/adm_ops.c:977
-#, c-format
-msgid "'%s' not found"
-msgstr "找不到“%s”"
-
-#: libsvn_wc/adm_ops.c:981
-#, c-format
-msgid "Unsupported node kind for path '%s'"
-msgstr "路径“%s”为不支持的节点种类"
-
-#: libsvn_wc/adm_ops.c:1011
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%s”已纳入版本控制"
+"Apply the differences between two sources to a working copy path.\n"
+"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1. In the first form, the source URLs are specified at revisions\n"
+" N and M. These are the two sources to be compared. The revisions\n"
+" default to HEAD if omitted.\n"
+"\n"
+" 2. In the second form, the URLs corresponding to the source working\n"
+" copy paths define the sources to be compared. The revisions must\n"
+" be specified.\n"
+"\n"
+" 3. In the third form, SOURCE can be a URL, or working copy item\n"
+" in which case the corresponding URL is used. This URL in\n"
+" revision REV is compared as it existed between revisions N and \n"
+" M. If REV is not specified, HEAD is assumed.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" WCPATH is the working copy path that will receive the changes.\n"
+" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
+" the sources have identical basenames that match a file within '.':\n"
+" in which case, the differences will be applied to that file.\n"
+msgstr ""
+"将两个来源之间的差异应用至工作拷贝路径。\n"
+"用法:1、merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2、merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3、merge -r N:M SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1、第一种形式中,来源 URL 各被指定到修订版 N 与 M。这两个就是作为\n"
+" 比较的来源。如果没有指定修订版的话,默认为 HEAD。\n"
+"\n"
+" 2、在第二种形式中,对应到两个来源的工作拷贝路径的 URL 定义出用以\n"
+" 进行比较的来源。这里必须指定修订版。\n"
+"\n"
+" 3、第三种形式中,SOURCE 可为 URL 或工作拷贝项目,后者会使用对应的\n"
+" 地址(URL)。在修订版 REV 的 地址(URL) 会以它存在于修订版 N 与 M 的路径来"
+"作\n"
+" 比较。如果未指定 REV,就会假设为 HEAD。\n"
+"\n"
+" WCPATH 是接受改变的工作拷贝路径。如果省略 WCPATH 的话,默认值为\n"
+" '.',除非来源的主要名字符合 '.' 里的某个文件;在这种情况下,文件\n"
+" 差异将会直接应用至该文件去。\n"
 
-#: libsvn_wc/adm_ops.c:1023
-#, c-format
+#: svn/main.c:496
 msgid ""
-"Can't replace '%s' with a node of a differing type; commit the deletion, "
-"update the parent, and then add '%s'"
-msgstr "无法以不同种类节点来替换“%s”:请提交该删除,更新父项目,再新增“%s”"
-
-#: libsvn_wc/adm_ops.c:1039
-#, c-format
-msgid "Can't find parent directory's entry while trying to add '%s'"
-msgstr "在尝试新增“%s”时,无法找到父目录的项目"
-
-#: libsvn_wc/adm_ops.c:1044
-#, c-format
-msgid "Can't add '%s' to a parent directory scheduled for deletion"
-msgstr "无法新增“%s”至已预定要删除的父目录"
-
-#: libsvn_wc/adm_ops.c:1060
-#, fuzzy, c-format
-msgid "The URL '%s' has different repository root than its parent"
-msgstr "地址(URL)“%s”与它的上级的档案库根目录不相同"
-
-#: libsvn_wc/adm_ops.c:1334 libsvn_wc/adm_ops.c:1339 libsvn_wc/adm_ops.c:1375
-#, c-format
-msgid "Error restoring props for '%s'"
-msgstr "还原“%s”的属性时发生错误"
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+" 2. mkdir URL...\n"
+"\n"
+" Create version controlled directories.\n"
+"\n"
+" 1. Each directory specified by a working copy PATH is created locally\n"
+" and scheduled for addition upon the next commit.\n"
+"\n"
+" 2. Each directory specified by a URL is created in the repository via\n"
+" an immediate commit.\n"
+"\n"
+" In both cases, all the intermediate directories must already exist.\n"
+msgstr ""
+"建立纳入版本控制下的新目录。\n"
+"用法:1、mkdir PATH...\n"
+" 2、mkdir URL...\n"
+"\n"
+" 建立版本控制的目录。\n"
+"\n"
+" 1、每一个以工作拷贝 PATH 指定的目录,都会建立在本地端,并且加入新增\n"
+" 调度,以待下一次的提交。\n"
+"\n"
+" 2、每个以地址(URL)指定的目录,都会透过立即提交于档案库中建立。\n"
+"\n"
+" 在这两个情况下,所有的中间目录都必须事先存在。\n"
 
-#: libsvn_wc/adm_ops.c:1349
-#, c-format
-msgid "Error removing props for '%s'"
-msgstr "移除“%s”的属性时发生错误"
+#: svn/main.c:513
+#, fuzzy
+msgid ""
+"Move and/or rename something in working copy or repository.\n"
+"usage: move SRC DST\n"
+"\n"
+" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
+" Note: the --revision option has no use and is deprecated.\n"
+"\n"
+" SRC and DST can both be working copy (WC) paths or URLs:\n"
+" WC -> WC: move and schedule for addition (with history)\n"
+" URL -> URL: complete server-side rename.\n"
+msgstr ""
+"移动或更名工作拷贝或档案库里的东西。\n"
+"用法:move SRC DST\n"
+"\n"
+" 注意: 本子命令等同于 'copy' 然后 'delete'。\n"
+"\n"
+" SRC 可同时为工作拷贝 (WC) 路径或地址(URL):\n"
+" WC -> WC : 移动并加入新增调度 (连同历史记录)\n"
+" URL -> URL : 完全是服务器端的更名。\n"
 
-#: libsvn_wc/adm_ops.c:1421
-#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "还原“%s”文字时发生错误"
+#: svn/main.c:526
+#, fuzzy
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Removes versioned props in working copy.\n"
+" 2. Removes unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"移除目录,文件,或修订版的属性。\n"
+"用法:1、propdel PROPNAME [PATH...]\n"
+" 2、propdel PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、移除纳入版本控制的工作拷贝属性。\n"
+" 2、移除无版本控制的远端档案库修订版属性。\n"
 
-#: libsvn_wc/adm_ops.c:1522
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "无法恢复:“%s”未纳入版本控制"
+#: svn/main.c:538
+#, fuzzy
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME PATH...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Edits versioned props in working copy.\n"
+" 2. Edits unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"以外部编辑器编辑目标的属性 PROPNAME。\n"
+"用法:1、propedit PROPNAME PATH...\n"
+" 2、propedit PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、编辑纳入版本控制的工作拷贝属性。\n"
+" 2、编辑无版本控制的远端档案库修订版属性改变。\n"
 
-#: libsvn_wc/adm_ops.c:1550
-#, c-format
-msgid "Cannot revert '%s': unsupported entry node kind"
-msgstr "无法恢复“%s”:不支持的项目节点种类"
+#: svn/main.c:551
+#, fuzzy
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Prints versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Prints unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" By default, this subcommand will add an extra newline to the end\n"
+" of the property values so that the output looks pretty. Also,\n"
+" whenever there are multiple paths involved, each property value\n"
+" is prefixed with the path with which it is associated. Use\n"
+" the --strict option to disable these beautifications (useful,\n"
+" for example, when redirecting binary property values to a file).\n"
+msgstr ""
+"显示目录,文件,或修订版的属性内容。\n"
+"用法:1、propget PROPNAME [TARGET[@REV]...]\n"
+" 2、propget PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1、显示纳入版本控制的工作拷贝属性。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2、显示无版本控制的远端档案库修订版属性。\n"
+"\n"
+" 本子命令默认会在属性内容加上额外的换行符,如此可得到较\n"
+" 美观的输出。另外,当同时处理多个路径时,每一个属性内容会加上它\n"
+" 所对应到的路径。使用 --strict 选项以关闭这项美化行为 (举例来说,\n"
+" 将二进制属性内容重导至一个文件时就很有用)。\n"
 
-#: libsvn_wc/adm_ops.c:1561
-#, c-format
-msgid "Cannot revert '%s': unsupported node kind in working copy"
-msgstr "无法恢复“%s”:工作拷贝中有不支持的节点种类"
+#: svn/main.c:570
+#, fuzzy
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+" 2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Lists versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Lists unversioned remote props on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"列出所有目录,文件,或修订版的属性。\n"
+"用法:1、proplist [TARGET[@REV]...]\n"
+" 2、proplist --revprop -r REV [URL]\n"
+"\n"
+" 1、列出纳入版本管理的工作拷贝属性。\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2、列出无版本控制的远端档案库修订版属性改变。\n"
 
-#: libsvn_wc/adm_ops.c:1609
+#: svn/main.c:582
+#, fuzzy
 msgid ""
-"Cannot revert addition of current directory; please try again from the "
-"parent directory"
-msgstr "无法恢复目前目录的新增;请从父目录再试一次"
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1. Creates a versioned, local propchange in working copy.\n"
+" 2. Creates an unversioned, remote propchange on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+" Note: svn recognizes the following special versioned properties\n"
+" but will store any arbitrary properties set:\n"
+" svn:ignore - A newline separated list of file patterns to ignore.\n"
+" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
+" URL, HeadURL - The URL for the head version of the "
+"object.\n"
+" Author, LastChangedBy - The last person to modify the file.\n"
+" Date, LastChangedDate - The date/time the object was last "
+"modified.\n"
+" Rev, Revision, - The last revision the object changed.\n"
+" LastChangedRevision\n"
+" Id - A compressed summary of the previous\n"
+" 4 keywords.\n"
+" svn:executable - If present, make the file executable.\n"
+" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+" svn:mime-type - The mimetype of the file. Used to determine\n"
+" whether to merge the file, and how to serve it from Apache.\n"
+" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+" treated as text. Anything else is treated as binary.\n"
+" svn:externals - A newline separated list of module specifiers,\n"
+" each of which consists of a relative directory path, optional\n"
+" revision flags, and an URL. For example\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - If present, indicates that the file should be locked\n"
+" before it is modified. Makes the working copy file read-only\n"
+" when it is not locked.\n"
+" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
+" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
+" attempt will fail, and a recursive attempt will set the property\n"
+" only on the file children of the directory.\n"
+msgstr ""
+"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
+"用法:1、propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
+" 2、propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
+"\n"
+" 1、在工作拷贝中建立一个版本控制的本地属性改变。\n"
+" 2、对档案库修订版建立一个无版本控制的远端属性改变。\n"
+"\n"
+" 注意:svn 承认以下受版本控制的特殊属性,不过还是可以储存任意的属性:\n"
+" svn:ignore - 以换行符隔开的忽略文件样式列表。\n"
+" svn:keywords - 欲展开的关键字。有效的关键字为。\n"
+" URL, HeadURL - 本物件于档案库 HEAD 版的地址(URL)。\n"
+" Author, LastChangedBy - 最后一次修改文件的使用者。\n"
+" Date, LastChangedDate - 本物件最近一次改变的日期。\n"
+" Rev, Revision, - 本物件最后一次改变的修订版。\n"
+" LastChangedRevision\n"
+" Id - 前四个关键字的压缩摘要。\n"
+" svn:executable - 如果可以的话,让文件变成可执行文件。这个属性无法\n"
+" 对目录设定。非递归的操作会失败,而递归的操作只会设定该目录\n"
+" 下的文件子项目。\n"
+" svn:eol-style - 'native','LF','CR','CRLF' 其中之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是否该合并该文件,\n"
+" 或是该如何从 Apache 处理它。以 'text/' (或是没有指定 mime 类别)\n"
+" 开始的会被视为文字,其它则为二进制数据。\n"
+" svn:externals - 以换行符隔开的模块指定列表,每一个都包含了一个\n"
+" 相对目录路径,选择性的修订版标志,以及一个地址(URL)。举例说明\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - 如果可以,指出文件在修改前应该是锁定的。 当没有被"
+"锁定,把工作拷贝文件设置为只读。\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及 svn:"
+"needs-lock 属性不能设置在一个目录上。 一个非递归操作会失败, 一个递归操"
+"作只会在目录下的文件设置属性。\n"
 
-#: libsvn_wc/adm_ops.c:1631
-#, c-format
-msgid "Unknown or unexpected kind for path '%s'"
-msgstr "路径“%s”有未知或意想不到的种类"
+#: svn/main.c:624
+#, fuzzy
+msgid "read property value from file ARG"
+msgstr "从文件 ARG 读取数据"
 
-#: libsvn_wc/adm_ops.c:1834
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "文件“%s”有本地的修改"
+#: svn/main.c:627
+msgid ""
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
+"\n"
+" Note: this subcommand does not semantically resolve conflicts or\n"
+" remove conflict markers; it merely removes the conflict-related\n"
+" artifact files and allows PATH to be committed again.\n"
+msgstr ""
+"移除工作拷贝的目录或文件的 '冲突' 状态。\n"
+"用法:resolved PATH...\n"
+"\n"
+" 注意:本子命令不会依语法来解决冲突或是移除冲突标记;它只是移除冲突的\n"
+" 相关文件,然后让 PATH 可以再次提交。\n"
 
-#: libsvn_wc/copy.c:148
-#, c-format
-msgid "'%s' already exists and is in the way"
-msgstr "“%s”已存在,变成路中间的大石头"
+#: svn/main.c:636
+msgid ""
+"Restore pristine working copy file (undo most local edits).\n"
+"usage: revert PATH...\n"
+"\n"
+" Note: this subcommand does not require network access, and resolves\n"
+" any conflicted states. However, it does not restore removed directories.\n"
+msgstr ""
+"恢复原始未改变的工作拷贝文件 (恢复大部份的本地修改)。\n"
+"用法:revert PATH...\n"
+"\n"
+" 注意:本子命令不会存取网络,并且会解除冲突的状况。但是它不会恢复\n"
+" 被删除的目录\n"
 
-#: libsvn_wc/copy.c:160
-#, c-format
+#: svn/main.c:644
+#, fuzzy
 msgid ""
-"'%s' is scheduled for deletion; it must be committed before being overwritten"
-msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
-
-#: libsvn_wc/copy.c:165
-#, c-format
-msgid "There is already a versioned item '%s'"
-msgstr "已有纳入版本控制项目“%s”"
-
-#: libsvn_wc/copy.c:176
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "无法复制或移动“%s”:它尚未纳入版本控制"
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+" With no args, print only locally modified items (no network access).\n"
+" With -u, add working revision and server out-of-date information.\n"
+" With -v, print full revision information on every item.\n"
+"\n"
+" The first six columns in the output are each one character wide:\n"
+" First column: Says if item was added, deleted, or otherwise changed\n"
+" ' ' no modifications\n"
+" 'A' Added\n"
+" 'C' Conflicted\n"
+" 'D' Deleted\n"
+" 'I' Ignored\n"
+" 'M' Modified\n"
+" 'R' Replaced\n"
+" 'X' item is unversioned, but is used by an externals definition\n"
+" '?' item is not under version control\n"
+" '!' item is missing (removed by non-svn command) or incomplete\n"
+" '~' versioned item obstructed by some item of a different kind\n"
+" Second column: Modifications of a file's or directory's properties\n"
+" ' ' no modifications\n"
+" 'C' Conflicted\n"
+" 'M' Modified\n"
+" Third column: Whether the working copy directory is locked\n"
+" ' ' not locked\n"
+" 'L' locked\n"
+" Fourth column: Scheduled commit will contain addition-with-history\n"
+" ' ' no history scheduled with commit\n"
+" '+' history scheduled with commit\n"
+" Fifth column: Whether the item is switched relative to its parent\n"
+" ' ' normal\n"
+" 'S' switched\n"
+" Sixth column: Repository lock token\n"
+" (without -u)\n"
+" ' ' no lock token\n"
+" 'K' lock token present\n"
+" (with -u)\n"
+" ' ' not locked in repository, no lock token\n"
+" 'K' locked in repository, lock toKen present\n"
+" 'O' locked in repository, lock token in some Other working copy\n"
+" 'T' locked in repository, lock token present but sTolen\n"
+" 'B' not locked in repository, lock token present but Broken\n"
+"\n"
+" The out-of-date information appears in the eighth column (with -u):\n"
+" '*' a newer revision exists on the server\n"
+" ' ' the working copy is up to date\n"
+"\n"
+" Remaining fields are variable width and delimited by spaces:\n"
+" The working revision (with -u or -v)\n"
+" The last committed revision and last committed author (with -v)\n"
+" The working copy path is always the final field, so it can\n"
+" include spaces.\n"
+"\n"
+" Example output:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
+msgstr ""
+"显示工作拷贝目录与文件的状态。\n"
+"用法:status [PATH...]\n"
+"\n"
+" 未指定参数时,它只会显示本地修改的项目 (没有网络的存取操作)。\n"
+" 使用 -u 时,再加上工作修订版与服务器过时的信息。\n"
+" 使用 -v 时,显示每一个项目的完整修订版信息。\n"
+"\n"
+" 输出的前五个栏位各为一个字符宽:\n"
+" 第一栏:表示一个项目是新增,删除,不然就是修改过的\n"
+" ' ' 无修改\n"
+" 'A' 新增\n"
+" 'C' 冲突\n"
+" 'D' 删除\n"
+" 'G' 合并\n"
+" 'I' 忽略\n"
+" 'M' 改变\n"
+" 'R' 替换\n"
+" 'X' 未纳入版本控制,但被外部定义所用\n"
+" '?' 该项目未纳入版本控制\n"
+" '!' 该项目已遗失 (被非 svn 命令所删除) 或是不完整\n"
+" '~' 版本控制下的项目被不同类型的所替换\n"
+" 第二栏:显示目录或文件的属性状态\n"
+" ' ' 无修改\n"
+" 'C' 冲突\n"
+" 'M' 改变\n"
+" 第三栏:只在工作拷贝目录被锁定时才会出现\n"
+" ' ' 未锁定\n"
+" 'L' 锁定\n"
+" 第四栏:预定要连同历史记录被新增\n"
+" ' ' 预定的提交并不包含历史记录\n"
+" '+' 预定的提交包含历史记录\n"
+" 第五栏:该项目相对其父目录是否已被切换\n"
+" ' ' 正常\n"
+" 'S' 被切换\n"
+" 第六栏:档案库锁定标记 (没有 -u)\n"
+" ' ' 没有锁定标记\n"
+" 'K' 存在锁定标记\n"
+" (有 -u)\n"
+" ' ' 没有在档案库中锁定,没有锁定标记\n"
+" 'K' 在档案库中被锁定,存在锁定标记\n"
+" 'O' 在档案库中被锁定,锁定标记在一些其他工作拷贝中\n"
+" 'T' 在档案库中被锁定,存在锁定标记但已被窃取\n"
+" 'B' 没有在档案库中被锁定,存在锁定标记但已被中止\n"
+"\n"
+" 是否过时的信息,出现的位置是第八栏 (与 -u 并用时):\n"
+" '*' 服务器上有更新修订版\n"
+" ' ' 工作拷贝是最新版的\n"
+"\n"
+" 剩余的栏位皆为变动宽度,并以空白隔开:\n"
+" 工作修订版 (与 -u 或 -v 并用时)\n"
+" 最后提交的修订版与最后提交的作者 (与 -v 并用时)\n"
+" 工作拷贝路径一定是最后一栏,所以它可以包含空白字符。\n"
+"\n"
+" 范例输出:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
 
-#: libsvn_wc/copy.c:183
-#, c-format
+#: svn/main.c:720
+#, fuzzy
 msgid ""
-"Cannot copy or move '%s': it's not in the repository yet; try committing "
-"first"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
+"Update the working copy to a different URL.\n"
+"usage: 1. switch URL [PATH]\n"
+" 2. switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1. Update the working copy to mirror a new URL within the repository.\n"
+" This behaviour is similar to 'svn update', and is the way to\n"
+" move a working copy to a branch or tag within the same repository.\n"
+"\n"
+" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+" This is used when repository's root URL changes (such as a scheme\n"
+" or hostname change) but your working copy still reflects the same\n"
+" directory within the same repository.\n"
+msgstr ""
+"更新工作拷贝至不同的地址(URL)。\n"
+"用法:1、switch URL [PATH]\n"
+" 2、switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1、更新你的工作拷贝,映射到一个新的地址(URL)。这操作跟“svn update”很像,\n"
+" 也是将工作拷贝移至同一档案库中的某一分支或标记。\n"
+"\n"
+" 2、改写工作拷贝的地址(URL)描述数据,以反映单纯的语法改变。当档案库的根\n"
+" 地址(URL)变动 (像是规则或是主机名称变动),但是工作拷贝仍旧对映到同一\n"
+" 档案库的同一目录时用之。\n"
 
-#: libsvn_wc/copy.c:455
-#, c-format
+#: svn/main.c:736
+#, fuzzy
 msgid ""
-"Cannot copy or move '%s': it is not in the repository yet; try committing "
-"first"
-msgstr "无法复制或移动“%s”:它尚未存在于档案库之中;请尝试先进行提交"
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+" Use --force to break the lock.\n"
+msgstr ""
+"解除工作拷贝或地址(URL)的锁定。\n"
+"用法:unlock TARGET...\n"
+"\n"
+" 使用 -force 中止锁定。\n"
 
-#: libsvn_wc/copy.c:525
-#, c-format
-msgid "Cannot copy to '%s' as it is scheduled for deletion"
-msgstr "无法复制到“%s”至因为它已预定为要删除"
+#: svn/main.c:744
+#, fuzzy
+msgid ""
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+" If no revision given, bring working copy up-to-date with HEAD rev.\n"
+" Else synchronize working copy to revision given by -r.\n"
+"\n"
+" For each updated item a line will start with a character reporting the\n"
+" action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+"\n"
+" A character in the first column signifies an update to the actual file,\n"
+" while updates to the file's properties are shown in the second column.\n"
+" A 'B' in the third column signifies that the lock for the file has\n"
+" been broken or stolen.\n"
+msgstr ""
+"将档案库的改变反应至工作拷贝。\n"
+"用法:update [PATH...]\n"
+"\n"
+" 如果没有提供修订版的话,它会将您的工作拷贝更新至 HEAD 修订版。\n"
+" 不然的话,同步至 -r 选项所指定的修订版。\n"
+"\n"
+" 对每一个更新的项目,每一列开头会以一个字符表示所采取的行为。\n"
+" 这些字符代表如下:\n"
+"\n"
+" A 新增\n"
+" D 删除\n"
+" U æ›´æ–°\n"
+" C 冲突\n"
+" G 合并\n"
+"\n"
+" 第一栏的字符表示实际文件的更新,\n"
+" 第二栏显示被操作的文件。\n"
+" 如果有字母‘B’出现在第三栏上,表示文件的锁定被破坏或盗取。\n"
 
-#: libsvn_wc/entries.c:127
-#, c-format
-msgid "Error writing entries file for '%s'"
-msgstr "写入“%s”的项目文件时发生错误"
+#: svn/main.c:806 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+msgid "Caught signal"
+msgstr "捕捉到信号(中断)"
 
-#: libsvn_wc/entries.c:222
-#, fuzzy, c-format
-msgid "Entry for '%s' has invalid repository root"
-msgstr "“%s”的入口档案库根目录无效"
+#: svn/main.c:918
+msgid "Non-numeric limit argument given"
+msgstr "给了非数字的参数"
 
-#: libsvn_wc/entries.c:244
-#, c-format
-msgid "Entry '%s' has invalid node kind"
-msgstr "项目“%s”有无效的节点种类"
+#: svn/main.c:924
+msgid "Argument to --limit must be positive"
+msgstr ""
 
-#: libsvn_wc/entries.c:269 libsvn_wc/entries.c:319 libsvn_wc/entries.c:359
-#: libsvn_wc/entries.c:386 libsvn_wc/entries.c:413
-#, c-format
-msgid "Entry '%s' has invalid '%s' value"
-msgstr "项目“%s”有无效的“%s”值"
+#: svn/main.c:944
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
 
-#: libsvn_wc/entries.c:627
-msgid "Missing default entry"
-msgstr "丢失默认项目"
+#: svn/main.c:952 svn/main.c:1143
+msgid "Can't specify -c with --old"
+msgstr ""
 
-#: libsvn_wc/entries.c:632
-msgid "Default entry has no revision number"
-msgstr "默认项目没有修订版编号"
+#: svn/main.c:959
+#, fuzzy
+msgid "Non-numeric change argument given to -c"
+msgstr "给了非数字的参数"
 
-#: libsvn_wc/entries.c:637
-msgid "Default entry is missing URL"
-msgstr "默认项目没有地址(URL)"
+#: svn/main.c:965
+#, fuzzy
+msgid "There is no change 0"
+msgstr "正在创建更改"
+
+#: svn/main.c:992
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
+"N:M' instead of '-r N -r M'"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
 
-#: libsvn_wc/entries.c:725
+#: svn/main.c:1005 svnadmin/main.c:1244
 #, c-format
-msgid "XML parser failed in '%s'"
-msgstr "XML 剖析器无法处理“%s”"
+msgid "Syntax error in revision argument '%s'"
+msgstr "修订版参数“%s”中有语法错误"
 
-#: libsvn_wc/entries.c:813
+#: svn/main.c:1159 svn/main.c:1169
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+
+#: svn/main.c:1185
 #, c-format
-msgid "Corrupt working copy: '%s' has no default entry"
-msgstr "损坏的工作拷贝:目录“%s”没有默认的项目"
+msgid "Syntax error in native-eol argument '%s'"
+msgstr "原生换列符号参数“%s”中有语法错误"
 
-#: libsvn_wc/entries.c:830
+#: svn/main.c:1249 svndumpfilter/main.c:1207 svnlook/main.c:2037
 #, c-format
-msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr "损坏的工作拷贝:目录“%s”有无效的调度"
+msgid "Subcommand argument required\n"
+msgstr "必须提供子命令参数\n"
 
-#: libsvn_wc/entries.c:864
+#: svn/main.c:1268 svnadmin/main.c:1367 svndumpfilter/main.c:1226
+#: svnlook/main.c:2056
 #, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr "损坏的工作拷贝:“%s”于目录“%s”中有无效的调度"
+msgid "Unknown command: '%s'\n"
+msgstr "未知的命令:“%s”\n"
 
-#: libsvn_wc/entries.c:873
+#: svn/main.c:1301
 #, c-format
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"addition) is not itself scheduled for addition"
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
 msgstr ""
-"损坏的工作拷贝:“%s”于目录“%s”中 (已加入新增调度) 与加入新增调度的不一致"
+"子命令“%s”不接受选项“%s”\n"
+"请输入“svn help %s”以取得用法。\n"
 
-#: libsvn_wc/entries.c:881
-#, c-format
+#: svn/main.c:1338
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr "日志信息档是一个版本控制中的文件;请使用 '--force-log' 以跳过此限制"
+
+#: svn/main.c:1345
+#, fuzzy
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr "锁定注释文件是一个版本控制中的文件;请使用 '--force-log' 强制执行"
+
+#: svn/main.c:1366
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"deletion) is not itself scheduled for deletion"
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
 msgstr ""
-"损坏的工作拷贝:“%s”于目录“%s”中 (已加入删除调度) 与加入删除调度的不一致"
+"日志信息是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 以跳过此限制"
 
-#: libsvn_wc/entries.c:889
-#, c-format
+#: svn/main.c:1373
+#, fuzzy
 msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"replacement) has an invalid schedule"
-msgstr "损坏的工作拷贝:“%s”于目录“%s”中 (已加入替换调度) 有无效的调度"
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"锁定注释是一个路径名称 (-F 是故意的吗?);请使用 '--force-log' 强制执行"
 
-#: libsvn_wc/entries.c:1204
-#, c-format
-msgid "No default entry in directory '%s'"
-msgstr "在目录“%s”中没有默认的项目"
+#: svn/main.c:1498
+msgid ""
+"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
+"details)\n"
+msgstr ""
+"svn:请执行“svn cleanup”以移去锁定 (输入“svn help cleanup”以取得详细说明)\n"
 
-#: libsvn_wc/entries.c:1259
-#, c-format
-msgid "Error writing to '%s'"
-msgstr "写至“%s”时发生错误"
+#: svn/merge-cmd.c:59
+msgid "Second revision required"
+msgstr "需要第二个修订版"
 
-#: libsvn_wc/entries.c:1525
-#, c-format
-msgid ""
-"Can't add '%s' to deleted directory; try undeleting its parent directory "
-"first"
-msgstr "无法新增“%s”至已删除的目录;请先尝试恢复其父目录"
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
+#, fuzzy
+msgid "Too many arguments given"
+msgstr "导入命令有太多参数"
 
-#: libsvn_wc/entries.c:1531
-#, c-format
-msgid ""
-"Can't replace '%s' in deleted directory; try undeleting its parent directory "
-"first"
-msgstr "无法在已删除的目录中替换“%s”;请先尝试恢复其父目录"
+#: svn/merge-cmd.c:117
+msgid "A working copy merge source needs an explicit revision"
+msgstr "工作拷贝的合并来源需特别指定修订版"
 
-#: libsvn_wc/entries.c:1540
-#, c-format
-msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
-msgstr "“%s”被标记为不存在,所以无法加入新增调度"
+#: svn/mkdir-cmd.c:84
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替?"
 
-#: libsvn_wc/entries.c:1569
+#: svn/notify.c:69
 #, c-format
-msgid "Entry '%s' is already under version control"
-msgstr "项目“%s”已纳入版本控制"
+msgid "Skipped missing target: '%s'\n"
+msgstr "跳过找不到的目标:“%s”\n"
 
-#: libsvn_wc/entries.c:1661
+#: svn/notify.c:76
 #, c-format
-msgid "Entry '%s' has illegal schedule"
-msgstr "项目“%s”有不合法的调度"
+msgid "Skipped '%s'\n"
+msgstr "跳过“%s”\n"
 
-#: libsvn_wc/entries.c:1802
+#: svn/notify.c:94
 #, c-format
-msgid "No such entry: '%s'"
-msgstr "没有这样的项目:“%s”"
+msgid "Restored '%s'\n"
+msgstr "已还原“%s”\n"
 
-#: libsvn_wc/entries.c:1913
+#: svn/notify.c:100
 #, c-format
-msgid "Directory '%s' has no THIS_DIR entry"
-msgstr "目录“%s”没有 THIS_DIR 项目"
+msgid "Reverted '%s'\n"
+msgstr "已恢复“%s”\n"
 
-#: libsvn_wc/entries.c:2002
+#: svn/notify.c:106
 #, c-format
-msgid "'%s' has an unrecognized node kind"
-msgstr "“%s”的节点种类无法辨识"
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr "无法恢复“%s”-- 请改用更新试试。\n"
 
-#: libsvn_wc/entries.c:2038
+#: svn/notify.c:114
 #, c-format
-msgid "Unexpectedly found '%s': path is marked 'missing'"
-msgstr "意想不到地找到了“%s”:路径已被标记为 '丢失'"
+msgid "Resolved conflicted state of '%s'\n"
+msgstr "“%s”的已解决的冲突状态\n"
 
-#: libsvn_wc/lock.c:159 libsvn_wc/lock.c:360
+#: svn/notify.c:195
 #, c-format
-msgid "Working copy '%s' locked"
-msgstr "工作拷贝“%s”被锁定了"
+msgid ""
+"\n"
+"Fetching external item into '%s'\n"
+msgstr ""
+"\n"
+"正在取得外部项目至“%s”\n"
 
-#: libsvn_wc/lock.c:280
+#: svn/notify.c:210
 #, c-format
-msgid "Path '%s' ends in '%s', which is unsupported for this operation"
-msgstr "路径“%s”以“%s”结束,本操作不支持"
-
-#: libsvn_wc/lock.c:679
-#, fuzzy, c-format
-msgid "Working copy '%s' is missing or not locked"
-msgstr "工作拷贝“%s”丢失或并未锁定"
+msgid "Exported external at revision %ld.\n"
+msgstr "导出修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/lock.c:1079
+#: svn/notify.c:211
 #, c-format
-msgid "Write-lock stolen in '%s'"
-msgstr "“%s”中的写入锁定被偷走了"
+msgid "Exported revision %ld.\n"
+msgstr "导出修订版 %ld。\n"
 
-#: libsvn_wc/lock.c:1087
+#: svn/notify.c:219
 #, c-format
-msgid "No write-lock in '%s'"
-msgstr "“%s”中没有写入锁定"
+msgid "Checked out external at revision %ld.\n"
+msgstr "取出修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/lock.c:1109
+#: svn/notify.c:220
 #, c-format
-msgid "Lock file '%s' is not a regular file"
-msgstr "锁定文件“%s”不是一般的文件"
+msgid "Checked out revision %ld.\n"
+msgstr "取出修订版 %ld。\n"
 
-#: libsvn_wc/log.c:183
-msgid "Can't move source to dest"
-msgstr "无法移动来源至目的"
+#: svn/notify.c:230
+#, c-format
+msgid "Updated external to revision %ld.\n"
+msgstr "更新外部定义至修订版 %ld。\n"
 
-#: libsvn_wc/log.c:339
+#: svn/notify.c:231
 #, c-format
-msgid "In directory '%s'"
-msgstr "在目录“%s”中"
+msgid "Updated to revision %ld.\n"
+msgstr "更新至修订版 %ld。\n"
 
-#: libsvn_wc/log.c:365
+#: svn/notify.c:239
 #, c-format
-msgid "Missing 'left' attribute in '%s'"
-msgstr "“%s”丢失了 'left' 属性"
+msgid "External at revision %ld.\n"
+msgstr "于修订版 %ld 的外部定义。\n"
 
-#: libsvn_wc/log.c:372
+#: svn/notify.c:240
 #, c-format
-msgid "Missing 'right' attribute in '%s'"
-msgstr "“%s”丢失了 'right' 属性"
+msgid "At revision %ld.\n"
+msgstr "于修订版 %ld。\n"
 
-#: libsvn_wc/log.c:415
+#: svn/notify.c:252
 #, c-format
-msgid "Missing 'dest' attribute in '%s'"
-msgstr "“%s”丢失了 'dest' 属性"
+msgid "External export complete.\n"
+msgstr "外部定义导出完成。\n"
 
-#: libsvn_wc/log.c:475
+#: svn/notify.c:253
 #, c-format
-msgid "Missing 'timestamp' attribute in '%s'"
-msgstr "“%s”丢失 'timestamp' 属性"
+msgid "Export complete.\n"
+msgstr "导出完成。\n"
 
-#: libsvn_wc/log.c:551 libsvn_wc/log.c:584
+#: svn/notify.c:260
 #, c-format
-msgid "Error checking path '%s'"
-msgstr "检查路径“%s”时发生错误"
+msgid "External checkout complete.\n"
+msgstr "外部定义取出完成。\n"
 
-#: libsvn_wc/log.c:558 libsvn_wc/log.c:591
+#: svn/notify.c:261
 #, c-format
-msgid "Error getting 'affected time' on '%s'"
-msgstr "取得“%s”的“affected time”时发生错误"
+msgid "Checkout complete.\n"
+msgstr "取出完成。\n"
 
-#: libsvn_wc/log.c:602
+#: svn/notify.c:268
 #, c-format
-msgid "Error modifying entry for '%s'"
-msgstr "修改“%s”的项目时发生错误"
+msgid "External update complete.\n"
+msgstr "外部定义更新完成。\n"
 
-#: libsvn_wc/log.c:628
-#, fuzzy, c-format
-msgid "Error removing lock from entry for '%s'"
-msgstr "移除条目“%s”的锁时发生错误"
+#: svn/notify.c:269
+#, c-format
+msgid "Update complete.\n"
+msgstr "更新完成。\n"
 
-#: libsvn_wc/log.c:759
+#: svn/notify.c:285
 #, c-format
-msgid "Missing 'revision' attribute for '%s'"
-msgstr "“%s”丢失了 'revision' 属性"
+msgid ""
+"\n"
+"Performing status on external item at '%s'\n"
+msgstr ""
+"\n"
+"对外部项目“%s”进行状态检查\n"
 
-#: libsvn_wc/log.c:773
+#: svn/notify.c:293
 #, c-format
-msgid "Log command for directory '%s' is mislocated"
-msgstr "对目录“%s”的日志命令被错置"
+msgid "Status against revision: %6ld\n"
+msgstr "状态于修订版:%6ld\n"
 
-#: libsvn_wc/log.c:940 libsvn_wc/log.c:1012
+#: svn/notify.c:301
 #, c-format
-msgid "Error checking existence of '%s'"
-msgstr "检查“%s”是否存在时发生错误"
+msgid "Sending %s\n"
+msgstr "正在发送 %s\n"
 
-#: libsvn_wc/log.c:951 libsvn_wc/log.c:1023
+#: svn/notify.c:310
 #, c-format
-msgid "Error comparing '%s' and '%s'"
-msgstr "比较“%s”与“%s”时发生错误"
+msgid "Adding (bin) %s\n"
+msgstr "新增 (二进制) %s\n"
 
-#: libsvn_wc/log.c:963
+#: svn/notify.c:317
 #, c-format
-msgid "Error getting 'affected time' for '%s'"
-msgstr "取得“%s”的 'affected time' 时发生错误"
+msgid "Adding %s\n"
+msgstr "新增 %s\n"
 
-#: libsvn_wc/log.c:1034 libsvn_wc/log.c:1121
+#: svn/notify.c:324
 #, c-format
-msgid "Error getting 'affected time' of '%s'"
-msgstr "取得“%s”的 'affected time' 时发生错误"
+msgid "Deleting %s\n"
+msgstr "删除 %s\n"
 
-#: libsvn_wc/log.c:1092
+#: svn/notify.c:331
 #, c-format
-msgid "Error replacing text-base of '%s'"
-msgstr "替换“%s”的文件参考基础时发生错误"
+msgid "Replacing %s\n"
+msgstr "替换 %s\n"
 
-#: libsvn_wc/log.c:1161 libsvn_wc/log.c:1210
+#: svn/notify.c:341
 #, c-format
-msgid "Error modifying entry of '%s'"
-msgstr "修改“%s”的项目时发生错误"
+msgid "Transmitting file data "
+msgstr "传输文件数据"
 
-#: libsvn_wc/log.c:1269
+#: svn/notify.c:350
 #, c-format
-msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
-msgstr "日志文件项目丢失 'name' 属性 (项目“%s”对应至目录“%s”)"
+msgid "'%s' locked by user '%s'.\n"
+msgstr "“%s”被用户“%s”锁定。\n"
 
-#: libsvn_wc/log.c:1331
+#: svn/notify.c:356
 #, c-format
-msgid "Unrecognized logfile element '%s' in '%s'"
-msgstr "无法确认的日志文件元素“%s”于“%s”中"
+msgid "'%s' unlocked.\n"
+msgstr "“%s”被解除锁定。\n"
 
-#: libsvn_wc/log.c:1342
+#: svn/propdel-cmd.c:77
 #, c-format
-msgid "Error processing command '%s' in '%s'"
-msgstr "在“%2$s”中处理命令“%1$s”时发生错误"
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr "属性“%s”自档案库修订版 %ld 中删除\n"
 
-#: libsvn_wc/log.c:1464
-msgid "Couldn't open log"
-msgstr "无法打开日志文件"
+#: svn/propdel-cmd.c:86
+#, c-format
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr "删除纳入版本控制的属性“%s”时不可指定修订版"
 
-#: libsvn_wc/log.c:1475
+#: svn/propdel-cmd.c:116
 #, c-format
-msgid "Error reading administrative log file in '%s'"
-msgstr "于“%s”中读取管理日志文件时发生错误"
+msgid "property '%s' deleted (recursively) from '%s'.\n"
+msgstr "属性“%s”自“%s”删除 (递归)。\n"
 
-#: libsvn_wc/log.c:1569
+#: svn/propdel-cmd.c:117
 #, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "“%s”并不是工作拷贝目录"
+msgid "property '%s' deleted from '%s'.\n"
+msgstr "属性“%s”自“%s”删除。\n"
+
+#: svn/propedit-cmd.c:101 svn/propedit-cmd.c:225 svn/propset-cmd.c:85
+msgid "Bad encoding option: prop value not stored as UTF8"
+msgstr "有问题的编码选项:属性内容未以 UTF8 储存"
 
-#: libsvn_wc/merge.c:306 libsvn_wc/merge.c:308 libsvn_wc/merge.c:310
-#: libsvn_wc/merge.c:312
-msgid "Unable to delete temporary file"
-msgstr "无法删除暂存文件"
+#: svn/propedit-cmd.c:110
+#, c-format
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr "属性“%s”于修订版 %ld 设为新值\n"
 
-#: libsvn_wc/props.c:100
+#: svn/propedit-cmd.c:116
 #, c-format
-msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr "属性“%s”于修订版 %ld 没有改变\n"
 
-#: libsvn_wc/props.c:109
+#: svn/propedit-cmd.c:124
 #, c-format
-msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr "编辑纳入版本控制的属性“%s”时不可指定修订版"
 
-#: libsvn_wc/props.c:125
-#, c-format
-msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
+#: svn/propedit-cmd.c:150 svn/propset-cmd.c:158
+msgid "Explicit target argument required"
+msgstr "必须明确地提供目标"
 
-#: libsvn_wc/props.c:172
+#: svn/propedit-cmd.c:173
 #, c-format
-msgid "Can't parse '%s'"
-msgstr "无法剖析“%s”"
+msgid "Editing property on non-local target '%s' not yet supported"
+msgstr "尚不支持编辑非本地目标“%s”的属性"
 
-#: libsvn_wc/props.c:198
+#: svn/propedit-cmd.c:200 svn/switch-cmd.c:140
 #, c-format
-msgid "Can't write property hash to '%s'"
-msgstr "无法写入属性集到“%s”"
+msgid "'%s' does not appear to be a working copy path"
+msgstr "“%s”不像是工作拷贝路径"
 
-#: libsvn_wc/props.c:251
+#: svn/propedit-cmd.c:232
 #, c-format
-msgid "Can't find entry '%s' in '%s'"
-msgstr "无法在“%2$s”中找到项目“%1$s”"
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr "“%2$s”的“%1$s”属性被设为新值\n"
 
-#: libsvn_wc/props.c:323 libsvn_wc/props.c:1161 libsvn_wc/update_editor.c:2342
+#: svn/propedit-cmd.c:239
 #, c-format
-msgid "Error writing log for '%s'"
-msgstr "为“%s”写入日志时发生错误"
+msgid "No changes to property '%s' on '%s'\n"
+msgstr "“%2$s”的“%1$s”属性没有改变\n"
 
-#: libsvn_wc/props.c:459
+#: svn/proplist-cmd.c:71
 #, c-format
-msgid ""
-"Trying to add new property '%s' with value '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"尝试添加新属性“%s”的值为“%s”,\n"
-"但是属性已经存在,值为“%s”。"
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
 
-#: libsvn_wc/props.c:481
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
-msgstr ""
-"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
-"但是属性并不存在。"
+#: svn/proplist-cmd.c:119
+#, fuzzy, c-format
+msgid "Properties on '%s':\n"
+msgstr "属性“%s”设定于“%s”\n"
 
-#: libsvn_wc/props.c:510
-#, c-format
+#: svn/props.c:51
+#, fuzzy
 msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"尝试把属性“%s”的值从“%s”改变为“%s”,\n"
-"但是属性的值已经是“%s”了。"
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr "操作修订版属性时,必须指定修订版为数字,日期或‘HEAD’。"
 
-#: libsvn_wc/props.c:1202
-#, c-format
-msgid "Unknown node kind: '%s'"
-msgstr "未知的节点类型:“%s”"
+#: svn/props.c:58
+#, fuzzy
+msgid "Wrong number of targets specified"
+msgstr "指定了错误数目的目标"
 
-#: libsvn_wc/props.c:1238 libsvn_wc/props.c:1260 libsvn_wc/props.c:1344
-#: libsvn_wc/props.c:1582
-msgid "Failed to load properties from disk"
-msgstr "无法从磁碟装载属性"
+#: svn/props.c:67
+msgid "Either a URL or versioned item is required"
+msgstr "必须提供地址(URL)或纳入版本控制的项目"
 
-#: libsvn_wc/props.c:1276 libsvn_wc/props.c:1612
+#: svn/propset-cmd.c:111
 #, c-format
-msgid "Cannot write property hash for '%s'"
-msgstr "无法写入“%s”的属性杂凑"
+msgid "property '%s' set on repository revision %ld\n"
+msgstr "设定属性“%s”于档案库修订版 %ld\n"
 
-#: libsvn_wc/props.c:1336 libsvn_wc/props.c:1474
+#: svn/propset-cmd.c:119
 #, c-format
-msgid "Property '%s' is an entry property"
-msgstr "属性“%s”是项目属性"
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr "无法指定修订版以设定版本控制下的属性“%s”"
 
-#: libsvn_wc/props.c:1381
+#: svn/propset-cmd.c:151
 #, c-format
-msgid "Cannot set '%s' on a directory ('%s')"
-msgstr "无法设定“%s”于目录 (“%s”)"
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr "必须明确地提供目的 (“%s”解释为属性内容)"
 
-#: libsvn_wc/props.c:1389
+#: svn/propset-cmd.c:184
 #, c-format
-msgid "Cannot set '%s' on a file ('%s')"
-msgstr "无法设定“%s”于文件 (“%s”)"
+msgid "property '%s' set (recursively) on '%s'\n"
+msgstr "属性“%s”设定 (递归) 于“%s”\n"
 
-#: libsvn_wc/props.c:1395
+#: svn/propset-cmd.c:185
 #, c-format
-msgid "'%s' is not a file or directory"
-msgstr "“%s”不是文件或目录"
+msgid "property '%s' set on '%s'\n"
+msgstr "属性“%s”设定于“%s”\n"
 
-#: libsvn_wc/props.c:1419
-#, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "文件“%s”有二进制的 mime 型别属性"
+#: svn/revert-cmd.c:61
+#, fuzzy
+msgid "Try 'svn revert --recursive' instead?"
+msgstr "尝试用 “svn revert -recursive” 代替?"
 
-#: libsvn_wc/props.c:2038
+#: svn/status.c:263
 #, c-format
-msgid "Error parsing %s property on '%s': '%s'"
-msgstr "剖析 %s 属性于“%s”发生错误:“%s”"
+msgid "'%s' has lock token, but no lock owner"
+msgstr "‘%s’锁被盗取,但没有锁的所有者"
 
-#: libsvn_wc/props.c:2051
+#: svn/switch-cmd.c:58
 #, c-format
-msgid ""
-"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
-"path"
-msgstr "无效属性 %s 于“%s”:目录牵涉到 '.' 或 '..' 或是绝对路径"
+msgid "'%s' to '%s' is not a valid relocation"
+msgstr "“%s”到“%s”不是有效的重定位"
 
-#: libsvn_wc/questions.c:104
+#: svn/util.c:60
 #, c-format
 msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
-msgstr "“%s”的工作拷贝格式已过时(%d);请重新取出您的工作拷贝"
+"\n"
+"Committed revision %ld.\n"
+msgstr ""
+"\n"
+"提交后的修订版为 %ld。\n"
 
-#: libsvn_wc/questions.c:112
-#, c-format
+#: svn/util.c:68
+#, fuzzy, c-format
 msgid ""
-"This client is too old to work with working copy '%s'; please get a newer "
-"Subversion client"
-msgstr "本客户端已过时,无法存取工作拷贝“%s”;请取得更新版的 Subversion 客户端"
+"\n"
+"Warning: %s\n"
+msgstr "%s警告:%s\n"
 
-#: libsvn_wc/questions.c:352
-#, c-format
+#: svn/util.c:136
 msgid ""
-"Checksum mismatch indicates corrupt text base: '%s'\n"
-" expected: %s\n"
-" actual: %s\n"
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
+"no 'editor-cmd' run-time configuration option was found"
 msgstr ""
-"总和检查值不一致,表示文件参考基础损坏:“%s”\n"
-" 预期: %s\n"
-" 实际: %s\n"
+"没有一个 SVN_EDITOR,VISUAL 或 EDITOR 环境变数被设定,执行时期的设定中也没有 "
+"'editor-cmd' 选项"
 
-#: libsvn_wc/translate.c:124
+#: svn/util.c:162
 #, c-format
-msgid "'%s' has unknown value for svn:eol-style property"
-msgstr "“%s”的 svn:eol-style 属性有不明的数值"
+msgid "Can't get working directory"
+msgstr "无法取得工作目录"
 
-#: libsvn_wc/update_editor.c:387
+#: svn/util.c:173 svn/util.c:196
 #, c-format
-msgid "No '.' entry in: '%s'"
-msgstr "不存在 '.' 项目:“%s”"
+msgid "Can't change working directory to '%s'"
+msgstr "无法更改工作拷贝至“%s”"
 
-#: libsvn_wc/update_editor.c:863
+#: svn/util.c:221
 #, c-format
-msgid "Won't delete locally modified directory '%s'"
-msgstr "无法删除本地修改的目录“%s”"
+msgid "Can't write to '%s'"
+msgstr "无法写入至“%s”"
 
-#: libsvn_wc/update_editor.c:1049
+#: svn/util.c:251
 #, c-format
-msgid "Failed to add directory '%s': object of the same name already exists"
-msgstr "无法新增目录“%s”:同名物件已存在"
+msgid "system('%s') returned %d"
+msgstr "系统(“%s”) 返回 %d"
 
-#: libsvn_wc/update_editor.c:1057
+#: svn/util.c:318
 #, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
-msgstr "无法新增目录“%s”:物件与管理目录同名"
+msgid "Can't restore working directory"
+msgstr "无法还原工作目录"
 
-#: libsvn_wc/update_editor.c:1071
-#, c-format
-msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
-msgstr "无法新增文件“%s”:copyfrom 参数尚不支持"
+#: svn/util.c:358
+msgid "Log message contains a zero byte"
+msgstr "日志信息中有一个零字节"
 
-#: libsvn_wc/update_editor.c:1092
-#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name is already scheduled "
-"for addition"
-msgstr "无法新增目录“%s”:同名物件已加入新增调度"
+#: svn/util.c:418
+msgid "Your commit message was left in a temporary file:"
+msgstr "您的提交信息保留在临时文件中:"
 
-#: libsvn_wc/update_editor.c:1315
-msgid "Couldn't do property merge"
-msgstr "无法进行属性合并"
+# as-is
+#: svn/util.c:470
+msgid "--This line, and those below, will be ignored--"
+msgstr "--此行及以下内容将会被忽略--"
 
-#: libsvn_wc/update_editor.c:1409
-#, c-format
+#: svn/util.c:510
+#, fuzzy
 msgid ""
-"Failed to mark '%s' absent: item of the same name is already scheduled for "
-"addition"
-msgstr "无法将“%s”标记为不存在:同名项目已加入新增调度"
+"Use of an external editor to fetch log message is not supported on OS400; "
+"consider using the --message (-m) or --file (-F) options"
+msgstr ""
+"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
+"message (-m) 或 --file (-F) 选项"
 
-#: libsvn_wc/update_editor.c:1501
-#, c-format
-msgid "Failed to add file '%s': object of the same name already exists"
-msgstr "无法新增文件“%s”:同名物件已存在"
+#: svn/util.c:592
+msgid "Cannot invoke editor to get log message when non-interactive"
+msgstr "在非交互式的情况下不能调用编辑器获取日志信息"
 
-#: libsvn_wc/update_editor.c:1522
-#, c-format
+#: svn/util.c:605
 msgid ""
-"Failed to add file '%s': object of the same name is already scheduled for "
-"addition"
-msgstr "无法新增文件“%s”:同名物件已加入新增调度"
-
-#: libsvn_wc/update_editor.c:1530
-#, c-format
-msgid "File '%s' in directory '%s' is not a versioned resource"
-msgstr "文件“%s”于目录“%s”中的并不是纳入版本控制的资源"
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+"无法使用外部编辑器取得日志信息;请尝试设定 $SVN_EDITOR 环境变数,或是使用 --"
+"message (-m) 或 --file (-F) 选项"
 
-#: libsvn_wc/update_editor.c:1651
-#, c-format
-msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
-msgstr "“%s”的总和检查值不符合;记录:“%s”,实际:“%s”"
+#: svn/util.c:641
+msgid ""
+"\n"
+"Log message unchanged or not specified\n"
+"a)bort, c)ontinue, e)dit\n"
+msgstr ""
+"\n"
+"日志信息未改变,或是未指定\n"
+"a)中断,c)继续,e)编辑\n"
 
-#: libsvn_wc/update_editor.c:1957
-msgid "Move failed"
-msgstr "移动失败"
+#: svn/util.c:694
+msgid "Use --force to override this restriction"
+msgstr "请用 --force 来撤销限制"
 
-#: libsvn_wc/update_editor.c:2884
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
 #, c-format
-msgid "'%s' has no ancestry information"
-msgstr "“%s”没有演进历程信息"
-
-#: libsvn_wc/update_editor.c:2972
-#, fuzzy, c-format
-msgid "Copyfrom-url '%s' has different repository root than '%s'"
-msgstr "Copyfrom-url “%s”与“%s”的档案库根目录不相同"
-
-#: libsvn_wc/util.c:83
-msgid "Unable to make any directories"
-msgstr "无法建立任何目录"
-
-#: svnadmin/main.c:94 svndumpfilter/main.c:62
 msgid "Can't open stdio file"
 msgstr "无法启动标准输出入文件"
 
-#: svnadmin/main.c:123
+#: svnadmin/main.c:124
 msgid "Repository argument required"
 msgstr "需有档案库参数"
 
-#: svnadmin/main.c:128
+#: svnadmin/main.c:129
 #, c-format
 msgid "'%s' is an URL when it should be a path"
 msgstr "“%s”是地址(URL),但是应该是路径"
 
-#: svnadmin/main.c:233 svndumpfilter/main.c:762 svnlook/main.c:98
-#: svnserve/main.c:111 svnversion/main.c:182
-msgid "show version information"
-msgstr "显示版本信息"
-
 #: svnadmin/main.c:236
 msgid "specify revision number ARG (or X:Y range)"
 msgstr "指定修订版编号 ARG (或 X:Y 范围)"
@@ -6808,18 +7310,21 @@
 msgstr "关闭日志文件自动移除 [Berkeley DB]"
 
 #: svnadmin/main.c:272
-msgid "remove redundant log files from source repository"
+#, fuzzy
+msgid ""
+"remove redundant Berkeley DB log files\n"
+" from source repository [Berkeley DB]"
 msgstr "自来源档案库移除多余的日志文件"
 
-#: svnadmin/main.c:275
+#: svnadmin/main.c:276
 msgid "call pre-commit hook before committing revisions"
 msgstr "提交修订版签调用 pre-commit 外挂"
 
-#: svnadmin/main.c:278
+#: svnadmin/main.c:279
 msgid "call post-commit hook after committing revisions"
 msgstr "提交修订版后调用 post-commit 外挂"
 
-#: svnadmin/main.c:281
+#: svnadmin/main.c:282
 msgid ""
 "wait instead of exit if the repository is in\n"
 " use by another process"
@@ -6827,7 +7332,21 @@
 "如果档案库被其他进程占用,等待而不直接退出\n"
 " "
 
-#: svnadmin/main.c:294
+#: svnadmin/main.c:286
+msgid ""
+"disallow use of SVNDIFF1 in on-disk storage,\n"
+" for backwards compatibility"
+msgstr ""
+
+#: svnadmin/main.c:299
+msgid ""
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"
+"Open the repository at REPOS_PATH, then abort, thus simulating\n"
+"a process that crashes while holding an open repository handle.\n"
+msgstr ""
+
+#: svnadmin/main.c:305
 msgid ""
 "usage: svnadmin create REPOS_PATH\n"
 "\n"
@@ -6837,7 +7356,7 @@
 "\n"
 "于 REPOS_PATH 建立一个新的,空的 Subversion 档案库。\n"
 
-#: svnadmin/main.c:300
+#: svnadmin/main.c:311
 msgid ""
 "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
 "\n"
@@ -6853,7 +7372,7 @@
 "与前一修订版的差异,deltification 本质上可压缩档案库。如果没有指定\n"
 "修订版的话,则直接对 HEAD 修订版进行。\n"
 
-#: svnadmin/main.c:309
+#: svnadmin/main.c:320
 msgid ""
 "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
 "\n"
@@ -6872,7 +7391,7 @@
 "一个修订版树。如果使用了 --incremental 选项,那么第一个转存的修订版会\n"
 "是与前一个修订版的差异,而非平常的全文输出。\n"
 
-#: svnadmin/main.c:320
+#: svnadmin/main.c:330
 msgid ""
 "usage: svnadmin help [SUBCOMMAND...]\n"
 "\n"
@@ -6882,7 +7401,7 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: svnadmin/main.c:325
+#: svnadmin/main.c:335
 msgid ""
 "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
 "\n"
@@ -6892,7 +7411,7 @@
 "\n"
 "产生档案库的即时拷贝。\n"
 
-#: svnadmin/main.c:330
+#: svnadmin/main.c:340
 msgid ""
 "usage: svnadmin list-dblogs REPOS_PATH\n"
 "\n"
@@ -6907,7 +7426,7 @@
 "\n"
 "警告:修改或删除仍在使用中的记录文件将导致档案库损坏。\n"
 
-#: svnadmin/main.c:337
+#: svnadmin/main.c:347
 msgid ""
 "usage: svnadmin list-unused-dblogs REPOS_PATH\n"
 "\n"
@@ -6919,7 +7438,7 @@
 "列出无用的 Berkeley DB 日志文件。\n"
 "\n"
 
-#: svnadmin/main.c:342
+#: svnadmin/main.c:352
 msgid ""
 "usage: svnadmin load REPOS_PATH\n"
 "\n"
@@ -6934,7 +7453,7 @@
 "系统中。如果档案库原先是空的,默认会将其 UUID 以流中的数值代之。\n"
 "进度报告会送至标准输出。\n"
 
-#: svnadmin/main.c:353
+#: svnadmin/main.c:362
 #, fuzzy
 msgid ""
 "usage: svnadmin lslocks REPOS_PATH\n"
@@ -6945,7 +7464,7 @@
 "\n"
 "显示所有锁的相信信息。\n"
 
-#: svnadmin/main.c:358
+#: svnadmin/main.c:367
 msgid ""
 "usage: svnadmin lstxns REPOS_PATH\n"
 "\n"
@@ -6955,7 +7474,7 @@
 "\n"
 "显示所有未处理事务的名称。\n"
 
-#: svnadmin/main.c:363
+#: svnadmin/main.c:372
 msgid ""
 "usage: svnadmin recover REPOS_PATH\n"
 "\n"
@@ -6974,7 +7493,7 @@
 "上结束。\n"
 "\n"
 
-#: svnadmin/main.c:371
+#: svnadmin/main.c:380
 msgid ""
 "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
 "\n"
@@ -6984,7 +7503,7 @@
 "\n"
 "无条件地从每一个 LOCKED_PATH 删除锁。\n"
 
-#: svnadmin/main.c:376
+#: svnadmin/main.c:385
 msgid ""
 "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
 "\n"
@@ -6994,7 +7513,7 @@
 "\n"
 "从档案库删除命名事务。\n"
 
-#: svnadmin/main.c:381
+#: svnadmin/main.c:390
 msgid ""
 "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
 "\n"
@@ -7018,7 +7537,7 @@
 "注意:修订版属性并未纳入版本控管,所以这个命令会永远盖写掉先前的\n"
 "日志信息。\n"
 
-#: svnadmin/main.c:395
+#: svnadmin/main.c:402
 msgid ""
 "usage: svnadmin verify REPOS_PATH\n"
 "\n"
@@ -7028,33 +7547,36 @@
 "\n"
 "校验储存于档案库的数据。\n"
 
-#: svnadmin/main.c:448
+#: svnadmin/main.c:456
 #, fuzzy
 msgid "Invalid revision specifier"
 msgstr "指定了无效的修订版本"
 
-#: svnadmin/main.c:453
+#: svnadmin/main.c:461
 #, fuzzy, c-format
 msgid "Revisions must not be greater than the youngest revision (%ld)"
 msgstr "修订版必须不能大于最新的修订版号(%ld)"
 
-#: svnadmin/main.c:521 svnadmin/main.c:603
+#: svnadmin/main.c:534 svnadmin/main.c:629
 msgid "First revision cannot be higher than second"
 msgstr "第一个修订版不可高于第二个"
 
-#: svnadmin/main.c:530
+#: svnadmin/main.c:543
 #, c-format
 msgid "Deltifying revision %ld..."
 msgstr "正在 deltify 修订版 %ld..."
 
-#: svnadmin/main.c:534
+#: svnadmin/main.c:547
+#, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: svnadmin/main.c:634
+#: svnadmin/main.c:654
+#, fuzzy
 msgid ""
 "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnadmin --version' to see the program version and FS modules.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7063,7 +7585,7 @@
 "\n"
 "可用的子命令:\n"
 
-#: svnadmin/main.c:641 svnlook/main.c:1765 svnserve/main.c:158
+#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
 #, fuzzy
 msgid ""
 "The following repository back-end (FS) modules are available:\n"
@@ -7072,7 +7594,8 @@
 "以下的档案库后台(FS) 模块可用:\n"
 "\n"
 
-#: svnadmin/main.c:724
+#: svnadmin/main.c:738
+#, c-format
 msgid ""
 "Repository lock acquired.\n"
 "Please wait; recovering the repository may take some time...\n"
@@ -7080,7 +7603,7 @@
 "已取得档案库锁定。\n"
 "请稍候;修复档案库也许得花费一些时间...\n"
 
-#: svnadmin/main.c:759
+#: svnadmin/main.c:773
 msgid ""
 "Failed to get exclusive repository access; perhaps another process\n"
 "such as httpd, svnserve or svn has it open?"
@@ -7088,11 +7611,13 @@
 "无法取得独占存取权限;可能是其他如 httpd,svnserve 或 svn 的进程正在打开它\n"
 "并没有释放权限?"
 
-#: svnadmin/main.c:764
+#: svnadmin/main.c:778
+#, c-format
 msgid "Waiting on repository lock; perhaps another process has it open?\n"
 msgstr "等待档案库锁定中;也许其它的进程把它打开了?\n"
 
-#: svnadmin/main.c:771
+#: svnadmin/main.c:785
+#, c-format
 msgid ""
 "\n"
 "Recovery completed.\n"
@@ -7100,50 +7625,53 @@
 "\n"
 "修复完成。\n"
 
-#: svnadmin/main.c:778
+#: svnadmin/main.c:792
 #, c-format
 msgid "The latest repos revision is %ld.\n"
 msgstr "最新的档案库修订版为 %ld。\n"
 
-#: svnadmin/main.c:888
+#: svnadmin/main.c:902
 #, c-format
 msgid "Transaction '%s' removed.\n"
 msgstr "事务“%s”被移除。\n"
 
-#: svnadmin/main.c:912
+#: svnadmin/main.c:926
+#, c-format
 msgid "Missing revision"
 msgstr "丢失修订版"
 
-#: svnadmin/main.c:915
+#: svnadmin/main.c:929
+#, c-format
 msgid "Only one revision allowed"
 msgstr "仅允许一个修订版"
 
-#: svnadmin/main.c:921
+#: svnadmin/main.c:935
+#, c-format
 msgid "Exactly one file argument required"
 msgstr "必须提供恰好一个的文件参数"
 
-#: svnadmin/main.c:1029 svnlook/main.c:1830
+#: svnadmin/main.c:1047 svnlook/main.c:1728
 #, c-format
 msgid "UUID Token: %s\n"
 msgstr "UUID 标识:%s\n"
 
 # this points to filename according to sunny256
-#: svnadmin/main.c:1030 svnlook/main.c:1831
+#: svnadmin/main.c:1048 svnlook/main.c:1729
 #, fuzzy, c-format
 msgid "Owner: %s\n"
 msgstr "所有者:%s\n"
 
-#: svnadmin/main.c:1031 svnlook/main.c:1832
+#: svnadmin/main.c:1049 svnlook/main.c:1730
 #, fuzzy, c-format
 msgid "Created: %s\n"
 msgstr "创建于:%s\n"
 
-#: svnadmin/main.c:1032 svnlook/main.c:1833
+#: svnadmin/main.c:1050 svnlook/main.c:1731
 #, c-format
 msgid "Expires: %s\n"
 msgstr "过期:%s\n"
 
-#: svnadmin/main.c:1034
+#: svnadmin/main.c:1052
 #, c-format
 msgid ""
 "Comment (%i lines):\n"
@@ -7154,7 +7682,7 @@
 "%s\n"
 "\n"
 
-#: svnadmin/main.c:1035
+#: svnadmin/main.c:1053
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -7165,21 +7693,28 @@
 "%s\n"
 "\n"
 
-#: svnadmin/main.c:1102
+#: svnadmin/main.c:1110
 #, fuzzy, c-format
 msgid "Path '%s' isn't locked.\n"
 msgstr "路径“%s”没有被锁定。\n"
 
-#: svnadmin/main.c:1114
+#: svnadmin/main.c:1122
 #, fuzzy, c-format
 msgid "Removed lock on '%s'.\n"
 msgstr "删除“%s”上的锁。\n"
 
-#: svnadmin/main.c:1324
+#: svnadmin/main.c:1230
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr "遇到了多个修订版参数;请尝试将 '-r M -r N' 改为 '-r M:N'"
+
+#: svnadmin/main.c:1349
+#, c-format
 msgid "subcommand argument required\n"
 msgstr "必须提供子命令参数\n"
 
-#: svnadmin/main.c:1409
+#: svnadmin/main.c:1434
 #, c-format
 msgid ""
 "subcommand '%s' doesn't accept option '%s'\n"
@@ -7189,50 +7724,51 @@
 "请使用“svnadmin help %s”以了解用法。\n"
 
 # as-is
-#: svndumpfilter/main.c:325
+#: svndumpfilter/main.c:319
 msgid "This is an empty revision for padding."
 msgstr "This is an empty revision for padding."
 
-#: svndumpfilter/main.c:378
+#: svndumpfilter/main.c:389
 #, c-format
 msgid "Revision %ld committed as %ld.\n"
 msgstr "修订版 %ld 提交为 %ld。\n"
 
-#: svndumpfilter/main.c:386
+#: svndumpfilter/main.c:412
 #, c-format
 msgid "Revision %ld skipped.\n"
 msgstr "跳过修订版 %ld。\n"
 
-#: svndumpfilter/main.c:489
+#: svndumpfilter/main.c:514
 #, c-format
 msgid "Invalid copy source path '%s'"
 msgstr "无效的复制来源路径“%s”"
 
-#: svndumpfilter/main.c:532
-msgid "Node with dropped parent sneaked in"
-msgstr "其父节点已舍弃的节点偷跑进来"
+#: svndumpfilter/main.c:558
+#, c-format
+msgid "No valid copyfrom revision in filtered stream"
+msgstr ""
 
-#: svndumpfilter/main.c:638
+#: svndumpfilter/main.c:663
 msgid "Delta property block detected - not supported by svndumpfilter"
 msgstr "Delta 属性块被检测到 - svndumpfilter 不支持"
 
-#: svndumpfilter/main.c:764
+#: svndumpfilter/main.c:788
 msgid "Do not display filtering statistics."
 msgstr "不显示过滤的统计数据。"
 
-#: svndumpfilter/main.c:766
+#: svndumpfilter/main.c:790
 msgid "Remove revisions emptied by filtering."
 msgstr "移除因过滤而产生的空修订版。"
 
-#: svndumpfilter/main.c:768
+#: svndumpfilter/main.c:792
 msgid "Renumber revisions left after filtering."
 msgstr "过滤后重编余下的修订版。"
 
-#: svndumpfilter/main.c:770
+#: svndumpfilter/main.c:794
 msgid "Don't filter revision properties."
 msgstr "不过滤修订版属性。"
 
-#: svndumpfilter/main.c:781
+#: svndumpfilter/main.c:805
 msgid ""
 "Filter out nodes with given prefixes from dumpstream.\n"
 "usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -7240,7 +7776,7 @@
 "自转存流移除符合指定字首的节点。\n"
 "用法:svndumpfilter exclude PATH_PREFIX...\n"
 
-#: svndumpfilter/main.c:787
+#: svndumpfilter/main.c:811
 msgid ""
 "Filter out nodes without given prefixes from dumpstream.\n"
 "usage: svndumpfilter include PATH_PREFIX...\n"
@@ -7248,7 +7784,7 @@
 "自转存串流移除未包含指定字首的节点。\n"
 "用法:svndumpfilter include PATH_PREFIX...\n"
 
-#: svndumpfilter/main.c:793
+#: svndumpfilter/main.c:817
 msgid ""
 "Describe the usage of this program or its subcommands.\n"
 "usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -7256,10 +7792,12 @@
 "描述本程序或其子命令的用法。\n"
 "用法:svndumpfilter help [SUBCOMMAND...]\n"
 
-#: svndumpfilter/main.c:863
+#: svndumpfilter/main.c:888
+#, fuzzy
 msgid ""
 "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
 "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svndumpfilter --version' to see the program version number.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7268,23 +7806,27 @@
 "\n"
 "可用的子命令:\n"
 
-#: svndumpfilter/main.c:917
+#: svndumpfilter/main.c:943
+#, c-format
 msgid "Excluding (and dropping empty revisions for) prefixes:\n"
 msgstr "排除 (以及丢弃空修订版) 的字首:\n"
 
-#: svndumpfilter/main.c:919
+#: svndumpfilter/main.c:945
+#, c-format
 msgid "Excluding prefixes:\n"
 msgstr "排除字首:\n"
 
-#: svndumpfilter/main.c:921
+#: svndumpfilter/main.c:947
+#, c-format
 msgid "Including (and dropping empty revisions for) prefixes:\n"
 msgstr "涵盖 (以及丢弃空修订版) 的字首:\n"
 
-#: svndumpfilter/main.c:923
+#: svndumpfilter/main.c:949
+#, c-format
 msgid "Including prefixes:\n"
 msgstr "包含的字首:\n"
 
-#: svndumpfilter/main.c:950
+#: svndumpfilter/main.c:976
 #, c-format
 msgid ""
 "Dropped %d revision(s).\n"
@@ -7293,21 +7835,22 @@
 "丢弃 %d 修订版。\n"
 "\n"
 
-#: svndumpfilter/main.c:956
+#: svndumpfilter/main.c:982
 msgid "Revisions renumbered as follows:\n"
 msgstr "修订版被重新编号,如下:\n"
 
-#: svndumpfilter/main.c:984
+#: svndumpfilter/main.c:1009
 #, c-format
 msgid " %ld => (dropped)\n"
 msgstr " %ld => (丢弃)\n"
 
-#: svndumpfilter/main.c:999
+#: svndumpfilter/main.c:1024
 #, c-format
 msgid "Dropped %d node(s):\n"
 msgstr "丢弃 %d 节点:\n"
 
-#: svndumpfilter/main.c:1204
+#: svndumpfilter/main.c:1245
+#, c-format
 msgid ""
 "\n"
 "Error: no prefixes supplied.\n"
@@ -7315,7 +7858,7 @@
 "\n"
 "错误:没有提供前置字首,\n"
 
-#: svndumpfilter/main.c:1247
+#: svndumpfilter/main.c:1289
 #, fuzzy, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -7324,40 +7867,44 @@
 "子命令“%s”不接受选项“%s”\n"
 "请使用“svndumpfilter help %s”以了解用法。\n"
 
-#: svnlook/main.c:101
+#: svnlook/main.c:99
 msgid "specify revision number ARG"
 msgstr "指定修订版编号 ARG"
 
-#: svnlook/main.c:104
+#: svnlook/main.c:102
 msgid "specify transaction name ARG"
 msgstr "指定事务名称 ARG"
 
-#: svnlook/main.c:107
+#: svnlook/main.c:105
 msgid "be verbose"
 msgstr "详细"
 
-#: svnlook/main.c:110
+#: svnlook/main.c:108
 msgid "show node revision ids for each path"
 msgstr "为每个路径显示节点修订版编号"
 
-#: svnlook/main.c:116
+#: svnlook/main.c:114
 #, fuzzy
 msgid "do not print differences for added files"
 msgstr "不要打印已新加文件的不同处"
 
-#: svnlook/main.c:119
+#: svnlook/main.c:117
 msgid "print differences against the copy source"
 msgstr "显示差异并对照原始内容"
 
-#: svnlook/main.c:122
+#: svnlook/main.c:120
 #, fuzzy
 msgid "operate on a revision property (use with -r or -t)"
 msgstr "在修订版属性上作操作(使用-r参数)"
 
-#: svnlook/main.c:125
+#: svnlook/main.c:123
 msgid "show full paths instead of indenting them"
 msgstr "显示完整路径代替缩略形式"
 
+#: svnlook/main.c:126
+msgid "show details for copies"
+msgstr ""
+
 #: svnlook/main.c:138
 msgid ""
 "usage: svnlook author REPOS_PATH\n"
@@ -7378,7 +7925,7 @@
 "\n"
 "显示文件的内容。FILE_PATH 前的 '/' 可省略。\n"
 
-#: svnlook/main.c:149
+#: svnlook/main.c:148
 msgid ""
 "usage: svnlook changed REPOS_PATH\n"
 "\n"
@@ -7388,7 +7935,7 @@
 "\n"
 "显示已改变的路径。\n"
 
-#: svnlook/main.c:154
+#: svnlook/main.c:153
 msgid ""
 "usage: svnlook date REPOS_PATH\n"
 "\n"
@@ -7398,7 +7945,7 @@
 "\n"
 "显示日期。\n"
 
-#: svnlook/main.c:159
+#: svnlook/main.c:158
 msgid ""
 "usage: svnlook diff REPOS_PATH\n"
 "\n"
@@ -7408,7 +7955,7 @@
 "\n"
 "以 GNU 样式,显示档案库中改变的文件与属性差异。\n"
 
-#: svnlook/main.c:165
+#: svnlook/main.c:164
 msgid ""
 "usage: svnlook dirs-changed REPOS_PATH\n"
 "\n"
@@ -7419,7 +7966,7 @@
 "\n"
 "显示本身曾改变 (或属性编辑) 过的目录,或是其下的文件更曾动过目录。\n"
 
-#: svnlook/main.c:171
+#: svnlook/main.c:170
 msgid ""
 "usage: svnlook help [SUBCOMMAND...]\n"
 "\n"
@@ -7429,7 +7976,7 @@
 "\n"
 "显示本程序或其子命令的用法。\n"
 
-#: svnlook/main.c:176
+#: svnlook/main.c:175
 msgid ""
 "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -7440,7 +7987,7 @@
 "\n"
 "显示档案库中,某个路径的历史记录信息 (如果没有指定路径,则为根目录)。\n"
 
-#: svnlook/main.c:182
+#: svnlook/main.c:181
 msgid ""
 "usage: svnlook info REPOS_PATH\n"
 "\n"
@@ -7450,7 +7997,7 @@
 "\n"
 "显示作者,日期戳,日志信息大小,以及日志信息。\n"
 
-#: svnlook/main.c:187
+#: svnlook/main.c:186
 #, fuzzy
 msgid ""
 "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
@@ -7461,7 +8008,7 @@
 "\n"
 "如果档案库路径已经存在锁,描述它。\n"
 
-#: svnlook/main.c:192
+#: svnlook/main.c:191
 msgid ""
 "usage: svnlook log REPOS_PATH\n"
 "\n"
@@ -7471,7 +8018,7 @@
 "\n"
 "显示日志信息。\n"
 
-#: svnlook/main.c:197
+#: svnlook/main.c:196
 #, fuzzy
 msgid ""
 "usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
@@ -7484,7 +8031,7 @@
 "显示档案库中,某个路径的属性的原始内容。\n"
 "加上 --revprop, 显示修订版属性的原始值。\n"
 
-#: svnlook/main.c:203
+#: svnlook/main.c:202
 #, fuzzy
 msgid ""
 "usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
@@ -7499,7 +8046,7 @@
 "加上 --revprop 选项, 修订版属性。\n"
 "加上 -v 的话,一并显示属性内容。\n"
 
-#: svnlook/main.c:210
+#: svnlook/main.c:209
 msgid ""
 "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
 "\n"
@@ -7511,7 +8058,7 @@
 "显示目录树,自 PATH_IN_REPOS 开始 (如果有提供的话,不然就从目录树的\n"
 "根目录开始),可选择性地显示节点修订版 id。\n"
 
-#: svnlook/main.c:216
+#: svnlook/main.c:215
 msgid ""
 "usage: svnlook uuid REPOS_PATH\n"
 "\n"
@@ -7521,7 +8068,7 @@
 "\n"
 "显示档案库的 UUID。\n"
 
-#: svnlook/main.c:221
+#: svnlook/main.c:220
 msgid ""
 "usage: svnlook youngest REPOS_PATH\n"
 "\n"
@@ -7531,60 +8078,53 @@
 "\n"
 "显示最新的修订版号。\n"
 
-#: svnlook/main.c:589
-#, fuzzy, c-format
-msgid "Error creating dir '%s' (path exists)"
-msgstr "创建目录“%s”时发生错误(路径已经存在)"
-
-#: svnlook/main.c:863
+#: svnlook/main.c:815
 #, c-format
 msgid "Copied: %s (from rev %ld, %s)\n"
 msgstr "已复制:%s (来自修订版 %ld,%s)\n"
 
-#: svnlook/main.c:941
+#: svnlook/main.c:884
 msgid "Added"
 msgstr "已加入"
 
-#: svnlook/main.c:942
+#: svnlook/main.c:885
 msgid "Deleted"
 msgstr "已删除"
 
-#: svnlook/main.c:943
+#: svnlook/main.c:886
 msgid "Modified"
 msgstr "已修改"
 
-#: svnlook/main.c:944
+#: svnlook/main.c:887
 msgid "Index"
 msgstr "索引"
 
-#: svnlook/main.c:956
+#: svnlook/main.c:899
+#, c-format
 msgid "(Binary files differ)\n"
 msgstr "(二进制文件差异)\n"
 
-#: svnlook/main.c:1085
+#: svnlook/main.c:1028
 msgid "unknown"
 msgstr "未知"
 
-#: svnlook/main.c:1230 svnlook/main.c:1323 svnlook/main.c:1393
+#: svnlook/main.c:1173 svnlook/main.c:1266 svnlook/main.c:1295
 #, c-format
 msgid "Transaction '%s' is not based on a revision; how odd"
 msgstr "事务“%s”并非根基于某个修订版;多神秘啊"
 
-#: svnlook/main.c:1260
+#: svnlook/main.c:1203
 #, c-format
 msgid "'%s' is a URL, probably should be a path"
 msgstr "“%s”是地址(URL),也许该是路径。"
 
-#: svnlook/main.c:1287
+#: svnlook/main.c:1230
 #, c-format
 msgid "Path '%s' is not a file"
 msgstr "路径“%s”不是文件"
 
-#: svnlook/main.c:1373
-msgid "Can't create temporary directory"
-msgstr "无法建立临时目录"
-
-#: svnlook/main.c:1473
+#: svnlook/main.c:1369
+#, c-format
 msgid ""
 "REVISION PATH <ID>\n"
 "-------- ---------\n"
@@ -7592,7 +8132,8 @@
 "ä¿® 订 版 路径 <ID>\n"
 "-------- ---------\n"
 
-#: svnlook/main.c:1478
+#: svnlook/main.c:1374
+#, c-format
 msgid ""
 "REVISION PATH\n"
 "-------- ----\n"
@@ -7600,27 +8141,30 @@
 "ä¿® 订 版 路径\n"
 "-------- ----\n"
 
-#: svnlook/main.c:1523
+#: svnlook/main.c:1419
 #, fuzzy, c-format
 msgid "Property '%s' not found on revision %ld"
 msgstr "属性“%s”在修订版 %ld 中找不到"
 
-#: svnlook/main.c:1527
+#: svnlook/main.c:1423
 #, fuzzy, c-format
 msgid "Property '%s' not found on path '%s' in revision %ld"
 msgstr "属性“%1$s”在修订版 %3$ld 中的路径“%2$s”中找不到"
 
-#: svnlook/main.c:1695 svnlook/main.c:1909
+#: svnlook/main.c:1592 svnlook/main.c:1807
+#, c-format
 msgid "Missing repository path argument"
 msgstr "未提供档案库路径参数"
 
-#: svnlook/main.c:1756
+#: svnlook/main.c:1653
+#, fuzzy
 msgid ""
 "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
 "Note: any subcommand which takes the '--revision' and '--transaction'\n"
 " options will, if invoked without one of those options, act on\n"
 " the repository's youngest revision.\n"
 "Type 'svnlook help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnlook --version' to see the program version and FS modules.\n"
 "\n"
 "Available subcommands:\n"
 msgstr ""
@@ -7631,12 +8175,12 @@
 "\n"
 "可用的子命令:\n"
 
-#: svnlook/main.c:1811
+#: svnlook/main.c:1709
 #, fuzzy
 msgid "Missing path argument"
 msgstr "未提供档案库路径参数"
 
-#: svnlook/main.c:1836
+#: svnlook/main.c:1734
 #, c-format
 msgid ""
 "Comment (%i lines):\n"
@@ -7645,7 +8189,7 @@
 "注释 (%i 行):\n"
 "%s\n"
 
-#: svnlook/main.c:1837
+#: svnlook/main.c:1735
 #, c-format
 msgid ""
 "Comment (%i line):\n"
@@ -7654,39 +8198,40 @@
 "注释 (%i 行):\n"
 "%s\n"
 
-#: svnlook/main.c:1883
-#, fuzzy
+#: svnlook/main.c:1781
+#, fuzzy, c-format
 msgid "Missing propname argument"
 msgstr "未提供属性名称参数"
 
-#: svnlook/main.c:1884
+#: svnlook/main.c:1782
+#, c-format
 msgid "Missing propname and repository path arguments"
 msgstr "未提供属性名称与档案库路径参数"
 
-#: svnlook/main.c:1890
+#: svnlook/main.c:1788
 msgid "Missing propname or repository path argument"
 msgstr "未提供属性名称或档案库路径参数"
 
-#: svnlook/main.c:2045
+#: svnlook/main.c:1946
 msgid "Invalid revision number supplied"
 msgstr "提供了无效的版本号码"
 
-#: svnlook/main.c:2103
+#: svnlook/main.c:2007
 msgid ""
 "The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
 msgstr "'--transaction' (-t) 与 '--revision' (-r) 参数不能同时存在"
 
-#: svnlook/main.c:2172
-#, fuzzy
+#: svnlook/main.c:2089
+#, fuzzy, c-format
 msgid "Repository argument required\n"
 msgstr "需有档案库参数"
 
-#: svnlook/main.c:2181
+#: svnlook/main.c:2098
 #, c-format
 msgid "'%s' is a URL when it should be a path\n"
 msgstr "“%s”是地址(URL),但是应该是路径\n"
 
-#: svnlook/main.c:2229
+#: svnlook/main.c:2149
 #, fuzzy, c-format
 msgid ""
 "Subcommand '%s' doesn't accept option '%s'\n"
@@ -7695,62 +8240,72 @@
 "子命令“%s”并不接受选项“%s”\n"
 "请使用“svnlook help %s”以了解用法。\n"
 
-#: svnserve/main.c:102
+#: svnserve/main.c:140
 msgid "daemon mode"
 msgstr "后台模式"
 
-#: svnserve/main.c:104
+#: svnserve/main.c:142
 msgid "listen port (for daemon mode)"
 msgstr "监听端口(后台模式)"
 
-#: svnserve/main.c:106
+#: svnserve/main.c:144
 msgid "listen hostname or IP address (for daemon mode)"
 msgstr "监听主机名或IP地址(后台模式)"
 
-#: svnserve/main.c:108
+#: svnserve/main.c:146
 msgid "run in foreground (useful for debugging)"
 msgstr "在前台运行(调试时有用)"
 
-#: svnserve/main.c:109 svnversion/main.c:181
+#: svnserve/main.c:147 svnversion/main.c:123
 msgid "display this help"
 msgstr "显示这个帮助"
 
-#: svnserve/main.c:112
+#: svnserve/main.c:150
 msgid "inetd mode"
 msgstr "inetd 模式"
 
-#: svnserve/main.c:113
+#: svnserve/main.c:151
 msgid "root of directory to serve"
 msgstr "服务根目录"
 
-#: svnserve/main.c:114
-msgid "deprecated; use repository config file"
+#: svnserve/main.c:153
+#, fuzzy
+msgid "force read only, overriding repository config file"
 msgstr "不赞成;使用档案库配置文件"
 
-#: svnserve/main.c:115
+#: svnserve/main.c:154
 msgid "tunnel mode"
 msgstr "隧道模式"
 
-#: svnserve/main.c:117
+#: svnserve/main.c:156
 msgid "tunnel username (default is current uid's name)"
 msgstr "隧道用户名(模式是当前用户UID的名字)"
 
-#: svnserve/main.c:119
+#: svnserve/main.c:158
 msgid "use threads instead of fork"
 msgstr "使用线程代替进程"
 
-#: svnserve/main.c:121
+#: svnserve/main.c:160
 msgid "listen once (useful for debugging)"
 msgstr "监听一次(调试时有用)"
 
-#: svnserve/main.c:132
+#: svnserve/main.c:162
+msgid "write server process ID to file arg"
+msgstr ""
+
+#: svnserve/main.c:165
+msgid "run as a windows service (SCM only)"
+msgstr ""
+
+#: svnserve/main.c:177
 #, c-format
 msgid "Type '%s --help' for usage.\n"
 msgstr "请使用“%s help”以得到用法和帮助。\n"
 
-#: svnserve/main.c:141
+#: svnserve/main.c:186
+#, fuzzy
 msgid ""
-"Usage: svnserve [options]\n"
+"usage: svnserve [options]\n"
 "\n"
 "Valid options:\n"
 msgstr ""
@@ -7758,76 +8313,243 @@
 "\n"
 "有效选项:\n"
 
-#: svnserve/main.c:359
-msgid ""
-"Warning: -R is deprecated.\n"
-"Anonymous access is now read-only by default.\n"
-"To change, use conf/svnserve.conf in repos:\n"
-" [general]\n"
-" anon-access = read|write|none (default read)\n"
-" auth-access = read|write|none (default write)\n"
-"Forcing all access to read-only for now\n"
-msgstr ""
-"警告:-R 不赞成使用。\n"
-"匿名访问默认只读。Anonymous access is now read-only by default.\n"
-"修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
-" [general]\n"
-" anon-access = read|write|none (默认 read)\n"
-" auth-access = read|write|none (默认 write)\n"
-"强制所有访问为只读\n"
-
-#: svnserve/main.c:381
-msgid "Option --tunnel-user is only valid in tunnel mode.\n"
-msgstr "选项 --tunnel-user 只有隧道模式时有效。\n"
-
-#: svnserve/main.c:388
+#: svnserve/main.c:453
 #, fuzzy
 msgid "You must specify exactly one of -d, -i, -t or -X.\n"
 msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n"
 
-#: svnserve/main.c:429
+#: svnserve/main.c:463
 #, c-format
-msgid "Can't get address info: %s\n"
-msgstr "不能获取地址信息:“%s”\n"
+msgid "Option --tunnel-user is only valid in tunnel mode.\n"
+msgstr "选项 --tunnel-user 只有隧道模式时有效。\n"
 
-#: svnserve/main.c:446
+#: svnserve/main.c:532
 #, c-format
-msgid "Can't create server socket: %s\n"
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+
+#: svnserve/main.c:568
+#, fuzzy, c-format
+msgid "Can't get address info"
+msgstr "不能获取地址信息:“%s”\n"
+
+#: svnserve/main.c:584
+#, fuzzy, c-format
+msgid "Can't create server socket"
 msgstr "无法创建服务器套接字:%s\n"
 
-#: svnserve/main.c:460
-#, c-format
-msgid "Can't bind server socket: %s\n"
+#: svnserve/main.c:597
+#, fuzzy, c-format
+msgid "Can't bind server socket"
 msgstr "不能绑定服务器套接字:“%s”\n"
 
-#: svnserve/main.c:503
+#: svnserve/main.c:665
 #, fuzzy, c-format
-msgid "Can't accept client connection: %s\n"
+msgid "Can't accept client connection"
 msgstr "无法接受客户连接:%s\n"
 
-#: svnserve/main.c:558
+#: svnserve/main.c:719
 #, fuzzy, c-format
-msgid "Can't create threadattr: %s\n"
+msgid "Can't create threadattr"
 msgstr "无法创建线程属性:“%s”\n"
 
 # as-is
-#: svnserve/main.c:567
+#: svnserve/main.c:727
 #, fuzzy, c-format
-msgid "Can't set detached state: %s\n"
+msgid "Can't set detached state"
 msgstr "不能设置分离的状态:“%s”\n"
 
-#: svnserve/main.c:581
+#: svnserve/main.c:740
 #, fuzzy, c-format
-msgid "Can't create thread: %s\n"
+msgid "Can't create thread"
 msgstr "无法创建线程:%s\n"
 
-#: svnversion/main.c:90
+#: svnserve/winservice.c:341
+#, c-format
+msgid "Failed to create winservice_start_event"
+msgstr ""
+
+#: svnserve/winservice.c:352
+#, c-format
+msgid "The service failed to start"
+msgstr ""
+
+#: svnserve/winservice.c:400
+#, c-format
+msgid "Failed to connect to Service Control Manager"
+msgstr ""
+
+#: svnserve/winservice.c:411
+#, c-format
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+
+#: svnsync/main.c:56
+msgid ""
+"usage: svnsync initialize DEST_URL SOURCE_URL\n"
+"\n"
+"Initialize a destination repository for synchronization from\n"
+"another repository.\n"
+"\n"
+"The destination URL must point to the root of a repository with\n"
+"no committed revisions. The destination repository must allow\n"
+"revision property changes.\n"
+"\n"
+"You should not commit to, or make revision property changes in,\n"
+"the destination repository by any method other than 'svnsync'.\n"
+"In other words, the destination repository should be a read-only\n"
+"mirror of the source repository.\n"
+msgstr ""
+
+#: svnsync/main.c:71
+msgid ""
+"usage: svnsync synchronize DEST_URL\n"
+"\n"
+"Transfer all pending revisions from source to destination.\n"
+msgstr ""
+
+#: svnsync/main.c:76
+msgid ""
+"usage: svnsync copy-revprops DEST_URL REV\n"
+"\n"
+"Copy all revision properties for revision REV from source to\n"
+"destination.\n"
+msgstr ""
+
+#: svnsync/main.c:82
+#, fuzzy
+msgid ""
+"usage: svnsync help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+"用法:svnadmin help [SUBCOMMAND...]\n"
+"\n"
+"显示本程序或其子命令的用法。\n"
+
+#: svnsync/main.c:184
+#, fuzzy, c-format
+msgid "Can't get local hostname"
+msgstr "无法获取文件名"
+
+#: svnsync/main.c:206
+#, c-format
+msgid "Failed to get lock on destination repos, currently held by '%s'\n"
+msgstr ""
+
+#: svnsync/main.c:301
+#, c-format
+msgid "Session is rooted at '%s' but the repos root is '%s'"
+msgstr ""
+
+#: svnsync/main.c:341
+#, c-format
+msgid "Copied properties for revision %ld (%s* properties skipped).\n"
+msgstr ""
+
+#: svnsync/main.c:346
+#, fuzzy, c-format
+msgid "Copied properties for revision %ld.\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+
+#: svnsync/main.c:387
+msgid "Cannot initialize a repository with content in it"
+msgstr ""
+
+#: svnsync/main.c:398
+#, c-format
+msgid "Destination repository is already synchronizing from '%s'"
+msgstr ""
+
+#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
+#: svnsync/main.c:1200
+#, fuzzy, c-format
+msgid "Path '%s' is not a URL"
+msgstr "路径“%s”不是文件"
+
+#: svnsync/main.c:838
+#, fuzzy, c-format
+msgid "Committed revision %ld.\n"
+msgstr ""
+"\n"
+"提交后的修订版为 %ld。\n"
+
+#: svnsync/main.c:877
+msgid "Destination repository has not been initialized"
+msgstr ""
+
+#: svnsync/main.c:892
+#, c-format
+msgid "UUID of source repository (%s) does not match expected UUID (%s)"
+msgstr ""
+
+#: svnsync/main.c:954
+#, c-format
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:992
+#, c-format
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:1069
+#, c-format
+msgid "Commit created rev %ld but should have created %ld"
+msgstr ""
+
+#: svnsync/main.c:1171
+msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+msgstr ""
+
+#: svnsync/main.c:1203
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "提供了无效的版本号码"
+
+#: svnsync/main.c:1239
 #, fuzzy
+msgid ""
+"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnsync --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"请使用 “svnadmin help <subcommand>” 以取得特定子命令的帮助信息。\n"
+"\n"
+"可用的子命令:\n"
+
+#: svnsync/main.c:1429
+#, fuzzy, c-format
+msgid ""
+"subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnsync help %s' for usage.\n"
+msgstr ""
+"子命令“%s”不接受选项“%s”\n"
+"请输入“svn help %s”以取得用法。\n"
+
+#: svnsync/main.c:1490
+msgid "Not enough arguments provided; try 'svnsync help' for more info"
+msgstr ""
+
+#: svnversion/main.c:39
+#, fuzzy, c-format
 msgid "Type 'svnversion --help' for usage.\n"
 msgstr "请使用“svnversion --help”以得到用法和帮助。\n"
 
-#: svnversion/main.c:101
-#, fuzzy
+#: svnversion/main.c:50
+#, fuzzy, c-format
 msgid ""
 "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
 "\n"
@@ -7880,81 +8602,237 @@
 " 如果调用时没有参数 WC_PATH 会使用当前目录。\n"
 "有效选项:\n"
 
-#: svnversion/main.c:179
+#: svnversion/main.c:121
 msgid "do not output the trailing newline"
 msgstr "不输出其后的换行符"
 
-#: svnversion/main.c:180
+#: svnversion/main.c:122
 msgid "last changed rather than current revisions"
 msgstr "最近一次改变的,而不是目前的修订版"
 
-#: svnversion/main.c:272
+#: svnversion/main.c:229
 #, c-format
 msgid "exported%s"
 msgstr "已导出%s"
 
-#: svnversion/main.c:281
+#: svnversion/main.c:238
 #, c-format
 msgid "'%s' not versioned, and not exported\n"
 msgstr "“%s”未纳入版本控制,并未导出\n"
 
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
+#~ msgid "Finished"
+#~ msgstr "完成"
 
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "无法清除“%s”:不是一个目录"
+#~ msgid "Can't get default file perms for file at '%s' (file close error)"
+#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
 
-#~ msgid "'svn info' only works on working copy paths, not URLs"
-#~ msgstr "“svn info”只工作于工作目录,不能是地址(URL)"
+#, fuzzy
+#~ msgid ""
+#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
+#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
 
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0的提交。\n"
+#~ msgid "'%s' is already a file/something else"
+#~ msgstr "“%s”已是文件/其它的东西"
 
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信息\n"
+#~ msgid "No URL target available"
+#~ msgstr "没有提供 URL 目标"
 
-#~ msgid "Working copy not locked"
-#~ msgstr "工作拷贝未锁定"
+#~ msgid "repository argument required\n"
+#~ msgstr "需有档案库参数\n"
 
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
+#~ msgid "unknown command: '%s'\n"
+#~ msgstr "未知的命令:“%s”\n"
+
+#~ msgid "Can't recode string"
+#~ msgstr "无法重新编码字符串"
+
+#~ msgid "native"
+#~ msgstr "本地"
+
+# as-is
+#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
+#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
 
 # as-is
 #~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
 #~ msgstr "不支持ra_davçš„ RA 插件 ABI 版本 (%d)"
 
+#~ msgid "No get_dir() available for URL schema"
+#~ msgstr "该地址(URL)规则中并不支持 get_dir()"
+
+#~ msgid "Working copy not locked"
+#~ msgstr "工作拷贝未锁定"
+
+#~ msgid "Print client version info\n"
+#~ msgstr "输出客户端版本信息\n"
+
+#~ msgid "No commit for revision 0.\n"
+#~ msgstr "没有修订版0的提交。\n"
+
+#~ msgid "Cannot cleanup '%s': not a directory"
+#~ msgstr "无法清除“%s”:不是一个目录"
+
+#~ msgid " %ld => %ld\n"
+#~ msgstr " %ld => %ld\n"
+
+#~ msgid "print client version info"
+#~ msgstr "打印客户端版本信息"
+
+#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
+#~ msgstr "传递 ARG 到 --diff-cmd 作为选项(默认使用参数 '-u')"
+
+#~ msgid "Wrong number of paths given"
+#~ msgstr "指定了错误数目的路径"
+
+#~ msgid "Not enough args provided"
+#~ msgstr "未提供足够的参数"
+
 # as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支持ra_svn的 RA 插件 ABI 版本 (%d)。"
+#~ msgid "Can't seek in '%s'"
+#~ msgstr "不能在“%s”定位"
 
-#~ msgid "native"
-#~ msgstr "本地"
+#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
+#~ msgstr "提交项目“%s”有复制标志,但是没有复制的地址(copyfrom URL)\n"
 
-#~ msgid "Can't recode string"
-#~ msgstr "无法重新编码字符串"
+#~ msgid "Unrecognized node kind of '%s'"
+#~ msgstr "“%s”的节点种类无法辨识"
 
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%s”\n"
+#~ msgid "'%s' is in the way"
+#~ msgstr "“%s”挡在中间"
 
-#~ msgid "repository argument required\n"
-#~ msgstr "需有档案库参数\n"
+#~ msgid "'%s' is not supported"
+#~ msgstr "“%s”不支持"
 
-#~ msgid "No URL target available"
-#~ msgstr "没有提供 URL 目标"
+#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
+#~ msgstr "文件系统“%3$s”中在事务“%2$s”中有损坏的复制记录“%1$s”"
 
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%s”已是文件/其它的东西"
+#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
+#~ msgstr "文件系统“%s”的“nodes”表格中,以畸形的 ID 作为搜寻关键字"
+
+#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
+#~ msgstr "文件系统“%2$s”中“%1$s”的 'next-id' 表格有无效的项目"
+
+#~ msgid "Search for malformed path '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$s”中搜寻畸形的路径“%1$s”"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for reading"
+#~ msgstr "不能打开文件“%s”进行读取"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for writing"
+#~ msgstr "不能打开文件“%s”进行写入"
+
+#, fuzzy
+#~ msgid "Error reading file '%s'"
+#~ msgstr "读取文件“%s”时发生错误"
+
+#, fuzzy
+#~ msgid "Error writing file '%s'"
+#~ msgstr "写入文件“%s”时发生错误"
+
+#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$s”中节点“%1$s”有损坏的节点修订版"
+
+#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
+#~ msgstr "损坏的节点修订版编号“%s”出现于文件系统“%s”中"
+
+#~ msgid "Found malformed header block in dumpfile stream"
+#~ msgstr "在导出文件流中找到有畸形的文件头"
+
+# as-is
+#~ msgid "Creating readme file"
+#~ msgstr "正在创建 readme 文件"
 
 #, fuzzy
+#~ msgid "Expected format '%d' of repository; found format '%d'"
+#~ msgstr "预期档案库格式“%d”;找到格式“%d”"
+
+# as-is
+#~ msgid "Can't open config file '%s'"
+#~ msgstr "不能打开配置文件“%s”"
+
+# as-is
+#~ msgid "Can't find config file '%s'"
+#~ msgstr "找不到配置文件“%s”"
+
+#~ msgid "Can't change executability of file '%s'"
+#~ msgstr "不能改变文件“%s”为可执行"
+
+#~ msgid "Can't stat new directory '%s'"
+#~ msgstr "无法获取新目录“%s”的状态"
+
+#~ msgid "Too few arguments"
+#~ msgstr "参数太少"
+
 #~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$s”在事务“%2$s”中路径“%1$s”没有被删除部分的更改"
+#~ "The entry '%s' is no longer a directory; remove the entry before updating"
+#~ msgstr "项目“%s”已不再是目录了;更新前请移除本项目"
 
-#~ msgid "Error writing to stream: unexpected EOF"
-#~ msgstr "写入流时发生错误:意想不到的 EOF"
+#~ msgid "Error restoring props for '%s'"
+#~ msgstr "还原“%s”的属性时发生错误"
 
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "不能获取”%s“文件的默认文件权限(关闭文件错误)"
+#~ msgid "Error removing props for '%s'"
+#~ msgstr "移除“%s”的属性时发生错误"
 
-#~ msgid "Finished"
-#~ msgstr "完成"
+#~ msgid ""
+#~ "'%s' is scheduled for deletion; it must be committed before being "
+#~ "overwritten"
+#~ msgstr "“%s”已加入删除调度;在覆盖之前,必须先被提交"
+
+#, fuzzy
+#~ msgid "Working copy '%s' is missing or not locked"
+#~ msgstr "工作拷贝“%s”丢失或并未锁定"
+
+#~ msgid "Error checking path '%s'"
+#~ msgstr "检查路径“%s”时发生错误"
+
+#~ msgid "Unable to delete temporary file"
+#~ msgstr "无法删除暂存文件"
+
+#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
+#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其删除\n"
+
+#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
+#~ msgstr "属性“%s”于本地被删除,但是更新将其设定为“%s”\n"
+
+#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
+#~ msgstr "属性“%s”于本地被修改成“%s”,但是更新将其设定为“%s”\n"
+
+#~ msgid "Unknown node kind: '%s'"
+#~ msgstr "未知的节点类型:“%s”"
+
+#~ msgid "'%s' has unknown value for svn:eol-style property"
+#~ msgstr "“%s”的 svn:eol-style 属性有不明的数值"
+
+#~ msgid "Move failed"
+#~ msgstr "移动失败"
+
+#~ msgid "Node with dropped parent sneaked in"
+#~ msgstr "其父节点已舍弃的节点偷跑进来"
+
+#, fuzzy
+#~ msgid "Error creating dir '%s' (path exists)"
+#~ msgstr "创建目录“%s”时发生错误(路径已经存在)"
+
+#~ msgid "Can't create temporary directory"
+#~ msgstr "无法建立临时目录"
+
+#~ msgid ""
+#~ "Warning: -R is deprecated.\n"
+#~ "Anonymous access is now read-only by default.\n"
+#~ "To change, use conf/svnserve.conf in repos:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (default read)\n"
+#~ " auth-access = read|write|none (default write)\n"
+#~ "Forcing all access to read-only for now\n"
+#~ msgstr ""
+#~ "警告:-R 不赞成使用。\n"
+#~ "匿名访问默认只读。Anonymous access is now read-only by default.\n"
+#~ "修改可通过编辑档案库目录 conf/svnserve.conf 中的:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (默认 read)\n"
+#~ " auth-access = read|write|none (默认 write)\n"
+#~ "强制所有访问为只读\n"

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 23 05:34:28 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.