You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/12/14 12:44:04 UTC

svn commit: r1645439 [5/8] - in /subversion/branches/1.7.x-issue4340-repos: ./ build/ac-macros/ build/generator/ build/generator/templates/ contrib/hook-scripts/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/ja...

Modified: subversion/branches/1.7.x-issue4340-repos/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-issue4340-repos/subversion/po/zh_CN.po?rev=1645439&r1=1645438&r2=1645439&view=diff
==============================================================================
--- subversion/branches/1.7.x-issue4340-repos/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/1.7.x-issue4340-repos/subversion/po/zh_CN.po [UTF-8] Sun Dec 14 11:44:03 2014
@@ -55,8 +55,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: subversion 1.7\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2012-08-17 15:23+0000\n"
-"PO-Revision-Date: 2012-08-17 15:18+0000\n"
+"POT-Creation-Date: 2013-07-02 23:23+0800\n"
+"PO-Revision-Date: 2013-07-02 23:21+0800\n"
 "Last-Translator: Subversion Developers <de...@subversion.apache.org>\n"
 "Language-Team: Simplified Chinese <de...@subversion.apache.org>\n"
 "Language: \n"
@@ -64,64 +64,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #. Constructing nice error messages for roots.
 #. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
 #. for PATH in ROOT. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:66
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "没有找到文件: 事务“%s”,路径 “%s”"
 
+#: ../include/private/svn_fs_util.h:71
 #, c-format
 msgid "File not found: revision %ld, path '%s'"
 msgstr "没有找到文件: 版本“%ld”,路径 “%s”"
 
 #. Build a detailed `file already exists' message for PATH in ROOT.
 #. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:82
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "文件已经存在: 文件系统“%s”,事务“%s”,路径“%s”"
 
+#: ../include/private/svn_fs_util.h:87
 #, c-format
 msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
 msgstr "文件已经存在: 文件系统“%s”,版本“%ld”,路径“%s”"
 
 #. ROOT is of type svn_fs_root_t *.
+#: ../include/private/svn_fs_util.h:95
 msgid "Root object must be a transaction root"
 msgstr "根对象必须是事务的根"
 
 #. SVN_FS__ERR_NOT_MUTABLE: the caller attempted to change a node
 #. outside of a transaction. FS is of type "svn_fs_t *".
+#: ../include/private/svn_fs_util.h:102
 #, c-format
 msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
 msgstr "文件不是可变的: 文件系统“%s”,版本“%ld”,路径 “%s”"
 
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:109
 #, c-format
 msgid "'%s' is not a directory in filesystem '%s'"
 msgstr "“%s”在文件系统“%s”中不是目录"
 
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:116
 #, c-format
 msgid "'%s' is not a file in filesystem '%s'"
 msgstr "“%s”在文件系统“%s”中不是文件"
 
 #. FS is of type "svn fs_t *", LOCK is of type "svn_lock_t *".
+#: ../include/private/svn_fs_util.h:124
 #, c-format
 msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
 msgstr "路径“%s”已经被用户“%s”锁定,其文件系统是“%s”"
 
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:131
 #, c-format
 msgid "No lock on path '%s' in filesystem '%s'"
 msgstr "路径“%s”没有被锁定,其文件系统是“%s”"
 
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:138
 #, c-format
 msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
 msgstr "锁已经过期:令牌 “%s”,文件系统 “%s”"
 
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:145
 #, c-format
 msgid "No username is currently associated with filesystem '%s'"
 msgstr "当前没有用户名称与文件系统“%s”关联"
@@ -129,961 +142,1305 @@ msgstr "当前没有用户名称与文�
 #. SVN_FS__ERR_LOCK_OWNER_MISMATCH: trying to use a lock whose
 #. LOCK_OWNER doesn't match the USERNAME associated with FS.
 #. FS is of type "svn fs_t *".
+#: ../include/private/svn_fs_util.h:154
 #, c-format
 msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
 msgstr "用户“%s”试图使用“%s”的锁,其文件系统是“%s”"
 
+#: ../include/svn_error_codes.h:160
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "无效的父内存池传递到 svn_make_pool()"
 
+#: ../include/svn_error_codes.h:164
 msgid "Bogus filename"
 msgstr "非法的文件名"
 
+#: ../include/svn_error_codes.h:168
 msgid "Bogus URL"
 msgstr "非法 URL"
 
+#: ../include/svn_error_codes.h:172
 msgid "Bogus date"
 msgstr "非法日期"
 
+#: ../include/svn_error_codes.h:176
 msgid "Bogus mime-type"
 msgstr "非法 mime-type"
 
+#: ../include/svn_error_codes.h:186
 msgid "Wrong or unexpected property value"
 msgstr "错误或不期望的属性值"
 
+#: ../include/svn_error_codes.h:190
 msgid "Version file format not correct"
 msgstr "版本文件格式不正确"
 
+#: ../include/svn_error_codes.h:194
 msgid "Path is not an immediate child of the specified directory"
 msgstr "路径不是指定目录的直接子孙"
 
+#: ../include/svn_error_codes.h:198
 msgid "Bogus UUID"
 msgstr "非法 UUID"
 
+#: ../include/svn_error_codes.h:203 ../include/svn_error_codes.h:905
 msgid "Invalid configuration value"
 msgstr "无效的配置取值"
 
+#: ../include/svn_error_codes.h:207
 msgid "Bogus server specification"
 msgstr "假的服务器规格"
 
+#: ../include/svn_error_codes.h:211
 msgid "Unsupported checksum type"
 msgstr "不支持的校验和类型"
 
+#: ../include/svn_error_codes.h:215
 msgid "Invalid character in hex checksum"
 msgstr "在 16 进制的校验和中发现无效字符"
 
+#: ../include/svn_error_codes.h:220
 msgid "Unknown string value of token"
 msgstr "未知的字符串令牌值"
 
+#: ../include/svn_error_codes.h:225
 msgid "Invalid changelist name"
 msgstr "无效的修改列表名称"
 
+#: ../include/svn_error_codes.h:231
 msgid "No such XML tag attribute"
 msgstr "没有这种 XML 标签属性"
 
+#: ../include/svn_error_codes.h:235
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> 没有祖先"
 
+#: ../include/svn_error_codes.h:239
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "无法识别的二进制数据编码: 无法解码"
 
+#: ../include/svn_error_codes.h:243
 msgid "XML data was not well-formed"
 msgstr "XML 数据语法错误"
 
+#: ../include/svn_error_codes.h:247
 msgid "Data cannot be safely XML-escaped"
 msgstr "XML 数据不能正确解码"
 
+#: ../include/svn_error_codes.h:253
 msgid "Inconsistent line ending style"
 msgstr "不一致的行结束样式"
 
+#: ../include/svn_error_codes.h:257
 msgid "Unrecognized line ending style"
 msgstr "无法识别的行结束样式"
 
+#: ../include/svn_error_codes.h:262
 msgid "Line endings other than expected"
 msgstr "行意外结束"
 
+#: ../include/svn_error_codes.h:266
 msgid "Ran out of unique names"
 msgstr "唯一名称耗尽"
 
+#: ../include/svn_error_codes.h:271
 msgid "Framing error in pipe protocol"
 msgstr "管道协议中帧错误"
 
+#: ../include/svn_error_codes.h:276
 msgid "Read error in pipe"
 msgstr "管道读取错误"
 
+#: ../include/svn_error_codes.h:280 ../libsvn_subr/cmdline.c:346
+#: ../libsvn_subr/cmdline.c:369 ../svn/util.c:929 ../svnlook/main.c:1836
 #, c-format
 msgid "Write error"
 msgstr "写入错误"
 
+#: ../include/svn_error_codes.h:285
 msgid "Write error in pipe"
 msgstr "管道写入错误"
 
+#: ../include/svn_error_codes.h:291
 msgid "Unexpected EOF on stream"
 msgstr "流意外结束"
 
+#: ../include/svn_error_codes.h:295
 msgid "Malformed stream data"
 msgstr "非法流数据"
 
+#: ../include/svn_error_codes.h:299
 msgid "Unrecognized stream data"
 msgstr "无法识别的流数据"
 
+#: ../include/svn_error_codes.h:304
 msgid "Stream doesn't support seeking"
 msgstr "流不支持定位操作"
 
+#: ../include/svn_error_codes.h:310
 msgid "Unknown svn_node_kind"
 msgstr "未知的 svn_node_kind"
 
+#: ../include/svn_error_codes.h:314
 msgid "Unexpected node kind found"
 msgstr "发现意外节点种类"
 
+#: ../include/svn_error_codes.h:320
 msgid "Can't find an entry"
 msgstr "无法找到条目"
 
+#: ../include/svn_error_codes.h:326
 msgid "Entry already exists"
 msgstr "条目已存在"
 
+#: ../include/svn_error_codes.h:330
 msgid "Entry has no revision"
 msgstr "条目没有版本"
 
+#: ../include/svn_error_codes.h:334
 msgid "Entry has no URL"
 msgstr "入口没有 URL"
 
+#: ../include/svn_error_codes.h:338
 msgid "Entry has an invalid attribute"
 msgstr "条目有无效属性"
 
+#: ../include/svn_error_codes.h:342
 msgid "Can't create an entry for a forbidden name"
 msgstr "不能为禁用的名称创建条目"
 
+#: ../include/svn_error_codes.h:348
 msgid "Obstructed update"
 msgstr "更新阻塞"
 
+#: ../include/svn_error_codes.h:353
 msgid "Mismatch popping the WC unwind stack"
 msgstr "不匹配的弹出工作副本展开堆栈"
 
+#: ../include/svn_error_codes.h:358
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "试图弹出空的工作副本展开堆栈"
 
+#: ../include/svn_error_codes.h:363
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "试图解锁非空展开堆栈"
 
+#: ../include/svn_error_codes.h:367
 msgid "Attempted to lock an already-locked dir"
 msgstr "试图锁定已加锁的目录"
 
+#: ../include/svn_error_codes.h:371
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "工作副本没有锁定;这可能是一个漏洞,请报告"
 
+#: ../include/svn_error_codes.h:376
 msgid "Invalid lock"
 msgstr "无效锁"
 
+#: ../include/svn_error_codes.h:382 ../include/svn_error_codes.h:388
 msgid "Path is not a working copy directory"
 msgstr "路径不是工作副本目录"
 
+#: ../include/svn_error_codes.h:392
 msgid "Path is not a working copy file"
 msgstr "路径不是工作副本文件"
 
+#: ../include/svn_error_codes.h:396
 msgid "Problem running log"
 msgstr "执行日志出错"
 
+#: ../include/svn_error_codes.h:400
 msgid "Can't find a working copy path"
 msgstr "找不到工作副本路径"
 
+#: ../include/svn_error_codes.h:404
 msgid "Working copy is not up-to-date"
 msgstr "工作副本没有更新到最新版本"
 
+#: ../include/svn_error_codes.h:408
 msgid "Left locally modified or unversioned files"
 msgstr "保留本地修改或未纳入版本控制的文件"
 
+#: ../include/svn_error_codes.h:412
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "条目有无法合并的调度"
 
+#: ../include/svn_error_codes.h:416
 msgid "Found a working copy path"
 msgstr "找到一个工作副本路径"
 
+#: ../include/svn_error_codes.h:420
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "工作副本中的冲突阻止了当前操作"
 
+#: ../include/svn_error_codes.h:424
 msgid "Working copy is corrupt"
 msgstr "工作副本已损坏"
 
+#: ../include/svn_error_codes.h:428
 msgid "Working copy text base is corrupt"
 msgstr "工作副本的参考文件损坏"
 
+#: ../include/svn_error_codes.h:432
 msgid "Cannot change node kind"
 msgstr "无法修改节点类型"
 
+#: ../include/svn_error_codes.h:436
 msgid "Invalid operation on the current working directory"
 msgstr "操作对当前工作目录无效"
 
+#: ../include/svn_error_codes.h:440
 msgid "Problem on first log entry in a working copy"
 msgstr "操作工作副本的第一个日志条目出错"
 
+#: ../include/svn_error_codes.h:444
 msgid "Unsupported working copy format"
 msgstr "不支持此工作副本格式"
 
+#: ../include/svn_error_codes.h:448
 msgid "Path syntax not supported in this context"
 msgstr "此上下文不支持路径语法"
 
+#: ../include/svn_error_codes.h:453
 msgid "Invalid schedule"
 msgstr "无效的调度"
 
+#: ../include/svn_error_codes.h:458
 msgid "Invalid relocation"
 msgstr "无效重定位"
 
+#: ../include/svn_error_codes.h:463
 msgid "Invalid switch"
 msgstr "无效的切换"
 
+#: ../include/svn_error_codes.h:468
 msgid "Changelist doesn't match"
 msgstr "修改列表不匹配"
 
+#: ../include/svn_error_codes.h:473
 msgid "Conflict resolution failed"
 msgstr "解决冲突失败"
 
+#: ../include/svn_error_codes.h:477
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "在工作副本中定位 “copyfrom” 的路径失败。"
 
+#: ../include/svn_error_codes.h:485
 msgid "Moving a path from one changelist to another"
 msgstr "将路径从一个修改列表移到另一个"
 
+#: ../include/svn_error_codes.h:490
 msgid "Cannot delete a file external"
 msgstr "无法删除外部文件"
 
+#: ../include/svn_error_codes.h:495
 msgid "Cannot move a file external"
 msgstr "无法移动外部文件"
 
+#: ../include/svn_error_codes.h:500
 msgid "Something's amiss with the wc sqlite database"
 msgstr "工作副本的 SQLite 数据库有错误"
 
+#: ../include/svn_error_codes.h:505
 msgid "The working copy is missing"
 msgstr "工作副本丢失"
 
+#: ../include/svn_error_codes.h:510
 msgid "The specified node is not a symlink"
 msgstr "指定的节点不是符号连接"
 
+#: ../include/svn_error_codes.h:515
 msgid "The specified path has an unexpected status"
 msgstr "指定的路径有不期望的状态"
 
+#: ../include/svn_error_codes.h:520
 msgid "The working copy needs to be upgraded"
 msgstr "工作副本需要升级"
 
-msgid "Previous operation has not finished; run 'cleanup' if it was interrupted"
+#: ../include/svn_error_codes.h:525
+msgid ""
+"Previous operation has not finished; run 'cleanup' if it was interrupted"
 msgstr "以前的操作没有完成;如果它被中断,请执行“svn cleanup”"
 
+#: ../include/svn_error_codes.h:531
 msgid "The operation can not be performed with the specified depth"
 msgstr "在指定的深度不能执行此操作"
 
+#: ../include/svn_error_codes.h:536
 msgid "Couldn't open a working copy file because access was denied"
 msgstr "不能打开工作副本文件,访问被拒绝"
 
+#: ../include/svn_error_codes.h:542
 msgid "General filesystem error"
 msgstr "普通文件系统错误"
 
+#: ../include/svn_error_codes.h:546
 msgid "Error closing filesystem"
 msgstr "关闭文件系统出错"
 
+#: ../include/svn_error_codes.h:550
 msgid "Filesystem is already open"
 msgstr "文件系统已经打开"
 
+#: ../include/svn_error_codes.h:554
 msgid "Filesystem is not open"
 msgstr "文件系统尚未打开"
 
+#: ../include/svn_error_codes.h:558
 msgid "Filesystem is corrupt"
 msgstr "文件系统损坏"
 
+#: ../include/svn_error_codes.h:562
 msgid "Invalid filesystem path syntax"
 msgstr "无效文件系统路径语法"
 
+#: ../include/svn_error_codes.h:566
 msgid "Invalid filesystem revision number"
 msgstr "无效文件系统版本号"
 
+#: ../include/svn_error_codes.h:570
 msgid "Invalid filesystem transaction name"
 msgstr "无效的文件系统事务名称"
 
+#: ../include/svn_error_codes.h:574
 msgid "Filesystem directory has no such entry"
 msgstr "文件系统目录没有此条目"
 
+#: ../include/svn_error_codes.h:578
 msgid "Filesystem has no such representation"
 msgstr "文件系统没有此修订版"
 
+#: ../include/svn_error_codes.h:582
 msgid "Filesystem has no such string"
 msgstr "文件系统没有此字符串"
 
+#: ../include/svn_error_codes.h:586
 msgid "Filesystem has no such copy"
 msgstr "文件系统此副本"
 
+#: ../include/svn_error_codes.h:590
 msgid "The specified transaction is not mutable"
 msgstr "指定的事务不可改变"
 
+#: ../include/svn_error_codes.h:594
 msgid "Filesystem has no item"
 msgstr "文件系统没有条目"
 
+#: ../include/svn_error_codes.h:598
 msgid "Filesystem has no such node-rev-id"
 msgstr "文件系统没有此 node-rev-id"
 
+#: ../include/svn_error_codes.h:602
 msgid "String does not represent a node or node-rev-id"
 msgstr "字符串不是节点或 node-rev-id"
 
+#: ../include/svn_error_codes.h:606
 msgid "Name does not refer to a filesystem directory"
 msgstr "文件系统无此目录"
 
+#: ../include/svn_error_codes.h:610
 msgid "Name does not refer to a filesystem file"
 msgstr "文件系统无此文件"
 
+#: ../include/svn_error_codes.h:614
 msgid "Name is not a single path component"
 msgstr "名称不是单一路径"
 
+#: ../include/svn_error_codes.h:618
 msgid "Attempt to change immutable filesystem node"
 msgstr "试图修改不变的文件系统节点"
 
+#: ../include/svn_error_codes.h:622
 msgid "Item already exists in filesystem"
 msgstr "文件系统已有此条目"
 
+#: ../include/svn_error_codes.h:626
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "试图删除或重建文件系统根目录"
 
+#: ../include/svn_error_codes.h:630
 msgid "Object is not a transaction root"
 msgstr "对象不是事务的根"
 
+#: ../include/svn_error_codes.h:634
 msgid "Object is not a revision root"
 msgstr "对象不是版本的根"
 
+#: ../include/svn_error_codes.h:638
 msgid "Merge conflict during commit"
 msgstr "提交时发生合并冲突"
 
+#: ../include/svn_error_codes.h:642
 msgid "A representation vanished or changed between reads"
 msgstr "读取时修订版消失或改变"
 
+#: ../include/svn_error_codes.h:646
 msgid "Tried to change an immutable representation"
 msgstr "试图修改不变的修订版"
 
+#: ../include/svn_error_codes.h:650
 msgid "Malformed skeleton data"
 msgstr "非法骨架数据"
 
+#: ../include/svn_error_codes.h:654
 msgid "Transaction is out of date"
 msgstr "事务过时"
 
+#: ../include/svn_error_codes.h:658
 msgid "Berkeley DB error"
 msgstr "BDB 错误"
 
+#: ../include/svn_error_codes.h:662
 msgid "Berkeley DB deadlock error"
 msgstr "BDB 死锁"
 
+#: ../include/svn_error_codes.h:666
 msgid "Transaction is dead"
 msgstr "事务已经结束"
 
+#: ../include/svn_error_codes.h:670
 msgid "Transaction is not dead"
 msgstr "事务尚未结束"
 
+#: ../include/svn_error_codes.h:675
 msgid "Unknown FS type"
 msgstr "未知的FS类型"
 
+#: ../include/svn_error_codes.h:680
 msgid "No user associated with filesystem"
 msgstr "没有用户与文件系统关联"
 
+#: ../include/svn_error_codes.h:685
 msgid "Path is already locked"
 msgstr "已经锁定路径"
 
+#: ../include/svn_error_codes.h:690 ../include/svn_error_codes.h:852
 msgid "Path is not locked"
 msgstr "路径没有加锁"
 
+#: ../include/svn_error_codes.h:695
 msgid "Lock token is incorrect"
 msgstr "不正确的锁定令牌"
 
+#: ../include/svn_error_codes.h:700
 msgid "No lock token provided"
 msgstr "没有提供锁定令牌"
 
+#: ../include/svn_error_codes.h:705
 msgid "Username does not match lock owner"
 msgstr "用户不是锁所有者"
 
+#: ../include/svn_error_codes.h:710
 msgid "Filesystem has no such lock"
 msgstr "文件系统没有此锁"
 
+#: ../include/svn_error_codes.h:715
 msgid "Lock has expired"
 msgstr "锁过期"
 
+#: ../include/svn_error_codes.h:720 ../include/svn_error_codes.h:839
 msgid "Item is out of date"
 msgstr "条目过时"
 
+#: ../include/svn_error_codes.h:732
 msgid "Unsupported FS format"
 msgstr "不支持的文件系统格式"
 
+#: ../include/svn_error_codes.h:737
 msgid "Representation is being written"
 msgstr "正在写修订版"
 
+#: ../include/svn_error_codes.h:742
 msgid "The generated transaction name is too long"
 msgstr "产生的事务名称太长"
 
+#: ../include/svn_error_codes.h:747
 msgid "Filesystem has no such node origin record"
 msgstr "文件系统没有此节点的原始记录"
 
+#: ../include/svn_error_codes.h:752
 msgid "Filesystem upgrade is not supported"
 msgstr "不支持文件系统升级"
 
+#: ../include/svn_error_codes.h:757
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "文件系统没有此校验和展现索引记录"
 
+#: ../include/svn_error_codes.h:762
 msgid "Property value in filesystem differs from the provided base value"
 msgstr "文件系统中的属性值与提供的基础值不同"
 
+#: ../include/svn_error_codes.h:769
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "版本库被锁,可能正在恢复"
 
+#: ../include/svn_error_codes.h:773
 msgid "A repository hook failed"
 msgstr "版本库钩子错误"
 
+#: ../include/svn_error_codes.h:777
 msgid "Incorrect arguments supplied"
 msgstr "提供了不正确的参数"
 
+#: ../include/svn_error_codes.h:781
 msgid "A report cannot be generated because no data was supplied"
 msgstr "没有数据,无法产生报告"
 
+#: ../include/svn_error_codes.h:785
 msgid "Bogus revision report"
 msgstr "版本报告非法"
 
+#: ../include/svn_error_codes.h:794
 msgid "Unsupported repository version"
 msgstr "不支持此版本库版本"
 
+#: ../include/svn_error_codes.h:798
 msgid "Disabled repository feature"
 msgstr "关闭版本库特性"
 
+#: ../include/svn_error_codes.h:802
 msgid "Error running post-commit hook"
 msgstr "执行 post-commit 钩子错误"
 
+#: ../include/svn_error_codes.h:807
 msgid "Error running post-lock hook"
 msgstr "执行 post-lock 钩子错误"
 
+#: ../include/svn_error_codes.h:812
 msgid "Error running post-unlock hook"
 msgstr "执行 post-unlock 钩子错误"
 
+#: ../include/svn_error_codes.h:817
 msgid "Repository upgrade is not supported"
 msgstr "不支持版本库升级"
 
+#: ../include/svn_error_codes.h:823
 msgid "Bad URL passed to RA layer"
 msgstr "传递至 RA 层的 URL 错误"
 
+#: ../include/svn_error_codes.h:827
 msgid "Authorization failed"
 msgstr "认证失败"
 
+#: ../include/svn_error_codes.h:831
 msgid "Unknown authorization method"
 msgstr "未知认证"
 
+#: ../include/svn_error_codes.h:835
 msgid "Repository access method not implemented"
 msgstr "版本库未实现存取方法"
 
+#: ../include/svn_error_codes.h:843
 msgid "Repository has no UUID"
 msgstr "版本库没有 UUID"
 
+#: ../include/svn_error_codes.h:847
 msgid "Unsupported RA plugin ABI version"
 msgstr "不支持此 RA 插件的 ABI 版本"
 
+#: ../include/svn_error_codes.h:857
 msgid "Server can only replay from the root of a repository"
 msgstr "服务器只能从版本库的根重放"
 
+#: ../include/svn_error_codes.h:862
 msgid "Repository UUID does not match expected UUID"
 msgstr "版本库的 UUID 与期望的 UUID 不匹配"
 
+#: ../include/svn_error_codes.h:867
 msgid "Repository root URL does not match expected root URL"
 msgstr "版本库根 URL 与期望的根 URL 不匹配"
 
+#: ../include/svn_error_codes.h:872
 msgid "Session URL does not match expected session URL"
 msgstr "会话 URL 与期望的会话 URL 不匹配"
 
+#: ../include/svn_error_codes.h:878
 msgid "RA layer failed to init socket layer"
 msgstr "RA 层无法初始化 socket 层"
 
+#: ../include/svn_error_codes.h:882
 msgid "RA layer failed to create HTTP request"
 msgstr "RA 层创建 HTTP 请求失败"
 
+#: ../include/svn_error_codes.h:886
 msgid "RA layer request failed"
 msgstr "RA 层请求失败"
 
+#: ../include/svn_error_codes.h:890
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA 层无法取得请求的 OPTIONS 信息"
 
+#: ../include/svn_error_codes.h:894
 msgid "RA layer failed to fetch properties"
 msgstr "RA 层无法取得属性"
 
+#: ../include/svn_error_codes.h:898
 msgid "RA layer file already exists"
 msgstr "RA 层文件已经存在"
 
+#: ../include/svn_error_codes.h:912
 msgid "HTTP Path Not Found"
 msgstr "找不到 HTTP 路径"
 
+#: ../include/svn_error_codes.h:916
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "执行 WebDAV PROPPATCH 失败"
 
+#: ../include/svn_error_codes.h:921 ../include/svn_error_codes.h:972
+#: ../libsvn_ra_svn/marshal.c:712 ../libsvn_ra_svn/marshal.c:830
+#: ../libsvn_ra_svn/marshal.c:857
 msgid "Malformed network data"
 msgstr "非法网络数据"
 
+#: ../include/svn_error_codes.h:926
 msgid "Unable to extract data from response header"
 msgstr "不能从响应的头信息中获取数据"
 
+#: ../include/svn_error_codes.h:931
 msgid "Repository has been moved"
 msgstr "版本库已经移动"
 
+#: ../include/svn_error_codes.h:936 ../libsvn_ra_serf/replay.c:860
+#: ../libsvn_ra_serf/update.c:2410 ../libsvn_ra_serf/util.c:704
 msgid "Connection timed out"
 msgstr "连接超时"
 
+#: ../include/svn_error_codes.h:941
 msgid "URL access forbidden for unknown reason"
 msgstr "因为未知的理由,禁止访问 URL"
 
+#: ../include/svn_error_codes.h:947 ../include/svn_error_codes.h:976
 msgid "Couldn't find a repository"
 msgstr "无法找到版本库"
 
+#: ../include/svn_error_codes.h:951
 msgid "Couldn't open a repository"
 msgstr "无法打开版本库"
 
+#: ../include/svn_error_codes.h:956
 msgid "Special code for wrapping server errors to report to client"
 msgstr "用专用代码封装服务器错误以便报告客户端"
 
+#: ../include/svn_error_codes.h:960
 msgid "Unknown svn protocol command"
 msgstr "未知的 svn 协议命令"
 
+#: ../include/svn_error_codes.h:964
 msgid "Network connection closed unexpectedly"
 msgstr "网络连接意外关闭"
 
+#: ../include/svn_error_codes.h:968
 msgid "Network read/write error"
 msgstr "网络读写错误"
 
+#: ../include/svn_error_codes.h:980
 msgid "Client/server version mismatch"
 msgstr "客户端/服务器版本不匹配"
 
+#: ../include/svn_error_codes.h:985
 msgid "Cannot negotiate authentication mechanism"
 msgstr "无法协商认证机制"
 
+#: ../include/svn_error_codes.h:990
 msgid "Editor drive was aborted"
 msgstr "编辑器中止"
 
+#: ../include/svn_error_codes.h:996
 msgid "Initialization of SSPI library failed"
 msgstr "初始化 SSPI 库失败"
 
+#: ../include/svn_error_codes.h:1000
 msgid "Server SSL certificate untrusted"
 msgstr "服务器的 SSL 证书不被信任"
 
+#: ../include/svn_error_codes.h:1004
 msgid "Initialization of the GSSAPI context failed"
 msgstr "初始化 GSSAPI 失败"
 
+#: ../include/svn_error_codes.h:1009
 msgid "While handling serf response:"
 msgstr "当处理 serf 的响应时:"
 
+#: ../include/svn_error_codes.h:1017
 msgid "Credential data unavailable"
 msgstr "无法取得凭证数据"
 
+#: ../include/svn_error_codes.h:1021
 msgid "No authentication provider available"
 msgstr "没有可用的认证提供者"
 
+#: ../include/svn_error_codes.h:1025
 msgid "All authentication providers exhausted"
 msgstr "所有的认证提供者都不可用"
 
+#: ../include/svn_error_codes.h:1029
 msgid "Credentials not saved"
 msgstr "没有保存凭证数据"
 
+#: ../include/svn_error_codes.h:1034
 msgid "Authentication failed"
 msgstr "认证失败"
 
+#: ../include/svn_error_codes.h:1040
 msgid "Read access denied for root of edit"
 msgstr "编辑根目录时拒绝读取"
 
+#: ../include/svn_error_codes.h:1045
 msgid "Item is not readable"
 msgstr "条目不可读"
 
+#: ../include/svn_error_codes.h:1050
 msgid "Item is partially readable"
 msgstr "条目部分可读"
 
+#: ../include/svn_error_codes.h:1054
 msgid "Invalid authz configuration"
 msgstr "认证配置无效"
 
+#: ../include/svn_error_codes.h:1059
 msgid "Item is not writable"
 msgstr "条目不能写"
 
+#: ../include/svn_error_codes.h:1065
 msgid "Svndiff data has invalid header"
 msgstr "svndiff 数据包含无效头"
 
+#: ../include/svn_error_codes.h:1069
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff 数据包含损坏窗口"
 
+#: ../include/svn_error_codes.h:1073
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
+#: ../include/svn_error_codes.h:1077
 msgid "Svndiff data contains invalid instruction"
 msgstr "svndiff 数据包含无效指令"
 
+#: ../include/svn_error_codes.h:1081
 msgid "Svndiff data ends unexpectedly"
 msgstr "svndiff 数据意外结束"
 
+#: ../include/svn_error_codes.h:1085
 msgid "Svndiff compressed data is invalid"
 msgstr "非法 svndiff 压缩数据"
 
+#: ../include/svn_error_codes.h:1091
 msgid "Diff data source modified unexpectedly"
 msgstr "svndiff 数据被意外修改"
 
+#: ../include/svn_error_codes.h:1097
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache 没有指向 SVN 文件系统的路径"
 
+#: ../include/svn_error_codes.h:1101
 msgid "Apache got a malformed URI"
 msgstr "Apache 得到非法 URI"
 
+#: ../include/svn_error_codes.h:1105
 msgid "Activity not found"
 msgstr "没有找到活动项"
 
+#: ../include/svn_error_codes.h:1109
 msgid "Baseline incorrect"
 msgstr "基线错误"
 
+#: ../include/svn_error_codes.h:1113
 msgid "Input/output error"
 msgstr "输出/输出错误"
 
+#: ../include/svn_error_codes.h:1119
 msgid "A path under version control is needed for this operation"
 msgstr "只能对纳入版本控制的路径执行此操作"
 
+#: ../include/svn_error_codes.h:1123
 msgid "Repository access is needed for this operation"
 msgstr "此操作需要存取版本库"
 
+#: ../include/svn_error_codes.h:1127
 msgid "Bogus revision information given"
 msgstr "给出的版本信息非法"
 
+#: ../include/svn_error_codes.h:1131
 msgid "Attempting to commit to a URL more than once"
 msgstr "试图对 URL 进行多次提交"
 
+#: ../include/svn_error_codes.h:1135
 msgid "Operation does not apply to binary file"
 msgstr "不能对二进制文件执行此操作"
 
+#: ../include/svn_error_codes.h:1141
 msgid "Format of an svn:externals property was invalid"
 msgstr "svn:externals 属性格式非法"
 
+#: ../include/svn_error_codes.h:1145
 msgid "Attempting restricted operation for modified resource"
 msgstr "试图对已修改的资源进行受限操作"
 
+#: ../include/svn_error_codes.h:1149
 msgid "Operation does not apply to directory"
 msgstr "不能对目录执行此操作"
 
+#: ../include/svn_error_codes.h:1153
 msgid "Revision range is not allowed"
 msgstr "不允许的版本范围"
 
+#: ../include/svn_error_codes.h:1157
 msgid "Inter-repository relocation not allowed"
 msgstr "不支持版本库之间的重新定位"
 
+#: ../include/svn_error_codes.h:1161
 msgid "Author name cannot contain a newline"
 msgstr "作者名称不能换行"
 
+#: ../include/svn_error_codes.h:1165
 msgid "Bad property name"
 msgstr "属性名称错误"
 
+#: ../include/svn_error_codes.h:1170
 msgid "Two versioned resources are unrelated"
 msgstr "两个纳入版本控制的资源不相关"
 
+#: ../include/svn_error_codes.h:1175
 msgid "Path has no lock token"
 msgstr "路径没有锁定令牌"
 
+#: ../include/svn_error_codes.h:1180
 msgid "Operation does not support multiple sources"
 msgstr "此操作不支持多个源对象"
 
+#: ../include/svn_error_codes.h:1185
 msgid "No versioned parent directories"
 msgstr "没有受版本控制的父目录"
 
+#: ../include/svn_error_codes.h:1190 ../include/svn_error_codes.h:1210
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "工作副本与合并来源没有准备好复兴"
 
+#: ../include/svn_error_codes.h:1195
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr "外部引用的文件不能覆写已存的版本控制的条目"
 
+#: ../include/svn_error_codes.h:1200
 msgid "Invalid path component strip count specified"
 msgstr "指定了无效的路径组件修剪计数"
 
+#: ../include/svn_error_codes.h:1205
 msgid "Detected a cycle while processing the operation"
 msgstr "当处理此操作是,检测到死循环"
 
+#: ../include/svn_error_codes.h:1215
 msgid "Invalid mergeinfo detected in merge target"
 msgstr "在合并目标检测到了合并信息"
 
+#: ../include/svn_error_codes.h:1220
 msgid "Can't perform this operation without a valid lock token"
 msgstr "不能在没有合法的锁令牌时执行此操作"
 
+#: ../include/svn_error_codes.h:1225
 msgid "The operation is forbidden by the server"
 msgstr "操作被服务器禁止"
 
+#: ../include/svn_error_codes.h:1231
 msgid "A problem occurred; see other errors for details"
 msgstr "发生问题;请参阅其它错误信息"
 
+#: ../include/svn_error_codes.h:1235
 msgid "Failure loading plugin"
 msgstr "加载插件失败"
 
+#: ../include/svn_error_codes.h:1239
 msgid "Malformed file"
 msgstr "文件格式错误"
 
+#: ../include/svn_error_codes.h:1243
 msgid "Incomplete data"
 msgstr "数据不完整"
 
+#: ../include/svn_error_codes.h:1247
 msgid "Incorrect parameters given"
 msgstr "参数不正确"
 
+#: ../include/svn_error_codes.h:1251
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "试图对未纳入版本控制的资源进行版本操作"
 
+#: ../include/svn_error_codes.h:1255
 msgid "Test failed"
 msgstr "测试失败"
 
+#: ../include/svn_error_codes.h:1259
 msgid "Trying to use an unsupported feature"
 msgstr "试图使用不支持的特性"
 
+#: ../include/svn_error_codes.h:1263
 msgid "Unexpected or unknown property kind"
 msgstr "意外或未知的属性类型"
 
+#: ../include/svn_error_codes.h:1267
 msgid "Illegal target for the requested operation"
 msgstr "此请求操作的目标非法"
 
+#: ../include/svn_error_codes.h:1271
 msgid "MD5 checksum is missing"
 msgstr "没有 MD5 校验和"
 
+#: ../include/svn_error_codes.h:1275
 msgid "Directory needs to be empty but is not"
 msgstr "必须为空的目录有内容"
 
+#: ../include/svn_error_codes.h:1279
 msgid "Error calling external program"
 msgstr "调用外部程序错误"
 
+#: ../include/svn_error_codes.h:1283
 msgid "Python exception has been set with the error"
 msgstr "Python 异常被设为错误"
 
+#: ../include/svn_error_codes.h:1287
 msgid "A checksum mismatch occurred"
 msgstr "校验和错误"
 
+#: ../include/svn_error_codes.h:1291
 msgid "The operation was interrupted"
 msgstr "操作被中断"
 
+#: ../include/svn_error_codes.h:1295
 msgid "The specified diff option is not supported"
 msgstr "不支持指定的 diff 选项"
 
+#: ../include/svn_error_codes.h:1299
 msgid "Property not found"
 msgstr "找不到属性"
 
+#: ../include/svn_error_codes.h:1303
 msgid "No auth file path available"
 msgstr "未提供 auth 文件路径"
 
+#: ../include/svn_error_codes.h:1308
 msgid "Incompatible library version"
 msgstr "不兼容的库版本"
 
+#: ../include/svn_error_codes.h:1313
 msgid "Mergeinfo parse error"
 msgstr "分析合并信息出错"
 
+#: ../include/svn_error_codes.h:1318
 msgid "Cease invocation of this API"
 msgstr "停止调用此 API"
 
+#: ../include/svn_error_codes.h:1323
 msgid "Error parsing revision number"
 msgstr "解析版本号出错"
 
+#: ../include/svn_error_codes.h:1328
 msgid "Iteration terminated before completion"
 msgstr "迭代在完成前终止"
 
+#: ../include/svn_error_codes.h:1333
 msgid "Unknown changelist"
 msgstr "未知修改列表"
 
+#: ../include/svn_error_codes.h:1338
 msgid "Reserved directory name in command line arguments"
 msgstr "在命令行参数中包含保留的目录名称"
 
+#: ../include/svn_error_codes.h:1343
 msgid "Inquiry about unknown capability"
 msgstr "查询未知特性"
 
+#: ../include/svn_error_codes.h:1348
 msgid "Test skipped"
 msgstr "跳过测试"
 
+#: ../include/svn_error_codes.h:1353
 msgid "apr memcache library not available"
 msgstr "apr memcache 库不可用"
 
+#: ../include/svn_error_codes.h:1358
 msgid "Couldn't perform atomic initialization"
 msgstr "不能完成原子的初始化"
 
+#: ../include/svn_error_codes.h:1363
 msgid "SQLite error"
 msgstr "SQLite 错误"
 
+#: ../include/svn_error_codes.h:1368
 msgid "Attempted to write to readonly SQLite db"
 msgstr "试图写至只读 SQLite 数据库"
 
+#: ../include/svn_error_codes.h:1373
 msgid "Unsupported schema found in SQLite db"
 msgstr "不支持 SQLite 数据库中的方案"
 
+#: ../include/svn_error_codes.h:1378
 msgid "The SQLite db is busy"
 msgstr "SQLite 数据库繁忙"
 
-msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
+#: ../include/svn_error_codes.h:1383
+msgid ""
+"SQLite busy at transaction rollback; resetting all busy SQLite statements to "
+"allow rollback"
 msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句,以便允许回滚"
 
+#: ../include/svn_error_codes.h:1389
 msgid "Constraint error in SQLite db"
 msgstr "在 SQLite 数据库中的约束出错"
 
+#: ../include/svn_error_codes.h:1395
 msgid "Error parsing arguments"
 msgstr "解析参数出错"
 
+#: ../include/svn_error_codes.h:1399
 msgid "Not enough arguments provided"
 msgstr "没有提供足够的参数"
 
+#: ../include/svn_error_codes.h:1403
 msgid "Mutually exclusive arguments specified"
 msgstr "参数冲突"
 
+#: ../include/svn_error_codes.h:1407
 msgid "Attempted command in administrative dir"
 msgstr "试图在管理目录中执行命令"
 
+#: ../include/svn_error_codes.h:1411
 msgid "The log message file is under version control"
 msgstr "日志信息文件被纳入版本控制"
 
+#: ../include/svn_error_codes.h:1415
 msgid "The log message is a pathname"
 msgstr "日志信息是路径名"
 
+#: ../include/svn_error_codes.h:1419
 msgid "Committing in directory scheduled for addition"
 msgstr "在调度增加的目录中进行提交"
 
+#: ../include/svn_error_codes.h:1423
 msgid "No external editor available"
 msgstr "没有外部编辑器可用"
 
+#: ../include/svn_error_codes.h:1427
 msgid "Something is wrong with the log message's contents"
 msgstr "日志信息内容不妥"
 
+#: ../include/svn_error_codes.h:1431
 msgid "A log message was given where none was necessary"
 msgstr "在不需要时给出日志信息"
 
+#: ../include/svn_error_codes.h:1435
 msgid "No external merge tool available"
 msgstr "没有外部合并工具可用"
 
+#: ../include/svn_error_codes.h:1439
 msgid "Failed processing one or more externals definitions"
 msgstr "处理一个或更多的外部定义失败"
 
+#: ../include/svn_error_codes.h:1445
 msgid "Assertion failure"
 msgstr "断言失败"
 
+#: ../include/svn_error_codes.h:1449
 msgid "No non-tracing links found in the error chain"
 msgstr "没有发现错误链中的非跟踪链接"
 
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:273
 msgid "GNOME Keyring is locked and we are non-interactive"
 msgstr "GNOME Keyring 被锁定,并且我们处于非交互方式"
 
+#: ../libsvn_client/add.c:550
 #, c-format
 msgid "'%s' prevents creating parent of '%s'"
 msgstr "'%s' 阻止创建 '%s' 的父亲"
 
+#: ../libsvn_client/add.c:587 ../libsvn_wc/adm_ops.c:918
 #, c-format
-msgid "'%s' is an existing item in conflict; please mark the conflict as resolved before adding a new item here"
+msgid ""
+"'%s' is an existing item in conflict; please mark the conflict as resolved "
+"before adding a new item here"
 msgstr "条目“%s”处于冲突状态;请在新增之前标记冲突为已经解决"
 
+#: ../libsvn_client/add.c:594 ../libsvn_wc/adm_ops.c:873
+#: ../libsvn_wc/workqueue.c:960 ../libsvn_wc/workqueue.c:1053
 #, c-format
 msgid "'%s' not found"
 msgstr "找不到 “%s”"
 
+#: ../libsvn_client/add.c:600 ../libsvn_wc/adm_ops.c:588
+#: ../libsvn_wc/adm_ops.c:878
 #, c-format
 msgid "Unsupported node kind for path '%s'"
 msgstr "路径 “%s” 有不支持的节点种类"
 
+#: ../libsvn_client/add.c:650 ../libsvn_client/cmdline.c:393
+#: ../libsvn_subr/opt.c:903
 #, c-format
 msgid "'%s' ends in a reserved name"
 msgstr "“%s”以保留名称结束"
 
+#: ../libsvn_client/add.c:682 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:56
+#: ../libsvn_client/cleanup.c:134 ../libsvn_client/commit.c:710
+#: ../libsvn_client/export.c:1050 ../libsvn_client/patch.c:2956
+#: ../libsvn_client/relocate.c:237 ../libsvn_client/resolved.c:54
+#: ../libsvn_client/revert.c:135 ../libsvn_client/status.c:269
+#: ../libsvn_client/switch.c:391 ../libsvn_client/update.c:590
+#: ../svn/util.c:1392
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "“%s”不是本地路径"
 
+#: ../libsvn_client/add.c:825 ../libsvn_client/add.c:852
 #, c-format
 msgid "There is no valid uri above '%s'"
 msgstr "在 '%s' 的上级没有合法的 URI"
 
+#: ../libsvn_client/blame.c:395
 #, c-format
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "无法为二进制文件 “%s” 计算追溯信息"
 
+#: ../libsvn_client/blame.c:622
 msgid "Start revision must precede end revision"
 msgstr "起始版本必须小于结束版本"
 
+#: ../libsvn_client/cat.c:75 ../libsvn_client/commit_util.c:1119
+#: ../libsvn_client/delete.c:65 ../libsvn_client/prop_commands.c:846
+#: ../libsvn_client/prop_commands.c:1141 ../libsvn_client/revisions.c:104
+#: ../libsvn_wc/adm_ops.c:2354 ../libsvn_wc/adm_ops.c:2389
+#: ../libsvn_wc/copy.c:611 ../libsvn_wc/entries.c:1285
+#: ../libsvn_wc/entries.c:2566 ../libsvn_wc/entries.c:2597 ../svn/notify.c:980
 #, c-format
 msgid "'%s' is not under version control"
 msgstr "“%s” 尚未纳入版本控制"
 
+#: ../libsvn_client/cat.c:80
 #, c-format
 msgid "'%s' refers to a directory"
 msgstr "“%s” 引用一个目录"
 
+#: ../libsvn_client/cat.c:90
 #, c-format
 msgid "'%s' has no base revision until it is committed"
 msgstr "在提交之前,“%s”没有基础版本"
 
+#: ../libsvn_client/cat.c:154 ../libsvn_client/export.c:290
 msgid "(local)"
 msgstr "(本地)"
 
+#: ../libsvn_client/cat.c:243
 #, c-format
 msgid "URL '%s' refers to a directory"
 msgstr "URL “%s” 指向目录"
 
+#: ../libsvn_client/changelist.c:57
 msgid "Target changelist name must not be empty"
 msgstr "目标修改列表的名称不能为空"
 
+#: ../libsvn_client/checkout.c:122 ../libsvn_client/export.c:1236
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "URL “%s” 不存在"
 
+#: ../libsvn_client/checkout.c:126
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "URL “%s” 指向一个文件,不是目录"
 
+#: ../libsvn_client/checkout.c:162
 #, c-format
 msgid "'%s' is already a working copy for a different URL"
 msgstr "“%s” 已经是指向不同 URL 的工作副本"
 
+#: ../libsvn_client/checkout.c:170
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "“%s” 已经存在并且不是目录"
 
+#: ../libsvn_client/cmdline.c:78
 #, c-format
 msgid "Improper relative URL '%s'"
 msgstr "不正确的相对 URL“%s”"
 
+#: ../libsvn_client/cmdline.c:149
 #, c-format
 msgid "All non-relative targets must have the same root URL"
 msgstr "所有非相对目标必须有相同的根 URL"
 
-msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
+#: ../libsvn_client/cmdline.c:353
+msgid ""
+"Resolving '^/': no repository root found in the target arguments or in the "
+"current directory"
 msgstr "解析“^/”: 在目标参数或当前目录中找不到版本库的根"
 
+#: ../libsvn_client/commit.c:150
 #, c-format
 msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
 msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
 
+#: ../libsvn_client/commit.c:441
 #, c-format
 msgid "Unknown or unversionable type for '%s'"
 msgstr "“%s” 是未知类型或不可纳入版本控制"
 
+#: ../libsvn_client/commit.c:548
 msgid "New entry name required when importing a file"
 msgstr "导入文件时,需要一个新的条目名称"
 
+#: ../libsvn_client/commit.c:583 ../libsvn_client/patch.c:2963
+#: ../libsvn_client/patch.c:2975 ../libsvn_wc/adm_ops.c:583
+#: ../libsvn_wc/lock.c:120 ../libsvn_wc/wc_db_wcroot.c:74
 #, c-format
 msgid "'%s' does not exist"
 msgstr "“%s” 不存在"
 
+#: ../libsvn_client/commit.c:665 ../libsvn_client/copy.c:461
+#: ../libsvn_client/merge.c:9250 ../libsvn_client/merge.c:10515
+#: ../libsvn_client/merge.c:10811 ../svnlook/main.c:1451
 #, c-format
 msgid "Path '%s' does not exist"
 msgstr "路径 “%s” 不存在"
 
+#: ../libsvn_client/commit.c:799 ../libsvn_client/copy.c:512
+#: ../libsvn_client/copy.c:1043 ../libsvn_client/copy.c:1300
+#: ../libsvn_client/copy.c:1924
 #, c-format
 msgid "Path '%s' already exists"
 msgstr "路径 “%s” 已经存在"
 
+#: ../libsvn_client/commit.c:814
 #, c-format
 msgid "'%s' is a reserved name and cannot be imported"
 msgstr "“%s” 是保留名称,无法被导入"
 
+#: ../libsvn_client/commit.c:852 ../libsvn_client/copy.c:1460
 msgid "Commit failed (details follow):"
 msgstr "提交失败(细节如下): "
 
+#: ../libsvn_client/commit.c:860
 msgid "Commit succeeded, but other errors follow:"
 msgstr "提交成功,但是发生了其它错误,细节如下: "
 
+#: ../libsvn_client/commit.c:867
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "解除锁定目录出错(细节如下): "
 
+#: ../libsvn_client/commit.c:878
 msgid "Error bumping revisions post-commit (details follow):"
 msgstr "执行 post-commit 出错 (细节如下): "
 
+#: ../libsvn_client/commit.c:1005
 #, c-format
-msgid "Cannot delete the directory '%s' in a non-recursive commit because it has children"
+msgid ""
+"Cannot delete the directory '%s' in a non-recursive commit because it has "
+"children"
 msgstr "因为目录“%s”非空,因此不能在非递归提交中删除它"
 
+#: ../libsvn_client/commit.c:1219
 #, c-format
 msgid "'%s' is a URL, but URLs cannot be commit targets"
 msgstr "“%s” 是 URL,但是 URL 不可作为提交目标"
 
+#: ../libsvn_client/commit.c:1325
 msgid ""
 "Commit can only commit to a single repository at a time.\n"
 "Are all targets part of the same working copy?"
@@ -1091,336 +1448,455 @@ msgstr ""
 "每次提交只能针对一个版本库。\n"
 "是否所有目标都属于同一工作副本?"
 
+#: ../libsvn_client/commit_util.c:93 ../libsvn_repos/commit.c:138
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "目录 “%s” 已经过时"
 
+#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:140
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "文件 “%s” 已经过时"
 
+#: ../libsvn_client/commit_util.c:129
 #, c-format
 msgid "Directory '%s' is locked in another working copy"
 msgstr "目录“%s”在其它工作副本中被锁定"
 
+#: ../libsvn_client/commit_util.c:130
 #, c-format
 msgid "File '%s' is locked in another working copy"
 msgstr "文件“%s” 在其它工作副本中被锁定"
 
+#: ../libsvn_client/commit_util.c:165
 #, c-format
 msgid "Changing directory '%s' is forbidden by the server"
 msgstr "服务器禁止修改目录“%s”"
 
+#: ../libsvn_client/commit_util.c:166
 #, c-format
 msgid "Changing file '%s' is forbidden by the server"
 msgstr "服务器禁止修改文件“%s”"
 
+#: ../libsvn_client/commit_util.c:331 ../libsvn_client/commit_util.c:580
+#: ../libsvn_client/commit_util.c:1113
 #, c-format
 msgid "Aborting commit: '%s' remains in conflict"
 msgstr "提交终止: “%s” 处于冲突状态"
 
+#: ../libsvn_client/commit_util.c:375
 #, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "提交终止: “%s” 仍处于树冲突状态"
 
+#: ../libsvn_client/commit_util.c:520
 #, c-format
 msgid "Unknown entry kind for '%s'"
 msgstr "“%s” 有未知的条目类型"
 
+#: ../libsvn_client/commit_util.c:547
 #, c-format
 msgid "Entry '%s' has unexpectedly changed special status"
 msgstr "条目 “%s” 意外改变状态"
 
+#: ../libsvn_client/commit_util.c:698
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "丢失了预定增加的“%s”"
 
+#: ../libsvn_client/commit_util.c:1182
 #, c-format
-msgid "'%s' is not known to exist in the repository and is not part of the commit, yet its child '%s' is part of the commit"
-msgstr "“%s” 不在版本库中,也不是提交的一部分,但是它的子路径 “%s” 是提交的一部分"
+msgid ""
+"'%s' is not known to exist in the repository and is not part of the commit, "
+"yet its child '%s' is part of the commit"
+msgstr ""
+"“%s” 不在版本库中,也不是提交的一部分,但是它的子路径 “%s” 是提交的一部分"
 
+#: ../libsvn_client/commit_util.c:1324
 #, 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:1481
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr "提交项目 “%s” 有复制标记,但是没有源地址(copyfrom URL)"
 
+#: ../libsvn_client/commit_util.c:1486
 #, c-format
 msgid "Commit item '%s' has copy flag but an invalid revision"
 msgstr "提交项目 “%s” 有复制标志,但是版本无效"
 
+#: ../libsvn_client/commit_util.c:2249
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "标准属性不能设置为版本属性"
 
+#: ../libsvn_client/copy.c:531 ../libsvn_client/copy.c:1940
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "路径 “%s” 不是目录"
 
+#: ../libsvn_client/copy.c:700 ../libsvn_client/copy.c:741
 #, c-format
 msgid "Path '%s' already exists, but is not a directory"
 msgstr "路径 “%s” 已经存在,但不是目录"
 
+#: ../libsvn_client/copy.c:806
 msgid "Source and destination URLs appear not to point to the same repository."
 msgstr "来源与目标 URL 似乎不在同一版本库。"
 
+#: ../libsvn_client/copy.c:1031 ../libsvn_client/prop_commands.c:186
 #, c-format
 msgid "Path '%s' does not exist in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
+#: ../libsvn_client/copy.c:1598
 #, c-format
 msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
 msgstr "源 URL “%s” 来自其它版本库;把它当作脱离的工作副本"
 
+#: ../libsvn_client/copy.c:1701 ../libsvn_client/copy.c:1714
+#: ../libsvn_wc/adm_ops.c:946 ../libsvn_wc/copy.c:727
 #, c-format
 msgid "'%s' is already under version control"
 msgstr "“%s”已纳入版本控制"
 
+#: ../libsvn_client/copy.c:1735
 #, c-format
 msgid "Entry for '%s' exists (though the working file is missing)"
 msgstr "“%s” 的入口存在(尽管丢失了工作文件)"
 
+#: ../libsvn_client/copy.c:1908
 #, c-format
 msgid "Path '%s' not found in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
+#: ../libsvn_client/copy.c:1913
 #, c-format
 msgid "Path '%s' not found in head revision"
 msgstr "HEAD 版本中找不到路径 “%s”"
 
+#: ../libsvn_client/copy.c:2035
 msgid "Cannot mix repository and working copy sources"
 msgstr "不能在源中混合版本库和工作副本"
 
+#: ../libsvn_client/copy.c:2087
 #, c-format
 msgid "Cannot copy path '%s' into its own child '%s'"
 msgstr "无法复制路径 “%s” 到其子目录 “%s” 中"
 
+#: ../libsvn_client/copy.c:2123
 #, c-format
-msgid "Cannot move the external at '%s'; please edit the svn:externals property on '%s'."
+msgid ""
+"Cannot move the external at '%s'; please edit the svn:externals property on "
+"'%s'."
 msgstr "不能移动在“%s”的外部引用;请在“%s”修改属性 svn:externals property 。"
 
+#: ../libsvn_client/copy.c:2138
 msgid "Moves between the working copy and the repository are not supported"
 msgstr "不支持在工作副本和版本库之间移动"
 
+#: ../libsvn_client/copy.c:2153
 #, c-format
 msgid "Cannot move URL '%s' into itself"
 msgstr "无法移动 URL “%s” 到本身"
 
+#: ../libsvn_client/copy.c:2154
 #, c-format
 msgid "Cannot move path '%s' into itself"
 msgstr "无法移动路径 “%s” 到本身"
 
+#: ../libsvn_client/copy.c:2221
 #, c-format
 msgid "'%s' does not have a URL associated with it"
 msgstr "“%s” 没有关联的 URL"
 
+#: ../libsvn_client/delete.c:60
 #, c-format
 msgid "'%s' is in the way of the resource actually under version control"
 msgstr "“%s” 阻碍资源纳入版本控制"
 
+#: ../libsvn_client/delete.c:75
 #, c-format
 msgid "'%s' has local modifications -- commit or revert them first"
 msgstr "“%s” 已有本地修改 -- 请先提交或撤销"
 
+#: ../libsvn_client/delete.c:109
 #, c-format
-msgid "Cannot remove the external at '%s'; please edit or delete the svn:externals property on '%s'"
+msgid ""
+"Cannot remove the external at '%s'; please edit or delete the svn:externals "
+"property on '%s'"
 msgstr "不能在“%s”删除外部引用;请在“%s”修改或删除属性 svn:externals"
 
+#: ../libsvn_client/deprecated.c:785 ../svn/move-cmd.c:65
 msgid "Cannot specify revisions (except HEAD) with move operations"
 msgstr "移动操作不能指定版本"
 
+#: ../libsvn_client/deprecated.c:1402
 msgid "No commits in repository"
 msgstr "版本库中没有提交"
 
+#: ../libsvn_client/deprecated.c:2477 ../libsvn_wc/deprecated.c:3688
 msgid "Non-recursive relocation not supported"
 msgstr "不支持非递归的重新定位"
 
+#: ../libsvn_client/diff.c:136
 #, c-format
 msgid "   Reverse-merged %s:r%s%s"
 msgstr "   已经撤销合并 %s:r%s%s"
 
+#: ../libsvn_client/diff.c:151
 #, c-format
 msgid "   Merged %s:r%s%s"
 msgstr "   已经合并 %s:r%s%s"
 
+#: ../libsvn_client/diff.c:161 ../libsvn_diff/diff_file.c:1837
+#: ../libsvn_diff/diff_file.c:1853
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr "路径 “%s” 必须是目录 “%s” 的直接子孙"
 
+#: ../libsvn_client/diff.c:368
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(版本 %ld)"
 
+#: ../libsvn_client/diff.c:370
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(工作副本)"
 
+#: ../libsvn_client/diff.c:630
 #, c-format
 msgid "%sProperty changes on: %s%s"
 msgstr "%s 属性改变: %s%s"
 
+#: ../libsvn_client/diff.c:969
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "无法显示: 文件标记为二进制类型。%s"
 
+#: ../libsvn_client/diff.c:1397
 #, c-format
 msgid "Path '%s' has no URL"
 msgstr "路径 '%s' 没有 URL"
 
+#: ../libsvn_client/diff.c:1423 ../libsvn_client/merge.c:6314
+#: ../libsvn_client/merge.c:9259
 msgid "Not all required revisions are specified"
 msgstr "没有全部提供需要的版本"
 
+#: ../libsvn_client/diff.c:1438
 msgid "At least one revision must be non-local for a pegged diff"
 msgstr "对于铆钉差异,必须至少有一个非本地版本"
 
+#: ../libsvn_client/diff.c:1481
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 中"
 
+#: ../libsvn_client/diff.c:1486
 #, c-format
-msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
+msgid ""
+"Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 或 '%ld' 中"
 
+#: ../libsvn_client/diff.c:1613
 #, c-format
-msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
+msgid ""
+"Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
 
+#: ../libsvn_client/diff.c:1618
 #, c-format
-msgid "Diff targets '%s and '%s' were not found in the repository at revisions '%ld' and '%ld'"
+msgid ""
+"Diff targets '%s and '%s' were not found in the repository at revisions "
+"'%ld' and '%ld'"
 msgstr "差异目标 '%s' 与 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
 
+#: ../libsvn_client/diff.c:1731
 msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
 msgstr "抱歉,svn_client_diff5 尚不支持这种调用方式"
 
-msgid "Only diffs between a path's text-base and its working files are supported at this time"
+#: ../libsvn_client/diff.c:1774
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
 msgstr "当前 diff 只支持参考文件与其工作文件比较"
 
+#: ../libsvn_client/diff.c:1970 ../libsvn_client/switch.c:147
 #, c-format
 msgid "Directory '%s' has no URL"
 msgstr "目录 “%s” 没有 URL"
 
+#: ../libsvn_client/diff.c:2233
 msgid "Summarizing diff can only compare repository to repository"
 msgstr "只有版本库和版本库才能比较差异概要"
 
+#: ../libsvn_client/export.c:95
 #, c-format
 msgid "'%s' is not a valid EOL value"
 msgstr "“%s” 不是一个有效的 EOL 值"
 
+#: ../libsvn_client/export.c:453
 msgid "Destination directory exists, and will not be overwritten unless forced"
 msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
 
+#: ../libsvn_client/export.c:588 ../libsvn_client/export.c:1114
 #, c-format
 msgid "Destination file '%s' exists, and will not be overwritten unless forced"
 msgstr "目标文件“%s”已存在,除非强迫为之,否则不会被覆盖"
 
+#: ../libsvn_client/export.c:593 ../libsvn_client/export.c:1119
 #, c-format
 msgid "Destination '%s' exists. Cannot overwrite directory with non-directory"
 msgstr "目标“%s”已存在。不能用非目录覆盖目录"
 
+#: ../libsvn_client/export.c:631 ../libsvn_client/export.c:778
 #, c-format
 msgid "'%s' exists and is not a directory"
 msgstr "“%s” 已存在且不是目录"
 
+#: ../libsvn_client/export.c:635 ../libsvn_client/export.c:782
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s” 已存在"
 
+#: ../libsvn_client/export.c:968 ../libsvn_client/repos_diff.c:987
+#: ../libsvn_fs_fs/dag.c:1040 ../libsvn_ra_neon/fetch.c:767
+#: ../libsvn_ra_svn/client.c:1081 ../libsvn_wc/diff_editor.c:1604
+#: ../libsvn_wc/externals.c:588 ../libsvn_wc/update_editor.c:4037
 #, c-format
 msgid "Checksum mismatch for '%s'"
 msgstr "'%s' 的校验和不匹配"
 
+#: ../libsvn_client/externals.c:395
 #, c-format
-msgid "Cannot insert a file external defined on '%s' into the working copy '%s'."
+msgid ""
+"Cannot insert a file external defined on '%s' into the working copy '%s'."
 msgstr "不能将在“%s”定义的文件外部引用插入到工作副本“%s”。"
 
+#: ../libsvn_client/externals.c:428
 #, c-format
-msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
+msgid ""
+"The file external from '%s' cannot overwrite the existing versioned item at "
+"'%s'"
 msgstr "来源于 “%s” 的外部引用的文件不能覆写位于 “%s” 的已存版本控制条目"
 
+#: ../libsvn_client/externals.c:445
 #, c-format
 msgid "The file external '%s' can not be created because the node exists."
 msgstr "不能创建文件外部引用 '%s',节点已经存在。"
 
+#: ../libsvn_client/externals.c:553
 #, c-format
 msgid "URL '%s' does not begin with a scheme"
 msgstr "URL “%s” 没有以方案开始"
 
+#: ../libsvn_client/externals.c:629
 #, c-format
 msgid "Illegal parent directory URL '%s'"
 msgstr "非法父目录 URL “%s”"
 
+#: ../libsvn_client/externals.c:668
 #, c-format
 msgid "Illegal repository root URL '%s'"
 msgstr "非法版本库根 URL “%s”"
 
+#: ../libsvn_client/externals.c:713
 #, c-format
 msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
 msgstr "外部相对 URL “%s” 不能包含后退路径,例如 “..”"
 
+#: ../libsvn_client/externals.c:741
 #, c-format
 msgid "Unrecognized format for the relative external URL '%s'"
 msgstr "外部相对 URL “%s” 的格式无法识别"
 
+#: ../libsvn_client/externals.c:880
 #, c-format
 msgid "URL '%s' at revision %ld doesn't exist"
 msgstr "URL “%s” 在版本 %ld 中不存在"
 
+#: ../libsvn_client/externals.c:885
 #, c-format
 msgid "URL '%s' at revision %ld is not a file or a directory"
 msgstr "URL “%s” 在版本 %ld 中不是文件或目录"
 
+#: ../libsvn_client/externals.c:953
 #, c-format
-msgid "Unsupported external: url of file external '%s' is not in repository '%s'"
+msgid ""
+"Unsupported external: url of file external '%s' is not in repository '%s'"
 msgstr "不支持的外部定义:外部文件“%s”的 URL 不在版本库“%s”中"
 
+#: ../libsvn_client/externals.c:1145
 #, c-format
 msgid "Traversal of '%s' found no ambient depth"
 msgstr "在 “%s” 中找不到深度"
 
+#: ../libsvn_client/info.c:345
 #, c-format
-msgid "Server does not support retrieving information about the repository root"
+msgid ""
+"Server does not support retrieving information about the repository root"
 msgstr "服务器不支持取得版本库根的信息"
 
+#: ../libsvn_client/info.c:352 ../libsvn_client/info.c:367
+#: ../libsvn_client/info.c:377 ../libsvn_client/list.c:245
 #, c-format
 msgid "URL '%s' non-existent in revision %ld"
 msgstr "URL “%s” 不在版本 %ld 中"
 
+#: ../libsvn_client/locking_commands.c:260
+#: ../libsvn_client/locking_commands.c:286
 msgid "No common parent found, unable to operate on disjoint arguments"
 msgstr "没有找到公共父节点,不能在分离的参数上操作"
 
+#: ../libsvn_client/locking_commands.c:305 ../libsvn_client/merge.c:9282
+#: ../libsvn_client/merge.c:9289 ../libsvn_client/merge.c:10524
+#: ../libsvn_client/merge.c:10820 ../libsvn_client/ra.c:462
+#: ../libsvn_client/ra.c:669 ../libsvn_client/update.c:234
 #, c-format
 msgid "'%s' has no URL"
 msgstr "“%s” 没有 URL"
 
+#: ../libsvn_client/locking_commands.c:319
 msgid "Unable to lock/unlock across multiple repositories"
 msgstr "不能跨越多个版本库进行锁定/解锁"
 
+#: ../libsvn_client/locking_commands.c:367
 #, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "“%s” 没有在工作副本中锁定"
 
+#: ../libsvn_client/locking_commands.c:410
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s” 没有被锁定"
 
+#: ../libsvn_client/locking_commands.c:444 ../libsvn_fs/fs-loader.c:1265
+#: ../libsvn_ra/ra_loader.c:1067
 msgid "Lock comment contains illegal characters"
 msgstr "锁定注释包含非法字符"
 
+#: ../libsvn_client/log.c:299 ../libsvn_client/log.c:357
 msgid "Missing required revision specification"
 msgstr "未提供请求的版本"
 
+#: ../libsvn_client/log.c:406
 #, c-format
 msgid "'%s' is not a relative path"
 msgstr "'%s' 不是相对路径"
 
+#: ../libsvn_client/log.c:428
 msgid "When specifying working copy paths, only one target may be given"
 msgstr "当指定工作副本路径时,只能给出一个目标"
 
+#: ../libsvn_client/log.c:454 ../libsvn_client/status.c:359
 #, c-format
 msgid "Entry '%s' has no URL"
 msgstr "条目“%s”没有URL"
 
+#: ../libsvn_client/merge.c:307
 #, c-format
 msgid "Url '%s' of '%s' is not in repository '%s'"
 msgstr "URL“%s”(祖先“%s”)不在版本库“%s”中"
@@ -1428,20 +1904,27 @@ msgstr "URL“%s”(祖先“%s”)不�
 #. 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/merge.c:1507
 msgid ".working"
 msgstr ".working"
 
+#: ../libsvn_client/merge.c:1509
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".merge-left.r%ld"
 
+#: ../libsvn_client/merge.c:1512
 #, c-format
 msgid ".merge-right.r%ld"
 msgstr ".merge-right.r%ld"
 
-msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
+#: ../libsvn_client/merge.c:3898
+msgid ""
+"Cannot reverse-merge a range from a path's own future history; try updating "
+"first"
 msgstr "不能从路径的未来历史中反向合并范围;请先更新"
 
+#: ../libsvn_client/merge.c:4629
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1452,192 +1935,267 @@ msgstr ""
 "当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n"
 "请解决所有冲突后,再次运行合并,处理剩余的未合并版本"
 
+#: ../libsvn_client/merge.c:5608
 #, c-format
 msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
 msgstr "在“%s”发现了非法的合并信息;合并跟踪是不可能的"
 
-msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+#: ../libsvn_client/merge.c:5662
+msgid ""
+"Merge tracking not allowed with missing subtrees; try restoring these items "
+"first:\n"
 msgstr "合并跟踪不允许丢失子树; 请先恢复这些项目:\n"
 
+#: ../libsvn_client/merge.c:6673
 #, c-format
-msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
+msgid ""
+"Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
 msgstr "在合并目标“%s”发现了非法的合并信息;合并跟踪是不可能的"
 
+#: ../libsvn_client/merge.c:8716
 msgid "Use of two URLs is not compatible with mergeinfo modification"
 msgstr "使用两个 URL 与合并信息修改不兼容"
 
-msgid "Merge from foreign repository is not compatible with mergeinfo modification"
+#: ../libsvn_client/merge.c:8723 ../libsvn_client/merge.c:9038
+msgid ""
+"Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr "从外部版本库合并与合并信息修改不兼容"
 
+#: ../libsvn_client/merge.c:8737 ../libsvn_client/merge.c:9297
+#: ../libsvn_client/merge.c:10827
 #, c-format
 msgid "Merge target '%s' does not exist in the working copy"
 msgstr "合并目标 “%s” 不在工作副本中"
 
+#: ../libsvn_client/merge.c:9164
 msgid "Cannot determine revision of working copy"
 msgstr "不能确定工作副本的版本"
 
+#: ../libsvn_client/merge.c:9170
 #, c-format
-msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
+msgid ""
+"Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
 msgstr "不能合并到有混合版本的工作副本 [%lu:%lu] 中;请先更新"
 
+#: ../libsvn_client/merge.c:9185
 msgid "Cannot merge into a working copy with a switched subtree"
 msgstr "不能合并到已经切换子目录的工作副本中"
 
+#: ../libsvn_client/merge.c:9201
 msgid "Cannot merge into a working copy that has local modifications"
 msgstr "不能合并到有本地修改的工作副本中"
 
+#: ../libsvn_client/merge.c:9263 ../svn/merge-cmd.c:346
 msgid "Merge sources must both be either paths or URLs"
 msgstr "合并源必须同时是路径或 URL"
 
+#: ../libsvn_client/merge.c:9332 ../libsvn_ra/ra_loader.c:554
 #, c-format
 msgid "'%s' isn't in the same repository as '%s'"
 msgstr "“%s”与“%s”并不在同一个版本库中"
 
+#: ../libsvn_client/merge.c:10342
 #, c-format
 msgid "Invalid mergeinfo detected on '%s', reintegrate merge not possible"
 msgstr "在“%s”发现了非法的合并信息;复兴合并是不可能的"
 
+#: ../libsvn_client/merge.c:10385 ../libsvn_client/merge.c:10653
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系"
 
+#: ../libsvn_client/merge.c:10539
 #, c-format
 msgid "'%s' must be from the same repository as '%s'"
 msgstr "“%s”必须与“%s”在同一个版本库中"
 
+#: ../libsvn_client/merge.c:10570
 #, c-format
-msgid "Neither the reintegrate source nor target can be the root of the repository"
+msgid ""
+"Neither the reintegrate source nor target can be the root of the repository"
 msgstr "复兴源或目标都不能是版本库的根。"
 
+#: ../libsvn_client/merge.c:10681
 #, c-format
 msgid ""
-"Reintegrate can only be used if revisions %ld through %ld were previously merged from %s to the reintegrate source, but this is not the case:\n"
+"Reintegrate can only be used if revisions %ld through %ld were previously "
+"merged from %s to the reintegrate source, but this is not the case:\n"
 "%s"
 msgstr ""
-"复兴只能用于版本 %ld 到 %ld 以前曾经从 %s 合并到复兴源的情况,但是现在不是这种情况:\n"
+"复兴只能用于版本 %ld 到 %ld 以前曾经从 %s 合并到复兴源的情况,但是现在不是这"
+"种情况:\n"
 "%s"
 
+#: ../libsvn_client/mergeinfo.c:1822
 msgid "Only depths 'infinity' and 'empty' are currently supported"
 msgstr "当前仅支持深度 'infinity' 和 'empty'"
 
+#: ../libsvn_client/patch.c:275
 #, c-format
 msgid "Cannot strip %u components from '%s'"
 msgstr "不能修剪 %u 个组件于“%s”"
 
+#: ../libsvn_client/patch.c:2952
 msgid "strip count must be positive"
 msgstr "修剪计数取值必须为正"
 
+#: ../libsvn_client/patch.c:2968 ../libsvn_fs_base/tree.c:4003
+#: ../libsvn_fs_base/tree.c:4008 ../libsvn_fs_fs/tree.c:2731
+#: ../libsvn_fs_fs/tree.c:2736 ../libsvn_ra/compat.c:685
+#: ../libsvn_ra_local/ra_plugin.c:1077
 #, c-format
 msgid "'%s' is not a file"
 msgstr "“%s”不是一个文件"
 
+#: ../libsvn_client/patch.c:2980 ../libsvn_wc/util.c:59
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "“%s”不是目录"
 
+#: ../libsvn_client/prop_commands.c:81
 #, c-format
 msgid "'%s' is a wcprop, thus not accessible to clients"
 msgstr "“%s” 是一个工作副本属性,应此不能被客户端存取"
 
+#: ../libsvn_client/prop_commands.c:173
 #, c-format
 msgid "Property '%s' is not a regular property"
 msgstr "属性 “%s” 不是常规属性"
 
+#: ../libsvn_client/prop_commands.c:301
 #, c-format
 msgid "Revision property '%s' not allowed in this context"
 msgstr "此上下文中不允许版本属性 “%s”"
 
+#: ../libsvn_client/prop_commands.c:308 ../libsvn_client/prop_commands.c:515
 #, c-format
 msgid "Bad property name: '%s'"
 msgstr "属性名称错误: “%s”"
 
+#: ../libsvn_client/prop_commands.c:336
 msgid "Targets must be working copy paths"
 msgstr "目标必须是工作副本路径"
 
+#: ../libsvn_client/prop_commands.c:409
 msgid "Targets must be URLs"
 msgstr "目标必须是 URL"
 
+#: ../libsvn_client/prop_commands.c:419
 msgid "Setting property on non-local targets needs a base revision"
 msgstr "设定非本地目标的属性需要版本参数"
 
+#: ../libsvn_client/prop_commands.c:434
 #, c-format
 msgid "Setting property '%s' on non-local targets is not supported"
 msgstr "不支持对非本地目标设置属性“%s”"
 
+#: ../libsvn_client/prop_commands.c:462
 #, c-format
-msgid "revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone else deleted it?)"
+msgid ""
+"revprop '%s' in r%ld is unexpectedly absent in repository (maybe someone "
+"else deleted it?)"
 msgstr "revprop “%s” 于版本 r%ld 出乎意料地不在版本库中(可能某人删除了?)"
 
+#: ../libsvn_client/prop_commands.c:471
 #, c-format
-msgid "revprop '%s' in r%ld has unexpected value in repository (maybe someone else changed it?)"
+msgid ""
+"revprop '%s' in r%ld has unexpected value in repository (maybe someone else "
+"changed it?)"
 msgstr "revprop “%s” 于版本 r%ld 在版本库中出乎意料地取值(可能某人修改了?)"
 
+#: ../libsvn_client/prop_commands.c:479
 #, c-format
-msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
+msgid ""
+"revprop '%s' in r%ld is unexpectedly present in repository (maybe someone "
+"else set it?)"
 msgstr "revprop “%s” 于版本 r%ld 出乎意料地在版本库中(可能某人设置了?)"
 
-msgid "Author name should not contain a newline; value will not be set unless forced"
+#: ../libsvn_client/prop_commands.c:510
+msgid ""
+"Author name should not contain a newline; value will not be set unless forced"
 msgstr "作者名称不能包含换行;除非强迫为之,否则其值不会被设定"
 
+#: ../libsvn_client/prop_commands.c:662
 #, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "没有路径 “%s” 在版本 %ld 中"
 
+#: ../libsvn_client/prop_commands.c:668 ../libsvn_client/prop_commands.c:985
+#: ../libsvn_wc/crop.c:182
 #, c-format
 msgid "Unknown node kind for '%s'"
 msgstr "“%s” 是未知的节点类型"
 
+#: ../libsvn_client/ra.c:156
 #, c-format
 msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
 msgstr "试图在非提交操作中,设定工作副本属性 “%s” 于 “%s”"
 
+#: ../libsvn_client/ra.c:356
 #, c-format
 msgid "Redirect cycle detected for URL '%s'"
 msgstr "z在 URL '%s' 检测到循环重定向"
 
+#: ../libsvn_client/ra.c:741 ../libsvn_ra/compat.c:394
 #, c-format
 msgid "Unable to find repository location for '%s' in revision %ld"
 msgstr "“%s” 的版本库位置不在版本 %ld 中"
 
+#: ../libsvn_client/ra.c:748
 #, c-format
-msgid "The location for '%s' for revision %ld does not exist in the repository or refers to an unrelated object"
+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:117
 #, c-format
 msgid "'%s' is not the root of the repository"
 msgstr "“%s” 不是版本库的根"
 
+#: ../libsvn_client/relocate.c:124
 #, c-format
 msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
 msgstr "版本库 “%s” 的 uuid 是 “%s”,但是工作副本的是 “%s”"
 
+#: ../libsvn_client/repos_diff.c:919 ../libsvn_wc/externals.c:508
 #, c-format
 msgid "Base checksum mismatch for '%s'"
 msgstr "“%s”的校验和错误"
 
+#: ../libsvn_client/revisions.c:113 ../libsvn_client/revisions.c:138
 #, c-format
 msgid "Path '%s' has no committed revision"
 msgstr "路径 “%s” 没有提交过"
 
+#: ../libsvn_client/revisions.c:166
 #, c-format
 msgid "Unrecognized revision type requested for '%s'"
 msgstr "“%s” 的请求版本类型无法识别"
 
+#: ../libsvn_client/revisions.c:189
 msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
 msgstr "对于 URL,版本关键字 PREV,BASE,或 COMMITTED 非法"
 
+#: ../libsvn_client/status.c:317 ../libsvn_client/status.c:491
+#: ../libsvn_wc/lock.c:563 ../libsvn_wc/lock.c:855 ../libsvn_wc/lock.c:1573
+#: ../libsvn_wc/wc_db.c:10217 ../libsvn_wc/wc_db_wcroot.c:560
 #, c-format
 msgid "'%s' is not a working copy"
 msgstr "“%s”不是工作副本"
 
+#: ../libsvn_client/switch.c:102
 #, c-format
 msgid "Cannot both exclude and switch a path"
 msgstr "不能同时排除和切换同一路径"
 
+#: ../libsvn_client/switch.c:123
 #, c-format
 msgid "Cannot switch '%s' because it is not in the repository yet"
 msgstr "不能切换“%s”,因为还不在版本库中"
 
+#: ../libsvn_client/switch.c:190 ../libsvn_ra_local/ra_plugin.c:228
+#: ../libsvn_ra_local/ra_plugin.c:307 ../libsvn_wc/update_editor.c:4584
 #, c-format
 msgid ""
 "'%s'\n"
@@ -1649,1636 +2207,2203 @@ msgstr ""
 "“%s”\n"
 "并不在同一个版本库中"
 
+#: ../libsvn_client/switch.c:215
 #, c-format
 msgid "'%s' shares no common ancestry with '%s'"
 msgstr "“%s”与“%s”没有共同的祖先"
 
+#: ../libsvn_client/util.c:110
 #, c-format
 msgid "URL '%s' is not a child of repository root URL '%s'"
 msgstr "URL “%s” 不是版本库根 URL “%s” 的子节点"
 
+#: ../libsvn_client/util.c:131
 #, c-format
 msgid "URL '%s' is not inside repository"
 msgstr "URL“%s”不在版本库中"
 
+#: ../libsvn_client/util.c:235 ../svn/util.c:1382
 #, c-format
 msgid "Cannot mix repository and working copy targets"
 msgstr "不能混合版本库和工作副本目标"
 
+#: ../libsvn_delta/svndiff.c:167
 msgid "Compression of svndiff data failed"
 msgstr "压缩 svndiff 数据失败"
 
+#: ../libsvn_delta/svndiff.c:449
 msgid "Decompression of svndiff data failed: no size"
 msgstr "解压 svndiff 数据失败: 没有长度"
 
+#: ../libsvn_delta/svndiff.c:452
 msgid "Decompression of svndiff data failed: size too large"
 msgstr "解压 svndiff 数据失败: 长度太大"
 
+#: ../libsvn_delta/svndiff.c:473
 msgid "Decompression of svndiff data failed"
 msgstr "解压 svndiff 数据失败"
 
+#: ../libsvn_delta/svndiff.c:480
 msgid "Size of uncompressed data does not match stored original length"
 msgstr "解压后的数据长度与原始长度不相等"
 
+#: ../libsvn_delta/svndiff.c:555
 #, c-format
 msgid "Invalid diff stream: insn %d cannot be decoded"
 msgstr "无效的差异流: insn %d 不能解码"
 
+#: ../libsvn_delta/svndiff.c:559
 #, c-format
 msgid "Invalid diff stream: insn %d has length zero"
 msgstr "无效的差异流: insn %d 出现 0 长度"
 
+#: ../libsvn_delta/svndiff.c:563
 #, c-format
 msgid "Invalid diff stream: insn %d overflows the target view"
 msgstr "无效的差异流: insn %d 溢出目标视图"
 
+#: ../libsvn_delta/svndiff.c:572
 #, c-format
 msgid "Invalid diff stream: [src] insn %d overflows the source view"
 msgstr "无效的差异流: [src] insn %d 溢出源视图"
 
+#: ../libsvn_delta/svndiff.c:579
 #, c-format
-msgid "Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
 msgstr "无效的差异流: [tgt] insn %d 起点超过目标视图位置"
 
+#: ../libsvn_delta/svndiff.c:586
 #, c-format
 msgid "Invalid diff stream: [new] insn %d overflows the new data section"
 msgstr "无效的差异流: [new] insn %d 溢出新数据区域"
 
+#: ../libsvn_delta/svndiff.c:596
 msgid "Delta does not fill the target window"
 msgstr "Delta 没有填充目标窗口"
 
+#: ../libsvn_delta/svndiff.c:599
 msgid "Delta does not contain enough new data"
 msgstr "Delta 没有包含足够新数据"
 
+#: ../libsvn_delta/svndiff.c:705
 msgid "Svndiff has invalid header"
 msgstr "Svndiff 数据包含无效头"
 
+#: ../libsvn_delta/svndiff.c:761 ../libsvn_delta/svndiff.c:925
 msgid "Svndiff contains a too-large window"
 msgstr "Svndiff 数据包含太大的窗口"
 
+#: ../libsvn_delta/svndiff.c:768 ../libsvn_delta/svndiff.c:932
 msgid "Svndiff contains corrupt window header"
 msgstr "Svndiff 数据包含无效窗口"
 
+#: ../libsvn_delta/svndiff.c:777
 msgid "Svndiff has backwards-sliding source views"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
+#: ../libsvn_delta/svndiff.c:826 ../libsvn_delta/svndiff.c:873
+#: ../libsvn_delta/svndiff.c:954
 msgid "Unexpected end of svndiff input"
 msgstr "svndiff 输入意料结束"
 
+#: ../libsvn_diff/diff_file.c:1074
 #, c-format
 msgid "The file '%s' changed unexpectedly during diff"
 msgstr "文件“%s”在比较期间意外改变"
 
+#: ../libsvn_diff/diff_file.c:1244
 msgid "Error in options to internal diff"
 msgstr "内部比较的选项错误"
 
+#: ../libsvn_diff/diff_file.c:1270
 #, c-format
 msgid "Invalid argument '%s' in diff options"
 msgstr "diff 选项中参数'%s'无效"
 
+#: ../libsvn_diff/diff_file.c:1553
 msgid "No newline at end of file"
 msgstr "文件没有以空行结尾"
 
 #. Order of date components can be different in different languages
+#: ../libsvn_diff/diff_file.c:1760
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 
+#: ../libsvn_diff/diff_file.c:2378
 #, c-format
 msgid "Failed to delete mmap '%s'"
 msgstr "删除 mmap“%s”失败"
 
+#: ../libsvn_fs/fs-loader.c:117 ../libsvn_ra/ra_loader.c:179
+#: ../libsvn_ra/ra_loader.c:192
 #, c-format
 msgid "'%s' does not define '%s()'"
 msgstr "“%s” 未定义 “%s()”"
 
+#: ../libsvn_fs/fs-loader.c:134
 #, c-format
 msgid "Can't grab FS mutex"
 msgstr "无法获取文件系统互斥体"
 
+#: ../libsvn_fs/fs-loader.c:146
 #, c-format
 msgid "Can't ungrab FS mutex"
 msgstr "不能释放文件系统互斥体"
 
+#: ../libsvn_fs/fs-loader.c:167
 #, c-format
 msgid "Failed to load module for FS type '%s'"
 msgstr "加载 “%s” 文件系统模块失败"
 
+#: ../libsvn_fs/fs-loader.c:200
 #, c-format
-msgid "Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
 msgstr "文件系统模块 “%s” 版本不匹配 : 找到 %d.%d.%d%s,期望 %d.%d.%d%s"
 
+#: ../libsvn_fs/fs-loader.c:225
 #, c-format
 msgid "Unknown FS type '%s'"
 msgstr "未知的文件系统类型 “%s”"
 
+#: ../libsvn_fs/fs-loader.c:328
 #, c-format
 msgid "Can't allocate FS mutex"
 msgstr "不能分配文件系统互斥体"
 
+#: ../libsvn_fs/fs-loader.c:358
 #, c-format
 msgid "Path '%s' is not in UTF-8"
 msgstr "路径 “%s” 不是 UTF-8 编码"
 
+#: ../libsvn_fs/fs-loader.c:366
 #, c-format
 msgid "Path '%s' contains '.' or '..' element"
 msgstr "路径 “%s” 包含 “.” 或 “..” 元素"
 
+#: ../libsvn_fs/fs-loader.c:1247
 #, c-format
 msgid "Malformed UUID '%s'"
 msgstr "非法 UUID “%s”"
 
+#: ../libsvn_fs/fs-loader.c:1275
 #, c-format
 msgid "Lock token URI '%s' has bad scheme; expected '%s'"
 msgstr "锁令牌 URI '%s' 的方案错误;期望是 '%s'"
 
+#: ../libsvn_fs/fs-loader.c:1282
 #, c-format
 msgid "Lock token '%s' is not ASCII at byte %u"
 msgstr "锁令牌  '%s' 在字节 %u 处不是 ASCII 字符"
 
+#: ../libsvn_fs/fs-loader.c:1289
 #, c-format
 msgid "Lock token URI '%s' is not XML-safe"
 msgstr "锁令牌 URI '%s' 不是 XML 安全的"
 
+#: ../libsvn_fs/fs-loader.c:1296
 msgid "Negative expiration date passed to svn_fs_lock"
 msgstr "传递到 svn_fs_lock 的有效期非法"
 
+#: ../libsvn_fs_base/bdb/bdb-err.c:104
 #, c-format
 msgid "Berkeley DB error for filesystem '%s' while %s:\n"
 msgstr "当 %s 关闭文件系统 “%s” 的 BDB 环境句柄时出错: \n"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:93
 msgid "creating change"
 msgstr "正在创建修改"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:117
 msgid "deleting changes"
 msgstr "正在删除修改"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:149 ../libsvn_fs_fs/fs_fs.c:4236
 msgid "Missing required node revision ID"
 msgstr "缺少必须的节点版本 ID"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:160 ../libsvn_fs_fs/fs_fs.c:4246
 msgid "Invalid change ordering: new node revision ID without delete"
 msgstr "无效的改变顺序: 没有删除新节点版本 ID"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/fs_fs.c:4257
 msgid "Invalid change ordering: non-add change on deleted path"
 msgstr "无效的改变顺序: 在已经删除的路径执行非增加修改"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:179 ../libsvn_fs_fs/fs_fs.c:4266
 msgid "Invalid change ordering: add change on preexisting path"
 msgstr "无效的改变顺序: 在已有路径增加修改"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:271
+#: ../libsvn_fs_base/bdb/changes-table.c:394
 msgid "creating cursor for reading changes"
 msgstr "正在为读取修改创建指针"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:296
+#: ../libsvn_fs_base/bdb/changes-table.c:415
 #, c-format
 msgid "Error reading changes for key '%s'"
 msgstr "读取键 “%s” 的修改时出错"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:355
+#: ../libsvn_fs_base/bdb/changes-table.c:438
 msgid "fetching changes"
 msgstr "正在获取修改"
 
+#: ../libsvn_fs_base/bdb/changes-table.c:368
+#: ../libsvn_fs_base/bdb/changes-table.c:451
 msgid "closing changes cursor"
 msgstr "正在关闭修改指针"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:87
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:116
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:159
 msgid "Only SHA1 checksums can be used as keys in the checksum-reps table.\n"
 msgstr "在校验和展现表中,只有 SHA1 校验和能用做键值。\n"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:135
 #, c-format
 msgid "Representation key for checksum '%s' exists in filesystem '%s'."
 msgstr "校验和 “%s” 的展现键已经存在于文件系统 “%s” 中。"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:142
 msgid "storing checksum-reps record"
 msgstr "正在存储校验和展现记录"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:186
 msgid "allocating new representation reuse ID (getting 'next-key')"
 msgstr "正在分配新展现的复用 ID(正在获取 “next-key”)"
 
+#: ../libsvn_fs_base/bdb/checksum-reps-table.c:207
 msgid "bumping next representation reuse ID"
 msgstr "跳到下个展现复用 ID"
 
+#: ../libsvn_fs_base/bdb/copies-table.c:92
 msgid "storing copy record"
 msgstr "正在存储副本记录"
 
+#: ../libsvn_fs_base/bdb/copies-table.c:115
 msgid "allocating new copy ID (getting 'next-key')"
 msgstr "正在分配新副本 ID(正在获取 “next-key”)"
 
+#: ../libsvn_fs_base/bdb/copies-table.c:133
 msgid "bumping next copy key"
 msgstr "正在提取下一个副本键"
 
+#: ../libsvn_fs_base/bdb/copies-table.c:171
 msgid "deleting entry from 'copies' table"
 msgstr "正在从 “copies” 表中删除条目"
 
+#: ../libsvn_fs_base/bdb/copies-table.c:199
 msgid "reading copy"
 msgstr "正在读取副本"
 
+#: ../libsvn_fs_base/bdb/node-origins-table.c:117
 #, c-format
-msgid "Node origin for '%s' exists in filesystem '%s' with a different value (%s) than what we were about to store (%s)"
+msgid ""
+"Node origin for '%s' exists in filesystem '%s' with a different value (%s) "
+"than what we were about to store (%s)"
 msgstr "“%s” 的原始节点在文件系统 “%s” 中,取值(%s)与我们要存储的值(%s)不同"
 
+#: ../libsvn_fs_base/bdb/node-origins-table.c:127
 msgid "storing node-origins record"
 msgstr "正在存储节点原始记录"
 
+#: ../libsvn_fs_base/bdb/nodes-table.c:102
 msgid "allocating new node ID (getting 'next-key')"
 msgstr "正在分配新的节点 ID (正在获取“next-key”)"
 
+#: ../libsvn_fs_base/bdb/nodes-table.c:120
 msgid "bumping next node ID key"
 msgstr "正在提取下一个节点 ID 键"
 
+#: ../libsvn_fs_base/bdb/nodes-table.c:156
 #, c-format
 msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
 msgstr "后续 id “%s”(对于 %s)已经在文件系统 “%s” 中"
 
+#: ../libsvn_fs_base/bdb/nodes-table.c:182
 msgid "deleting entry from 'nodes' table"
 msgstr "正在从“nodes”表删除条目"
 
 #. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/nodes-table.c:220
 msgid "reading node revision"
 msgstr "正在读取节点版本"
 
+#: ../libsvn_fs_base/bdb/nodes-table.c:253
 msgid "storing node revision"
 msgstr "正在存储节点版本"
 
+#: ../libsvn_fs_base/bdb/reps-table.c:98
+#: ../libsvn_fs_base/bdb/reps-table.c:200
 #, c-format
 msgid "No such representation '%s'"
 msgstr "没有修订版“%s”"
 
 #. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/reps-table.c:101
 msgid "reading representation"
 msgstr "正在读取修订版"
 
+#: ../libsvn_fs_base/bdb/reps-table.c:128
 msgid "storing representation"
 msgstr "正在存储修订版"
 
+#: ../libsvn_fs_base/bdb/reps-table.c:156
 msgid "allocating new representation (getting next-key)"
 msgstr "正在分配新修订版(正在获取 next-key)"
 
+#: ../libsvn_fs_base/bdb/reps-table.c:177
 msgid "bumping next representation key"
 msgstr "正在提取下一个修订版键"
 
 #. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/reps-table.c:203
 msgid "deleting representation"
 msgstr "正在删除修订版"
 
 #. Handle any other error conditions.
+#: ../libsvn_fs_base/bdb/rev-table.c:95
 msgid "reading filesystem revision"
 msgstr "正在读取文件系统版本"
 
+#: ../libsvn_fs_base/bdb/strings-table.c:94
 msgid "creating cursor for reading a string"
 msgstr "正在为读取字符串创建指针"
 
+#: ../libsvn_fs_base/bdb/txn-table.c:99
 msgid "storing transaction record"
 msgstr "正在存储事务记录"
 
+#: ../libsvn_fs_base/bdb/uuids-table.c:119
 msgid "get repository uuid"
 msgstr "获取版本库 UUID"
 
+#: ../libsvn_fs_base/bdb/uuids-table.c:147
 msgid "set repository uuid"
 msgstr "设置版本库 UUID"
 
+#: ../libsvn_fs_base/dag.c:228
 #, c-format
 msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
 msgstr "损坏的数据库: 初始的事务编号在文件系统“%s”中不是“0”"
 
+#: ../libsvn_fs_base/dag.c:236
 #, c-format
 msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
 msgstr "损坏的数据库: 初始的副本编号在文件系统“%s”中不是“0”"
 
+#: ../libsvn_fs_base/dag.c:245
 #, c-format
 msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
 msgstr "损坏的数据库: 初始的版本号在文件系统“%s”中不是“0”"
 
+#: ../libsvn_fs_base/dag.c:294
 msgid "Attempted to get entries of a non-directory node"
 msgstr "试图从非目录节点中获取条目"
 
+#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:376
 #, c-format
 msgid "Attempted to create a node with an illegal name '%s'"
 msgstr "试图用非法的名字“%s”创建节点"
 
+#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:382
 msgid "Attempted to create entry in non-directory parent"
 msgstr "试图在非目录的父节点创建条目"
 
+#: ../libsvn_fs_base/dag.c:473 ../libsvn_fs_base/dag.c:737
+#: ../libsvn_fs_fs/dag.c:388
 #, c-format
 msgid "Attempted to clone child of non-mutable node"
 msgstr "试图克隆非可变节点的子节点"
 
+#: ../libsvn_fs_base/dag.c:480
 #, c-format
 msgid "Attempted to create entry that already exists"
 msgstr "试图创建已经存在的条目"
 
+#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468
 msgid "Attempted to set entry in non-directory node"
 msgstr "试图在非目录节点中设置条目"
 
+#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474
 msgid "Attempted to set entry in immutable node"
 msgstr "试图在不变节点设置条目"
 
+#: ../libsvn_fs_base/dag.c:602
 #, c-format
 msgid "Can't set proplist on *immutable* node-revision %s"
 msgstr "不能在*不变*节点版本 %s 设置属性列表"
 
+#: ../libsvn_fs_base/dag.c:743
 #, c-format
 msgid "Attempted to make a child clone with an illegal name '%s'"
 msgstr "试图以非法名字“%s”创建子克隆"
 
+#: ../libsvn_fs_base/dag.c:860
 #, c-format
 msgid "Attempted to delete entry '%s' from *non*-directory node"
 msgstr "试图从*非*目录节点删除条目“%s”"
 
+#: ../libsvn_fs_base/dag.c:866
 #, c-format
 msgid "Attempted to delete entry '%s' from immutable directory node"
 msgstr "试图从不变目录节点删除条目“%s”"
 
+#: ../libsvn_fs_base/dag.c:873
 #, c-format
 msgid "Attempted to delete a node with an illegal name '%s'"
 msgstr "试图删除一个非法名字“%s”的节点"

[... 9803 lines stripped ...]