subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prabh...@apache.org
Subject svn commit: r1501136 [8/10] - in /subversion/branches/verify-keep-going: ./ build/ build/ac-macros/ build/generator/ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/javahl/src/org/apac...
Date Tue, 09 Jul 2013 08:48:47 GMT
Modified: subversion/branches/verify-keep-going/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/po/zh_CN.po?rev=1501136&r1=1501135&r2=1501136&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/verify-keep-going/subversion/po/zh_CN.po [UTF-8] Tue Jul  9 08:48:43 2013
@@ -53,75 +53,88 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: subversion 1.7\n"
+"Project-Id-Version: subversion 1.9\n"
 "Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2012-08-18 03:48+0000\n"
-"PO-Revision-Date: 2012-08-18 03:49+0000\n"
-"Last-Translator: Subversion Developers <dev@subversion.apache.org>\n"
+"POT-Creation-Date: 2013-07-02 21:30+0800\n"
+"PO-Revision-Date: 2013-06-28 16:53+0800\n"
+"Last-Translator: \n"
 "Language-Team: Simplified Chinese <dev@subversion.apache.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "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:81
 #, c-format
 msgid "File not found: transaction '%s', path '%s'"
 msgstr "没有找到文件: 事务“%s”,路径 “%s”"
 
+#: ../include/private/svn_fs_util.h:86
 #, 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:97
 #, c-format
 msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
 msgstr "文件已经存在: 文件系统“%s”,事务“%s”,路径“%s”"
 
+#: ../include/private/svn_fs_util.h:102
 #, 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:110
 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:117
 #, 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:124
 #, 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:131
 #, 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:139
 #, 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:146
 #, 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:153
 #, 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:160
 #, c-format
 msgid "No username is currently associated with filesystem '%s'"
 msgstr "当前没有用户名称与文件系统“%s”关联"
@@ -129,969 +142,1323 @@ 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:169
 #, 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:164
 msgid "Bad parent pool passed to svn_make_pool()"
 msgstr "无效的父内存池传递到 svn_make_pool()"
 
+#: ../include/svn_error_codes.h:168
 msgid "Bogus filename"
 msgstr "非法的文件名"
 
+#: ../include/svn_error_codes.h:172
 msgid "Bogus URL"
 msgstr "非法 URL"
 
+#: ../include/svn_error_codes.h:176
 msgid "Bogus date"
 msgstr "非法日期"
 
+#: ../include/svn_error_codes.h:180
 msgid "Bogus mime-type"
 msgstr "非法 mime-type"
 
+#: ../include/svn_error_codes.h:190
 msgid "Wrong or unexpected property value"
 msgstr "错误或不期望的属性值"
 
+#: ../include/svn_error_codes.h:194
 msgid "Version file format not correct"
 msgstr "版本文件格式不正确"
 
+#: ../include/svn_error_codes.h:198
 msgid "Path is not an immediate child of the specified directory"
 msgstr "路径不是指定目录的直接子孙"
 
+#: ../include/svn_error_codes.h:202
 msgid "Bogus UUID"
 msgstr "非法 UUID"
 
+#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:949
 msgid "Invalid configuration value"
 msgstr "无效的配置取值"
 
+#: ../include/svn_error_codes.h:211
 msgid "Bogus server specification"
 msgstr "假的服务器规格"
 
+#: ../include/svn_error_codes.h:215
 msgid "Unsupported checksum type"
 msgstr "不支持的校验和类型"
 
+#: ../include/svn_error_codes.h:219
 msgid "Invalid character in hex checksum"
 msgstr "在 16 进制的校验和中发现无效字符"
 
+#: ../include/svn_error_codes.h:224
 msgid "Unknown string value of token"
 msgstr "未知的字符串令牌值"
 
+#: ../include/svn_error_codes.h:229
 msgid "Invalid changelist name"
 msgstr "无效的修改列表名称"
 
+#: ../include/svn_error_codes.h:234
 msgid "Invalid atomic"
 msgstr "无效原子"
 
+#: ../include/svn_error_codes.h:240
 msgid "No such XML tag attribute"
 msgstr "没有这种 XML 标签属性"
 
+#: ../include/svn_error_codes.h:244
 msgid "<delta-pkg> is missing ancestry"
 msgstr "<delta-pkg> 没有祖先"
 
+#: ../include/svn_error_codes.h:248
 msgid "Unrecognized binary data encoding; can't decode"
 msgstr "无法识别的二进制数据编码: 无法解码"
 
+#: ../include/svn_error_codes.h:252
 msgid "XML data was not well-formed"
 msgstr "XML 数据语法错误"
 
+#: ../include/svn_error_codes.h:256
 msgid "Data cannot be safely XML-escaped"
 msgstr "XML 数据不能正确解码"
 
+#: ../include/svn_error_codes.h:262
 msgid "Inconsistent line ending style"
 msgstr "不一致的行结束样式"
 
+#: ../include/svn_error_codes.h:266
 msgid "Unrecognized line ending style"
 msgstr "无法识别的行结束样式"
 
+#: ../include/svn_error_codes.h:271
 msgid "Line endings other than expected"
 msgstr "行意外结束"
 
+#: ../include/svn_error_codes.h:275
 msgid "Ran out of unique names"
 msgstr "唯一名称耗尽"
 
+#: ../include/svn_error_codes.h:280
 msgid "Framing error in pipe protocol"
 msgstr "管道协议中帧错误"
 
+#: ../include/svn_error_codes.h:285
 msgid "Read error in pipe"
 msgstr "管道读取错误"
 
+#: ../include/svn_error_codes.h:289 ../libsvn_subr/cmdline.c:362
+#: ../libsvn_subr/cmdline.c:385 ../svn/util.c:564 ../svnlook/svnlook.c:2008
 #, c-format
 msgid "Write error"
 msgstr "写入错误"
 
+#: ../include/svn_error_codes.h:294
 msgid "Write error in pipe"
 msgstr "管道写入错误"
 
+#: ../include/svn_error_codes.h:300
 msgid "Unexpected EOF on stream"
 msgstr "流意外结束"
 
+#: ../include/svn_error_codes.h:304
 msgid "Malformed stream data"
 msgstr "非法流数据"
 
+#: ../include/svn_error_codes.h:308
 msgid "Unrecognized stream data"
 msgstr "无法识别的流数据"
 
+#: ../include/svn_error_codes.h:313
 msgid "Stream doesn't support seeking"
 msgstr "流不支持定位操作"
 
+#: ../include/svn_error_codes.h:319
 msgid "Unknown svn_node_kind"
 msgstr "未知的 svn_node_kind"
 
+#: ../include/svn_error_codes.h:323
 msgid "Unexpected node kind found"
 msgstr "发现意外节点种类"
 
+#: ../include/svn_error_codes.h:329
 msgid "Can't find an entry"
 msgstr "无法找到条目"
 
+#: ../include/svn_error_codes.h:335
 msgid "Entry already exists"
 msgstr "条目已存在"
 
+#: ../include/svn_error_codes.h:339
 msgid "Entry has no revision"
 msgstr "条目没有版本"
 
+#: ../include/svn_error_codes.h:343
 msgid "Entry has no URL"
 msgstr "入口没有 URL"
 
+#: ../include/svn_error_codes.h:347
 msgid "Entry has an invalid attribute"
 msgstr "条目有无效属性"
 
+#: ../include/svn_error_codes.h:351
 msgid "Can't create an entry for a forbidden name"
 msgstr "不能为禁用的名称创建条目"
 
+#: ../include/svn_error_codes.h:357
 msgid "Obstructed update"
 msgstr "更新阻塞"
 
+#: ../include/svn_error_codes.h:362
 msgid "Mismatch popping the WC unwind stack"
 msgstr "不匹配的弹出工作副本展开堆栈"
 
+#: ../include/svn_error_codes.h:367
 msgid "Attempt to pop empty WC unwind stack"
 msgstr "试图弹出空的工作副本展开堆栈"
 
+#: ../include/svn_error_codes.h:372
 msgid "Attempt to unlock with non-empty unwind stack"
 msgstr "试图解锁非空展开堆栈"
 
+#: ../include/svn_error_codes.h:376
 msgid "Attempted to lock an already-locked dir"
 msgstr "试图锁定已加锁的目录"
 
+#: ../include/svn_error_codes.h:380
 msgid "Working copy not locked; this is probably a bug, please report"
 msgstr "工作副本没有锁定;这可能是一个漏洞,请报告"
 
+#: ../include/svn_error_codes.h:385
 msgid "Invalid lock"
 msgstr "无效锁"
 
+#: ../include/svn_error_codes.h:391 ../include/svn_error_codes.h:397
 msgid "Path is not a working copy directory"
 msgstr "路径不是工作副本目录"
 
+#: ../include/svn_error_codes.h:401
 msgid "Path is not a working copy file"
 msgstr "路径不是工作副本文件"
 
+#: ../include/svn_error_codes.h:405
 msgid "Problem running log"
 msgstr "执行日志出错"
 
+#: ../include/svn_error_codes.h:409
 msgid "Can't find a working copy path"
 msgstr "找不到工作副本路径"
 
+#: ../include/svn_error_codes.h:413
 msgid "Working copy is not up-to-date"
 msgstr "工作副本没有更新到最新版本"
 
+#: ../include/svn_error_codes.h:417
 msgid "Left locally modified or unversioned files"
 msgstr "保留本地修改或未纳入版本控制的文件"
 
+#: ../include/svn_error_codes.h:421
 msgid "Unmergeable scheduling requested on an entry"
 msgstr "条目有无法合并的调度"
 
+#: ../include/svn_error_codes.h:425
 msgid "Found a working copy path"
 msgstr "找到一个工作副本路径"
 
+#: ../include/svn_error_codes.h:429
 msgid "A conflict in the working copy obstructs the current operation"
 msgstr "工作副本中的冲突阻止了当前操作"
 
+#: ../include/svn_error_codes.h:433
 msgid "Working copy is corrupt"
 msgstr "工作副本已损坏"
 
+#: ../include/svn_error_codes.h:437
 msgid "Working copy text base is corrupt"
 msgstr "工作副本的参考文件损坏"
 
+#: ../include/svn_error_codes.h:441
 msgid "Cannot change node kind"
 msgstr "无法修改节点类型"
 
+#: ../include/svn_error_codes.h:445
 msgid "Invalid operation on the current working directory"
 msgstr "操作对当前工作目录无效"
 
+#: ../include/svn_error_codes.h:449
 msgid "Problem on first log entry in a working copy"
 msgstr "操作工作副本的第一个日志条目出错"
 
+#: ../include/svn_error_codes.h:453
 msgid "Unsupported working copy format"
 msgstr "不支持此工作副本格式"
 
+#: ../include/svn_error_codes.h:457
 msgid "Path syntax not supported in this context"
 msgstr "此上下文不支持路径语法"
 
+#: ../include/svn_error_codes.h:462
 msgid "Invalid schedule"
 msgstr "无效的调度"
 
+#: ../include/svn_error_codes.h:467
 msgid "Invalid relocation"
 msgstr "无效重定位"
 
+#: ../include/svn_error_codes.h:472
 msgid "Invalid switch"
 msgstr "无效的切换"
 
+#: ../include/svn_error_codes.h:477
 msgid "Changelist doesn't match"
 msgstr "修改列表不匹配"
 
+#: ../include/svn_error_codes.h:482
 msgid "Conflict resolution failed"
 msgstr "解决冲突失败"
 
+#: ../include/svn_error_codes.h:486
 msgid "Failed to locate 'copyfrom' path in working copy"
 msgstr "在工作副本中定位 “copyfrom” 的路径失败。"
 
+#: ../include/svn_error_codes.h:494
 msgid "Moving a path from one changelist to another"
 msgstr "将路径从一个修改列表移到另一个"
 
+#: ../include/svn_error_codes.h:499
 msgid "Cannot delete a file external"
 msgstr "无法删除外部文件"
 
+#: ../include/svn_error_codes.h:504
 msgid "Cannot move a file external"
 msgstr "无法移动外部文件"
 
+#: ../include/svn_error_codes.h:509
 msgid "Something's amiss with the wc sqlite database"
 msgstr "工作副本的 SQLite 数据库有错误"
 
+#: ../include/svn_error_codes.h:514
 msgid "The working copy is missing"
 msgstr "工作副本丢失"
 
+#: ../include/svn_error_codes.h:519
 msgid "The specified node is not a symlink"
 msgstr "指定的节点不是符号连接"
 
+#: ../include/svn_error_codes.h:524
 msgid "The specified path has an unexpected status"
 msgstr "指定的路径有不期望的状态"
 
+#: ../include/svn_error_codes.h:529
 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:534
+msgid ""
+"Previous operation has not finished; run 'cleanup' if it was interrupted"
 msgstr "以前的操作没有完成;如果它被中断,请执行“svn cleanup”"
 
+#: ../include/svn_error_codes.h:540
 msgid "The operation cannot be performed with the specified depth"
 msgstr "在指定的深度不能执行此操作"
 
+#: ../include/svn_error_codes.h:545
 msgid "Couldn't open a working copy file because access was denied"
 msgstr "不能打开工作副本文件,访问被拒绝"
 
+#: ../include/svn_error_codes.h:550
+msgid "Mixed-revision working copy was found but not expected"
+msgstr "发现了不期望的混合版本的工作副本"
+
+#: ../include/svn_error_codes.h:555
+msgid "Duplicate targets in svn:externals property"
+msgstr "svn:externals 属性包含重复的目标"
+
+#: ../include/svn_error_codes.h:561
 msgid "General filesystem error"
 msgstr "普通文件系统错误"
 
+#: ../include/svn_error_codes.h:565
 msgid "Error closing filesystem"
 msgstr "关闭文件系统出错"
 
+#: ../include/svn_error_codes.h:569
 msgid "Filesystem is already open"
 msgstr "文件系统已经打开"
 
+#: ../include/svn_error_codes.h:573
 msgid "Filesystem is not open"
 msgstr "文件系统尚未打开"
 
+#: ../include/svn_error_codes.h:577
 msgid "Filesystem is corrupt"
 msgstr "文件系统损坏"
 
+#: ../include/svn_error_codes.h:581
 msgid "Invalid filesystem path syntax"
 msgstr "无效文件系统路径语法"
 
+#: ../include/svn_error_codes.h:585
 msgid "Invalid filesystem revision number"
 msgstr "无效文件系统版本号"
 
+#: ../include/svn_error_codes.h:589
 msgid "Invalid filesystem transaction name"
 msgstr "无效的文件系统事务名称"
 
+#: ../include/svn_error_codes.h:593
 msgid "Filesystem directory has no such entry"
 msgstr "文件系统目录没有此条目"
 
+#: ../include/svn_error_codes.h:597
 msgid "Filesystem has no such representation"
 msgstr "文件系统没有此修订版"
 
+#: ../include/svn_error_codes.h:601
 msgid "Filesystem has no such string"
 msgstr "文件系统没有此字符串"
 
+#: ../include/svn_error_codes.h:605
 msgid "Filesystem has no such copy"
 msgstr "文件系统此副本"
 
+#: ../include/svn_error_codes.h:609
 msgid "The specified transaction is not mutable"
 msgstr "指定的事务不可改变"
 
+#: ../include/svn_error_codes.h:613
 msgid "Filesystem has no item"
 msgstr "文件系统没有条目"
 
+#: ../include/svn_error_codes.h:617
 msgid "Filesystem has no such node-rev-id"
 msgstr "文件系统没有此 node-rev-id"
 
+#: ../include/svn_error_codes.h:621
 msgid "String does not represent a node or node-rev-id"
 msgstr "字符串不是节点或 node-rev-id"
 
+#: ../include/svn_error_codes.h:625
 msgid "Name does not refer to a filesystem directory"
 msgstr "文件系统无此目录"
 
+#: ../include/svn_error_codes.h:629
 msgid "Name does not refer to a filesystem file"
 msgstr "文件系统无此文件"
 
+#: ../include/svn_error_codes.h:633
 msgid "Name is not a single path component"
 msgstr "名称不是单一路径"
 
+#: ../include/svn_error_codes.h:637
 msgid "Attempt to change immutable filesystem node"
 msgstr "试图修改不变的文件系统节点"
 
+#: ../include/svn_error_codes.h:641
 msgid "Item already exists in filesystem"
 msgstr "文件系统已有此条目"
 
+#: ../include/svn_error_codes.h:645
 msgid "Attempt to remove or recreate fs root dir"
 msgstr "试图删除或重建文件系统根目录"
 
+#: ../include/svn_error_codes.h:649
 msgid "Object is not a transaction root"
 msgstr "对象不是事务的根"
 
+#: ../include/svn_error_codes.h:653
 msgid "Object is not a revision root"
 msgstr "对象不是版本的根"
 
+#: ../include/svn_error_codes.h:657
 msgid "Merge conflict during commit"
 msgstr "提交时发生合并冲突"
 
+#: ../include/svn_error_codes.h:661
 msgid "A representation vanished or changed between reads"
 msgstr "读取时修订版消失或改变"
 
+#: ../include/svn_error_codes.h:665
 msgid "Tried to change an immutable representation"
 msgstr "试图修改不变的修订版"
 
+#: ../include/svn_error_codes.h:669
 msgid "Malformed skeleton data"
 msgstr "非法骨架数据"
 
+#: ../include/svn_error_codes.h:673
 msgid "Transaction is out of date"
 msgstr "事务过时"
 
+#: ../include/svn_error_codes.h:677
 msgid "Berkeley DB error"
 msgstr "BDB 错误"
 
+#: ../include/svn_error_codes.h:681
 msgid "Berkeley DB deadlock error"
 msgstr "BDB 死锁"
 
+#: ../include/svn_error_codes.h:685
 msgid "Transaction is dead"
 msgstr "事务已经结束"
 
+#: ../include/svn_error_codes.h:689
 msgid "Transaction is not dead"
 msgstr "事务尚未结束"
 
+#: ../include/svn_error_codes.h:694
 msgid "Unknown FS type"
 msgstr "未知的FS类型"
 
+#: ../include/svn_error_codes.h:699
 msgid "No user associated with filesystem"
 msgstr "没有用户与文件系统关联"
 
+#: ../include/svn_error_codes.h:704
 msgid "Path is already locked"
 msgstr "已经锁定路径"
 
+#: ../include/svn_error_codes.h:709 ../include/svn_error_codes.h:891
 msgid "Path is not locked"
 msgstr "路径没有加锁"
 
+#: ../include/svn_error_codes.h:714
 msgid "Lock token is incorrect"
 msgstr "不正确的锁定令牌"
 
+#: ../include/svn_error_codes.h:719
 msgid "No lock token provided"
 msgstr "没有提供锁定令牌"
 
+#: ../include/svn_error_codes.h:724
 msgid "Username does not match lock owner"
 msgstr "用户不是锁所有者"
 
+#: ../include/svn_error_codes.h:729
 msgid "Filesystem has no such lock"
 msgstr "文件系统没有此锁"
 
+#: ../include/svn_error_codes.h:734
 msgid "Lock has expired"
 msgstr "锁过期"
 
+#: ../include/svn_error_codes.h:739 ../include/svn_error_codes.h:878
 msgid "Item is out of date"
 msgstr "条目过时"
 
+#: ../include/svn_error_codes.h:751
 msgid "Unsupported FS format"
 msgstr "不支持的文件系统格式"
 
+#: ../include/svn_error_codes.h:756
 msgid "Representation is being written"
 msgstr "正在写修订版"
 
+#: ../include/svn_error_codes.h:761
 msgid "The generated transaction name is too long"
 msgstr "产生的事务名称太长"
 
+#: ../include/svn_error_codes.h:766
 msgid "Filesystem has no such node origin record"
 msgstr "文件系统没有此节点的原始记录"
 
+#: ../include/svn_error_codes.h:771
 msgid "Filesystem upgrade is not supported"
 msgstr "不支持文件系统升级"
 
+#: ../include/svn_error_codes.h:776
 msgid "Filesystem has no such checksum-representation index record"
 msgstr "文件系统没有此校验和展现索引记录"
 
+#: ../include/svn_error_codes.h:781
 msgid "Property value in filesystem differs from the provided base value"
 msgstr "文件系统中的属性值与提供的基础值不同"
 
+#: ../include/svn_error_codes.h:787
 msgid "The filesystem editor completion process was not followed"
-msgstr ""
+msgstr "没有运行文件系统编辑器完成进程"
 
+#: ../include/svn_error_codes.h:792
 msgid "A packed revprop could not be read"
 msgstr "不能读取打包的 revprop"
 
+#: ../include/svn_error_codes.h:797
+msgid "Could not initialize the revprop caching infrastructure."
+msgstr "不能初始化 revprop 缓存"
+
+#: ../include/svn_error_codes.h:803
 msgid "The repository is locked, perhaps for db recovery"
 msgstr "版本库被锁,可能正在恢复"
 
+#: ../include/svn_error_codes.h:807
 msgid "A repository hook failed"
 msgstr "版本库钩子错误"
 
+#: ../include/svn_error_codes.h:811
 msgid "Incorrect arguments supplied"
 msgstr "提供了不正确的参数"
 
+#: ../include/svn_error_codes.h:815
 msgid "A report cannot be generated because no data was supplied"
 msgstr "没有数据,无法产生报告"
 
+#: ../include/svn_error_codes.h:819
 msgid "Bogus revision report"
 msgstr "版本报告非法"
 
+#: ../include/svn_error_codes.h:828
 msgid "Unsupported repository version"
 msgstr "不支持此版本库版本"
 
+#: ../include/svn_error_codes.h:832
 msgid "Disabled repository feature"
 msgstr "关闭版本库特性"
 
+#: ../include/svn_error_codes.h:836
 msgid "Error running post-commit hook"
 msgstr "执行 post-commit 钩子错误"
 
+#: ../include/svn_error_codes.h:841
 msgid "Error running post-lock hook"
 msgstr "执行 post-lock 钩子错误"
 
+#: ../include/svn_error_codes.h:846
 msgid "Error running post-unlock hook"
 msgstr "执行 post-unlock 钩子错误"
 
+#: ../include/svn_error_codes.h:851
 msgid "Repository upgrade is not supported"
 msgstr "不支持版本库升级"
 
+#: ../include/svn_error_codes.h:856
+msgid "Repository is corrupt"
+msgstr "版本库已损坏"
+
+#: ../include/svn_error_codes.h:862
 msgid "Bad URL passed to RA layer"
 msgstr "传递至 RA 层的 URL 错误"
 
+#: ../include/svn_error_codes.h:866
 msgid "Authorization failed"
 msgstr "认证失败"
 
+#: ../include/svn_error_codes.h:870
 msgid "Unknown authorization method"
 msgstr "未知认证"
 
+#: ../include/svn_error_codes.h:874
 msgid "Repository access method not implemented"
 msgstr "版本库未实现存取方法"
 
+#: ../include/svn_error_codes.h:882
 msgid "Repository has no UUID"
 msgstr "版本库没有 UUID"
 
+#: ../include/svn_error_codes.h:886
 msgid "Unsupported RA plugin ABI version"
 msgstr "不支持此 RA 插件的 ABI 版本"
 
+#: ../include/svn_error_codes.h:896
 msgid "Server can only replay from the root of a repository"
 msgstr "服务器只能从版本库的根重放"
 
+#: ../include/svn_error_codes.h:901
 msgid "Repository UUID does not match expected UUID"
 msgstr "版本库的 UUID 与期望的 UUID 不匹配"
 
+#: ../include/svn_error_codes.h:906
 msgid "Repository root URL does not match expected root URL"
 msgstr "版本库根 URL 与期望的根 URL 不匹配"
 
+#: ../include/svn_error_codes.h:911
 msgid "Session URL does not match expected session URL"
 msgstr "会话 URL 与期望的会话 URL 不匹配"
 
+#: ../include/svn_error_codes.h:916 ../libsvn_ra_svn/client.c:492
+#, c-format
+msgid "Can't create tunnel"
+msgstr "无法创建隧道"
+
+#: ../include/svn_error_codes.h:922
 msgid "RA layer failed to init socket layer"
 msgstr "RA 层无法初始化 socket 层"
 
+#: ../include/svn_error_codes.h:926
 msgid "RA layer failed to create HTTP request"
 msgstr "RA 层创建 HTTP 请求失败"
 
+#: ../include/svn_error_codes.h:930
 msgid "RA layer request failed"
 msgstr "RA 层请求失败"
 
+#: ../include/svn_error_codes.h:934
 msgid "RA layer didn't receive requested OPTIONS info"
 msgstr "RA 层无法取得请求的 OPTIONS 信息"
 
+#: ../include/svn_error_codes.h:938
 msgid "RA layer failed to fetch properties"
 msgstr "RA 层无法取得属性"
 
+#: ../include/svn_error_codes.h:942
 msgid "RA layer file already exists"
 msgstr "RA 层文件已经存在"
 
+#: ../include/svn_error_codes.h:956
 msgid "HTTP Path Not Found"
 msgstr "找不到 HTTP 路径"
 
+#: ../include/svn_error_codes.h:960
 msgid "Failed to execute WebDAV PROPPATCH"
 msgstr "执行 WebDAV PROPPATCH 失败"
 
+#. If condition COND is not met, return a "malformed network data" error.
+#.
+#: ../include/svn_error_codes.h:965 ../include/svn_error_codes.h:1418
+#: ../libsvn_ra_svn/marshal.c:1142 ../libsvn_ra_svn/marshal.c:1364
+#: ../libsvn_ra_svn/marshal.c:1394 ../libsvn_ra_svn/marshal.c:2431
 msgid "Malformed network data"
 msgstr "非法网络数据"
 
+#: ../include/svn_error_codes.h:970
 msgid "Unable to extract data from response header"
 msgstr "不能从响应的头信息中获取数据"
 
+#: ../include/svn_error_codes.h:975
 msgid "Repository has been moved"
 msgstr "版本库已经移动"
 
+#: ../include/svn_error_codes.h:980 ../libsvn_ra_serf/update.c:2881
+#: ../libsvn_ra_serf/util.c:762
 msgid "Connection timed out"
 msgstr "连接超时"
 
+#: ../include/svn_error_codes.h:985
 msgid "URL access forbidden for unknown reason"
 msgstr "因为未知的理由,禁止访问 URL"
 
+#: ../include/svn_error_codes.h:991 ../include/svn_error_codes.h:1422
 msgid "Couldn't find a repository"
 msgstr "无法找到版本库"
 
+#: ../include/svn_error_codes.h:995
 msgid "Couldn't open a repository"
 msgstr "无法打开版本库"
 
-msgid "Special code for wrapping server errors to report to client"
-msgstr "用专用代码封装服务器错误以便报告客户端"
-
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 协议命令"
-
-msgid "Network connection closed unexpectedly"
-msgstr "网络连接意外关闭"
-
-msgid "Network read/write error"
-msgstr "网络读写错误"
-
-msgid "Client/server version mismatch"
-msgstr "客户端/服务器版本不匹配"
-
-msgid "Cannot negotiate authentication mechanism"
-msgstr "无法协商认证机制"
-
-msgid "Editor drive was aborted"
-msgstr "编辑器中止"
-
-msgid "Initialization of SSPI library failed"
-msgstr "初始化 SSPI 库失败"
-
-msgid "Server SSL certificate untrusted"
-msgstr "服务器的 SSL 证书不被信任"
-
-msgid "Initialization of the GSSAPI context failed"
-msgstr "初始化 GSSAPI 失败"
-
-msgid "While handling serf response:"
-msgstr "当处理 serf 的响应时:"
-
-msgid "Credential data unavailable"
-msgstr "无法取得凭证数据"
-
-msgid "No authentication provider available"
-msgstr "没有可用的认证提供者"
-
-msgid "All authentication providers exhausted"
-msgstr "所有的认证提供者都不可用"
-
-msgid "Credentials not saved"
-msgstr "没有保存凭证数据"
-
-msgid "Authentication failed"
-msgstr "认证失败"
-
-msgid "Read access denied for root of edit"
-msgstr "编辑根目录时拒绝读取"
-
-msgid "Item is not readable"
-msgstr "条目不可读"
-
-msgid "Item is partially readable"
-msgstr "条目部分可读"
-
-msgid "Invalid authz configuration"
-msgstr "认证配置无效"
-
-msgid "Item is not writable"
-msgstr "条目不能写"
-
+#: ../include/svn_error_codes.h:1001
 msgid "Svndiff data has invalid header"
 msgstr "svndiff 数据包含无效头"
 
+#: ../include/svn_error_codes.h:1005
 msgid "Svndiff data contains corrupt window"
 msgstr "Svndiff 数据包含损坏窗口"
 
+#: ../include/svn_error_codes.h:1009
 msgid "Svndiff data contains backward-sliding source view"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
+#: ../include/svn_error_codes.h:1013
 msgid "Svndiff data contains invalid instruction"
 msgstr "svndiff 数据包含无效指令"
 
+#: ../include/svn_error_codes.h:1017
 msgid "Svndiff data ends unexpectedly"
 msgstr "svndiff 数据意外结束"
 
+#: ../include/svn_error_codes.h:1021
 msgid "Svndiff compressed data is invalid"
 msgstr "非法 svndiff 压缩数据"
 
-msgid "Diff data source modified unexpectedly"
-msgstr "svndiff 数据被意外修改"
-
+#: ../include/svn_error_codes.h:1027
 msgid "Apache has no path to an SVN filesystem"
 msgstr "Apache 没有指向 SVN 文件系统的路径"
 
+#: ../include/svn_error_codes.h:1031
 msgid "Apache got a malformed URI"
 msgstr "Apache 得到非法 URI"
 
+#: ../include/svn_error_codes.h:1035
 msgid "Activity not found"
 msgstr "没有找到活动项"
 
+#: ../include/svn_error_codes.h:1039
 msgid "Baseline incorrect"
 msgstr "基线错误"
 
+#: ../include/svn_error_codes.h:1043
 msgid "Input/output error"
 msgstr "输出/输出错误"
 
+#: ../include/svn_error_codes.h:1049
 msgid "A path under version control is needed for this operation"
 msgstr "只能对纳入版本控制的路径执行此操作"
 
+#: ../include/svn_error_codes.h:1053
 msgid "Repository access is needed for this operation"
 msgstr "此操作需要存取版本库"
 
+#: ../include/svn_error_codes.h:1057
 msgid "Bogus revision information given"
 msgstr "给出的版本信息非法"
 
+#: ../include/svn_error_codes.h:1061
 msgid "Attempting to commit to a URL more than once"
 msgstr "试图对 URL 进行多次提交"
 
+#: ../include/svn_error_codes.h:1065
 msgid "Operation does not apply to binary file"
 msgstr "不能对二进制文件执行此操作"
 
+#: ../include/svn_error_codes.h:1071
 msgid "Format of an svn:externals property was invalid"
 msgstr "svn:externals 属性格式非法"
 
+#: ../include/svn_error_codes.h:1075
 msgid "Attempting restricted operation for modified resource"
 msgstr "试图对已修改的资源进行受限操作"
 
+#: ../include/svn_error_codes.h:1079
 msgid "Operation does not apply to directory"
 msgstr "不能对目录执行此操作"
 
+#: ../include/svn_error_codes.h:1083
 msgid "Revision range is not allowed"
 msgstr "不允许的版本范围"
 
+#: ../include/svn_error_codes.h:1087
 msgid "Inter-repository relocation not allowed"
 msgstr "不支持版本库之间的重新定位"
 
+#: ../include/svn_error_codes.h:1091
 msgid "Author name cannot contain a newline"
 msgstr "作者名称不能换行"
 
+#: ../include/svn_error_codes.h:1095
 msgid "Bad property name"
 msgstr "属性名称错误"
 
+#: ../include/svn_error_codes.h:1100
 msgid "Two versioned resources are unrelated"
 msgstr "两个纳入版本控制的资源不相关"
 
+#: ../include/svn_error_codes.h:1105
 msgid "Path has no lock token"
 msgstr "路径没有锁定令牌"
 
+#: ../include/svn_error_codes.h:1110
 msgid "Operation does not support multiple sources"
 msgstr "此操作不支持多个源对象"
 
+#: ../include/svn_error_codes.h:1115
 msgid "No versioned parent directories"
 msgstr "没有受版本控制的父目录"
 
+#: ../include/svn_error_codes.h:1120 ../include/svn_error_codes.h:1140
 msgid "Working copy and merge source not ready for reintegration"
 msgstr "工作副本与合并来源没有准备好复兴"
 
+#: ../include/svn_error_codes.h:1125
 msgid "A file external cannot overwrite an existing versioned item"
 msgstr "外部引用的文件不能覆写已存的版本控制的条目"
 
+#: ../include/svn_error_codes.h:1130
 msgid "Invalid path component strip count specified"
 msgstr "指定了无效的路径组件修剪计数"
 
+#: ../include/svn_error_codes.h:1135
 msgid "Detected a cycle while processing the operation"
 msgstr "当处理此操作是,检测到死循环"
 
+#: ../include/svn_error_codes.h:1145
 msgid "Invalid mergeinfo detected in merge target"
 msgstr "在合并目标检测到了合并信息"
 
+#: ../include/svn_error_codes.h:1150
 msgid "Can't perform this operation without a valid lock token"
 msgstr "不能在没有合法的锁令牌时执行此操作"
 
+#: ../include/svn_error_codes.h:1155
 msgid "The operation is forbidden by the server"
 msgstr "操作被服务器禁止"
 
+#: ../include/svn_error_codes.h:1161
 msgid "A problem occurred; see other errors for details"
 msgstr "发生问题;请参阅其它错误信息"
 
+#: ../include/svn_error_codes.h:1165
 msgid "Failure loading plugin"
 msgstr "加载插件失败"
 
+#: ../include/svn_error_codes.h:1169
 msgid "Malformed file"
 msgstr "文件格式错误"
 
+#: ../include/svn_error_codes.h:1173
 msgid "Incomplete data"
 msgstr "数据不完整"
 
+#: ../include/svn_error_codes.h:1177
 msgid "Incorrect parameters given"
 msgstr "参数不正确"
 
+#: ../include/svn_error_codes.h:1181
 msgid "Tried a versioning operation on an unversioned resource"
 msgstr "试图对未纳入版本控制的资源进行版本操作"
 
+#: ../include/svn_error_codes.h:1185
 msgid "Test failed"
 msgstr "测试失败"
 
+#: ../include/svn_error_codes.h:1189
 msgid "Trying to use an unsupported feature"
 msgstr "试图使用不支持的特性"
 
+#: ../include/svn_error_codes.h:1193
 msgid "Unexpected or unknown property kind"
 msgstr "意外或未知的属性类型"
 
+#: ../include/svn_error_codes.h:1197
 msgid "Illegal target for the requested operation"
 msgstr "此请求操作的目标非法"
 
+#: ../include/svn_error_codes.h:1201
 msgid "MD5 checksum is missing"
 msgstr "没有 MD5 校验和"
 
+#: ../include/svn_error_codes.h:1205
 msgid "Directory needs to be empty but is not"
 msgstr "必须为空的目录有内容"
 
+#: ../include/svn_error_codes.h:1209
 msgid "Error calling external program"
 msgstr "调用外部程序错误"
 
+#: ../include/svn_error_codes.h:1213
 msgid "Python exception has been set with the error"
 msgstr "Python 异常被设为错误"
 
+#: ../include/svn_error_codes.h:1217
 msgid "A checksum mismatch occurred"
 msgstr "校验和错误"
 
+#: ../include/svn_error_codes.h:1221
 msgid "The operation was interrupted"
 msgstr "操作被中断"
 
+#: ../include/svn_error_codes.h:1225
 msgid "The specified diff option is not supported"
 msgstr "不支持指定的 diff 选项"
 
+#: ../include/svn_error_codes.h:1229
 msgid "Property not found"
 msgstr "找不到属性"
 
+#: ../include/svn_error_codes.h:1233
 msgid "No auth file path available"
 msgstr "未提供 auth 文件路径"
 
+#: ../include/svn_error_codes.h:1238
 msgid "Incompatible library version"
 msgstr "不兼容的库版本"
 
+#: ../include/svn_error_codes.h:1243
 msgid "Mergeinfo parse error"
 msgstr "分析合并信息出错"
 
+#: ../include/svn_error_codes.h:1248
 msgid "Cease invocation of this API"
 msgstr "停止调用此 API"
 
+#: ../include/svn_error_codes.h:1253
 msgid "Error parsing revision number"
 msgstr "解析版本号出错"
 
+#: ../include/svn_error_codes.h:1258
 msgid "Iteration terminated before completion"
 msgstr "迭代在完成前终止"
 
+#: ../include/svn_error_codes.h:1263
 msgid "Unknown changelist"
 msgstr "未知修改列表"
 
+#: ../include/svn_error_codes.h:1268
 msgid "Reserved directory name in command line arguments"
 msgstr "在命令行参数中包含保留的目录名称"
 
+#: ../include/svn_error_codes.h:1273
 msgid "Inquiry about unknown capability"
 msgstr "查询未知特性"
 
+#: ../include/svn_error_codes.h:1278
 msgid "Test skipped"
 msgstr "跳过测试"
 
-msgid "apr memcache library not available"
-msgstr "apr memcache 库不可用"
+#: ../include/svn_error_codes.h:1283
+msgid "APR memcache library not available"
+msgstr "APR memcache 库不可用"
 
+#: ../include/svn_error_codes.h:1288
 msgid "Couldn't perform atomic initialization"
 msgstr "不能完成原子的初始化"
 
+#: ../include/svn_error_codes.h:1293
 msgid "SQLite error"
 msgstr "SQLite 错误"
 
+#: ../include/svn_error_codes.h:1298
 msgid "Attempted to write to readonly SQLite db"
 msgstr "试图写至只读 SQLite 数据库"
 
+#: ../include/svn_error_codes.h:1305
 msgid "Unsupported schema found in SQLite db"
 msgstr "不支持 SQLite 数据库中的方案"
 
+#: ../include/svn_error_codes.h:1310
 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:1315
+msgid ""
+"SQLite busy at transaction rollback; resetting all busy SQLite statements to "
+"allow rollback"
 msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句,以便允许回滚"
 
+#: ../include/svn_error_codes.h:1321
 msgid "Constraint error in SQLite db"
 msgstr "在 SQLite 数据库中的约束出错"
 
-msgid "too many memcached servers configured"
-msgstr ""
+#: ../include/svn_error_codes.h:1326
+msgid "Too many memcached servers configured"
+msgstr "配置了太多的 memcached 服务器"
+
+#: ../include/svn_error_codes.h:1331
+msgid "Failed to parse version number string"
+msgstr "解析版本号字符串失败"
+
+#: ../include/svn_error_codes.h:1336
+msgid "Atomic data storage is corrupt"
+msgstr "原子数据存储损坏"
+
+#: ../include/svn_error_codes.h:1341
+msgid "utf8proc library error"
+msgstr "UTF8 处理库错误"
+
+#: ../include/svn_error_codes.h:1346
+msgid "Bad arguments to SQL operators GLOB or LIKE"
+msgstr "传递给 SQL 操作符 GBLOB 或 LIKE 的参数错误"
 
+#: ../include/svn_error_codes.h:1352
 msgid "Error parsing arguments"
 msgstr "解析参数出错"
 
+#: ../include/svn_error_codes.h:1356
 msgid "Not enough arguments provided"
 msgstr "没有提供足够的参数"
 
+#: ../include/svn_error_codes.h:1360
 msgid "Mutually exclusive arguments specified"
 msgstr "参数冲突"
 
+#: ../include/svn_error_codes.h:1364
 msgid "Attempted command in administrative dir"
 msgstr "试图在管理目录中执行命令"
 
+#: ../include/svn_error_codes.h:1368
 msgid "The log message file is under version control"
 msgstr "日志信息文件被纳入版本控制"
 
+#: ../include/svn_error_codes.h:1372
 msgid "The log message is a pathname"
 msgstr "日志信息是路径名"
 
+#: ../include/svn_error_codes.h:1376
 msgid "Committing in directory scheduled for addition"
 msgstr "在调度增加的目录中进行提交"
 
+#: ../include/svn_error_codes.h:1380
 msgid "No external editor available"
 msgstr "没有外部编辑器可用"
 
+#: ../include/svn_error_codes.h:1384
 msgid "Something is wrong with the log message's contents"
 msgstr "日志信息内容不妥"
 
+#: ../include/svn_error_codes.h:1388
 msgid "A log message was given where none was necessary"
 msgstr "在不需要时给出日志信息"
 
+#: ../include/svn_error_codes.h:1392
 msgid "No external merge tool available"
 msgstr "没有外部合并工具可用"
 
+#: ../include/svn_error_codes.h:1396
 msgid "Failed processing one or more externals definitions"
 msgstr "处理一个或更多的外部定义失败"
 
+#: ../include/svn_error_codes.h:1402
+msgid "Special code for wrapping server errors to report to client"
+msgstr "用专用代码封装服务器错误以便报告客户端"
+
+#: ../include/svn_error_codes.h:1406
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 协议命令"
+
+#: ../include/svn_error_codes.h:1410
+msgid "Network connection closed unexpectedly"
+msgstr "网络连接意外关闭"
+
+#: ../include/svn_error_codes.h:1414
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: ../include/svn_error_codes.h:1426
+msgid "Client/server version mismatch"
+msgstr "客户端/服务器版本不匹配"
+
+#: ../include/svn_error_codes.h:1431
+msgid "Cannot negotiate authentication mechanism"
+msgstr "无法协商认证机制"
+
+#: ../include/svn_error_codes.h:1436
+msgid "Editor drive was aborted"
+msgstr "编辑器中止"
+
+#: ../include/svn_error_codes.h:1444
+msgid "Credential data unavailable"
+msgstr "无法取得凭证数据"
+
+#: ../include/svn_error_codes.h:1448
+msgid "No authentication provider available"
+msgstr "没有可用的认证提供者"
+
+#: ../include/svn_error_codes.h:1452
+msgid "All authentication providers exhausted"
+msgstr "所有的认证提供者都不可用"
+
+#: ../include/svn_error_codes.h:1456
+msgid "Credentials not saved"
+msgstr "没有保存凭证数据"
+
+#: ../include/svn_error_codes.h:1461
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: ../include/svn_error_codes.h:1467
+msgid "Read access denied for root of edit"
+msgstr "编辑根目录时拒绝读取"
+
+#: ../include/svn_error_codes.h:1472
+msgid "Item is not readable"
+msgstr "条目不可读"
+
+#: ../include/svn_error_codes.h:1477
+msgid "Item is partially readable"
+msgstr "条目部分可读"
+
+#: ../include/svn_error_codes.h:1481
+msgid "Invalid authz configuration"
+msgstr "认证配置无效"
+
+#: ../include/svn_error_codes.h:1486
+msgid "Item is not writable"
+msgstr "条目不能写"
+
+#: ../include/svn_error_codes.h:1493
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff 数据被意外修改"
+
+#: ../include/svn_error_codes.h:1499
+msgid "Initialization of SSPI library failed"
+msgstr "初始化 SSPI 库失败"
+
+#: ../include/svn_error_codes.h:1503
+msgid "Server SSL certificate untrusted"
+msgstr "服务器的 SSL 证书不被信任"
+
+#: ../include/svn_error_codes.h:1508
+msgid "Initialization of the GSSAPI context failed"
+msgstr "初始化 GSSAPI 失败"
+
+#: ../include/svn_error_codes.h:1513
+msgid "While handling serf response:"
+msgstr "当处理 serf 的响应时:"
+
+#: ../include/svn_error_codes.h:1519
 msgid "Assertion failure"
 msgstr "断言失败"
 
+#: ../include/svn_error_codes.h:1523
 msgid "No non-tracing links found in the error chain"
 msgstr "没有发现错误链中的非跟踪链接"
 
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:274
 msgid "GNOME Keyring is locked and we are non-interactive"
 msgstr "GNOME Keyring 被锁定,并且我们处于非交互方式"
 
+#: ../libsvn_client/add.c:606 ../libsvn_client/cmdline.c:356
+#: ../libsvn_subr/opt.c:930
+#, c-format
+msgid "'%s' ends in a reserved name"
+msgstr "“%s”以保留名称结束"
+
+#: ../libsvn_client/add.c:872
 #, c-format
 msgid "'%s' prevents creating parent of '%s'"
 msgstr "'%s' 阻止创建 '%s' 的父亲"
 
+#: ../libsvn_client/add.c:911 ../libsvn_wc/adm_ops.c:732
 #, 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:918 ../libsvn_wc/adm_ops.c:687
+#: ../libsvn_wc/workqueue.c:900 ../libsvn_wc/workqueue.c:994
 #, c-format
 msgid "'%s' not found"
 msgstr "找不到 “%s”"
 
+#: ../libsvn_client/add.c:924 ../libsvn_wc/adm_ops.c:692
+#: ../libsvn_wc/delete.c:98
 #, c-format
 msgid "Unsupported node kind for path '%s'"
 msgstr "路径 “%s” 有不支持的节点种类"
 
-#, c-format
-msgid "'%s' ends in a reserved name"
-msgstr "“%s”以保留名称结束"
-
+#: ../libsvn_client/add.c:957 ../libsvn_client/changelist.c:65
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:233
+#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:820
+#: ../libsvn_client/patch.c:3012 ../libsvn_client/relocate.c:232
+#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136
+#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:471
+#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:105
+#: ../svn/util.c:979
 #, c-format
 msgid "'%s' is not a local path"
 msgstr "“%s”不是本地路径"
 
+#: ../libsvn_client/add.c:998 ../libsvn_client/copy_foreign.c:489
+#: ../libsvn_wc/adm_ops.c:766 ../libsvn_wc/copy.c:715
+#, c-format
+msgid "'%s' is already under version control"
+msgstr "“%s”已纳入版本控制"
+
+#: ../libsvn_client/add.c:1131 ../libsvn_client/add.c:1158
 #, c-format
-msgid "There is no valid uri above '%s'"
+msgid "There is no valid URI above '%s'"
 msgstr "在 '%s' 的上级没有合法的 URI"
 
+#: ../libsvn_client/blame.c:660
 #, c-format
 msgid "Cannot calculate blame information for binary file '%s'"
 msgstr "无法为二进制文件 “%s” 计算追溯信息"
 
-msgid "Start revision must precede end revision"
-msgstr "起始版本必须小于结束版本"
-
+#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610
+#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:829
+#: ../libsvn_client/prop_commands.c:1384 ../libsvn_client/revisions.c:104
+#: ../libsvn_wc/adm_ops.c:1197 ../libsvn_wc/adm_ops.c:1247
+#: ../libsvn_wc/copy.c:563 ../libsvn_wc/copy.c:624 ../libsvn_wc/entries.c:1301
+#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
+#: ../svn/notify.c:1104
 #, c-format
 msgid "'%s' is not under version control"
 msgstr "“%s” 尚未纳入版本控制"
 
+#: ../libsvn_client/cat.c:82
 #, c-format
 msgid "'%s' refers to a directory"
 msgstr "“%s” 引用一个目录"
 
+#: ../libsvn_client/cat.c:92
 #, c-format
-msgid "'%s' has no base revision until it is committed"
+msgid "'%s' has no pristine version until it is committed"
 msgstr "在提交之前,“%s”没有基础版本"
 
+#: ../libsvn_client/cat.c:147 ../libsvn_client/export.c:388
 msgid "(local)"
 msgstr "(本地)"
 
+#: ../libsvn_client/cat.c:247
 #, 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:109 ../libsvn_client/export.c:1445
 #, c-format
 msgid "URL '%s' doesn't exist"
 msgstr "URL “%s” 不存在"
 
+#: ../libsvn_client/checkout.c:113
 #, c-format
 msgid "URL '%s' refers to a file, not a directory"
 msgstr "URL “%s” 指向一个文件,不是目录"
 
+#: ../libsvn_client/checkout.c:147
 #, c-format
 msgid "'%s' is already a working copy for a different URL"
 msgstr "“%s” 已经是指向不同 URL 的工作副本"
 
+#: ../libsvn_client/checkout.c:155
 #, c-format
 msgid "'%s' already exists and is not a directory"
 msgstr "“%s” 已经存在并且不是目录"
 
+#: ../libsvn_client/cleanup.c:87
 #, c-format
-msgid "Improper relative URL '%s'"
-msgstr "不正确的相对 URL“%s”"
+msgid "Working copy at '%s' is already locked."
+msgstr "工作副本“%s”已经锁定"
 
+#: ../libsvn_client/cmdline.c:104
 #, 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:312
+msgid ""
+"Resolving '^/': no repository root found in the target arguments or in the "
+"current directory"
 msgstr "解析“^/”: 在目标参数或当前目录中找不到版本库的根"
 
-#, c-format
-msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
-msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
-
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "“%s” 是未知类型或不可纳入版本控制"
-
-msgid "New entry name required when importing a file"
-msgstr "导入文件时,需要一个新的条目名称"
-
-#, c-format
-msgid "'%s' does not exist"
-msgstr "“%s” 不存在"
-
-#, c-format
-msgid "Path '%s' already exists"
-msgstr "路径 “%s” 已经存在"
-
-#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%s” 是保留名称,无法被导入"
-
+#: ../libsvn_client/commit.c:155 ../libsvn_client/copy.c:1510
 msgid "Commit failed (details follow):"
 msgstr "提交失败(细节如下): "
 
+#: ../libsvn_client/commit.c:163
 msgid "Commit succeeded, but other errors follow:"
 msgstr "提交成功,但是发生了其它错误,细节如下: "
 
+#: ../libsvn_client/commit.c:170
 msgid "Error unlocking locked dirs (details follow):"
 msgstr "解除锁定目录出错(细节如下): "
 
+#: ../libsvn_client/commit.c:181
 msgid "Error bumping revisions post-commit (details follow):"
 msgstr "执行 post-commit 出错 (细节如下): "
 
+#: ../libsvn_client/commit.c:314
 #, 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:613
 #, c-format
 msgid "'%s' is a URL, but URLs cannot be commit targets"
 msgstr "“%s” 是 URL,但是 URL 不可作为提交目标"
 
+#: ../libsvn_client/commit.c:735
 msgid ""
 "Commit can only commit to a single repository at a time.\n"
 "Are all targets part of the same working copy?"
@@ -1099,347 +1466,510 @@ msgstr ""
 "每次提交只能针对一个版本库。\n"
 "是否所有目标都属于同一工作副本?"
 
+#: ../libsvn_client/commit.c:851
 #, c-format
-msgid "Cannot commit '%s' because it was moved from '%s' which is not part of the commit; both sides of the move must be committed together"
+msgid ""
+"Cannot commit '%s' because it was moved from '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
 msgstr ""
 
+#: ../libsvn_client/commit.c:882
 #, c-format
-msgid "Cannot commit '%s' because it was moved to '%s' which is not part of the commit; both sides of the move must be committed together"
+msgid ""
+"Cannot commit '%s' because it was moved to '%s' which is not part of the "
+"commit; both sides of the move must be committed together"
 msgstr ""
 
+#: ../libsvn_client/commit_util.c:94 ../libsvn_repos/commit.c:167
 #, c-format
 msgid "Directory '%s' is out of date"
 msgstr "目录 “%s” 已经过时"
 
+#: ../libsvn_client/commit_util.c:95 ../libsvn_repos/commit.c:169
 #, c-format
 msgid "File '%s' is out of date"
 msgstr "文件 “%s” 已经过时"
 
+#: ../libsvn_client/commit_util.c:130
 #, c-format
 msgid "Directory '%s' is locked in another working copy"
 msgstr "目录“%s”在其它工作副本中被锁定"
 
+#: ../libsvn_client/commit_util.c:131
 #, c-format
 msgid "File '%s' is locked in another working copy"
 msgstr "文件“%s” 在其它工作副本中被锁定"
 
+#: ../libsvn_client/commit_util.c:166
 #, c-format
 msgid "Changing directory '%s' is forbidden by the server"
 msgstr "服务器禁止修改目录“%s”"
 
+#: ../libsvn_client/commit_util.c:167
 #, c-format
 msgid "Changing file '%s' is forbidden by the server"
 msgstr "服务器禁止修改文件“%s”"
 
+#: ../libsvn_client/commit_util.c:315
 #, c-format
 msgid "Aborting commit: '%s' remains in tree-conflict"
 msgstr "提交终止: “%s” 仍处于树冲突状态"
 
+#: ../libsvn_client/commit_util.c:666
 #, c-format
 msgid "Aborting commit: '%s' remains in conflict"
 msgstr "提交终止: “%s” 处于冲突状态"
 
+#: ../libsvn_client/commit_util.c:685
 #, c-format
 msgid "Node '%s' has unexpectedly changed kind"
 msgstr "节点 “%s” 的类型意外改变"
 
+#: ../libsvn_client/commit_util.c:726
 #, c-format
 msgid "'%s' is scheduled for addition, but is missing"
 msgstr "丢失了预定增加的“%s”"
 
+#: ../libsvn_client/commit_util.c:1212
 #, 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:1351
 #, 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:1502
 #, c-format
 msgid "Commit item '%s' has copy flag but no copyfrom URL"
 msgstr "提交项目 “%s” 有复制标记,但是没有源地址(copyfrom URL)"
 
+#: ../libsvn_client/commit_util.c:1507
 #, c-format
 msgid "Commit item '%s' has copy flag but an invalid revision"
 msgstr "提交项目 “%s” 有复制标志,但是版本无效"
 
+#: ../libsvn_client/commit_util.c:1969
 msgid "Standard properties can't be set explicitly as revision properties"
 msgstr "标准属性不能设置为版本属性"
 
+#: ../libsvn_client/copy.c:427
 #, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径 “%s” 不存在"
+msgid "Path '%s' exists, but is excluded"
+msgstr "路径 “%s” 存在,但被排除"
 
+#: ../libsvn_client/copy.c:433 ../libsvn_client/copy.c:1050
+#: ../libsvn_client/copy.c:1309 ../libsvn_client/copy.c:1884
+#: ../libsvn_client/import.c:868
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径 “%s” 已经存在"
+
+#: ../libsvn_client/copy.c:488
+#, c-format
+msgid "Path '%s' already exists as unversioned node"
+msgstr "路径 “%s” 已经作为非版本控制节点存在"
+
+#: ../libsvn_client/copy.c:510 ../libsvn_client/copy.c:520
+#: ../libsvn_client/copy.c:1900
 #, c-format
 msgid "Path '%s' is not a directory"
 msgstr "路径 “%s” 不是目录"
 
+#: ../libsvn_client/copy.c:559 ../libsvn_client/merge.c:10115
+#: ../svnlook/svnlook.c:1424
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径 “%s” 不存在"
+
+#: ../libsvn_client/copy.c:729 ../libsvn_client/copy.c:770
 #, c-format
 msgid "Path '%s' already exists, but is not a directory"
 msgstr "路径 “%s” 已经存在,但不是目录"
 
+#: ../libsvn_client/copy.c:831
 msgid "Source and destination URLs appear not to point to the same repository."
 msgstr "来源与目标 URL 似乎不在同一版本库。"
 
+#: ../libsvn_client/copy.c:1040 ../libsvn_client/prop_commands.c:167
 #, c-format
 msgid "Path '%s' does not exist in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "源 URL “%s” 来自其它版本库;把它当作脱离的工作副本"
-
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%s”已纳入版本控制"
-
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "“%s” 的入口存在(尽管丢失了工作文件)"
-
+#: ../libsvn_client/copy.c:1868
 #, c-format
 msgid "Path '%s' not found in revision %ld"
 msgstr "路径 “%s” 不在版本 %ld 中"
 
+#: ../libsvn_client/copy.c:1873
 #, c-format
 msgid "Path '%s' not found in head revision"
 msgstr "HEAD 版本中找不到路径 “%s”"
 
+#: ../libsvn_client/copy.c:2001
 msgid "Cannot mix repository and working copy sources"
 msgstr "不能在源中混合版本库和工作副本"
 
+#: ../libsvn_client/copy.c:2053
 #, c-format
 msgid "Cannot copy path '%s' into its own child '%s'"
 msgstr "无法复制路径 “%s” 到其子目录 “%s” 中"
 
+#: ../libsvn_client/copy.c:2089
 #, 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:2104
 msgid "Moves between the working copy and the repository are not supported"
 msgstr "不支持在工作副本和版本库之间移动"
 
+#: ../libsvn_client/copy.c:2119
 #, c-format
 msgid "Cannot move URL '%s' into itself"
 msgstr "无法移动 URL “%s” 到本身"
 
+#: ../libsvn_client/copy.c:2120
 #, c-format
 msgid "Cannot move path '%s' into itself"
 msgstr "无法移动路径 “%s” 到本身"
 
+#: ../libsvn_client/copy.c:2187
 #, c-format
 msgid "'%s' does not have a URL associated with it"
 msgstr "“%s” 没有关联的 URL"
 
+#: ../libsvn_client/copy_foreign.c:131 ../libsvn_client/copy_foreign.c:282
+#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103
+#: ../libsvn_wc/update_editor.c:1120
+#, c-format
+msgid "Path '%s' is not in the working copy"
+msgstr "路径 “%s” 不在工作副本中"
+
+#: ../libsvn_client/copy_foreign.c:372 ../libsvn_client/export.c:812
+#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1051
+#: ../libsvn_ra_svn/client.c:1201 ../libsvn_wc/diff_editor.c:1977
+#: ../libsvn_wc/diff_editor.c:2056 ../libsvn_wc/externals.c:651
+#: ../libsvn_wc/update_editor.c:4236
+#, c-format
+msgid "Checksum mismatch for '%s'"
+msgstr "'%s' 的校验和不匹配"
+
+#: ../libsvn_client/copy_foreign.c:479
+#, c-format
+msgid "'%s' is not a valid location inside a repository"
+msgstr "“%s”在版本库中不是合法的位置"
+
+#: ../libsvn_client/copy_foreign.c:510
+#, c-format
+msgid "Can't add '%s', because no parent directory is found"
+msgstr "不能增加“%s”,因为没有发现它的父目录"
+
+#: ../libsvn_client/delete.c:76
 #, c-format
 msgid "'%s' is in the way of the resource actually under version control"
 msgstr "“%s” 阻碍资源纳入版本控制"
 
+#: ../libsvn_client/delete.c:95
 #, c-format
 msgid "'%s' has local modifications -- commit or revert them first"
 msgstr "“%s” 已有本地修改 -- 请先提交或撤销"
 
+#: ../libsvn_client/delete.c:127
 #, 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:862 ../svn/move-cmd.c:65
 msgid "Cannot specify revisions (except HEAD) with move operations"
 msgstr "移动操作不能指定版本"
 
+#: ../libsvn_client/deprecated.c:1624
 msgid "No commits in repository"
 msgstr "版本库中没有提交"
 
+#: ../libsvn_client/deprecated.c:2930 ../libsvn_wc/deprecated.c:4095
 msgid "Non-recursive relocation not supported"
 msgstr "不支持非递归的重新定位"
 
-#, c-format
-msgid "   Reverse-merged %s:r%s%s"
-msgstr "   已经撤销合并 %s:r%s%s"
-
-#, c-format
-msgid "   Merged %s:r%s%s"
-msgstr "   已经合并 %s:r%s%s"
-
+#. Utilities
+#: ../libsvn_client/diff.c:64
 #, c-format
 msgid "Path '%s' must be an immediate child of the directory '%s'"
 msgstr "路径 “%s” 必须是目录 “%s” 的直接子孙"
 
+#: ../libsvn_client/diff.c:258
 #, c-format
 msgid "%s\t(revision %ld)"
 msgstr "%s\t(版本 %ld)"
 
+#: ../libsvn_client/diff.c:260
 #, c-format
 msgid "%s\t(working copy)"
 msgstr "%s\t(工作副本)"
 
+#: ../libsvn_client/diff.c:512 ../svnlook/svnlook.c:794
 #, c-format
 msgid "%sProperty changes on: %s%s"
 msgstr "%s 属性改变: %s%s"
 
+#: ../libsvn_client/diff.c:760
 #, c-format
 msgid "Cannot display: file marked as a binary type.%s"
 msgstr "无法显示: 文件标记为二进制类型。%s"
 
-#, c-format
-msgid "Path '%s' has no URL"
-msgstr "路径 '%s' 没有 URL"
-
+#: ../libsvn_client/diff.c:1265 ../libsvn_client/merge.c:7176
+#: ../libsvn_client/merge.c:10522
 msgid "Not all required revisions are specified"
 msgstr "没有全部提供需要的版本"
 
-msgid "At least one revision must be something other than BASE or WORKING when diffing a URL"
+#: ../libsvn_client/diff.c:1279
+msgid ""
+"At least one revision must be something other than BASE or WORKING when "
+"diffing a URL"
 msgstr "要比较 URL 的时候,必须有一个版本,既不是基础版本,又不是工作版本"
 
+#: ../libsvn_client/diff.c:1316
 #, c-format
 msgid "Diff target '%s' was not found in the repository at revision '%ld'"
 msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 中"
 
+#: ../libsvn_client/diff.c:1321
 #, 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:1496
 #, 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:1501
 #, 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:1575
 msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
 msgstr "抱歉,svn_client_diff6 尚不支持这种调用方式"
 
+#: ../libsvn_client/diff.c:1616
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr "当前只支持纯文本类型的参考文件与其工作文件比较比较差异"
+
+#: ../libsvn_client/diff.c:2221
+msgid ""
+"Summarized diffs are only supported between a path's text-base and its "
+"working files at this time"
+msgstr "当前概要差异只支持参考文件与其工作文件比较"
+
+#: ../libsvn_client/diff.c:2582 ../libsvn_client/diff.c:2648
+msgid "Cannot ignore properties and show only properties at the same time"
+msgstr ""
+
+#: ../libsvn_client/diff_local.c:609
 #, c-format
 msgid "'%s' is not the same node kind as '%s'"
 msgstr "'%s' 与 '%s' 的节点类型不同"
 
+#: ../libsvn_client/diff_local.c:629 ../libsvn_wc/props.c:1568
 #, c-format
 msgid "'%s' is not a file or directory"
 msgstr "“%s”不是文件或目录"
 
-#, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录 “%s” 没有 URL"
-
-msgid "Summarized diffs are only supported between a path's text-base and its working files at this time"
-msgstr "当前概要差异只支持参考文件与其工作文件比较"
-
-msgid "Summarizing diff cannot compare repository to WC"
-msgstr "版本库和工作副本不能比较差异概要"
-
-msgid "Cannot ignore properties and show only properties at the same time"
-msgstr ""
-
+#: ../libsvn_client/export.c:102
 #, c-format
 msgid "'%s' is not a valid EOL value"
 msgstr "“%s” 不是一个有效的 EOL 值"
 
+#: ../libsvn_client/export.c:240
 msgid "Destination directory exists, and will not be overwritten unless forced"
 msgstr "目的目录已存在,除非强迫为之,否则不会覆盖"
 
+#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1525
+#: ../libsvn_wc/adm_crawler.c:1204 ../libsvn_wc/conflicts.c:1293
+#: ../libsvn_wc/copy.c:586 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
+#: ../libsvn_wc/info.c:409 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227
+#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2509
+#: ../libsvn_wc/wc_db.c:2703 ../libsvn_wc/wc_db.c:2727
+#: ../libsvn_wc/wc_db.c:2885 ../libsvn_wc/wc_db.c:3876
+#: ../libsvn_wc/wc_db.c:5895 ../libsvn_wc/wc_db.c:6215
+#: ../libsvn_wc/wc_db.c:6376 ../libsvn_wc/wc_db.c:6530
+#: ../libsvn_wc/wc_db.c:8355 ../libsvn_wc/wc_db.c:8812
+#: ../libsvn_wc/wc_db.c:9441 ../libsvn_wc/wc_db.c:9588
+#: ../libsvn_wc/wc_db.c:9728 ../libsvn_wc/wc_db.c:10078
+#: ../libsvn_wc/wc_db.c:11565 ../libsvn_wc/wc_db.c:11641
+#: ../libsvn_wc/wc_db.c:13175 ../libsvn_wc/wc_db.c:13235
+#: ../libsvn_wc/wc_db.c:13373 ../libsvn_wc/wc_db.c:13531
+#: ../libsvn_wc/wc_db.c:13968 ../libsvn_wc/wc_db.c:14749
 #, c-format
 msgid "The node '%s' was not found."
 msgstr "找不到节点 '%s'。"
 
+#: ../libsvn_client/export.c:283 ../libsvn_client/export.c:1182
+#: ../libsvn_client/export.c:1239
 #, c-format
 msgid "Destination file '%s' exists, and will not be overwritten unless forced"
 msgstr "目标文件“%s”已存在,除非强迫为之,否则不会被覆盖"
 
+#: ../libsvn_client/export.c:289 ../libsvn_client/export.c:1187
+#: ../libsvn_client/export.c:1244
 #, c-format
 msgid "Destination '%s' exists. Cannot overwrite directory with non-directory"
 msgstr "目标“%s”已存在。不能用非目录覆盖目录"
 
+#: ../libsvn_client/export.c:471 ../libsvn_client/export.c:620
+#: ../libsvn_client/export.c:1076
 #, c-format
 msgid "'%s' exists and is not a directory"
 msgstr "“%s” 已存在且不是目录"
 
+#: ../libsvn_client/export.c:475 ../libsvn_client/export.c:624
+#: ../libsvn_client/export.c:1080
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s” 已存在"
 
+#: ../libsvn_client/externals.c:406
 #, c-format
-msgid "Checksum mismatch for '%s'"
-msgstr "'%s' 的校验和不匹配"
-
-#, 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:431
 #, 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:444
 #, c-format
 msgid "The file external '%s' can not be created because the node exists."
 msgstr "不能创建文件外部引用 '%s',节点已经存在。"
 
+#: ../libsvn_client/externals.c:703
 #, c-format
 msgid "URL '%s' at revision %ld doesn't exist"
 msgstr "URL “%s” 在版本 %ld 中不存在"
 
+#: ../libsvn_client/externals.c:708
 #, c-format
 msgid "URL '%s' at revision %ld is not a file or a directory"
 msgstr "URL “%s” 在版本 %ld 中不是文件或目录"
 
+#: ../libsvn_client/externals.c:786
 #, 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”中"
 
-#, c-format
-msgid "Path '%s' is not in the working copy"
-msgstr "路径 “%s” 不在工作副本中"
-
+#: ../libsvn_client/externals.c:979
 #, c-format
 msgid "Traversal of '%s' found no ambient depth"
 msgstr "在 “%s” 中找不到深度"
 
+#: ../libsvn_client/import.c:159
 #, c-format
-msgid "URL '%s' non-existent in revision %ld"
-msgstr "URL “%s” 不在版本 %ld 中"
+msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
+msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
 
+#: ../libsvn_client/import.c:489
 #, c-format
-msgid "Server does not support retrieving information about the repository root"
-msgstr "服务器不支持取得版本库根的信息"
+msgid "Unknown or unversionable type for '%s'"
+msgstr "“%s” 是未知类型或不可纳入版本控制"
+
+#: ../libsvn_client/import.c:709
+msgid "New entry name required when importing a file"
+msgstr "导入文件时,需要一个新的条目名称"
+
+#: ../libsvn_client/import.c:760 ../libsvn_client/patch.c:3019
+#: ../libsvn_client/patch.c:3031 ../libsvn_wc/delete.c:93
+#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%s” 不存在"
+
+#: ../libsvn_client/import.c:896
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%s” 是保留名称,无法被导入"
+
+#: ../libsvn_client/info.c:310 ../libsvn_client/list.c:376
+#, c-format
+msgid "URL '%s' non-existent in revision %ld"
+msgstr "URL “%s” 不在版本 %ld 中"
 
+#: ../libsvn_client/locking_commands.c:266
+#: ../libsvn_client/locking_commands.c:292
 msgid "No common parent found, unable to operate on disjoint arguments"
 msgstr "没有找到公共父节点,不能在分离的参数上操作"
 
+#: ../libsvn_client/locking_commands.c:325
 #, c-format
-msgid "'%s' has no URL"
-msgstr "“%s” 没有 URL"
+msgid "The node '%s' is not a file"
+msgstr "节点 '%s' 不是文件"
 
+#: ../libsvn_client/locking_commands.c:345
 msgid "Unable to lock/unlock across multiple repositories"
 msgstr "不能跨越多个版本库进行锁定/解锁"
 
+#: ../libsvn_client/locking_commands.c:400
 #, c-format
 msgid "'%s' is not locked in this working copy"
 msgstr "“%s” 没有在工作副本中锁定"
 
+#: ../libsvn_client/locking_commands.c:450
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s” 没有被锁定"
 
+#: ../libsvn_client/locking_commands.c:483 ../libsvn_fs/fs-loader.c:1457
+#: ../libsvn_ra/ra_loader.c:1074
 msgid "Lock comment contains illegal characters"
 msgstr "锁定注释包含非法字符"
 
-msgid "Missing required revision specification"
-msgstr "未提供请求的版本"
+#: ../libsvn_client/log.c:309
+msgid "No valid target found"
+msgstr "没有发现合法目标"
 
+#: ../libsvn_client/log.c:340
 #, c-format
 msgid "'%s' is not a relative path"
 msgstr "'%s' 不是相对路径"
 
+#: ../libsvn_client/log.c:366
 msgid "When specifying working copy paths, only one target may be given"
 msgstr "当指定工作副本路径时,只能给出一个目标"
 
-#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "条目“%s”没有URL"
+#: ../libsvn_client/log.c:390 ../libsvn_client/revisions.c:189
+msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
+msgstr "对于 URL,版本关键字 PREV,BASE,或 COMMITTED 非法"
+
+#: ../libsvn_client/log.c:523 ../libsvn_client/log.c:830
+msgid "Missing required revision specification"
+msgstr "未提供请求的版本"
 
+#: ../libsvn_client/merge.c:439
 #, c-format
-msgid "Url '%s' of '%s' is not in repository '%s'"
-msgstr "URL“%s”(祖先“%s”)不在版本库“%s”中"
+msgid "URL '%s' of '%s' is not in repository '%s'"
+msgstr "URL“%s”(本地路径“%s”)不在版本库“%s”中"
 
+#: ../libsvn_client/merge.c:476
 #, c-format
 msgid "'%s' must be from the same repository as '%s'"
 msgstr "“%s”必须与“%s”在同一个版本库中"
@@ -1447,20 +1977,27 @@ msgstr "“%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:2028
 msgid ".working"
 msgstr ".working"
 
+#: ../libsvn_client/merge.c:2030
 #, c-format
 msgid ".merge-left.r%ld"
 msgstr ".merge-left.r%ld"
 
+#: ../libsvn_client/merge.c:2033
 #, 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:4681
+msgid ""
+"Cannot reverse-merge a range from a path's own future history; try updating "
+"first"
 msgstr "不能从路径的未来历史中反向合并范围;请先更新"
 
+#: ../libsvn_client/merge.c:5416
 #, c-format
 msgid ""
 "One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -1471,200 +2008,315 @@ msgstr ""
 "当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n"
 "请解决所有冲突后,再次运行合并,处理剩余的未合并版本"
 
-#, c-format
-msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
+#: ../libsvn_client/merge.c:6231
+#, fuzzy, c-format
+msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
 msgstr "在“%s”发现了非法的合并信息;合并跟踪是不可能的"
 
-msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
+#: ../libsvn_client/merge.c:6380
+msgid ""
+"Merge tracking not allowed with missing subtrees; try restoring these items "
+"first:\n"
 msgstr "合并跟踪不允许丢失子树; 请先恢复这些项目:\n"
 
-#, c-format
-msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
+#: ../libsvn_client/merge.c:7380
+#, fuzzy, c-format
+msgid ""
+"Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
 msgstr "在合并目标“%s”发现了非法的合并信息;合并跟踪是不可能的"
 
+#: ../libsvn_client/merge.c:9697
 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:9704 ../libsvn_client/merge.c:10029
+msgid ""
+"Merge from foreign repository is not compatible with mergeinfo modification"
 msgstr "从外部版本库合并与合并信息修改不兼容"
 
+#: ../libsvn_client/merge.c:10122 ../libsvn_client/merge.c:10265
 #, c-format
 msgid "Merge target '%s' does not exist in the working copy"
 msgstr "合并目标 “%s” 不在工作副本中"
 
+#: ../libsvn_client/merge.c:10145
 msgid "Cannot determine revision of working copy"
 msgstr "不能确定工作副本的版本"
 
-#, c-format
-msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
+#: ../libsvn_client/merge.c:10151
+#, fuzzy, c-format
+msgid ""
+"Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
 msgstr "不能合并到有混合版本的工作副本 [%lu:%lu] 中;请先更新"
 
+#: ../libsvn_client/merge.c:10166
 msgid "Cannot merge into a working copy with a switched subtree"
 msgstr "不能合并到已经切换子目录的工作副本中"
 
+#: ../libsvn_client/merge.c:10182
 msgid "Cannot merge into a working copy that has local modifications"
 msgstr "不能合并到有本地修改的工作副本中"
 
+#: ../libsvn_client/merge.c:10202 ../svn/merge-cmd.c:60
 #, c-format
-msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
+msgid ""
+"Invalid merge source '%s'; a working copy path can only be used with a "
+"repository revision (a number, a date, or head)"
 msgstr ""
 
+#: ../libsvn_client/merge.c:10525 ../svn/merge-cmd.c:127
 msgid "Merge sources must both be either paths or URLs"
 msgstr "合并源必须同时是路径或 URL"
 
+#: ../libsvn_client/merge.c:11286 ../libsvn_client/merge.c:11448
+#: ../libsvn_client/merge.c:12320
 #, c-format
 msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
 msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系"
 
+#: ../libsvn_client/merge.c:11398
 #, 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:11408
 msgid "Reintegrate merge not possible"
 msgstr "复兴合并是不可能的"
 
+#: ../libsvn_client/merge.c:11481
 #, 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/merge.c:11543
 #, c-format
-msgid "Can't reintegrate into '%s' because it is locally added and therefore not related to the merge source"
+msgid ""
+"Can't reintegrate into '%s' because it is locally added and therefore not "
+"related to the merge source"
+msgstr ""
+
+#: ../libsvn_client/merge.c:11811
+msgid "Cannot merge automatically while ignoring mergeinfo"
 msgstr ""
 
-msgid "The required merge is reintegrate-like, and the record-only option cannot be used with this kind of merge"
+#: ../libsvn_client/merge.c:12536
+msgid ""
+"The required merge is reintegrate-like, and the record-only option cannot be "
+"used with this kind of merge"
 msgstr ""
 
-msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge"
+#: ../libsvn_client/merge.c:12542
+msgid ""
+"The required merge is reintegrate-like, and the depth option cannot be used "
+"with this kind of merge"
 msgstr ""
 
-msgid "The required merge is reintegrate-like, and the force option cannot be used with this kind of merge"
+#: ../libsvn_client/merge.c:12548
+msgid ""
+"The required merge is reintegrate-like, and the force_delete option cannot "
+"be used with this kind of merge"
 msgstr ""
 
+#: ../libsvn_client/mergeinfo.c:1696
 msgid "Only depths 'infinity' and 'empty' are currently supported"
 msgstr "当前仅支持深度 'infinity' 和 'empty'"
 
+#: ../libsvn_client/patch.c:279
 #, c-format
 msgid "Cannot strip %u components from '%s'"
 msgstr "不能修剪 %u 个组件于“%s”"
 
+#: ../libsvn_client/patch.c:910
+#, fuzzy
+msgid "Invalid link representation"
+msgstr "正在读取修订版"
+
+#: ../libsvn_client/patch.c:3008
 msgid "strip count must be positive"
 msgstr "修剪计数取值必须为正"
 
+#: ../libsvn_client/patch.c:3024 ../libsvn_fs_base/tree.c:3978
+#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3077
+#: ../libsvn_fs_fs/tree.c:3082 ../libsvn_ra/compat.c:675
+#: ../libsvn_ra_local/ra_plugin.c:1163
 #, c-format
 msgid "'%s' is not a file"
 msgstr "“%s”不是一个文件"
 
+#: ../libsvn_client/patch.c:3036 ../libsvn_wc/util.c:59
 #, c-format
 msgid "'%s' is not a directory"
 msgstr "“%s”不是目录"
 
+#: ../libsvn_client/prop_commands.c:60
 #, c-format
 msgid "'%s' is a wcprop, thus not accessible to clients"
 msgstr "“%s” 是一个工作副本属性,应此不能被客户端存取"
 
+#: ../libsvn_client/prop_commands.c:155
 #, c-format
 msgid "Property '%s' is not a regular property"
 msgstr "属性 “%s” 不是常规属性"
 
+#: ../libsvn_client/prop_commands.c:266
 #, c-format
 msgid "Revision property '%s' not allowed in this context"
 msgstr "此上下文中不允许版本属性 “%s”"
 
+#: ../libsvn_client/prop_commands.c:273 ../libsvn_client/prop_commands.c:468
 #, c-format
 msgid "Bad property name: '%s'"
 msgstr "属性名称错误: “%s”"
 
+#: ../libsvn_client/prop_commands.c:301
 msgid "Targets must be working copy paths"
 msgstr "目标必须是工作副本路径"
 
+#: ../libsvn_client/prop_commands.c:362
 msgid "Targets must be URLs"
 msgstr "目标必须是 URL"
 
+#: ../libsvn_client/prop_commands.c:372
 msgid "Setting property on non-local targets needs a base revision"
 msgstr "设定非本地目标的属性需要版本参数"
 
+#: ../libsvn_client/prop_commands.c:387
 #, c-format
 msgid "Setting property '%s' on non-local targets is not supported"
 msgstr "不支持对非本地目标设置属性“%s”"
 
+#: ../libsvn_client/prop_commands.c:415
 #, 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:424
 #, 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:432
 #, 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:463
+msgid ""
+"Author name should not contain a newline; value will not be set unless forced"
 msgstr "作者名称不能包含换行;除非强迫为之,否则其值不会被设定"
 
+#: ../libsvn_client/prop_commands.c:577
 #, c-format
 msgid "'%s' does not exist in revision %ld"
 msgstr "没有路径 “%s” 在版本 %ld 中"
 
+#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1092
+#: ../libsvn_wc/crop.c:168
 #, c-format
 msgid "Unknown node kind for '%s'"
 msgstr "“%s” 是未知的节点类型"
 
-#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+#: ../libsvn_client/ra.c:161
+#, fuzzy, c-format
+msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
 msgstr "试图在非提交操作中,设定工作副本属性 “%s” 于 “%s”"
 
+#: ../libsvn_client/ra.c:415
 #, c-format
 msgid "Redirect cycle detected for URL '%s'"
 msgstr "z在 URL '%s' 检测到循环重定向"
 
+#: ../libsvn_client/ra.c:501 ../libsvn_client/ra.c:837
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%s” 没有 URL"
+
+#: ../libsvn_client/ra.c:678 ../libsvn_fs_fs/fs_fs.c:1941
+#: ../libsvn_fs_fs/fs_fs.c:1996 ../libsvn_fs_fs/fs_fs.c:2007
+#: ../libsvn_repos/log.c:2307 ../libsvn_repos/log.c:2311
+#, c-format
+msgid "No such revision %ld"
+msgstr "没有版本 %ld"
+
+#: ../libsvn_client/ra.c:704 ../libsvn_ra/compat.c:395
 #, c-format
 msgid "Unable to find repository location for '%s' in revision %ld"
 msgstr "“%s” 的版本库位置不在版本 %ld 中"
 
+#: ../libsvn_client/ra.c:716
 #, 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:931 ../libsvn_wc/externals.c:570
 #, 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” 的请求版本类型无法识别"
 
-msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
-msgstr "对于 URL,版本关键字 PREV,BASE,或 COMMITTED 非法"
-
+#: ../libsvn_client/status.c:407 ../libsvn_client/status.c:586
+#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
+#: ../libsvn_wc/wc_db.c:12787 ../libsvn_wc/wc_db_wcroot.c:630
 #, c-format
 msgid "'%s' is not a working copy"
 msgstr "“%s”不是工作副本"
 
+#: ../libsvn_client/status.c:454
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr "条目“%s”没有URL"
+
+#: ../libsvn_client/switch.c:129
 #, c-format
 msgid "Cannot both exclude and switch a path"
 msgstr "不能同时排除和切换同一路径"
 
+#: ../libsvn_client/switch.c:150
 #, c-format
 msgid "Cannot switch '%s' because it is not in the repository yet"
 msgstr "不能切换“%s”,因为还不在版本库中"
 
+#: ../libsvn_client/switch.c:175
+#, c-format
+msgid "Directory '%s' has no URL"
+msgstr "目录 “%s” 没有 URL"
+
+#: ../libsvn_client/switch.c:215 ../libsvn_ra_local/ra_plugin.c:235
+#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4827
 #, c-format
 msgid ""
 "'%s'\n"
@@ -1676,346 +2328,473 @@ msgstr ""
 "“%s”\n"
 "并不在同一个版本库中"
 
+#: ../libsvn_client/switch.c:240
 #, c-format
 msgid "'%s' shares no common ancestry with '%s'"
 msgstr "“%s”与“%s”没有共同的祖先"
 
+#: ../libsvn_client/util.c:329
 #, c-format
 msgid "Cannot mix repository and working copy targets"
 msgstr "不能混合版本库和工作副本目标"
 
+#: ../libsvn_delta/svndiff.c:175
 msgid "Compression of svndiff data failed"
 msgstr "压缩 svndiff 数据失败"
 
+#: ../libsvn_delta/svndiff.c:538
 msgid "Decompression of svndiff data failed: no size"
 msgstr "解压 svndiff 数据失败: 没有长度"
 
+#: ../libsvn_delta/svndiff.c:541
 msgid "Decompression of svndiff data failed: size too large"
 msgstr "解压 svndiff 数据失败: 长度太大"
 
+#: ../libsvn_delta/svndiff.c:565
 msgid "Decompression of svndiff data failed"
 msgstr "解压 svndiff 数据失败"
 
+#: ../libsvn_delta/svndiff.c:572
 msgid "Size of uncompressed data does not match stored original length"
 msgstr "解压后的数据长度与原始长度不相等"
 
+#: ../libsvn_delta/svndiff.c:648
 #, c-format
 msgid "Invalid diff stream: insn %d cannot be decoded"
 msgstr "无效的差异流: insn %d 不能解码"
 
+#: ../libsvn_delta/svndiff.c:652
 #, c-format
 msgid "Invalid diff stream: insn %d has length zero"
 msgstr "无效的差异流: insn %d 出现 0 长度"
 
+#: ../libsvn_delta/svndiff.c:656
 #, c-format
 msgid "Invalid diff stream: insn %d overflows the target view"
 msgstr "无效的差异流: insn %d 溢出目标视图"
 
+#: ../libsvn_delta/svndiff.c:665
 #, c-format
 msgid "Invalid diff stream: [src] insn %d overflows the source view"
 msgstr "无效的差异流: [src] insn %d 溢出源视图"
 
+#: ../libsvn_delta/svndiff.c:672
 #, 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:679
 #, c-format
 msgid "Invalid diff stream: [new] insn %d overflows the new data section"
 msgstr "无效的差异流: [new] insn %d 溢出新数据区域"
 
+#: ../libsvn_delta/svndiff.c:689
 msgid "Delta does not fill the target window"
 msgstr "Delta 没有填充目标窗口"
 
+#: ../libsvn_delta/svndiff.c:692
 msgid "Delta does not contain enough new data"
 msgstr "Delta 没有包含足够新数据"
 
+#: ../libsvn_delta/svndiff.c:797
 msgid "Svndiff has invalid header"
 msgstr "Svndiff 数据包含无效头"
 
+#: ../libsvn_delta/svndiff.c:853 ../libsvn_delta/svndiff.c:1035
 msgid "Svndiff contains a too-large window"
 msgstr "Svndiff 数据包含太大的窗口"
 
+#: ../libsvn_delta/svndiff.c:860 ../libsvn_delta/svndiff.c:1042
 msgid "Svndiff contains corrupt window header"
 msgstr "Svndiff 数据包含无效窗口"
 
+#: ../libsvn_delta/svndiff.c:869
 msgid "Svndiff has backwards-sliding source views"
 msgstr "Svndiff 数据包含向后变化的资源视图"
 
+#: ../libsvn_delta/svndiff.c:926 ../libsvn_delta/svndiff.c:983
+#: ../libsvn_delta/svndiff.c:1064
 msgid "Unexpected end of svndiff input"
 msgstr "svndiff 输入意料结束"
 
+#: ../libsvn_diff/diff_file.c:1094
 #, c-format
 msgid "The file '%s' changed unexpectedly during diff"
 msgstr "文件“%s”在比较期间意外改变"
 
+#: ../libsvn_diff/diff_file.c:1264
 msgid "Error in options to internal diff"
 msgstr "内部比较的选项错误"
 
+#: ../libsvn_diff/diff_file.c:1290
 #, c-format
 msgid "Invalid argument '%s' in diff options"
 msgstr "diff 选项中参数'%s'无效"
 
-msgid "No newline at end of file"
-msgstr "文件没有以空行结尾"
-
 #. Order of date components can be different in different languages
+#: ../libsvn_diff/diff_file.c:1787
 msgid "%a %b %e %H:%M:%S %Y"
 msgstr "%a %b %e %H:%M:%S %Y"
 
+#: ../libsvn_diff/diff_file.c:1863 ../libsvn_diff/diff_file.c:1879
+#, fuzzy, c-format
+msgid "Path '%s' must be inside the directory '%s'"
+msgstr "路径 “%s” 必须是目录 “%s” 的直接子孙"
+
+#: ../libsvn_diff/diff_file.c:2397
 #, c-format
 msgid "Failed to delete mmap '%s'"
 msgstr "删除 mmap“%s”失败"
 
+#: ../libsvn_diff/util.c:463
+#, c-format
+msgid "   Reverse-merged %s:r%s%s"
+msgstr "   已经撤销合并 %s:r%s%s"
+
+#: ../libsvn_diff/util.c:480
+#, c-format
+msgid "   Merged %s:r%s%s"
+msgstr "   已经合并 %s:r%s%s"
+
+#: ../libsvn_fs/editor.c:219
 #, c-format
 msgid "Revision for modifying '%s' is required"
 msgstr ""
 
+#: ../libsvn_fs/editor.c:228
 #, c-format
 msgid "'%s' is out of date; try updating"
 msgstr "“%s” 已经过时;请先更新"
 
+#: ../libsvn_fs/editor.c:265
 #, c-format
 msgid "'%s' has been modified since the commit began (restart the commit)"
 msgstr "自提交开始,“%s” 已有本地修改 (重新提交)"
 
+#: ../libsvn_fs/editor.c:323
 #, c-format
 msgid "'%s' already exists, so may be out of date; try updating"
 msgstr "“%s” 已经存在,因此可能过时;请先更新"
 
+#: ../libsvn_fs/editor.c:456
 msgid "The filesystem does not support 'absent' nodes"
 msgstr "此文件系统不支持 'absent' 节点"
 
+#: ../libsvn_fs/fs-loader.c:120
 #, c-format
 msgid "Invalid name for FS type '%s'"
 msgstr "文件类型“%s”的名称无效"
 
+#: ../libsvn_fs/fs-loader.c:137 ../libsvn_ra/ra_loader.c:161
+#: ../libsvn_ra/ra_loader.c:174
 #, c-format
 msgid "'%s' does not define '%s()'"
 msgstr "“%s” 未定义 “%s()”"
 
+#: ../libsvn_fs/fs-loader.c:163

[... 14993 lines stripped ...]


Mime
View raw message