diff options
Diffstat (limited to 'subversion/po/zh_CN.po')
| -rw-r--r-- | subversion/po/zh_CN.po | 8506 |
1 files changed, 6372 insertions, 2134 deletions
diff --git a/subversion/po/zh_CN.po b/subversion/po/zh_CN.po index 42b3490..a11599d 100644 --- a/subversion/po/zh_CN.po +++ b/subversion/po/zh_CN.po @@ -21,6 +21,9 @@ # Update to new pot: # ../../tools/po/po-update.sh zh_CN # +# Merge from trunk: +# python ../../../../trunk/tools/dev/po-merge.py < ../../../../trunk/subversion/po/zh_CN.po zh_CN.po +# # Check translation: # msgfmt --statistics -c -o zh_CN.mo zh_CN.po # @@ -53,1037 +56,1397 @@ # msgid "" msgstr "" -"Project-Id-Version: subversion 1.7\n" +"Project-Id-Version: subversion 1.8\n" "Report-Msgid-Bugs-To: dev@subversion.apache.org\n" -"POT-Creation-Date: 2012-02-27 09:18+0000\n" -"PO-Revision-Date: 2012-02-27 09:18+0000\n" +"POT-Creation-Date: 2013-07-03 16:58+0800\n" +"PO-Revision-Date: 2013-07-03 16:57+0800\n" "Last-Translator: Subversion Developers <dev@subversion.apache.org>\n" "Language-Team: Simplified Chinese <dev@subversion.apache.org>\n" -"Language: \n" +"Language: zh_CN\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 *". +#. 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 *". +#. 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 *". +#. 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 *". +#. 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 *". +#. 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 *". +#. 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”关联" #. 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 *". +#. 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:944 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:569 ../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”" -msgid "The operation can not be performed with the specified depth" +#: ../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:886 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:873 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 "没有运行文件系统编辑器完成进程" + +#: ../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:857 msgid "Bad URL passed to RA layer" msgstr "传递至 RA 层的 URL 错误" +#: ../include/svn_error_codes.h:861 msgid "Authorization failed" msgstr "认证失败" +#: ../include/svn_error_codes.h:865 msgid "Unknown authorization method" msgstr "未知认证" +#: ../include/svn_error_codes.h:869 msgid "Repository access method not implemented" msgstr "版本库未实现存取方法" +#: ../include/svn_error_codes.h:877 msgid "Repository has no UUID" msgstr "版本库没有 UUID" +#: ../include/svn_error_codes.h:881 msgid "Unsupported RA plugin ABI version" msgstr "不支持此 RA 插件的 ABI 版本" +#: ../include/svn_error_codes.h:891 msgid "Server can only replay from the root of a repository" msgstr "服务器只能从版本库的根重放" +#: ../include/svn_error_codes.h:896 msgid "Repository UUID does not match expected UUID" msgstr "版本库的 UUID 与期望的 UUID 不匹配" +#: ../include/svn_error_codes.h:901 msgid "Repository root URL does not match expected root URL" msgstr "版本库根 URL 与期望的根 URL 不匹配" +#: ../include/svn_error_codes.h:906 msgid "Session URL does not match expected session URL" msgstr "会话 URL 与期望的会话 URL 不匹配" +#: ../include/svn_error_codes.h:911 ../libsvn_ra_svn/client.c:491 +#, c-format +msgid "Can't create tunnel" +msgstr "无法创建隧道" + +#: ../include/svn_error_codes.h:917 msgid "RA layer failed to init socket layer" msgstr "RA 层无法初始化 socket 层" +#: ../include/svn_error_codes.h:921 msgid "RA layer failed to create HTTP request" msgstr "RA 层创建 HTTP 请求失败" +#: ../include/svn_error_codes.h:925 msgid "RA layer request failed" msgstr "RA 层请求失败" +#: ../include/svn_error_codes.h:929 msgid "RA layer didn't receive requested OPTIONS info" msgstr "RA 层无法取得请求的 OPTIONS 信息" +#: ../include/svn_error_codes.h:933 msgid "RA layer failed to fetch properties" msgstr "RA 层无法取得属性" +#: ../include/svn_error_codes.h:937 msgid "RA layer file already exists" msgstr "RA 层文件已经存在" +#: ../include/svn_error_codes.h:951 msgid "HTTP Path Not Found" msgstr "找不到 HTTP 路径" +#: ../include/svn_error_codes.h:955 msgid "Failed to execute WebDAV PROPPATCH" msgstr "执行 WebDAV PROPPATCH 失败" +#: ../include/svn_error_codes.h:960 ../include/svn_error_codes.h:1403 +#: ../libsvn_ra_svn/marshal.c:1075 ../libsvn_ra_svn/marshal.c:1285 +#: ../libsvn_ra_svn/marshal.c:1315 msgid "Malformed network data" msgstr "非法网络数据" +#: ../include/svn_error_codes.h:965 msgid "Unable to extract data from response header" msgstr "不能从响应的头信息中获取数据" +#: ../include/svn_error_codes.h:970 msgid "Repository has been moved" msgstr "版本库已经移动" +#: ../include/svn_error_codes.h:975 ../libsvn_ra_serf/update.c:2881 +#: ../libsvn_ra_serf/util.c:767 msgid "Connection timed out" msgstr "连接超时" +#: ../include/svn_error_codes.h:980 msgid "URL access forbidden for unknown reason" msgstr "因为未知的理由，禁止访问 URL" +#: ../include/svn_error_codes.h:986 ../include/svn_error_codes.h:1407 msgid "Couldn't find a repository" msgstr "无法找到版本库" +#: ../include/svn_error_codes.h:990 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:996 msgid "Svndiff data has invalid header" msgstr "svndiff 数据包含无效头" +#: ../include/svn_error_codes.h:1000 msgid "Svndiff data contains corrupt window" msgstr "Svndiff 数据包含损坏窗口" +#: ../include/svn_error_codes.h:1004 msgid "Svndiff data contains backward-sliding source view" msgstr "Svndiff 数据包含向后变化的资源视图" +#: ../include/svn_error_codes.h:1008 msgid "Svndiff data contains invalid instruction" msgstr "svndiff 数据包含无效指令" +#: ../include/svn_error_codes.h:1012 msgid "Svndiff data ends unexpectedly" msgstr "svndiff 数据意外结束" +#: ../include/svn_error_codes.h:1016 msgid "Svndiff compressed data is invalid" msgstr "非法 svndiff 压缩数据" -msgid "Diff data source modified unexpectedly" -msgstr "svndiff 数据被意外修改" - +#: ../include/svn_error_codes.h:1022 msgid "Apache has no path to an SVN filesystem" msgstr "Apache 没有指向 SVN 文件系统的路径" +#: ../include/svn_error_codes.h:1026 msgid "Apache got a malformed URI" msgstr "Apache 得到非法 URI" +#: ../include/svn_error_codes.h:1030 msgid "Activity not found" msgstr "没有找到活动项" +#: ../include/svn_error_codes.h:1034 msgid "Baseline incorrect" msgstr "基线错误" +#: ../include/svn_error_codes.h:1038 msgid "Input/output error" msgstr "输出/输出错误" +#: ../include/svn_error_codes.h:1044 msgid "A path under version control is needed for this operation" msgstr "只能对纳入版本控制的路径执行此操作" +#: ../include/svn_error_codes.h:1048 msgid "Repository access is needed for this operation" msgstr "此操作需要存取版本库" +#: ../include/svn_error_codes.h:1052 msgid "Bogus revision information given" msgstr "给出的版本信息非法" +#: ../include/svn_error_codes.h:1056 msgid "Attempting to commit to a URL more than once" msgstr "试图对 URL 进行多次提交" +#: ../include/svn_error_codes.h:1060 msgid "Operation does not apply to binary file" msgstr "不能对二进制文件执行此操作" +#: ../include/svn_error_codes.h:1066 msgid "Format of an svn:externals property was invalid" msgstr "svn:externals 属性格式非法" +#: ../include/svn_error_codes.h:1070 msgid "Attempting restricted operation for modified resource" msgstr "试图对已修改的资源进行受限操作" +#: ../include/svn_error_codes.h:1074 msgid "Operation does not apply to directory" msgstr "不能对目录执行此操作" +#: ../include/svn_error_codes.h:1078 msgid "Revision range is not allowed" msgstr "不允许的版本范围" +#: ../include/svn_error_codes.h:1082 msgid "Inter-repository relocation not allowed" msgstr "不支持版本库之间的重新定位" +#: ../include/svn_error_codes.h:1086 msgid "Author name cannot contain a newline" msgstr "作者名称不能换行" +#: ../include/svn_error_codes.h:1090 msgid "Bad property name" msgstr "属性名称错误" +#: ../include/svn_error_codes.h:1095 msgid "Two versioned resources are unrelated" msgstr "两个纳入版本控制的资源不相关" +#: ../include/svn_error_codes.h:1100 msgid "Path has no lock token" msgstr "路径没有锁定令牌" +#: ../include/svn_error_codes.h:1105 msgid "Operation does not support multiple sources" msgstr "此操作不支持多个源对象" +#: ../include/svn_error_codes.h:1110 msgid "No versioned parent directories" msgstr "没有受版本控制的父目录" +#: ../include/svn_error_codes.h:1115 ../include/svn_error_codes.h:1135 msgid "Working copy and merge source not ready for reintegration" msgstr "工作副本与合并来源没有准备好复兴" +#: ../include/svn_error_codes.h:1120 msgid "A file external cannot overwrite an existing versioned item" msgstr "外部引用的文件不能覆写已存的版本控制的条目" +#: ../include/svn_error_codes.h:1125 msgid "Invalid path component strip count specified" msgstr "指定了无效的路径组件修剪计数" +#: ../include/svn_error_codes.h:1130 msgid "Detected a cycle while processing the operation" msgstr "当处理此操作是，检测到死循环" +#: ../include/svn_error_codes.h:1140 msgid "Invalid mergeinfo detected in merge target" msgstr "在合并目标检测到了合并信息" +#: ../include/svn_error_codes.h:1145 msgid "Can't perform this operation without a valid lock token" msgstr "不能在没有合法的锁令牌时执行此操作" +#: ../include/svn_error_codes.h:1150 msgid "The operation is forbidden by the server" msgstr "操作被服务器禁止" +#: ../include/svn_error_codes.h:1156 msgid "A problem occurred; see other errors for details" msgstr "发生问题；请参阅其它错误信息" +#: ../include/svn_error_codes.h:1160 msgid "Failure loading plugin" msgstr "加载插件失败" +#: ../include/svn_error_codes.h:1164 msgid "Malformed file" msgstr "文件格式错误" +#: ../include/svn_error_codes.h:1168 msgid "Incomplete data" msgstr "数据不完整" +#: ../include/svn_error_codes.h:1172 msgid "Incorrect parameters given" msgstr "参数不正确" +#: ../include/svn_error_codes.h:1176 msgid "Tried a versioning operation on an unversioned resource" msgstr "试图对未纳入版本控制的资源进行版本操作" +#: ../include/svn_error_codes.h:1180 msgid "Test failed" msgstr "测试失败" +#: ../include/svn_error_codes.h:1184 msgid "Trying to use an unsupported feature" msgstr "试图使用不支持的特性" +#: ../include/svn_error_codes.h:1188 msgid "Unexpected or unknown property kind" msgstr "意外或未知的属性类型" +#: ../include/svn_error_codes.h:1192 msgid "Illegal target for the requested operation" msgstr "此请求操作的目标非法" +#: ../include/svn_error_codes.h:1196 msgid "MD5 checksum is missing" msgstr "没有 MD5 校验和" +#: ../include/svn_error_codes.h:1200 msgid "Directory needs to be empty but is not" msgstr "必须为空的目录有内容" +#: ../include/svn_error_codes.h:1204 msgid "Error calling external program" msgstr "调用外部程序错误" +#: ../include/svn_error_codes.h:1208 msgid "Python exception has been set with the error" msgstr "Python 异常被设为错误" +#: ../include/svn_error_codes.h:1212 msgid "A checksum mismatch occurred" msgstr "校验和错误" +#: ../include/svn_error_codes.h:1216 msgid "The operation was interrupted" msgstr "操作被中断" +#: ../include/svn_error_codes.h:1220 msgid "The specified diff option is not supported" msgstr "不支持指定的 diff 选项" +#: ../include/svn_error_codes.h:1224 msgid "Property not found" msgstr "找不到属性" +#: ../include/svn_error_codes.h:1228 msgid "No auth file path available" msgstr "未提供 auth 文件路径" +#: ../include/svn_error_codes.h:1233 msgid "Incompatible library version" msgstr "不兼容的库版本" +#: ../include/svn_error_codes.h:1238 msgid "Mergeinfo parse error" msgstr "分析合并信息出错" +#: ../include/svn_error_codes.h:1243 msgid "Cease invocation of this API" msgstr "停止调用此 API" +#: ../include/svn_error_codes.h:1248 msgid "Error parsing revision number" msgstr "解析版本号出错" +#: ../include/svn_error_codes.h:1253 msgid "Iteration terminated before completion" msgstr "迭代在完成前终止" +#: ../include/svn_error_codes.h:1258 msgid "Unknown changelist" msgstr "未知修改列表" +#: ../include/svn_error_codes.h:1263 msgid "Reserved directory name in command line arguments" msgstr "在命令行参数中包含保留的目录名称" +#: ../include/svn_error_codes.h:1268 msgid "Inquiry about unknown capability" msgstr "查询未知特性" +#: ../include/svn_error_codes.h:1273 msgid "Test skipped" msgstr "跳过测试" -msgid "apr memcache library not available" -msgstr "apr memcache 库不可用" +#: ../include/svn_error_codes.h:1278 +msgid "APR memcache library not available" +msgstr "APR memcache 库不可用" +#: ../include/svn_error_codes.h:1283 msgid "Couldn't perform atomic initialization" msgstr "不能完成原子的初始化" +#: ../include/svn_error_codes.h:1288 msgid "SQLite error" msgstr "SQLite 错误" +#: ../include/svn_error_codes.h:1293 msgid "Attempted to write to readonly SQLite db" msgstr "试图写至只读 SQLite 数据库" +#: ../include/svn_error_codes.h:1300 msgid "Unsupported schema found in SQLite db" msgstr "不支持 SQLite 数据库中的方案" +#: ../include/svn_error_codes.h:1305 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:1310 +msgid "" +"SQLite busy at transaction rollback; resetting all busy SQLite statements to " +"allow rollback" msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句，以便允许回滚" +#: ../include/svn_error_codes.h:1316 msgid "Constraint error in SQLite db" msgstr "在 SQLite 数据库中的约束出错" +#: ../include/svn_error_codes.h:1321 +msgid "Too many memcached servers configured" +msgstr "配置了太多的 memcached 服务器" + +#: ../include/svn_error_codes.h:1326 +msgid "Failed to parse version number string" +msgstr "解析版本号字符串失败" + +#: ../include/svn_error_codes.h:1331 +msgid "Atomic data storage is corrupt" +msgstr "原子数据存储损坏" + +#: ../include/svn_error_codes.h:1337 msgid "Error parsing arguments" msgstr "解析参数出错" +#: ../include/svn_error_codes.h:1341 msgid "Not enough arguments provided" msgstr "没有提供足够的参数" +#: ../include/svn_error_codes.h:1345 msgid "Mutually exclusive arguments specified" msgstr "参数冲突" +#: ../include/svn_error_codes.h:1349 msgid "Attempted command in administrative dir" msgstr "试图在管理目录中执行命令" +#: ../include/svn_error_codes.h:1353 msgid "The log message file is under version control" msgstr "日志信息文件被纳入版本控制" +#: ../include/svn_error_codes.h:1357 msgid "The log message is a pathname" msgstr "日志信息是路径名" +#: ../include/svn_error_codes.h:1361 msgid "Committing in directory scheduled for addition" msgstr "在调度增加的目录中进行提交" +#: ../include/svn_error_codes.h:1365 msgid "No external editor available" msgstr "没有外部编辑器可用" +#: ../include/svn_error_codes.h:1369 msgid "Something is wrong with the log message's contents" msgstr "日志信息内容不妥" +#: ../include/svn_error_codes.h:1373 msgid "A log message was given where none was necessary" msgstr "在不需要时给出日志信息" +#: ../include/svn_error_codes.h:1377 msgid "No external merge tool available" msgstr "没有外部合并工具可用" +#: ../include/svn_error_codes.h:1381 msgid "Failed processing one or more externals definitions" msgstr "处理一个或更多的外部定义失败" +#: ../include/svn_error_codes.h:1387 +msgid "Special code for wrapping server errors to report to client" +msgstr "用专用代码封装服务器错误以便报告客户端" + +#: ../include/svn_error_codes.h:1391 +msgid "Unknown svn protocol command" +msgstr "未知的 svn 协议命令" + +#: ../include/svn_error_codes.h:1395 +msgid "Network connection closed unexpectedly" +msgstr "网络连接意外关闭" + +#: ../include/svn_error_codes.h:1399 +msgid "Network read/write error" +msgstr "网络读写错误" + +#: ../include/svn_error_codes.h:1411 +msgid "Client/server version mismatch" +msgstr "客户端/服务器版本不匹配" + +#: ../include/svn_error_codes.h:1416 +msgid "Cannot negotiate authentication mechanism" +msgstr "无法协商认证机制" + +#: ../include/svn_error_codes.h:1421 +msgid "Editor drive was aborted" +msgstr "编辑器中止" + +#: ../include/svn_error_codes.h:1429 +msgid "Credential data unavailable" +msgstr "无法取得凭证数据" + +#: ../include/svn_error_codes.h:1433 +msgid "No authentication provider available" +msgstr "没有可用的认证提供者" + +#: ../include/svn_error_codes.h:1437 +msgid "All authentication providers exhausted" +msgstr "所有的认证提供者都不可用" + +#: ../include/svn_error_codes.h:1441 +msgid "Credentials not saved" +msgstr "没有保存凭证数据" + +#: ../include/svn_error_codes.h:1446 +msgid "Authentication failed" +msgstr "认证失败" + +#: ../include/svn_error_codes.h:1452 +msgid "Read access denied for root of edit" +msgstr "编辑根目录时拒绝读取" + +#: ../include/svn_error_codes.h:1457 +msgid "Item is not readable" +msgstr "条目不可读" + +#: ../include/svn_error_codes.h:1462 +msgid "Item is partially readable" +msgstr "条目部分可读" + +#: ../include/svn_error_codes.h:1466 +msgid "Invalid authz configuration" +msgstr "认证配置无效" + +#: ../include/svn_error_codes.h:1471 +msgid "Item is not writable" +msgstr "条目不能写" + +#: ../include/svn_error_codes.h:1478 +msgid "Diff data source modified unexpectedly" +msgstr "svndiff 数据被意外修改" + +#: ../include/svn_error_codes.h:1484 +msgid "Initialization of SSPI library failed" +msgstr "初始化 SSPI 库失败" + +#: ../include/svn_error_codes.h:1488 +msgid "Server SSL certificate untrusted" +msgstr "服务器的 SSL 证书不被信任" + +#: ../include/svn_error_codes.h:1493 +msgid "Initialization of the GSSAPI context failed" +msgstr "初始化 GSSAPI 失败" + +#: ../include/svn_error_codes.h:1498 +msgid "While handling serf response:" +msgstr "当处理 serf 的响应时:" + +#: ../include/svn_error_codes.h:1504 msgid "Assertion failure" msgstr "断言失败" +#: ../include/svn_error_codes.h:1508 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:875 #, c-format msgid "'%s' prevents creating parent of '%s'" msgstr "'%s' 阻止创建 '%s' 的父亲" +#: ../libsvn_client/add.c:914 ../libsvn_wc/adm_ops.c:731 #, 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:921 ../libsvn_wc/adm_ops.c:686 +#: ../libsvn_wc/workqueue.c:904 ../libsvn_wc/workqueue.c:998 #, c-format msgid "'%s' not found" msgstr "找不到 “%s”" +#: ../libsvn_client/add.c:927 ../libsvn_wc/adm_ops.c:691 +#: ../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:960 ../libsvn_client/changelist.c:65 +#: ../libsvn_client/changelist.c:104 ../libsvn_client/cleanup.c:55 +#: ../libsvn_client/export.c:1392 ../libsvn_client/import.c:815 +#: ../libsvn_client/patch.c:3009 ../libsvn_client/relocate.c:232 +#: ../libsvn_client/resolved.c:121 ../libsvn_client/revert.c:136 +#: ../libsvn_client/status.c:353 ../libsvn_client/switch.c:473 +#: ../libsvn_client/update.c:646 ../libsvn_client/upgrade.c:105 +#: ../svn/util.c:984 #, c-format msgid "'%s' is not a local path" msgstr "“%s”不是本地路径" +#: ../libsvn_client/add.c:1001 ../libsvn_client/copy_foreign.c:489 +#: ../libsvn_wc/adm_ops.c:765 ../libsvn_wc/copy.c:715 #, c-format -msgid "There is no valid uri above '%s'" -msgstr "在 '%s' 的上级没有合法的 URI" +msgid "'%s' is already under version control" +msgstr "“%s”已纳入版本控制" +#: ../libsvn_client/add.c:1134 ../libsvn_client/add.c:1161 #, c-format -msgid "Cannot calculate blame information for binary file '%s'" -msgstr "无法为二进制文件 “%s” 计算追溯信息" +msgid "There is no valid URI above '%s'" +msgstr "在 '%s' 的上级没有合法的 URI" +#: ../libsvn_client/blame.c:605 msgid "Start revision must precede end revision" msgstr "起始版本必须小于结束版本" +#: ../libsvn_client/blame.c:633 +#, c-format +msgid "Cannot calculate blame information for binary file '%s'" +msgstr "无法为二进制文件 “%s” 计算追溯信息" + +#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:610 +#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:833 +#: ../libsvn_client/prop_commands.c:1388 ../libsvn_client/revisions.c:104 +#: ../libsvn_wc/adm_ops.c:1196 ../libsvn_wc/adm_ops.c:1246 +#: ../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:1095 #, 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” 已经存在并且不是目录" -#, c-format -msgid "Improper relative URL '%s'" -msgstr "不正确的相对 URL“%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' 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:307 #, 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:606 #, c-format msgid "'%s' is a URL, but URLs cannot be commit targets" msgstr "“%s” 是 URL，但是 URL 不可作为提交目标" +#: ../libsvn_client/commit.c:728 msgid "" "Commit can only commit to a single repository at a time.\n" "Are all targets part of the same working copy?" @@ -1091,353 +1454,538 @@ msgstr "" "每次提交只能针对一个版本库。\n" "是否所有目标都属于同一工作副本？" +#: ../libsvn_client/commit.c:844 +#, 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" +msgstr "" + +#: ../libsvn_client/commit.c:875 +#, 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" +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”" -#, c-format -msgid "Aborting commit: '%s' remains in conflict" -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 "Unknown entry kind for '%s'" -msgstr "“%s” 有未知的条目类型" +msgid "Aborting commit: '%s' remains in conflict" +msgstr "提交终止: “%s” 处于冲突状态" +#: ../libsvn_client/commit_util.c:685 #, c-format -msgid "Entry '%s' has unexpectedly changed special status" -msgstr "条目 “%s” 意外改变状态" +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' 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:862 +#, 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:10116 +#: ../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:1119 +#, 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:1185 ../libsvn_wc/diff_editor.c:1977 +#: ../libsvn_wc/diff_editor.c:2056 ../libsvn_wc/externals.c:651 +#: ../libsvn_wc/update_editor.c:4205 +#, 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:3953 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:10523 msgid "Not all required revisions are specified" msgstr "没有全部提供需要的版本" -msgid "At least one revision must be non-local for a pegged diff" -msgstr "对于铆钉差异，必须至少有一个非本地版本" +#: ../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' 中" -msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported" -msgstr "抱歉，svn_client_diff5 尚不支持这种调用方式" +#: ../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 "当前概要差异只支持参考文件与其工作文件比较" -msgid "Only diffs between a path's text-base and its working files are supported at this time" -msgstr "当前 diff 只支持参考文件与其工作文件比较" +#: ../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 "Directory '%s' has no URL" -msgstr "目录 “%s” 没有 URL" +msgid "'%s' is not the same node kind as '%s'" +msgstr "'%s' 与 '%s' 的节点类型不同" -msgid "Summarizing diff can only compare repository to repository" -msgstr "只有版本库和版本库才能比较差异概要" +#: ../libsvn_client/diff_local.c:629 ../libsvn_wc/props.c:1568 +#, c-format +msgid "'%s' is not a file or directory" +msgstr "“%s”不是文件或目录" +#: ../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:235 ../libsvn_wc/crop.c:326 +#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:704 ../libsvn_wc/props.c:227 +#: ../libsvn_wc/status.c:2781 ../libsvn_wc/wc_db.c:2497 +#: ../libsvn_wc/wc_db.c:2691 ../libsvn_wc/wc_db.c:2715 +#: ../libsvn_wc/wc_db.c:2873 ../libsvn_wc/wc_db.c:3864 +#: ../libsvn_wc/wc_db.c:5883 ../libsvn_wc/wc_db.c:6203 +#: ../libsvn_wc/wc_db.c:6364 ../libsvn_wc/wc_db.c:6518 +#: ../libsvn_wc/wc_db.c:8343 ../libsvn_wc/wc_db.c:8800 +#: ../libsvn_wc/wc_db.c:9429 ../libsvn_wc/wc_db.c:9576 +#: ../libsvn_wc/wc_db.c:9716 ../libsvn_wc/wc_db.c:10066 +#: ../libsvn_wc/wc_db.c:11553 ../libsvn_wc/wc_db.c:11629 +#: ../libsvn_wc/wc_db.c:13163 ../libsvn_wc/wc_db.c:13223 +#: ../libsvn_wc/wc_db.c:13361 ../libsvn_wc/wc_db.c:13519 +#: ../libsvn_wc/wc_db.c:13956 ../libsvn_wc/wc_db.c:14737 +#, 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' does not begin with a scheme" -msgstr "URL “%s” 没有以方案开始" +msgid "URL '%s' at revision %ld doesn't exist" +msgstr "URL “%s” 在版本 %ld 中不存在" +#: ../libsvn_client/externals.c:708 #, c-format -msgid "Illegal parent directory URL '%s'" -msgstr "非法父目录 URL “%s”" +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 "Illegal repository root URL '%s'" -msgstr "非法版本库根 URL “%s”" +msgid "" +"Unsupported external: URL of file external '%s' is not in repository '%s'" +msgstr "不支持的外部对象：文件外部对象“%s”的 URL 不在版本库“%s”中" +#: ../libsvn_client/externals.c:979 #, c-format -msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" -msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”" +msgid "Traversal of '%s' found no ambient depth" +msgstr "在 “%s” 中找不到深度" +#: ../libsvn_client/import.c:159 #, c-format -msgid "Unrecognized format for the relative external URL '%s'" -msgstr "外部相对 URL “%s” 的格式无法识别" +msgid "%s property on '%s' contains unrecognized EOL-style '%s'" +msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'" +#: ../libsvn_client/import.c:489 #, c-format -msgid "URL '%s' at revision %ld doesn't exist" -msgstr "URL “%s” 在版本 %ld 中不存在" +msgid "Unknown or unversionable type for '%s'" +msgstr "“%s” 是未知类型或不可纳入版本控制" -#, c-format -msgid "URL '%s' at revision %ld is not a file or a directory" -msgstr "URL “%s” 在版本 %ld 中不是文件或目录" +#: ../libsvn_client/import.c:707 +msgid "New entry name required when importing a file" +msgstr "导入文件时，需要一个新的条目名称" +#: ../libsvn_client/import.c:758 ../libsvn_client/patch.c:3016 +#: ../libsvn_client/patch.c:3028 ../libsvn_wc/delete.c:93 +#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77 #, c-format -msgid "Traversal of '%s' found no ambient depth" -msgstr "在 “%s” 中找不到深度" +msgid "'%s' does not exist" +msgstr "“%s” 不存在" +#: ../libsvn_client/import.c:891 #, c-format -msgid "Server does not support retrieving information about the repository root" -msgstr "服务器不支持取得版本库根的信息" +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:1411 +#: ../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 "当指定工作副本路径时，只能给出一个目标" +#: ../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 "Entry '%s' has no URL" -msgstr "条目“%s”没有URL" +msgid "URL '%s' of '%s' is not in repository '%s'" +msgstr "URL“%s”(本地路径“%s”)不在版本库“%s”中" +#: ../libsvn_client/merge.c:476 #, c-format -msgid "Url '%s' of '%s' is not in repository '%s'" -msgstr "URL“%s”(祖先“%s”)不在版本库“%s”中" +msgid "'%s' must be from the same repository as '%s'" +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" @@ -1448,192 +1996,307 @@ msgstr "" "当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n" "请解决所有冲突后，再次运行合并，处理剩余的未合并版本" +#: ../libsvn_client/merge.c:6231 #, c-format -msgid "Invalid mergeinfo detected on '%s', mergetracking not possible" -msgstr "在“%s”发现了非法的合并信息；合并跟踪是不可能的" +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" +#: ../libsvn_client/merge.c:7380 #, c-format -msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible" -msgstr "在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的" +msgid "" +"Invalid mergeinfo detected on merge target '%s', merge tracking not possible" +msgstr "在合并目标“%s”检测到非法的合并信息；合并跟踪是不可能的" +#: ../libsvn_client/merge.c:9698 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:9705 ../libsvn_client/merge.c:10030 +msgid "" +"Merge from foreign repository is not compatible with mergeinfo modification" msgstr "从外部版本库合并与合并信息修改不兼容" +#: ../libsvn_client/merge.c:10123 ../libsvn_client/merge.c:10266 #, c-format msgid "Merge target '%s' does not exist in the working copy" msgstr "合并目标 “%s” 不在工作副本中" +#: ../libsvn_client/merge.c:10146 msgid "Cannot determine revision of working copy" msgstr "不能确定工作副本的版本" +#: ../libsvn_client/merge.c:10152 #, c-format -msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first" -msgstr "不能合并到有混合版本的工作副本 [%lu:%lu] 中；请先更新" +msgid "" +"Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first" +msgstr "不能合并到有混合版本的工作副本 [%ld:%ld] 中；请先更新" +#: ../libsvn_client/merge.c:10167 msgid "Cannot merge into a working copy with a switched subtree" msgstr "不能合并到已经切换子目录的工作副本中" +#: ../libsvn_client/merge.c:10183 msgid "Cannot merge into a working copy that has local modifications" msgstr "不能合并到有本地修改的工作副本中" -msgid "Merge sources must both be either paths or URLs" -msgstr "合并源必须同时是路径或 URL" - +#: ../libsvn_client/merge.c:10203 ../svn/merge-cmd.c:60 #, c-format -msgid "'%s' isn't in the same repository as '%s'" -msgstr "“%s”与“%s”并不在同一个版本库中" +msgid "" +"Invalid merge source '%s'; a working copy path can only be used with a " +"repository revision (a number, a date, or head)" +msgstr "" -#, c-format -msgid "Invalid mergeinfo detected on '%s', reintegrate merge not possible" -msgstr "在“%s”发现了非法的合并信息；复兴合并是不可能的" +#: ../libsvn_client/merge.c:10526 ../svn/merge-cmd.c:127 +msgid "Merge sources must both be either paths or URLs" +msgstr "合并源必须同时是路径或 URL" +#: ../libsvn_client/merge.c:11287 ../libsvn_client/merge.c:11449 +#: ../libsvn_client/merge.c:12321 #, c-format msgid "'%s@%ld' must be ancestrally related to '%s@%ld'" msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系" +#: ../libsvn_client/merge.c:11399 #, c-format -msgid "'%s' must be from the same repository as '%s'" -msgstr "“%s”必须与“%s”在同一个版本库中" - -#, 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:11409 +msgid "Reintegrate merge not possible" +msgstr "复兴合并是不可能的" + +#: ../libsvn_client/merge.c:11482 #, 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:11544 +#, c-format +msgid "" +"Can't reintegrate into '%s' because it is locally added and therefore not " +"related to the merge source" +msgstr "" + +#: ../libsvn_client/merge.c:11812 +msgid "Cannot merge automatically while ignoring mergeinfo" +msgstr "" + +#: ../libsvn_client/merge.c:12537 +msgid "" +"The required merge is reintegrate-like, and the record-only option cannot be " +"used with this kind of merge" +msgstr "" + +#: ../libsvn_client/merge.c:12543 +msgid "" +"The required merge is reintegrate-like, and the depth option cannot be used " +"with this kind of merge" +msgstr "" + +#: ../libsvn_client/merge.c:12549 +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:1700 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 +msgid "Invalid link representation" +msgstr "非法链接表述" + +#: ../libsvn_client/patch.c:3005 msgid "strip count must be positive" msgstr "修剪计数取值必须为正" +#: ../libsvn_client/patch.c:3021 ../libsvn_fs_base/tree.c:3978 +#: ../libsvn_fs_base/tree.c:3983 ../libsvn_fs_fs/tree.c:3047 +#: ../libsvn_fs_fs/tree.c:3052 ../libsvn_ra/compat.c:675 +#: ../libsvn_ra_local/ra_plugin.c:1144 #, c-format msgid "'%s' is not a file" msgstr "“%s”不是一个文件" +#: ../libsvn_client/patch.c:3033 ../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:1096 +#: ../libsvn_wc/crop.c:167 #, c-format msgid "Unknown node kind for '%s'" msgstr "“%s” 是未知的节点类型" +#: ../libsvn_client/ra.c:161 #, c-format -msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation" +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:812 +#, c-format +msgid "'%s' has no URL" +msgstr "“%s” 没有 URL" + +#: ../libsvn_client/ra.c:679 ../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:691 #, 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:12775 ../libsvn_wc/wc_db_wcroot.c:627 #, 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:4795 #, c-format msgid "" "'%s'\n" @@ -1645,1910 +2308,2654 @@ msgstr "" "“%s”\n" "并不在同一个版本库中" +#: ../libsvn_client/switch.c:242 #, c-format msgid "'%s' shares no common ancestry with '%s'" msgstr "“%s”与“%s”没有共同的祖先" -#, c-format -msgid "URL '%s' is not a child of repository root URL '%s'" -msgstr "URL “%s” 不是版本库根 URL “%s” 的子节点" - -#, c-format -msgid "URL '%s' is not inside repository" -msgstr "URL“%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 +#, 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 "'%s' does not define '%s()'" -msgstr "“%s” 未定义 “%s()”" +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 "修改“%s”需要版本号" + +#: ../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 "Can't grab FS mutex" -msgstr "无法获取文件系统互斥体" +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 "Can't ungrab FS mutex" -msgstr "不能释放文件系统互斥体" +msgid "'%s' does not define '%s()'" +msgstr "“%s” 未定义 “%s()”" +#: ../libsvn_fs/fs-loader.c:163 #, c-format msgid "Failed to load module for FS type '%s'" msgstr "加载 “%s” 文件系统模块失败" +#: ../libsvn_fs/fs-loader.c:185 #, 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:265 #, c-format msgid "Unknown FS type '%s'" msgstr "未知的文件系统类型 “%s”" -#, c-format -msgid "Can't allocate FS mutex" -msgstr "不能分配文件系统互斥体" - +#: ../libsvn_fs/fs-loader.c:387 #, c-format msgid "Path '%s' is not in UTF-8" msgstr "路径 “%s” 不是 UTF-8 编码" +#: ../libsvn_fs/fs-loader.c:395 #, c-format msgid "Path '%s' contains '.' or '..' element" msgstr "路径 “%s” 包含 “.” 或 “..” 元素" +#: ../libsvn_fs/fs-loader.c:552 ../libsvn_repos/repos.c:1982 +msgid "Hotcopy source and destination are equal" +msgstr "热复制的源地址与目标地址相同" + +#: ../libsvn_fs/fs-loader.c:562 +#, c-format +msgid "'%s' already exists and is a file" +msgstr "“%s”已存在，它是文件" + +#: ../libsvn_fs/fs-loader.c:567 +#, c-format +msgid "'%s' already exists and has an unknown node kind" +msgstr "“%s”已存在，具有未知的节点类型" + +#: ../libsvn_fs/fs-loader.c:585 +#, c-format +msgid "" +"The filesystem type of the hotcopy source ('%s') does not match the " +"filesystem type of the hotcopy destination ('%s')" +msgstr "热复制源地址的文件系统类型('%s') 与目标地址('%s') 的不相同" + +#: ../libsvn_fs/fs-loader.c:1393 #, c-format msgid "Malformed UUID '%s'" msgstr "非法 UUID “%s”" +#: ../libsvn_fs/fs-loader.c:1421 #, c-format msgid "Lock token URI '%s' has bad scheme; expected '%s'" msgstr "锁令牌 URI '%s' 的方案错误；期望是 '%s'" +#: ../libsvn_fs/fs-loader.c:1428 #, c-format msgid "Lock token '%s' is not ASCII at byte %u" msgstr "锁令牌 '%s' 在字节 %u 处不是 ASCII 字符" +#: ../libsvn_fs/fs-loader.c:1435 #, c-format msgid "Lock token URI '%s' is not XML-safe" msgstr "锁令牌 URI '%s' 不是 XML 安全的" +#: ../libsvn_fs/fs-loader.c:1442 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:94 msgid "creating change" msgstr "正在创建修改" +#: ../libsvn_fs_base/bdb/changes-table.c:118 msgid "deleting changes" msgstr "正在删除修改" +#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/fs_fs.c:5863 msgid "Missing required node revision ID" msgstr "缺少必须的节点版本 ID" +#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/fs_fs.c:5873 msgid "Invalid change ordering: new node revision ID without delete" msgstr "无效的改变顺序: 没有删除新节点版本 ID" +#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/fs_fs.c:5884 msgid "Invalid change ordering: non-add change on deleted path" msgstr "无效的改变顺序: 在已经删除的路径执行非增加修改" +#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/fs_fs.c:5893 msgid "Invalid change ordering: add change on preexisting path" msgstr "无效的改变顺序: 在已有路径增加修改" +#: ../libsvn_fs_base/bdb/changes-table.c:272 +#: ../libsvn_fs_base/bdb/changes-table.c:395 msgid "creating cursor for reading changes" msgstr "正在为读取修改创建指针" +#: ../libsvn_fs_base/bdb/changes-table.c:297 +#: ../libsvn_fs_base/bdb/changes-table.c:416 #, c-format msgid "Error reading changes for key '%s'" msgstr "读取键 “%s” 的修改时出错" +#: ../libsvn_fs_base/bdb/changes-table.c:356 +#: ../libsvn_fs_base/bdb/changes-table.c:439 msgid "fetching changes" msgstr "正在获取修改" +#: ../libsvn_fs_base/bdb/changes-table.c:369 +#: ../libsvn_fs_base/bdb/changes-table.c:452 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:164 +msgid "deleting entry from 'checksum-reps' table" +msgstr "正在从 “checksum-reps” 表中删除条目" + +#: ../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/lock-tokens-table.c:87 +msgid "storing lock token record" +msgstr "正在存储加锁令牌记录" + +#: ../libsvn_fs_base/bdb/lock-tokens-table.c:108 +msgid "deleting entry from 'lock-tokens' table" +msgstr "正在从 “lock-tokens” 表中删除条目" + +#: ../libsvn_fs_base/bdb/lock-tokens-table.c:135 +msgid "reading lock token" +msgstr "正在读取加锁令牌" + +#: ../libsvn_fs_base/bdb/locks-table.c:93 +msgid "storing lock record" +msgstr "正在存储加锁记录" + +#: ../libsvn_fs_base/bdb/locks-table.c:116 +msgid "deleting lock from 'locks' table" +msgstr "正在从“locks”表删除锁" + +#: ../libsvn_fs_base/bdb/locks-table.c:143 +msgid "reading lock" +msgstr "正在读取锁" + +#: ../libsvn_fs_base/bdb/locks-table.c:246 +msgid "creating cursor for reading lock tokens" +msgstr "正在为读取加锁令牌创建游标" + +#: ../libsvn_fs_base/bdb/locks-table.c:321 +msgid "fetching lock tokens" +msgstr "正在取出加锁令牌" + +#: ../libsvn_fs_base/bdb/locks-table.c:323 +msgid "fetching lock tokens (closing cursor)" +msgstr "正在取出加锁令牌 (正在关闭游标)" + +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:95 +msgid "deleting record from 'miscellaneous' table" +msgstr "正在从“miscellaneous”表删除条目" + +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:103 +msgid "storing miscellaneous record" +msgstr "正在存储杂项记录" + +#: ../libsvn_fs_base/bdb/miscellaneous-table.c:131 +msgid "fetching miscellaneous record" +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/node-origins-table.c:142 +msgid "deleting entry from 'node-origins' table" +msgstr "正在从“node-origins”表删除条目" + +#: ../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/rev-table.c:141 +msgid "updating filesystem revision" +msgstr "正在更新文件系统版本" + +#: ../libsvn_fs_base/bdb/rev-table.c:149 +msgid "storing filesystem revision" +msgstr "正在存储文件系统版本" + +#: ../libsvn_fs_base/bdb/rev-table.c:179 +msgid "getting youngest revision (creating cursor)" +msgstr "正在取出最新版本(创建游标)" + +#: ../libsvn_fs_base/bdb/rev-table.c:203 +msgid "getting youngest revision (finding last entry)" +msgstr "正在取出最新版本(查找最新项)" + +#. You can't commit a transaction with open cursors, because: +#. 1) key/value pairs don't get deleted until the cursors referring +#. to them are closed, so closing a cursor can fail for various +#. reasons, and txn_commit shouldn't fail that way, and +#. 2) using a cursor after committing its transaction can cause +#. undetectable database corruption. +#: ../libsvn_fs_base/bdb/rev-table.c:213 +msgid "getting youngest revision (closing cursor)" +msgstr "正在取出最新版本(关闭游标)" + +#: ../libsvn_fs_base/bdb/strings-table.c:94 +#: ../libsvn_fs_base/bdb/strings-table.c:300 +#: ../libsvn_fs_base/bdb/strings-table.c:491 msgid "creating cursor for reading a string" msgstr "正在为读取字符串创建指针" +#: ../libsvn_fs_base/bdb/strings-table.c:124 +msgid "moving cursor" +msgstr "正在移动指针" + +#: ../libsvn_fs_base/bdb/strings-table.c:136 +msgid "rerunning cursor move" +msgstr "重新执行游标移动" + +#: ../libsvn_fs_base/bdb/strings-table.c:228 +#: ../libsvn_fs_base/bdb/strings-table.c:247 +#: ../libsvn_fs_base/bdb/strings-table.c:265 +msgid "reading string" +msgstr "正在读取字符串" + +#. Done with the cursor. +#: ../libsvn_fs_base/bdb/strings-table.c:254 +#: ../libsvn_fs_base/bdb/strings-table.c:334 +#: ../libsvn_fs_base/bdb/strings-table.c:539 +msgid "closing string-reading cursor" +msgstr "正在关闭读取字符串的游标" + +#: ../libsvn_fs_base/bdb/strings-table.c:313 +#: ../libsvn_fs_base/bdb/strings-table.c:505 +msgid "getting next-key value" +msgstr "正在取出 next-key 的值" + +#. ignore the error, the original is +#. more important. +#: ../libsvn_fs_base/bdb/strings-table.c:331 +msgid "bumping next string key" +msgstr "正在跳到下一个字符串键" + +#: ../libsvn_fs_base/bdb/strings-table.c:358 +msgid "appending string" +msgstr "正在追加字符串" + +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/strings-table.c:390 +msgid "clearing string" +msgstr "正在清理字符串" + +#: ../libsvn_fs_base/bdb/strings-table.c:399 +msgid "storing empty contents" +msgstr "正在存储空内容" + +#: ../libsvn_fs_base/bdb/strings-table.c:436 +msgid "fetching string length" +msgstr "正在获取字符串的长度" + +#. Handle any other error conditions. +#: ../libsvn_fs_base/bdb/strings-table.c:466 +msgid "deleting string" +msgstr "正在删除字符串" + +#: ../libsvn_fs_base/bdb/strings-table.c:524 +msgid "writing copied data" +msgstr "正在写入已复制的数据" + +#: ../libsvn_fs_base/bdb/strings-table.c:535 +msgid "fetching string data for a copy" +msgstr "正在取出字符数据" + +#: ../libsvn_fs_base/bdb/txn-table.c:99 msgid "storing transaction record" msgstr "正在存储事务记录" +#: ../libsvn_fs_base/bdb/txn-table.c:123 +msgid "allocating new transaction ID (getting 'next-key')" +msgstr "正在分配新事务 ID(正在获取 “next-key”)" + +#: ../libsvn_fs_base/bdb/txn-table.c:142 +msgid "bumping next transaction key" +msgstr "正在跳到下一个事务键" + +#: ../libsvn_fs_base/bdb/txn-table.c:188 +msgid "deleting entry from 'transactions' table" +msgstr "正在从“transactions”表删除条目" + +#: ../libsvn_fs_base/bdb/txn-table.c:218 +msgid "reading transaction" +msgstr "正在读取事务" + +#: ../libsvn_fs_base/bdb/txn-table.c:251 +msgid "reading transaction list (opening cursor)" +msgstr "正在读取事务列表(游标已打开)" + +#: ../libsvn_fs_base/bdb/txn-table.c:314 +msgid "reading transaction list (listing keys)" +msgstr "正在读取事务列表(正在枚举键)" + +#: ../libsvn_fs_base/bdb/txn-table.c:317 +msgid "reading transaction list (closing cursor)" +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:372 #, 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:378 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:384 #, 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:462 msgid "Attempted to set entry in non-directory node" msgstr "试图在非目录节点中设置条目" +#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:468 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”的节点" +#: ../libsvn_fs_base/dag.c:888 ../libsvn_fs_base/dag.c:921 #, c-format msgid "Delete failed: directory has no entry '%s'" msgstr "删除失败: 目录没有条目“%s”" +#: ../libsvn_fs_base/dag.c:970 #, c-format msgid "Attempted removal of immutable node" msgstr "试图删除不变节点" +#: ../libsvn_fs_base/dag.c:1088 #, c-format msgid "Attempted to get textual contents of a *non*-file node" msgstr "试图获取*非*文件节点的文本内容" +#: ../libsvn_fs_base/dag.c:1121 #, c-format msgid "Attempted to get length of a *non*-file node" msgstr "试图获取*非*文件节点的长度" +#: ../libsvn_fs_base/dag.c:1148 #, c-format msgid "Attempted to get checksum of a *non*-file node" msgstr "试图获取*非*文件节点的校验和" +#: ../libsvn_fs_base/dag.c:1187 ../libsvn_fs_base/dag.c:1244 #, c-format msgid "Attempted to set textual contents of a *non*-file node" msgstr "试图设置*非*文件节点的文本内容" +#: ../libsvn_fs_base/dag.c:1193 ../libsvn_fs_base/dag.c:1250 #, c-format msgid "Attempted to set textual contents of an immutable node" msgstr "试图设置不变节点的文本内容" +#: ../libsvn_fs_base/dag.c:1279 ../libsvn_fs_base/reps-strings.c:829 #, c-format msgid "Checksum mismatch on representation '%s'" msgstr "'%s' 的校验和不匹配" +#: ../libsvn_fs_base/dag.c:1373 #, c-format msgid "Attempted to open non-existent child node '%s'" msgstr "试图打开不存在的子节点“%s”" +#: ../libsvn_fs_base/dag.c:1379 #, c-format msgid "Attempted to open node with an illegal name '%s'" msgstr "试图以非法名字“%s”打开节点" +#: ../libsvn_fs_base/dag.c:1700 #, c-format msgid "Attempted merge tracking info change on immutable node" msgstr "试图在不变节点合并跟踪信息的修改" +#: ../libsvn_fs_base/dag.c:1740 #, c-format msgid "Attempted mergeinfo count change on immutable node" msgstr "试图在不变节点修改合并信息计数" +#: ../libsvn_fs_base/dag.c:1752 #, c-format msgid "Invalid value (%%%s) for node revision mergeinfo count" msgstr "节点合并信息计数的值非法(%%%s)" +#: ../libsvn_fs_base/err.c:46 #, c-format msgid "Corrupt filesystem revision %ld in filesystem '%s'" msgstr "文件系统版本 %ld 损坏，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/fs_fs.c:2267 #, c-format msgid "Reference to non-existent node '%s' in filesystem '%s'" msgstr "引用不存在的节点 “%s”，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:68 #, c-format msgid "No such revision %ld in filesystem '%s'" msgstr "没有版本 %ld，其文件系统是“%s”" +#: ../libsvn_fs_base/err.c:80 #, c-format msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'" msgstr "“%s” 的 “transactions” 表有无效入口，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:91 #, c-format msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'" msgstr "“%s” 的 “copies” 表有无效入口，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:102 #, c-format msgid "No transaction named '%s' in filesystem '%s'" msgstr "事务 “%s” 不在文件系统 “%s” 中" +#: ../libsvn_fs_base/err.c:113 #, c-format msgid "Cannot modify transaction named '%s' in filesystem '%s'" msgstr "无法修改名为 “%s” 的事务，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:124 #, c-format msgid "No copy with id '%s' in filesystem '%s'" msgstr "没有标识 “%s” 的副本，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:134 #, c-format msgid "Token '%s' does not point to any existing lock in filesystem '%s'" msgstr "标识“%s”没有指向文件系统“%s”中存在的锁" +#: ../libsvn_fs_base/err.c:144 #, c-format msgid "No token given for path '%s' in filesystem '%s'" msgstr "路径 “%s” 没有令牌，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:153 #, c-format msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'" msgstr "“%s” 的 “locks” 表锁损坏，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:163 #, c-format msgid "No record in 'node-origins' table for node id '%s' in filesystem '%s'" msgstr "在 “node-origins” 表中，没有节点 “%s” 的记录，其文件系统是 “%s”" +#: ../libsvn_fs_base/err.c:173 #, c-format msgid "No record in 'checksum-reps' table for checksum '%s' in filesystem '%s'" msgstr "在 “checksum-reps” 表中，没有校验和 “%s” 的记录，其文件系统是 “%s”" +#: ../libsvn_fs_base/fs.c:87 #, c-format msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d" msgstr "不正确的数据库版本: 得到 %d.%d.%d，应该最低是 %d.%d.%d" +#: ../libsvn_fs_base/fs.c:98 #, c-format msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d" msgstr "不正确的数据库版本: 用 %d.%d.%d 版本编译，正在运行版本 %d.%d.%d" +#: ../libsvn_fs_base/fs.c:188 #, c-format msgid "Berkeley DB error for filesystem '%s' while closing environment:\n" msgstr "关闭文件系统“%s”的BDB环境句柄时出错: \n" +#: ../libsvn_fs_base/fs.c:551 #, c-format msgid "Berkeley DB error for filesystem '%s' while creating environment:\n" msgstr "创建文件系统“%s”的BDB环境句柄时出错: \n" +#: ../libsvn_fs_base/fs.c:557 #, c-format msgid "Berkeley DB error for filesystem '%s' while opening environment:\n" msgstr "打开文件系统“%s”的BDB环境句柄时出错: \n" +#: ../libsvn_fs_base/fs.c:572 +msgid "creating 'nodes' table" +msgstr "正在创建“nodes”表" + +#: ../libsvn_fs_base/fs.c:573 +msgid "opening 'nodes' table" +msgstr "正在打开“nodes”表" + +#: ../libsvn_fs_base/fs.c:578 +msgid "creating 'revisions' table" +msgstr "正在创建“revisions”表" + +#: ../libsvn_fs_base/fs.c:579 +msgid "opening 'revisions' table" +msgstr "正在打开“revisions”表" + +#: ../libsvn_fs_base/fs.c:584 +msgid "creating 'transactions' table" +msgstr "正在创建“transactions”表" + +#: ../libsvn_fs_base/fs.c:585 +msgid "opening 'transactions' table" +msgstr "正在打开“transactions”表" + +#: ../libsvn_fs_base/fs.c:590 +msgid "creating 'copies' table" +msgstr "正在创建“copies”表" + +#: ../libsvn_fs_base/fs.c:591 +msgid "opening 'copies' table" +msgstr "正在打开“copies”表" + +#: ../libsvn_fs_base/fs.c:596 +msgid "creating 'changes' table" +msgstr "正在创建“changes”表" + +#: ../libsvn_fs_base/fs.c:597 +msgid "opening 'changes' table" +msgstr "正在打开“changes”表" + +#: ../libsvn_fs_base/fs.c:602 +msgid "creating 'representations' table" +msgstr "正在创建“representations”表" + +#: ../libsvn_fs_base/fs.c:603 +msgid "opening 'representations' table" +msgstr "正在打开“representations”表" + +#: ../libsvn_fs_base/fs.c:608 +msgid "creating 'strings' table" +msgstr "正在创建“strings”表" + +#: ../libsvn_fs_base/fs.c:609 +msgid "opening 'strings' table" +msgstr "正在打开“strings”表" + +#: ../libsvn_fs_base/fs.c:614 +msgid "creating 'uuids' table" +msgstr "正在创建“uuids”表" + +#: ../libsvn_fs_base/fs.c:615 +msgid "opening 'uuids' table" +msgstr "正在打开“uuids”表" + +#: ../libsvn_fs_base/fs.c:620 +msgid "creating 'locks' table" +msgstr "正在创建“locks”表" + +#: ../libsvn_fs_base/fs.c:621 +msgid "opening 'locks' table" +msgstr "正在打开“locks”表" + +#: ../libsvn_fs_base/fs.c:626 +msgid "creating 'lock-tokens' table" +msgstr "正在创建“lock-tokens”表" + +#: ../libsvn_fs_base/fs.c:627 +msgid "opening 'lock-tokens' table" +msgstr "正在打开“lock-tokens”表" + +#: ../libsvn_fs_base/fs.c:635 +msgid "creating 'node-origins' table" +msgstr "正在创建“node-origins”表" + +#: ../libsvn_fs_base/fs.c:636 +msgid "opening 'node-origins' table" +msgstr "正在打开“node-origins”表" + +#: ../libsvn_fs_base/fs.c:645 +msgid "creating 'miscellaneous' table" +msgstr "正在创建“miscellaneous”表" + +#: ../libsvn_fs_base/fs.c:646 +msgid "opening 'miscellaneous' table" +msgstr "正在打开“miscellaneous”表" + +#: ../libsvn_fs_base/fs.c:655 +msgid "creating 'checksum-reps' table" +msgstr "正在创建“checksum-reps”表" + +#: ../libsvn_fs_base/fs.c:656 +msgid "opening 'checksum-reps' table" +msgstr "正在打开“checksum-reps”表" + +#: ../libsvn_fs_base/fs.c:728 #, c-format -msgid "The '%s' feature requires version %d of the filesystem schema; filesystem '%s' uses only version %d" +msgid "" +"The '%s' feature requires version %d of the filesystem schema; filesystem " +"'%s' uses only version %d" msgstr "“%s”特性需要文件系统方案版本 %d；文件系统“%s”版本仅为 %d" +#: ../libsvn_fs_base/fs.c:747 #, c-format msgid "Expected FS format '%d'; found format '%d'" msgstr "期望文件系统格式“%d”；发现格式“%d”" +#: ../libsvn_fs_base/fs.c:1213 +#, c-format +msgid "BDB repositories do not support incremental hotcopy" +msgstr "BDB 版本库不支持增量热复制" + +#: ../libsvn_fs_base/fs.c:1317 msgid "" "Error copying logfile; the DB_LOG_AUTOREMOVE feature\n" "may be interfering with the hotcopy algorithm. If\n" "the problem persists, try deactivating this feature\n" "in DB_CONFIG" msgstr "" -"复制日志文件出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直存在，请\n" +"复制日志文件出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直存在，" +"请\n" "尝试在 DB_CONFIG 中禁用此特性。" +#: ../libsvn_fs_base/fs.c:1336 msgid "" "Error running catastrophic recovery on hotcopy; the\n" "DB_LOG_AUTOREMOVE feature may be interfering with the\n" "hotcopy algorithm. If the problem persists, try deactivating\n" "this feature in DB_CONFIG" msgstr "" -"热复制时执行灾难恢复出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直\n" +"热复制时执行灾难恢复出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一" +"直\n" "存在，请尝试在 DB_CONFIG 中禁用此特性。" +#: ../libsvn_fs_base/fs.c:1381 msgid "Module for working with a Berkeley DB repository." msgstr "模块只能操作BDB版本库。" +#: ../libsvn_fs_base/fs.c:1428 #, c-format msgid "Unsupported FS loader version (%d) for bdb" msgstr "不支持的BDB之FS加载器版本 (%d)" +#: ../libsvn_fs_base/lock.c:108 ../libsvn_fs_base/lock.c:113 +#: ../libsvn_fs_fs/lock.c:786 ../libsvn_fs_fs/lock.c:791 +#: ../libsvn_fs_fs/lock.c:813 #, c-format msgid "Path '%s' doesn't exist in HEAD revision" msgstr "HEAD中没有路径“%s”" +#: ../libsvn_fs_base/lock.c:540 ../libsvn_fs_fs/lock.c:682 #, c-format msgid "Cannot verify lock on path '%s'; no username available" msgstr "不能校验路径“%s”上的锁；没有用户名" +#: ../libsvn_fs_base/lock.c:546 ../libsvn_fs_fs/lock.c:688 #, c-format msgid "User '%s' does not own lock on path '%s' (currently locked by '%s')" msgstr "用户 “%s” 不是路径 “%s” 的锁的所有者(当前由用户 “%s” 锁定)" +#: ../libsvn_fs_base/lock.c:552 ../libsvn_fs_fs/lock.c:694 #, c-format msgid "Cannot verify lock on path '%s'; no matching lock-token available" msgstr "不能校验路径“%s”的锁；没有匹配的可用锁令牌" #. Helper macro that evaluates to an error message indicating that #. the representation referred to by X has an unknown node kind. +#: ../libsvn_fs_base/reps-strings.c:58 #, c-format msgid "Unknown node kind for representation '%s'" msgstr "修订版“%s”的节点类型未知" +#: ../libsvn_fs_base/reps-strings.c:110 msgid "Representation is not of type 'delta'" msgstr "修订版不是“delta”类型" +#: ../libsvn_fs_base/reps-strings.c:380 msgid "Svndiff source length inconsistency" msgstr "svndiff源长度不一致" +#: ../libsvn_fs_base/reps-strings.c:506 #, c-format msgid "Diff version inconsistencies in representation '%s'" msgstr "在修订版“%s”中diff的版本不一致" +#: ../libsvn_fs_base/reps-strings.c:532 #, c-format -msgid "Corruption detected whilst reading delta chain from representation '%s' to '%s'" +msgid "" +"Corruption detected whilst reading delta chain from representation '%s' to " +"'%s'" msgstr "从修订版“%s”到“%s”读差异链时检测到数据损坏" +#: ../libsvn_fs_base/reps-strings.c:798 #, c-format msgid "Rep contents are too large: got %s, limit is %s" msgstr "版本内容太大: 得到 %s，上限是 %s" +#: ../libsvn_fs_base/reps-strings.c:814 #, c-format msgid "Failure reading representation '%s'" msgstr "读取修订版“%s”失败" +#: ../libsvn_fs_base/reps-strings.c:924 #, c-format msgid "MD5 checksum mismatch on representation '%s'" msgstr "“%s” 的 MD5 校验和不匹配" +#: ../libsvn_fs_base/reps-strings.c:934 #, c-format msgid "SHA1 checksum mismatch on representation '%s'" msgstr "“%s” 的 SHA1 校验和不匹配" +#: ../libsvn_fs_base/reps-strings.c:945 msgid "Null rep, but offset past zero already" msgstr "空的版本，但是偏移已经大于零" +#: ../libsvn_fs_base/reps-strings.c:1062 ../libsvn_fs_base/reps-strings.c:1253 #, c-format msgid "Rep '%s' is not mutable" msgstr "版本“%s”是不可变的" +#: ../libsvn_fs_base/reps-strings.c:1077 #, c-format msgid "Rep '%s' both mutable and non-fulltext" msgstr "版本 “%s” 可变并且非全文本" +#: ../libsvn_fs_base/reps-strings.c:1372 msgid "Failed to get new string key" msgstr "取新的字符串键失败" +#: ../libsvn_fs_base/reps-strings.c:1449 #, c-format msgid "Attempt to deltify '%s' against itself" msgstr "“%s”试图与自身比较" +#: ../libsvn_fs_base/reps-strings.c:1522 #, c-format msgid "Failed to calculate MD5 digest for '%s'" msgstr "计算“%s”的MD5摘要失败" +#: ../libsvn_fs_base/revs-txns.c:72 #, c-format msgid "Transaction is not dead: '%s'" msgstr "事务未结束: “%s”" +#: ../libsvn_fs_base/revs-txns.c:75 #, c-format msgid "Transaction is dead: '%s'" msgstr "事务已结束: “%s”" +#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:9710 #, c-format msgid "revprop '%s' has unexpected value in filesystem" msgstr "revprop“%s”在文件系统中有不期望的值" +#: ../libsvn_fs_base/revs-txns.c:1030 msgid "Transaction aborted, but cleanup failed" msgstr "事务终止，但清除失败" +#: ../libsvn_fs_base/trail.c:99 +msgid "beginning Berkeley DB transaction" +msgstr "正在开始 BDB 事务" + +#: ../libsvn_fs_base/trail.c:134 +msgid "aborting Berkeley DB transaction" +msgstr "正在中止 BDB 事务" + +#: ../libsvn_fs_base/trail.c:158 +msgid "committing Berkeley DB transaction" +msgstr "正在提交 BDB 事务" + +#: ../libsvn_fs_base/tree.c:772 ../libsvn_fs_fs/tree.c:1046 #, c-format msgid "Failure opening '%s'" msgstr "打开“%s”失败" +#: ../libsvn_fs_base/tree.c:1403 ../libsvn_fs_fs/tree.c:1497 msgid "Cannot compare property value between two different filesystems" msgstr "不能在两个不同的文件系统之间比较属性值" +#: ../libsvn_fs_base/tree.c:1849 ../libsvn_fs_base/tree.c:1919 msgid "Corrupt DB: faulty predecessor count" msgstr "损坏的数据库: 先前的数目不完整" +#: ../libsvn_fs_base/tree.c:1976 #, c-format msgid "Unexpected immutable node at '%s'" msgstr "“%s”有意外的不变节点" +#: ../libsvn_fs_base/tree.c:1997 ../libsvn_fs_fs/tree.c:1527 +#: ../libsvn_repos/commit.c:1244 #, c-format msgid "Conflict at '%s'" msgstr "在“%s”冲突" +#: ../libsvn_fs_base/tree.c:2050 ../libsvn_fs_base/tree.c:2802 +#: ../libsvn_fs_fs/tree.c:1578 ../libsvn_fs_fs/tree.c:2115 msgid "Bad merge; ancestor, source, and target not all in same fs" msgstr "错误的合并；初始，原始，目标不在同一个文件系统" +#: ../libsvn_fs_base/tree.c:2066 ../libsvn_fs_fs/tree.c:1594 #, c-format msgid "Bad merge; target '%s' has id '%s', same as ancestor" msgstr "错误的合并: 目标“%s”拥有标识“%s”，与初始相同" +#: ../libsvn_fs_base/tree.c:2610 #, c-format msgid "Transaction '%s' out-of-date with respect to revision '%s'" msgstr "事务 “%s” 过时，对于版本 “%s” " +#: ../libsvn_fs_base/tree.c:2886 #, c-format msgid "Cannot deltify revisions prior to r%ld" msgstr "不能在 r%ld 之前计算增量变化" +#: ../libsvn_fs_base/tree.c:3004 ../libsvn_fs_fs/tree.c:2270 msgid "The root directory cannot be deleted" msgstr "不能删除根目录" +#: ../libsvn_fs_base/tree.c:3217 ../libsvn_fs_fs/tree.c:2340 #, c-format msgid "Cannot copy between two different filesystems ('%s' and '%s')" msgstr "不能在两个不同的文件系统(“%s”和“%s”)之间复制" +#: ../libsvn_fs_base/tree.c:3226 ../libsvn_fs_fs/tree.c:2346 msgid "Copy from mutable tree not currently supported" msgstr "当前不支持从可变的树复制" +#: ../libsvn_fs_base/tree.c:3736 ../libsvn_fs_fs/tree.c:2823 #, c-format msgid "Base checksum mismatch on '%s'" msgstr "'%s' 的校验和错误" +#: ../libsvn_fs_base/tree.c:3969 ../libsvn_fs_fs/tree.c:3038 msgid "Cannot compare file contents between two different filesystems" msgstr "不能在两个不同的文件系统间比较文件内容" +#: ../libsvn_fs_base/tree.c:5013 ../libsvn_fs_base/tree.c:5188 #, c-format msgid "Node-revision '%s' claims to have mergeinfo but doesn't" msgstr "节点版本“%s”声称自己有合并信息，实际上却没有" +#: ../libsvn_fs_base/tree.c:5049 #, c-format -msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory" +msgid "" +"Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not " +"a directory" msgstr "节点版本“%s”声称自己是包含合并信息的树顶，实际上却不是目录" +#: ../libsvn_fs_fs/dag.c:426 ../libsvn_fs_fs/dag.c:442 +#: ../libsvn_ra_serf/serf.c:971 ../libsvn_ra_serf/serf.c:1034 msgid "Can't get entries of non-directory" msgstr "不能获取非目录的条目" +#: ../libsvn_fs_fs/dag.c:551 #, c-format -msgid "Can't increment mergeinfo count on node-revision %%s to negative value %%%s" +msgid "" +"Can't increment mergeinfo count on node-revision %%s to negative value %%%s" msgstr "不能在节点版本 %%s 增加合并信息计数，因为会溢出到负值 %%%s" +#: ../libsvn_fs_fs/dag.c:562 #, c-format -msgid "Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" +msgid "" +"Can't increment mergeinfo count on *file* node-revision %%s to %%%s (> 1)" msgstr "不能在*文件*修订节点增加合并信息计数 %%s 到 %%%s (> 1)" +#: ../libsvn_fs_fs/dag.c:1134 msgid "Empty noderev in cache" msgstr "缓存中 noderev 为空" +#: ../libsvn_fs_fs/dag.c:1326 #, c-format -msgid "Can't fetch FSFS shared data" -msgstr "不能获取文件系统互斥体" - -#, c-format -msgid "Can't create FSFS write-lock mutex" -msgstr "不能创建文件系统写互斥体" +msgid "Attempted to update ancestry of non-mutable node" +msgstr "试图更新非可变节点的前驱" +#: ../libsvn_fs_fs/fs.c:82 #, c-format -msgid "Can't create FSFS txn-current mutex" -msgstr "不能创建 FSFS txn-current 互斥体" - -#, c-format -msgid "Can't create FSFS txn list mutex" -msgstr "不能创建文件系统事务列表互斥体" +msgid "Can't fetch FSFS shared data" +msgstr "不能获取文件系统互斥体" +#: ../libsvn_fs_fs/fs.c:106 #, c-format msgid "Can't store FSFS shared data" msgstr "不能存储文件系统共享数据" +#: ../libsvn_fs_fs/fs.c:400 msgid "Module for working with a plain file (FSFS) repository." msgstr "模块与文本文件(FSFS)版本库一起工作。" +#: ../libsvn_fs_fs/fs.c:450 #, c-format msgid "Unsupported FS loader version (%d) for fsfs" msgstr "不支持的FSFS之FS加载器版本 (%d)" -#, c-format -msgid "Can't grab FSFS txn list mutex" -msgstr "不能获取文件系统事务列表互斥体" - -#, c-format -msgid "Can't ungrab FSFS txn list mutex" -msgstr "不能释放文件系统事务列表互斥体" - -#, c-format -msgid "Can't grab FSFS mutex for '%s'" -msgstr "无法为 “%s” 获取 FSFS 互斥体" - -#, c-format -msgid "Can't ungrab FSFS mutex for '%s'" -msgstr "不能为 “%s” 释放 FSFS 互斥体" - +#: ../libsvn_fs_fs/fs_fs.c:727 #, c-format msgid "Can't unlock unknown transaction '%s'" msgstr "不能解锁未知事务“%s”" +#: ../libsvn_fs_fs/fs_fs.c:731 #, c-format msgid "Can't unlock nonlocked transaction '%s'" msgstr "不能解锁未锁事务“%s”" +#: ../libsvn_fs_fs/fs_fs.c:738 #, c-format msgid "Can't unlock prototype revision lockfile for transaction '%s'" msgstr "不能为事务“%s”解锁原型版本锁文件" +#: ../libsvn_fs_fs/fs_fs.c:744 #, c-format msgid "Can't close prototype revision lockfile for transaction '%s'" msgstr "不能为事务“%s”关闭原型版本锁文件" +#: ../libsvn_fs_fs/fs_fs.c:806 #, c-format -msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by this process" +msgid "" +"Cannot write to the prototype revision file of transaction '%s' because a " +"previous representation is currently being written by this process" msgstr "因为当前进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。" +#: ../libsvn_fs_fs/fs_fs.c:842 #, c-format -msgid "Cannot write to the prototype revision file of transaction '%s' because a previous representation is currently being written by another process" +msgid "" +"Cannot write to the prototype revision file of transaction '%s' because a " +"previous representation is currently being written by another process" msgstr "因为其它进程正在写入以前版本，所以不能为事务 '%s' 写入原型版本文件。" +#: ../libsvn_fs_fs/fs_fs.c:849 ../libsvn_subr/io.c:2007 #, c-format msgid "Can't get exclusive lock on file '%s'" msgstr "不能获取文件“%s”的排它锁" +#: ../libsvn_fs_fs/fs_fs.c:968 #, c-format -msgid "Format file '%s' contains unexpected non-digit '%c' within '%s'" -msgstr "格式文件“%s”包含意外的非数字字符 '%c' 在 '%s' 中" +msgid "%s file '%s' contains unexpected non-digit '%c' within '%s'" +msgstr "%s 文件“%s”包含意外的非数字字符 '%c' 在 '%s' 中" +#: ../libsvn_fs_fs/fs_fs.c:1027 #, c-format msgid "Can't read first line of format file '%s'" msgstr "不能读取格式文件“%s”的首行" +#: ../libsvn_fs_fs/fs_fs.c:1064 #, c-format msgid "'%s' contains invalid filesystem format option '%s'" msgstr "“%s”包含非法文件系统格式选项“%s”" +#: ../libsvn_fs_fs/fs_fs.c:1130 #, c-format -msgid "Found format '%d', only created by unreleased dev builds; see http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" -msgstr "发现了文件系统格式“%d”，它是由未发布的开发版本创建的；参见 http://subversion.apache.org/docs/release-notes/1.7#revprop-packing" +msgid "" +"Found format '%d', only created by unreleased dev builds; see http://" +"subversion.apache.org/docs/release-notes/1.7#revprop-packing" +msgstr "" +"发现了文件系统格式“%d”，它是由未发布的开发版本创建的；参见 http://subversion." +"apache.org/docs/release-notes/1.7#revprop-packing" +#: ../libsvn_fs_fs/fs_fs.c:1141 #, c-format msgid "Expected FS format between '1' and '%d'; found format '%d'" msgstr "期望文件系统格式在“1”到“%d”之间；发现格式“%d”" +#: ../libsvn_fs_fs/fs_fs.c:1581 #, c-format msgid "'%s' is not a regular file. Please move it out of the way and try again" msgstr "'%s' 不是普通文件。请移除后重试" +#: ../libsvn_fs_fs/fs_fs.c:1752 #, c-format -msgid "Failed to create hotcopy at '%s'. The file '%s' is missing from the source repository. Please create this file, for instance by running 'svnadmin upgrade %s'" -msgstr "在“%s”创建热备份失败。源版本库丢失了文件“%s”。请创建此文件，例如通过执行“svnadmin upgrade %s”来创建它。" +msgid "Can't read '%s'" +msgstr "不能读取“%s”" +#: ../libsvn_fs_fs/fs_fs.c:1815 ../libsvn_fs_fs/fs_fs.c:1834 #, c-format msgid "Found malformed header '%s' in revision file" msgstr "在版本文件中找到非法文件头“%s”" +#: ../libsvn_fs_fs/fs_fs.c:1870 #, c-format msgid "Invalid revision number '%ld'" msgstr "无效的版本号“%ld”" +#: ../libsvn_fs_fs/fs_fs.c:1885 ../libsvn_fs_fs/fs_fs.c:1940 +#: ../libsvn_fs_fs/fs_fs.c:1951 ../libsvn_repos/log.c:2268 +#: ../libsvn_repos/log.c:2272 #, c-format msgid "No such revision %ld" msgstr "没有版本 %ld" +#: ../libsvn_fs_fs/fs_fs.c:1985 +msgid "Unexpected EOF" +msgstr "流意外结束" + +#: ../libsvn_fs_fs/fs_fs.c:1992 #, c-format -msgid "Manifest offset '%s' too large" -msgstr "清单偏移“%s”太大" +msgid "Number '%s' invalid or too large" +msgstr "数字“%s”不合法，或者太大" +#: ../libsvn_fs_fs/fs_fs.c:2159 ../libsvn_fs_fs/fs_fs.c:2173 +#: ../libsvn_fs_fs/fs_fs.c:2181 ../libsvn_fs_fs/fs_fs.c:2189 +#: ../libsvn_fs_fs/fs_fs.c:2198 ../libsvn_fs_fs/fs_fs.c:2211 +#: ../libsvn_fs_fs/fs_fs.c:2220 msgid "Malformed text representation offset line in node-rev" msgstr "node-rev 中有非法的文本修订版偏移行" +#: ../libsvn_fs_fs/fs_fs.c:2251 #, c-format msgid "While reading representation offsets for node-revision '%s':" msgstr "读取节点版本“%s”的偏移失败：" +#: ../libsvn_fs_fs/fs_fs.c:2406 msgid "Missing id field in node-rev" msgstr "node-rev 中没有 id" +#: ../libsvn_fs_fs/fs_fs.c:2420 #, c-format msgid "Missing kind field in node-rev '%s'" msgstr "node-rev '%s' 中没有 kind 字段" +#: ../libsvn_fs_fs/fs_fs.c:2455 #, c-format msgid "Missing cpath field in node-rev '%s'" msgstr "node-rev '%s' 中没有 cpath 字段" +#: ../libsvn_fs_fs/fs_fs.c:2483 ../libsvn_fs_fs/fs_fs.c:2490 #, c-format msgid "Malformed copyroot line in node-rev '%s'" msgstr "node-rev '%s' 中的 copyroot 行非法" +#: ../libsvn_fs_fs/fs_fs.c:2507 ../libsvn_fs_fs/fs_fs.c:2514 #, c-format msgid "Malformed copyfrom line in node-rev '%s'" msgstr "node-rev '%s' 中的 copyfrom 行非法" +#: ../libsvn_fs_fs/fs_fs.c:2683 ../libsvn_fs_fs/fs_fs.c:7584 #, c-format msgid "Attempted to write to non-transaction '%s'" msgstr "试图写至非事务 '%s'" +#: ../libsvn_fs_fs/fs_fs.c:2820 #, c-format msgid "Malformed representation header at %s" msgstr "位于 %s 的修订版头非法" +#: ../libsvn_fs_fs/fs_fs.c:2852 #, c-format msgid "Missing node-id in node-rev at r%ld (offset %s)" msgstr "node-rev r%ld (偏移 %s) 中没有 node-id" +#: ../libsvn_fs_fs/fs_fs.c:2861 #, c-format msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)" msgstr "node-id '%s' 损坏，位于 node-rev r%ld (偏移 %s)" +#: ../libsvn_fs_fs/fs_fs.c:2952 #, c-format msgid "Revision file (r%ld) lacks trailing newline" msgstr "版本文件 (r%ld) 缺少结尾换行" +#: ../libsvn_fs_fs/fs_fs.c:2966 #, c-format msgid "Final line in revision file (r%ld) longer than 64 characters" msgstr "版本文件 (r%ld) 的最后一行大于 64 个字符" +#: ../libsvn_fs_fs/fs_fs.c:2981 #, c-format msgid "Final line in revision file r%ld missing space" msgstr "版本文件 (r%ld) 的最后一行缺少空白字符" +#: ../libsvn_fs_fs/fs_fs.c:3676 +#, c-format +msgid "Packed revprop manifest for rev %ld too small" +msgstr "版本 %ld 打包的属性清单太小" + +#: ../libsvn_fs_fs/fs_fs.c:3722 +msgid "Header end not found" +msgstr "找不到 Header 的结束标记" + +#: ../libsvn_fs_fs/fs_fs.c:3750 +msgid "Packed revprop size exceeds pack file size" +msgstr "打包的版本属性大小超出了打包文件长度" + +#: ../libsvn_fs_fs/fs_fs.c:3809 +#, c-format +msgid "No such packed revision %ld" +msgstr "没有此打包版本 %ld" + +#: ../libsvn_fs_fs/fs_fs.c:3849 +#, c-format +msgid "Failed to read revprop pack file for rev %ld" +msgstr "无法找到版本 %ld 打包的版本属性" + +#: ../libsvn_fs_fs/fs_fs.c:3856 +#, c-format +msgid "Revprop pack file for rev %ld is corrupt" +msgstr "版本 %ld 的属性打包文件损坏" + +#: ../libsvn_fs_fs/fs_fs.c:3929 +#, c-format +msgid "Could not read revprops for revision %ld" +msgstr "无法找到版本 %ld 的版本属性" + +#: ../libsvn_fs_fs/fs_fs.c:4154 +#, c-format +msgid "Packed file '%s' misses a tag" +msgstr "打包文件“%s”去哦少标签" + +#: ../libsvn_fs_fs/fs_fs.c:4491 msgid "Malformed svndiff data in representation" msgstr "修订版的 svndiff 数据非法" +#: ../libsvn_fs_fs/fs_fs.c:4927 ../libsvn_fs_fs/fs_fs.c:4946 msgid "Reading one svndiff window read beyond the end of the representation" msgstr "读svndiff窗口时超出了结尾" -msgid "svndiff data requested non-existent source" -msgstr "svndiff 数据请求不存在的来源" - -msgid "svndiff requested position beyond end of stream" -msgstr "svndiff 请求的位置超出了流的结尾" - +#: ../libsvn_fs_fs/fs_fs.c:5034 msgid "svndiff window length is corrupt" msgstr "svndiff 的窗体长度已损坏" +#: ../libsvn_fs_fs/fs_fs.c:5202 msgid "Checksum mismatch while reading representation" msgstr "读取修订版时校验和不匹配" +#: ../libsvn_fs_fs/fs_fs.c:5565 ../libsvn_fs_fs/fs_fs.c:5579 +#: ../libsvn_fs_fs/fs_fs.c:5586 #, c-format msgid "Directory entry corrupt in '%s'" msgstr "'%s' 的目录入口损坏" +#: ../libsvn_fs_fs/fs_fs.c:6064 ../libsvn_fs_fs/fs_fs.c:6069 +#: ../libsvn_fs_fs/fs_fs.c:6075 ../libsvn_fs_fs/fs_fs.c:6092 +#: ../libsvn_fs_fs/fs_fs.c:6125 ../libsvn_fs_fs/fs_fs.c:6145 +#: ../libsvn_fs_fs/fs_fs.c:6180 ../libsvn_fs_fs/fs_fs.c:6185 msgid "Invalid changes line in rev-file" msgstr "rev-file 中有非法修改行" +#: ../libsvn_fs_fs/fs_fs.c:6118 msgid "Invalid change kind in rev file" msgstr "rev 文件中有无效的改变种类" +#: ../libsvn_fs_fs/fs_fs.c:6138 msgid "Invalid text-mod flag in rev-file" msgstr "rev-file 中有无效的 text-mod 标志" +#: ../libsvn_fs_fs/fs_fs.c:6158 msgid "Invalid prop-mod flag in rev-file" msgstr "rev-file 中有无效的 prop-mod 标志" +#: ../libsvn_fs_fs/fs_fs.c:6416 msgid "Copying from transactions not allowed" msgstr "不允许从事务复制" +#: ../libsvn_fs_fs/fs_fs.c:6549 #, c-format msgid "Unable to create transaction directory in '%s' for revision %ld" msgstr "无法在“%s”中为版本 %ld 创建事务目录" +#: ../libsvn_fs_fs/fs_fs.c:6614 msgid "Internal error: a null transaction id was passed to get_txn_proplist()" msgstr "内部错误: 向 get_txn_proplist() 传递了空事务标识" +#: ../libsvn_fs_fs/fs_fs.c:6773 ../libsvn_fs_fs/fs_fs.c:6780 msgid "next-id file corrupt" msgstr "next-id 文件损坏" +#: ../libsvn_fs_fs/fs_fs.c:6876 #, c-format msgid "Transaction '%s' cleanup failed" msgstr "事务 '%s' 清理失败" +#: ../libsvn_fs_fs/fs_fs.c:7016 #, c-format msgid "Invalid change type %d" msgstr "无效的修改类型 %d" +#: ../libsvn_fs_fs/fs_fs.c:7604 msgid "Can't set text contents of a directory" msgstr "无法设定目录的文本内容" +#: ../libsvn_fs_fs/fs_fs.c:7690 ../libsvn_fs_fs/fs_fs.c:7695 +#: ../libsvn_fs_fs/fs_fs.c:7702 msgid "Corrupt 'current' file" msgstr "文件 “current” 损坏" +#: ../libsvn_fs_fs/fs_fs.c:7962 #, c-format -msgid "predecessor count for the root node-revision is wrong: found %d, committing r%ld" -msgstr "根节点版本的前驱计数错误：发现 %d，正在提交 r%ld" +msgid "" +"predecessor count for the root node-revision is wrong: found (%d+%ld != %d), " +"committing r%ld" +msgstr "根节点版本的前任计数错误: 发现 (%d+%ld != %d), 正在提交 r%ld" +#: ../libsvn_fs_fs/fs_fs.c:8097 msgid "Truncated protorev file detected" msgstr "检测到文件 protorev 被截断" +#: ../libsvn_fs_fs/fs_fs.c:8497 msgid "Transaction out of date" msgstr "事务过时" +#: ../libsvn_fs_fs/fs_fs.c:8991 msgid "Recovery encountered a non-directory node" msgstr "修复时遇到非目录节点" +#: ../libsvn_fs_fs/fs_fs.c:9013 msgid "Recovery encountered a deltified directory representation" msgstr "修复时遇到差异目录表示" +#: ../libsvn_fs_fs/fs_fs.c:9049 ../libsvn_fs_fs/fs_fs.c:9058 +#: ../libsvn_fs_fs/fs_fs.c:9064 msgid "Directory entry corrupt" msgstr "目录条目损坏" +#: ../libsvn_fs_fs/fs_fs.c:9237 #, c-format msgid "Expected current rev to be <= %ld but found %ld" msgstr "期望当前版本 <= %ld，但它是 %ld" +#: ../libsvn_fs_fs/fs_fs.c:9294 #, c-format msgid "Revision %ld has a revs file but no revprops file" msgstr "版本 %ld 有版本文件，但是没有版本属性文件" +#: ../libsvn_fs_fs/fs_fs.c:9301 +#, c-format +msgid "Revision %ld has a revs file but the revprops file is inaccessible" +msgstr "版本 %ld 有版本文件，但是版本属性文件不可访问" + +#: ../libsvn_fs_fs/fs_fs.c:9310 #, c-format msgid "Revision %ld has a non-file where its revprops file should be" msgstr "版本 %ld 有非文件项目，与其属性文件的记录矛盾" +#: ../libsvn_fs_fs/fs_fs.c:9488 #, c-format -msgid "Node origin for '%s' exists with a different value (%s) than what we were about to store (%s)" +msgid "" +"Node origin for '%s' exists with a different value (%s) than what we were " +"about to store (%s)" msgstr "“%s” 的 origin 节点取值(%s)与我们要存储的值(%s)不同" +#: ../libsvn_fs_fs/fs_fs.c:9594 #, c-format msgid "No such transaction '%s'" msgstr "没有事务 '%s'" +#: ../libsvn_fs_fs/fs_fs.c:10311 #, c-format msgid "FSFS format (%d) too old to pack; please upgrade the filesystem." msgstr "要打包的 FSFS 格式 (%d) 太旧，请升级。" +#: ../libsvn_fs_fs/fs_fs.c:10590 ../libsvn_subr/io.c:248 +#, c-format +msgid "Error converting entry in directory '%s' to UTF-8" +msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败" + +#: ../libsvn_fs_fs/fs_fs.c:10627 ../libsvn_subr/io.c:1021 +#, c-format +msgid "Source '%s' is not a directory" +msgstr "源 “%s” 不是目录" + +#: ../libsvn_fs_fs/fs_fs.c:10633 ../libsvn_subr/io.c:1027 +#, c-format +msgid "Destination '%s' is not a directory" +msgstr "目的 “%s” 不是目录" + +#: ../libsvn_fs_fs/fs_fs.c:10705 ../libsvn_subr/io.c:1104 +#: ../libsvn_subr/io.c:2485 +#, c-format +msgid "Can't read directory '%s'" +msgstr "无法读取目录 “%s”" + +#: ../libsvn_fs_fs/fs_fs.c:10710 ../libsvn_subr/io.c:1109 +#: ../libsvn_subr/io.c:2490 ../libsvn_subr/io.c:3995 +#, c-format +msgid "Error closing directory '%s'" +msgstr "关闭目录 “%s” 出错" + +#: ../libsvn_fs_fs/fs_fs.c:10950 +#, c-format +msgid "" +"The FSFS format (%d) of the hotcopy source does not match the FSFS format " +"(%d) of the hotcopy destination; please upgrade both repositories to the " +"same format" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:10959 +msgid "" +"The UUID of the hotcopy source does not match the UUID of the hotcopy " +"destination" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:10966 +msgid "" +"The sharding layout configuration of the hotcopy source does not match the " +"sharding layout configuration of the hotcopy destination" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:11071 +#, c-format +msgid "" +"Failed to create hotcopy at '%s'. The file '%s' is missing from the source " +"repository. Please create this file, for instance by running 'svnadmin " +"upgrade %s'" +msgstr "" +"在“%s”创建热备份失败。源版本库丢失了文件“%s”。请创建此文件，例如通过执" +"行“svnadmin upgrade %s”来创建它。" + +#: ../libsvn_fs_fs/fs_fs.c:11097 +#, c-format +msgid "" +"The hotcopy destination already contains more revisions (%lu) than the " +"hotcopy source contains (%lu); are source and destination swapped?" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:11133 +#, c-format +msgid "" +"The hotcopy destination already contains more packed revisions (%lu) than " +"the hotcopy source contains (%lu)" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:11246 +#, c-format +msgid "" +"The assumed HEAD revision (%lu) of the hotcopy source has been packed while " +"the hotcopy was in progress; please restart the hotcopy operation" +msgstr "" + +#: ../libsvn_fs_fs/fs_fs.c:11261 +#, c-format +msgid "" +"Revision %lu disappeared from the hotcopy source while hotcopy was in " +"progress" +msgstr "当正在进行热复制时，版本 %lu 从热复制源地址消失" + +#: ../libsvn_fs_fs/lock.c:120 #, c-format msgid "Corrupt lockfile for path '%s' in filesystem '%s'" msgstr "路径 “%s”的锁文件损坏，其文件系统是 “%s”" +#: ../libsvn_fs_fs/lock.c:228 #, c-format msgid "Cannot write lock/entries hashfile '%s'" msgstr "无法写入锁/条目的哈希文件“%s”" +#: ../libsvn_fs_fs/lock.c:280 #, c-format msgid "Can't parse lock/entries hashfile '%s'" msgstr "不能解析锁/条目的哈希文件“%s“" +#: ../libsvn_fs_fs/lock.c:818 #, c-format msgid "Lock failed: newer version of '%s' exists" msgstr "加锁失败: “%s”的新版本已经存在" +#: ../libsvn_fs_fs/rep-cache.c:113 msgid "Couldn't open rep-cache database" msgstr "无法打开缓存数据库" +#: ../libsvn_fs_fs/rep-cache.c:242 ../libsvn_fs_fs/rep-cache.c:287 msgid "Only SHA1 checksums can be used as keys in the rep_cache table.\n" msgstr "在表 rep_cache 中，只有 SHA1 校验和才能用作键。\n" +#: ../libsvn_fs_fs/rep-cache.c:323 #, c-format -msgid "Youngest revision is r%ld, but rep-cache contains r%ld" -msgstr "最小的版本是 r%ld，但是缓存中包含的是 r%ld" +msgid "" +"Representation key for checksum '%%s' exists in filesystem '%%s' with a " +"different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld," +"%%%s,%%%s,%%%s)" +msgstr "" +"校验和 “%%s” 的展现键已经存在于文件系统 “%%s” 中，取值(%%ld,%%%s,%%%s,%%%s)与" +"我们要存储的值(%%ld,%%%s,%%%s,%%%s)不同" +#: ../libsvn_fs_fs/tree.c:2190 ../libsvn_subr/path.c:1233 #, c-format -msgid "Representation key for checksum '%%s' exists in filesystem '%%s' with a different value (%%ld,%%%s,%%%s,%%%s) than what we were about to store (%%ld,%%%s,%%%s,%%%s)" -msgstr "校验和 “%%s” 的展现键已经存在于文件系统 “%%s” 中，取值(%%ld,%%%s,%%%s,%%%s)与我们要存储的值(%%ld,%%%s,%%%s,%%%s)不同" +msgid "Invalid control character '0x%02x' in path '%s'" +msgstr "无效控制字符 “0x%02x” 在路径 “%s” 中" +#: ../libsvn_fs_fs/tree.c:3789 #, c-format msgid "Node-revision #'%s' claims to have mergeinfo but doesn't" msgstr "节点版本 #“%s” 声称有合并信息，实际上却没有" +#: ../libsvn_fs_fs/tree.c:3905 #, c-format msgid "Node-revision '%s@%ld' claims to have mergeinfo but doesn't" msgstr "节点版本“%s@%ld”声称有合并信息，实际上却没有" +#: ../libsvn_fs_fs/tree.c:4105 #, c-format -msgid "Querying mergeinfo requires version %d of the FSFS filesystem schema; filesystem '%s' uses only version %d" +msgid "" +"Querying mergeinfo requires version %d of the FSFS filesystem schema; " +"filesystem '%s' uses only version %d" msgstr "查询合并信息需要 FSFS 文件系统方案版本 %d；文件系统“%s”只使用版本 %d" +#: ../libsvn_fs_util/fs-util.c:154 msgid "Filesystem object has not been opened yet" msgstr "文件系统对象尚未打开" +#: ../libsvn_fs_util/fs-util.c:157 msgid "Filesystem object already open" msgstr "文件系统对象已经打开" +#: ../libsvn_ra/compat.c:182 #, c-format msgid "Missing changed-path information for '%s' in revision %ld" msgstr "未提供 “%s” 于版本 %ld 中的 changed-path 信息" +#: ../libsvn_ra/compat.c:326 ../libsvn_ra/compat.c:570 #, c-format msgid "Path '%s' doesn't exist in revision %ld" msgstr "路径 “%s” 不在版本 %ld 中" +#: ../libsvn_ra/compat.c:403 #, c-format msgid "'%s' in revision %ld is an unrelated object" msgstr "“%s” 于版本 %ld 是一个无关对象" +#: ../libsvn_ra/compat.c:843 ../libsvn_ra/ra_loader.c:1291 #, c-format msgid "Invalid peg revision %ld" msgstr "无效的铆钉版本 %ld" +#: ../libsvn_ra/compat.c:846 ../libsvn_ra/ra_loader.c:1294 +#: ../libsvn_repos/rev_hunt.c:214 ../libsvn_repos/rev_hunt.c:329 #, c-format msgid "Invalid end revision %ld" msgstr "无效结束版本 %ld" +#: ../libsvn_ra/compat.c:849 ../libsvn_ra/ra_loader.c:1297 msgid "Peg revision must precede end revision" msgstr "铆钉版本必须小于结束版本" +#: ../libsvn_ra/ra_loader.c:215 #, c-format msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "“%s” 的 RA 版本不匹配: 找到 %d.%d.%d%s，期望 %d.%d.%d%s" +#: ../libsvn_ra/ra_loader.c:292 ../libsvn_ra_serf/serf.c:527 #, c-format msgid "Illegal repository URL '%s'" msgstr "非法版本库 URL “%s”" +#: ../libsvn_ra/ra_loader.c:399 #, c-format msgid "Invalid config: unknown HTTP library '%s'" msgstr "无效配置: 未知的 HTTP 库“%s”" +#: ../libsvn_ra/ra_loader.c:468 #, c-format msgid "Unrecognized URL scheme for '%s'" msgstr "无法识别的URL方案(一般需要svn://，http://，file://等开头)“%s”" +#: ../libsvn_ra/ra_loader.c:519 #, c-format msgid "Repository UUID '%s' doesn't match expected UUID '%s'" msgstr "版本库的 UUID“%s”与期望的 UUID“%s”不匹配" +#: ../libsvn_ra/ra_loader.c:540 +#, c-format +msgid "'%s' isn't in the same repository as '%s'" +msgstr "“%s”与“%s”并不在同一个版本库中" + +#: ../libsvn_ra/ra_loader.c:564 #, c-format msgid "'%s' isn't a child of session URL '%s'" msgstr "“%s” 不是会话 URL “%s” 的子节点" +#: ../libsvn_ra/ra_loader.c:580 ../libsvn_ra_svn/client.c:2398 #, c-format msgid "'%s' isn't a child of repository root URL '%s'" msgstr "“%s” 不是版本库根 URL “%s” 的子节点" +#: ../libsvn_ra/ra_loader.c:624 #, c-format -msgid "Specifying 'old_value_p' is not allowed when the '%s' capability is not advertised, and could indicate a bug in your client" -msgstr "当特性 '%s' 没有广告时，不允许指定 'old_value_p'，也说明您的客户端有问题" +msgid "" +"Specifying 'old_value_p' is not allowed when the '%s' capability is not " +"advertised, and could indicate a bug in your client" +msgstr "" +"当特性 '%s' 没有广告时，不允许指定 'old_value_p'，也说明您的客户端有问题" +#: ../libsvn_ra/ra_loader.c:1445 #, c-format msgid " - handles '%s' scheme\n" msgstr " - 处理“%s”方案\n" +#: ../libsvn_ra/ra_loader.c:1538 #, c-format msgid "Unrecognized URL scheme '%s'" msgstr "无法识别的URL方案(一般需要svn://，http://，file://等开头)“%s”" +#: ../libsvn_ra/util.c:64 #, c-format msgid "Retrieval of mergeinfo unsupported by '%s'" msgstr "“%s” 不支持取回合并信息" +#: ../libsvn_ra/util.c:88 +#, c-format +msgid "The '%s' feature is not supported by '%s'" +msgstr "特性“%s”不被“%s”支持" + +#: ../libsvn_ra/util.c:129 #, c-format msgid "Lock was stolen by '%s'; unable to remove it" msgstr "锁被 '%s' 窃取；不能删除" +#: ../libsvn_ra/util.c:170 #, c-format msgid "Unable to determine local hostname" msgstr "无法确定本地主机名称" +#: ../libsvn_ra/util.c:265 #, c-format msgid "Couldn't get lock on destination repos after %d attempts" msgstr "尝试 %d 次后，对目标版本库加锁失败" +#: ../libsvn_ra_local/ra_plugin.c:161 msgid "memory-cache-size invalid" msgstr "非法的 memory-cache-size" #. ---------------------------------------------------------------- #. ** The RA vtable routines ** +#: ../libsvn_ra_local/ra_plugin.c:502 msgid "Module for accessing a repository on local disk." msgstr "访问本地磁盘的版本库模块。" +#: ../libsvn_ra_local/ra_plugin.c:578 msgid "Unable to open an ra_local session to URL" msgstr "无法为 URL 打开 ra_local 会话" +#: ../libsvn_ra_local/ra_plugin.c:611 ../libsvn_ra_serf/serf.c:519 #, c-format msgid "URL '%s' is not a child of the session's repository root URL '%s'" msgstr "URL “%s” 不是会话版本库根 URL “%s” 的子节点" +#: ../libsvn_ra_local/ra_plugin.c:1139 ../libsvn_ra_local/ra_plugin.c:1596 +#: ../libsvn_ra_serf/util.c:2414 #, c-format msgid "'%s' path not found" msgstr "找不到路径 “%s”" +#: ../libsvn_ra_local/ra_plugin.c:1538 ../libsvn_ra_serf/options.c:616 +#: ../libsvn_ra_svn/client.c:2599 #, c-format msgid "Don't know anything about capability '%s'" msgstr "不知道特性 “%s” 的任何信息" +#: ../libsvn_ra_local/ra_plugin.c:1744 #, c-format msgid "Unsupported RA loader version (%d) for ra_local" msgstr "不支持ra_local RA加载器版本 %d" +#: ../libsvn_ra_local/split_url.c:49 ../libsvn_ra_local/split_url.c:55 #, c-format msgid "Unable to open repository '%s'" msgstr "无法打开版本库“%s”" -msgid "Could not fetch the Version Resource URL (needed during an import or when it is missing from the local, cached props)" -msgstr "不能获取版本资源URL(导入时需要或本地缓存属性中缺少)" - -#, c-format -msgid "File or directory '%s' is out of date; try updating" -msgstr "文件或目录 “%s” 已经过时；请先更新" - -msgid "The CHECKOUT response did not contain a 'Location:' header" -msgstr "检出(CHECKOUT)响应没有包含“Location:”头信息" - -#, c-format -msgid "Unable to parse URL '%s'" -msgstr "不能解析 URL “%s”" - -#, c-format -msgid "POST request did not return transaction information" -msgstr "POST 请求没有返回事务的信息" - -#, c-format -msgid "File '%s' already exists" -msgstr "文件“%s”已存在" - +#: ../libsvn_ra_serf/commit.c:219 #, c-format -msgid "Could not write svndiff to temp file" -msgstr "无法将 svndiff 写入临时文件" - -#, c-format -msgid "No lock on path '%s' (Status %d on PUT Request)" -msgstr "路径“%s”没有被锁定 (PUT 请求的状态码是 %d)" - -msgid "Could not save the URL of the version resource" -msgstr "无法储存版本资源的URL" - -msgid "Could not get content-type from response" -msgstr "不能从响应中获得内容类型" - -msgid "Could not save file" -msgstr "无法保存文件" - -msgid "Can't get text contents of a directory" -msgstr "无法获得目录的文本内容" - -#, c-format -msgid " expected: %s" -msgstr " 期望: %s" - -#, c-format -msgid " actual: %s" -msgstr " 实际: %s" - -msgid "Server response missing the expected deadprop-count property" -msgstr "服务器响应丢失了期望的 deadprop-count 属性" - -msgid "DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent" -msgstr "DAV 请求失败；可能是版本库的 pre-revprop-change 钩子执行失败或者不存在" - -#, c-format -msgid "Missing rev attr in target-revision element" -msgstr "元素 target-revision 没有 rev 属性" - -#, c-format -msgid "Missing name attr in absent-directory element" -msgstr "元素 absent-directory 没有 name 属性" - -#, c-format -msgid "Missing name attr in absent-file element" -msgstr "元素 absent-file 没有 name 属性" +msgid "%s of '%s': %d %s" +msgstr "%s 于 '%s': %d %s" -#, c-format -msgid "Missing path attr in resource element" -msgstr "元素 resource 没有 path 属性" +#: ../libsvn_ra_serf/commit.c:319 +msgid "No Location header received" +msgstr "没有收到位置头" -#, c-format -msgid "Missing rev attr in open-directory element" -msgstr "元素 open-directory 没有 rev 属性" +#: ../libsvn_ra_serf/commit.c:329 +msgid "Error parsing Location header value" +msgstr "解析位置头出错" +#: ../libsvn_ra_serf/commit.c:431 #, c-format -msgid "Missing name attr in open-directory element" -msgstr "元素 open-directory 没有 name 属性" +msgid "Directory '%s' is out of date; try updating" +msgstr "目录 “%s” 已经过时；请先更新" +#: ../libsvn_ra_serf/commit.c:519 ../libsvn_repos/commit.c:512 #, c-format -msgid "Missing name attr in add-directory element" -msgstr "元素 add-directory 没有 name 属性" +msgid "Path '%s' not present" +msgstr "路径 “%s” 不存在" +#: ../libsvn_ra_serf/commit.c:569 #, c-format -msgid "Missing copyfrom-rev attr in add-directory element" -msgstr "元素 add-directory 没有 copyfrom-rev 属性" +msgid "File '%s' is out of date; try updating" +msgstr "文件 “%s” 已经过时；请先更新" -#, c-format -msgid "Missing rev attr in open-file element" -msgstr "元素 open-file 没有 rev 属性" +#: ../libsvn_ra_serf/commit.c:971 +msgid "At least one property change failed; repository is unchanged" +msgstr "至少有一个属性变更失败；版本库未改变" +#: ../libsvn_ra_serf/commit.c:1171 #, c-format -msgid "Missing name attr in open-file element" -msgstr "元素 open-file 没有 name 属性" +msgid "Failed writing updated file" +msgstr "更新文件失败" +#: ../libsvn_ra_serf/commit.c:1359 ../libsvn_ra_serf/commit.c:1449 #, c-format -msgid "Missing name attr in add-file element" -msgstr "元素 add-file 没有 name 属性" +msgid "%s of '%s': %d %s (%s://%s)" +msgstr "%s 于 '%s': %d %s (%s://%s)" +#: ../libsvn_ra_serf/commit.c:1369 #, c-format -msgid "Missing copyfrom-rev attr in add-file element" -msgstr "元素 add-file 没有 copyfrom-rev 属性" +msgid "POST request did not return transaction information" +msgstr "POST 请求没有返回事务的信息" -#, c-format -msgid "Missing name attr in set-prop element" -msgstr "元素 set-pro 没有 name 属性" +#: ../libsvn_ra_serf/commit.c:1413 +msgid "" +"The OPTIONS response did not include the requested activity-collection-set " +"value" +msgstr "OPTIONS 响应中没有包含请求的 activity-collection-set 值。" +#: ../libsvn_ra_serf/commit.c:1678 ../libsvn_ra_serf/commit.c:2076 +#: ../libsvn_ra_serf/update.c:2631 #, c-format -msgid "Missing name attr in remove-prop element" -msgstr "元素 remove-prop 没有 name 属性" +msgid "Unable to parse URL '%s'" +msgstr "不能解析 URL “%s”" +#: ../libsvn_ra_serf/commit.c:1706 ../libsvn_ra_serf/util.c:2410 #, c-format -msgid "Missing name attr in delete-entry element" -msgstr "元素 delete-entry 没有 attr 属性" +msgid "Access to '%s' forbidden" +msgstr "禁止访问 '%s'" +#: ../libsvn_ra_serf/commit.c:1710 #, c-format -msgid "Error writing to '%s': unexpected EOF" -msgstr "写入 “%s” 时出错: 意外的 EOF" +msgid "Adding directory failed: %s on %s (%d %s)" +msgstr "增加目录失败: “%s” 于 “%s”(%d %s)" +#: ../libsvn_ra_serf/commit.c:1928 #, c-format -msgid "Unknown XML encoding: '%s'" -msgstr "未知的 XML 编码: “%s”" +msgid "File '%s' already exists" +msgstr "文件“%s”已存在" +#: ../libsvn_ra_serf/commit.c:2199 #, c-format -msgid "REPORT response handling failed to complete the editor drive" -msgstr "处理报告响应失败，不能完成编辑" +msgid "MERGE request failed: returned %d (during commit)" +msgstr "MERGE 请求失败: 返回 %d (在提交期间)" -msgid "Failed to write full amount to stream" -msgstr "无法将全部数据写入流" +#: ../libsvn_ra_serf/commit.c:2464 +msgid "" +"DAV request failed; it's possible that the repository's pre-revprop-change " +"hook either failed or is non-existent" +msgstr "DAV 请求失败；可能是版本库的 pre-revprop-change 钩子执行失败或者不存在" +#: ../libsvn_ra_serf/get_deleted_rev.c:173 #, c-format msgid "'%s' REPORT not implemented" msgstr "未实现 “%s” REPORT " -msgid "The file-revs report didn't contain any revisions" -msgstr "file-revs 报告中没有包含任何版本" - -msgid "Server does not support date-based operations" -msgstr "服务器不支持基于日期的操作" - -msgid "Invalid server response to dated-rev request" -msgstr "服务器请求 dated-rev 的响应无效" - -msgid "Expected valid revision range" -msgstr "期望合法的版本范围" - -msgid "Expected a valid revnum and path" -msgstr "期望合法的版本号和路径" - -msgid "Incomplete lock data returned" -msgstr "返回了不完全的锁数据" - +#: ../libsvn_ra_serf/locks.c:234 #, c-format -msgid "Got unrecognized encoding '%s'" -msgstr "得到不能识别的编码“%s”" +msgid "Lock request failed: %d %s" +msgstr "加锁请求失败: %d %s" + +#: ../libsvn_ra_serf/locks.c:414 +msgid "Malformed URL for repository" +msgstr "版本库的 URL 非法" +#: ../libsvn_ra_serf/locks.c:420 msgid "Server does not support locking features" msgstr "服务器不支持加锁" -msgid "Invalid creation date header value in response." -msgstr "在响应头中有非法创建日期" - -msgid "Invalid timeout value" -msgstr "非法超时取值" - -#, c-format -msgid "Failed to parse URI '%s'" -msgstr "解析 URI “%s” 失败" - -#, c-format -msgid "Lock request failed: %d %s" -msgstr "加锁请求失败: %d %s" - +#: ../libsvn_ra_serf/locks.c:581 #, c-format msgid "'%s' is not locked in the repository" msgstr "版本库中的“%s”没有被锁定" +#: ../libsvn_ra_serf/locks.c:632 ../libsvn_ra_serf/locks.c:638 #, c-format -msgid "Unlock failed on '%s' (%d Forbidden)" -msgstr "对 '%s' 解锁失败 (%d 禁止)" - -#, c-format -msgid "No lock on path '%s' (%d Bad Request)" -msgstr "路径“%s”没有被锁定 (%d 错误的请求)" - -msgid "Failed to fetch lock information" -msgstr "获取锁信息失败" +msgid "Unlock request failed: %d %s" +msgstr "解锁请求失败: %d %s" +#: ../libsvn_ra_serf/log.c:169 #, c-format -msgid "Missing name attr in revprop element" -msgstr "元素 revprop 没有 name 属性" +msgid "Unsupported encoding '%s'" +msgstr "不支持的编码“%s”" +#: ../libsvn_ra_serf/log.c:568 ../libsvn_ra_svn/client.c:1551 msgid "Server does not support custom revprops via log" msgstr "服务器不支持通过日志自定义 revprops" -#, c-format -msgid "Protocol error: we told the server not to auto-merge any resources, but it said that '%s' was merged" -msgstr "通讯协议错误: 我们让服务器不要自动合并任何资源，但是它报告“%s”已被合并" - -#, c-format -msgid "Internal error: there is an unknown parent (%d) for the 'DAV:response' element within the MERGE response" -msgstr "内部错误: 在 MERGE 响应中，“DAV:response”元素有未知的父项 (%d)" - -#, c-format -msgid "Protocol error: the MERGE response for the '%s' resource did not return all of the properties that we asked for (and need to complete the commit)" -msgstr "通讯协议错误: 对“%s”的 MERGE 响应并未返回所有我们请求的属性 (这些是完成提交所需要的)" - +#: ../libsvn_ra_serf/merge.c:200 #, c-format msgid "A MERGE response for '%s' is not a child of the destination ('%s')" msgstr "“%s”的 MERGE 响应并不是目标 (“%s”) 的子项" -msgid "The MERGE property response had an error status" -msgstr "MERGE 属性响应包含错误状态" - -msgid "The OPTIONS response did not include the requested activity-collection-set; this often means that the URL is not WebDAV-enabled" -msgstr "OPTIONS 响应没有包含请求的 activity-collection-set；通常是此 URL 没有启用 WebDAV。" - +#: ../libsvn_ra_serf/options.c:599 #, c-format msgid "Don't know how to handle '%s' for capability '%s'" msgstr "不知道如何处理“%s”，对于特性“%s”" +#: ../libsvn_ra_serf/options.c:623 #, c-format msgid "Attempt to fetch capability '%s' resulted in '%s'" msgstr "试图取得特性 “%s” 导致 “%s”" +#: ../libsvn_ra_serf/property.c:279 ../libsvn_ra_serf/update.c:2473 #, c-format -msgid "Failed to find label '%s' for URL '%s'" -msgstr "无法找到标签 “%s” 于 URL “%s”" - -#, c-format -msgid "'%s' was not present on the resource '%s'" -msgstr "'%s' 不在资源 '%s' 中" - -#, c-format -msgid "Neon was unable to parse URL '%s'" -msgstr "Neon 不能解析URL“%s”" +msgid "Got unrecognized encoding '%s'" +msgstr "得到不能识别的编码“%s”" -msgid "The path was not part of a repository" -msgstr "路径不是版本库的一部分" +#: ../libsvn_ra_serf/property.c:700 +msgid "The PROPFIND response did not include the requested properties" +msgstr "PROPFIND 响应中没有包含请求的属性" -#, c-format -msgid "No part of path '%s' was found in repository HEAD" -msgstr "路径“%s”的任何部分都不在版本库的 HEAD 中" +#: ../libsvn_ra_serf/property.c:993 +msgid "" +"The PROPFIND response did not include the requested baseline-collection value" +msgstr "PROPFIND 响应中没有包含请求的 baseline-collection 值。" -msgid "The VCC property was not found on the resource" -msgstr "资源没有 VCC 属性" +#: ../libsvn_ra_serf/property.c:1005 +msgid "The PROPFIND response did not include the requested version-name value" +msgstr "PROPFIND 响应中没有包含请求的 version-name 值。" -msgid "The relative-path property was not found on the resource" -msgstr "资源没有 relative-path 属性" +#: ../libsvn_ra_serf/property.c:1043 +msgid "The OPTIONS response did not include the requested checked-in value" +msgstr "OPTIONS 响应中没有包含请求的 checked-in 值。" +#: ../libsvn_ra_serf/property.c:1125 msgid "The OPTIONS response did not include the youngest revision" msgstr "OPTIONS 响应中没有包含最新的版本" -#, c-format -msgid "Url '%s' is not in repository '%s'" -msgstr "URL '%s' 不在版本库 '%s' 中" +#: ../libsvn_ra_serf/property.c:1218 +msgid "The PROPFIND response did not include the requested resourcetype value" +msgstr "PROPFIND 响应中没有包含请求的 resourcetype 值" -msgid "'DAV:baseline-collection' was not present on the baseline resource" -msgstr "基线资源没有“DAV:baseline-collection”" +#: ../libsvn_ra_serf/property.c:1253 +msgid "The PROPFIND response did not include the requested 'DAV:' properties" +msgstr "PROPFIND 响应中没有包含请求的 'DAV:' 属性" -#, c-format -msgid "'%s' was not present on the baseline resource" -msgstr "“%s” 不在基线资源中" +#: ../libsvn_ra_serf/replay.c:223 ../libsvn_ra_serf/update.c:1660 +msgid "Missing revision attr in target-revision element" +msgstr "元素“target-revision没有revision属性" -#, c-format -msgid "No lock on path '%s'; repository is unchanged" -msgstr "路径 '%s' 上没有锁；版本库未改变" +#: ../libsvn_ra_serf/replay.c:241 +msgid "Missing revision attr in open-root element" +msgstr "元素“open-root没有revisioin属性" -msgid "At least one property change failed; repository is unchanged" -msgstr "至少有一个属性变更失败；版本库未改变" +#: ../libsvn_ra_serf/replay.c:261 ../libsvn_ra_serf/update.c:1888 +msgid "Missing name attr in delete-entry element" +msgstr "元素 delete-entry 没有 attr 属性" -msgid "Got apply-textdelta element without preceding add-file or open-file" -msgstr "元素 apply-textdelta 之前没有 add-file 或者 open-file 元素" +#: ../libsvn_ra_serf/replay.c:267 +msgid "Missing revision attr in delete-entry element" +msgstr "delete-entry元素没有revision属性" -msgid "Got close-file element without preceding add-file or open-file" -msgstr "元素close-file之前没有add-file或者open-file元素" +#: ../libsvn_ra_serf/replay.c:287 ../libsvn_ra_serf/update.c:1727 +msgid "Missing name attr in open-directory element" +msgstr "元素 open-directory 没有 name 属性" -msgid "Got close-directory element without ever opening a directory" -msgstr "在没有打开目录的情况下发现了close-directory元素" +#: ../libsvn_ra_serf/replay.c:293 ../libsvn_ra_serf/update.c:1678 +#: ../libsvn_ra_serf/update.c:1718 +msgid "Missing revision attr in open-directory element" +msgstr "open-directory元素没有revision属性" -#, c-format -msgid "Error writing stream: unexpected EOF" -msgstr "写入流出错: 意外的 EOF" +#: ../libsvn_ra_serf/replay.c:313 ../libsvn_ra_serf/update.c:1765 +msgid "Missing name attr in add-directory element" +msgstr "元素 add-directory 没有 name 属性" -#, c-format -msgid "Got cdata content for a prop delete" -msgstr "删除属性时遇到cdata内容" +#: ../libsvn_ra_serf/replay.c:349 ../libsvn_ra_serf/update.c:1809 +msgid "Missing name attr in open-file element" +msgstr "元素 open-file 没有 name 属性" + +#: ../libsvn_ra_serf/replay.c:355 ../libsvn_ra_serf/update.c:1818 +msgid "Missing revision attr in open-file element" +msgstr "open-file元素没有revision属性" +#: ../libsvn_ra_serf/replay.c:376 ../libsvn_ra_serf/update.c:1843 +msgid "Missing name attr in add-file element" +msgstr "元素 add-file 没有 name 属性" + +#: ../libsvn_ra_serf/replay.c:442 ../libsvn_ra_serf/update.c:1984 +#: ../libsvn_ra_serf/update.c:2071 #, c-format -msgid "PIN for token \"%s\" in slot \"%s\"" -msgstr "钉住令牌“%s”于通道“%s”" +msgid "Missing name attr in %s element" +msgstr "元素“%s”没有name属性" -msgid "Invalid URL: illegal character in proxy port number" -msgstr "无效URL: 代理端口中有非法字符" +#: ../libsvn_ra_serf/replay.c:579 +msgid "Error writing stream: unexpected EOF" +msgstr "写入流出错: 意外的 EOF" -msgid "Invalid URL: negative proxy port number" -msgstr "无效URL: 负的代理端口" +#: ../libsvn_ra_serf/sb_bucket.c:65 +msgid "Failed to read the request" +msgstr "读取请求失败" -msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535" -msgstr "无效URL: 代理端口大于TCP通信端口最大值65535" +#: ../libsvn_ra_serf/serf.c:62 +msgid "Module for accessing a repository via WebDAV protocol using serf." +msgstr "通过 WebDAV 协议使用 serf 访问版本库的模块。" + +#: ../libsvn_ra_serf/serf.c:122 +#, c-format +msgid "Invalid config: unknown %s '%s'" +msgstr "无效配置: 未知 %s “%s”" +#: ../libsvn_ra_serf/serf.c:303 msgid "Invalid config: illegal character in timeout value" msgstr "无效配置: 超时数值中有非法字符" +#: ../libsvn_ra_serf/serf.c:307 msgid "Invalid config: negative timeout value" msgstr "无效配置: 负的超时" -msgid "Invalid config: illegal character in debug mask value" -msgstr "无效配置: 调试掩码中有非法字符" +#: ../libsvn_ra_serf/serf.c:320 +msgid "Invalid URL: illegal character in proxy port number" +msgstr "无效URL: 代理端口中有非法字符" -#, c-format -msgid "Invalid config: unknown http authtype '%s'" -msgstr "无效配置: 未知的 http 认证类型“%s”" +#: ../libsvn_ra_serf/serf.c:324 +msgid "Invalid URL: negative proxy port number" +msgstr "无效URL: 负的代理端口" -msgid "Module for accessing a repository via WebDAV protocol using Neon." -msgstr "通过 WebDAV 协议使用 neon 访问版本库的模块。" +#: ../libsvn_ra_serf/serf.c:327 +msgid "" +"Invalid URL: proxy port number greater than maximum TCP port number 65535" +msgstr "无效URL: 代理端口大于TCP通信端口最大值65535" +#: ../libsvn_ra_serf/serf.c:347 #, c-format -msgid "URL '%s' is malformed or the scheme or host or path is missing" -msgstr "非法 URL “%s”，缺少方案，主机或路径" - -msgid "Network socket initialization failed" -msgstr "创建网络套接字失败" - -msgid "SSL is not supported" -msgstr "不支持 SSL" +msgid "Could not resolve proxy server '%s'" +msgstr "不能解析代理服务器“%s”" +#: ../libsvn_ra_serf/serf.c:420 #, c-format -msgid "Invalid config: unable to load certificate file '%s'" -msgstr "无效的配置: 无法加载证书文件“%s”" +msgid "Illegal URL '%s'" +msgstr "非法 URL “%s”" +#: ../libsvn_ra_serf/serf.c:488 #, c-format -msgid "Invalid config: unable to load PKCS#11 provider '%s'" -msgstr "无效的配置: 无法加载 PKCS#11 提供者“%s”" +msgid "Connection to '%s' failed" +msgstr "连接到“%s”失败" +#: ../libsvn_ra_serf/serf.c:1149 msgid "The UUID property was not found on the resource or any of its parents" msgstr "无法在本资源或其任何父项目中找到UUID属性" +#: ../libsvn_ra_serf/serf.c:1223 #, c-format -msgid "Unsupported RA loader version (%d) for ra_neon" -msgstr "不支持的 ra_neon RA 加载器版本(%d)" - -msgid "The request response contained at least one error" -msgstr "请求的响应至少有一个错误" - -msgid "The response contains a non-conforming HTTP status line" -msgstr "响应包含了不一致的HTTP状态行" - -#, c-format -msgid "Error setting property '%s': " -msgstr "设置属性 “%s” 出错: " - -#, c-format -msgid "%s of '%s'" -msgstr "方法 %s 失败于 “%s”" - -#, c-format -msgid "Access to '%s' forbidden" -msgstr "禁止访问 '%s'" - -#, c-format -msgid "Repository moved permanently to '%s'; please relocate" -msgstr "版本库永久移到 “%s”；请重新定位。" - -#, c-format -msgid "Repository moved temporarily to '%s'; please relocate" -msgstr "版本库临时移到‘%s’；请重新定位。" - -#, c-format -msgid "Server sent unexpected return value (%d %s) in response to %s request for '%s'" -msgstr "服务器发送了意外的返回值(%d %s)，在响应 “%s” 的请求 “%s” 中" - -#, c-format -msgid "authorization failed: %s" -msgstr "认证失败: %s" - -msgid "authorization failed" -msgstr "认证失败" - -msgid "could not connect to server" -msgstr "无法连接到服务器" - -msgid "timed out waiting for server" -msgstr "等待服务器超时" - -#. ### This is a translation nightmare. Make sure to compose full strings -#. and mark those for translation. -#, c-format -msgid "%s: %s (%s://%s)" -msgstr "%s: %s (%s://%s)" - -msgid "General svn error from server" -msgstr "来自服务器的一般 svn 错误" - -#, c-format -msgid "Can't calculate the request body size" -msgstr "无法计算请求主体大小" - -#, c-format -msgid "The %s request returned invalid XML in the response: %s (%s)" -msgstr "%s 请求的响应返回无效 XML: %s (%s)" - -#, c-format -msgid "Error reading spooled %s request response" -msgstr "读取请求 %s 响应的脱机数据时出现错误" - -#, c-format -msgid "%s of '%s': %d %s" -msgstr "%s 于 '%s': %d %s" - -msgid "No Location header received" -msgstr "没有收到位置头" - -#, c-format -msgid "Directory '%s' is out of date; try updating" -msgstr "目录 “%s” 已经过时；请先更新" - -#, c-format -msgid "Path '%s' not present" -msgstr "路径 “%s” 不存在" - -#, c-format -msgid "File '%s' is out of date; try updating" -msgstr "文件 “%s” 已经过时；请先更新" - -#, c-format -msgid "Failed writing updated file" -msgstr "更新文件失败" - -#, c-format -msgid "%s of '%s': %d %s (%s://%s)" -msgstr "%s 于 '%s': %d %s (%s://%s)" - -msgid "The OPTIONS response did not include the requested activity-collection-set value" -msgstr "OPTIONS 响应中没有包含请求的 activity-collection-set 值。" - -#, c-format -msgid "Adding directory failed: %s on %s (%d %s)" -msgstr "增加目录失败: “%s” 于 “%s”(%d %s)" +msgid "Unsupported RA loader version (%d) for ra_serf" +msgstr "不支持的 ra_serf RA 加载器版本(%d)" +#: ../libsvn_ra_serf/serf.c:1237 #, c-format -msgid "Location segment report failed on '%s'@'%ld'" -msgstr "位置分段报告失败于“%s”@“%ld”" - -msgid "Malformed URL for repository" -msgstr "版本库的 URL 非法" +msgid "" +"ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d " +"library" +msgstr "ra_serf 为 serf %d.%d.%d 编译，但是加载了不兼容的共享库 %d.%d.%d" +#: ../libsvn_ra_serf/update.c:1118 #, c-format -msgid "Unlock request failed: %d %s" -msgstr "解锁请求失败: %d %s" +msgid "GET request returned unexpected delta base: %s" +msgstr "GET 请求返回不期望的差异基础: %s" +#: ../libsvn_ra_serf/update.c:1136 #, c-format -msgid "Unsupported encoding '%s'" -msgstr "不支持的编码“%s”" - -msgid "The PROPFIND response did not include the requested baseline-collection value" -msgstr "PROPFIND 响应中没有包含请求的 baseline-collection 值。" - -msgid "The PROPFIND response did not include the requested version-name value" -msgstr "PROPFIND 响应中没有包含请求的 version-name 值。" - -msgid "The OPTIONS response did not include the requested checked-in value" -msgstr "OPTIONS 响应中没有包含请求的 checked-in 值。" - -msgid "The PROPFIND response did not include the requested resourcetype value" -msgstr "PROPFIND 响应中没有包含请求的 resourcetype 值" - -msgid "Missing revision attr in target-revision element" -msgstr "元素“target-revision没有revision属性" - -msgid "Missing revision attr in open-root element" -msgstr "元素“open-root没有revisioin属性" - -msgid "Missing revision attr in delete-entry element" -msgstr "delete-entry元素没有revision属性" - -msgid "Missing revision attr in open-directory element" -msgstr "open-directory元素没有revision属性" +msgid "GET request failed: %d %s" +msgstr "GET 请求失败: %d %s" -msgid "Missing revision attr in open-file element" -msgstr "open-file元素没有revision属性" +#: ../libsvn_ra_serf/update.c:1922 +msgid "Missing name attr in absent-directory element" +msgstr "元素 absent-directory 没有 name 属性" -#, c-format -msgid "Missing name attr in %s element" -msgstr "元素“%s”没有name属性" +#: ../libsvn_ra_serf/update.c:1947 +msgid "Missing name attr in absent-file element" +msgstr "元素 absent-file 没有 name 属性" +#: ../libsvn_ra_serf/update.c:2015 ../libsvn_ra_serf/update.c:2122 #, c-format -msgid "Error retrieving replay REPORT (%d)" -msgstr "获取重放报告出错(%d)" - -msgid "Module for accessing a repository via WebDAV protocol using serf." -msgstr "通过 WebDAV 协议使用 serf 访问版本库的模块。" +msgid "Unknown tag '%s' while at state %d" +msgstr "未知标签“%s”，上下文状态 %d" -#, c-format -msgid "Could not resolve proxy server '%s'" -msgstr "不能解析代理服务器“%s”" +#: ../libsvn_ra_serf/update.c:2190 ../libsvn_ra_serf/update.c:2314 +#: ../libsvn_ra_serf/update.c:2351 +msgid "" +"The REPORT or PROPFIND response did not include the requested checked-in " +"value" +msgstr "REPORT 或 PROPFIND 响应中没有包含请求的 checked-in 值。" +#: ../libsvn_ra_serf/update.c:2533 #, c-format -msgid "Unsupported RA loader version (%d) for ra_serf" -msgstr "不支持的 ra_serf RA 加载器版本(%d)" +msgid "Error writing to '%s': unexpected EOF" +msgstr "写入“%s”出错: 意外的文件结束" -#, c-format -msgid "ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d library" -msgstr "ra_serf 为 serf %d.%d.%d 编译，但是加载了不兼容的共享库 %d.%d.%d" +#: ../libsvn_ra_serf/update.c:2902 +msgid "Error retrieving REPORT" +msgstr "获取报告出错" -#, c-format -msgid "GET request failed: %d %s" -msgstr "GET 请求失败: %d %s" +#: ../libsvn_ra_serf/update.c:3111 +msgid "Missing update-report close tag" +msgstr "缺少更新报告的关闭标签" -#, c-format -msgid "Unknown tag '%s' while at state %d" -msgstr "未知标签“%s”，上下文状态 %d" +#: ../libsvn_ra_serf/update.c:3581 +msgid "Can't get text contents of a directory" +msgstr "无法获得目录的文本内容" +#: ../libsvn_ra_serf/util.c:347 #, c-format -msgid "Error retrieving REPORT (%d)" -msgstr "获取报告出错(%d)" +msgid "Invalid config: unable to load certificate file '%s'" +msgstr "无效的配置: 无法加载证书文件“%s”" -#, c-format +#: ../libsvn_ra_serf/util.c:783 ../libsvn_ra_serf/util.c:786 msgid "Error running context" msgstr "执行上下文错误" +#: ../libsvn_ra_serf/util.c:1103 ../libsvn_ra_serf/util.c:1108 #, c-format msgid "Malformed DAV:status CDATA '%s'" msgstr "非法 DAV:status CDATA '%s'" +#: ../libsvn_ra_serf/util.c:1400 #, c-format msgid "XML parsing failed" msgstr "XML 解析失败" +#: ../libsvn_ra_serf/util.c:1403 #, c-format msgid "XML parsing failed: (%d %s)" msgstr "XML 解析失败: (%d %s)" +#: ../libsvn_ra_serf/util.c:1778 msgid "" "No more credentials or we tried too many times.\n" "Authentication failed" msgstr "" -"没有凭证或已经试了太多次。\n" +"没有更多凭据或已经试了太多次。\n" "认证失败" +#: ../libsvn_ra_serf/util.c:1800 msgid "Proxy authentication failed" msgstr "代理认证失败" +#: ../libsvn_ra_serf/util.c:1911 #, c-format msgid "Premature EOF seen from server (http status=%d)" msgstr "从服务器发现 EOF 太早 (http status=%d)" +#: ../libsvn_ra_serf/util.c:1980 #, c-format msgid "%s request on '%s' failed: %d %s" msgstr "%s 请求于 '%s' 失败: %d %s" -msgid "The PROPFIND response did not include the requested version-controlled-configuration value" +#: ../libsvn_ra_serf/util.c:2302 +msgid "" +"The PROPFIND response did not include the requested version-controlled-" +"configuration value" msgstr "PROPFIND 响应中没有包含请求的 version-controlled-configuration 值。" +#: ../libsvn_ra_serf/util.c:2404 +#, c-format +msgid "Repository moved permanently to '%s'; please relocate" +msgstr "版本库永久移到 “%s”；请重新定位。" + +#: ../libsvn_ra_serf/util.c:2406 +#, c-format +msgid "Repository moved temporarily to '%s'; please relocate" +msgstr "版本库临时移到‘%s’；请重新定位。" + +#: ../libsvn_ra_serf/util.c:2417 #, c-format msgid "'%s': no lock token available" msgstr "“%s”：没有可用的锁定令牌" +#: ../libsvn_ra_serf/util.c:2421 +#, c-format +msgid "DAV request failed: Content length required" +msgstr "DAV 请求失败: 需要内容长度" + +#: ../libsvn_ra_serf/util.c:2427 +#, c-format +msgid "Unexpected HTTP status %d '%s' on '%s'\n" +msgstr "意外 HTTP 状态 %d “%s”于“%s”\n" + +#: ../libsvn_ra_serf/util.c:2571 +#, c-format +msgid "The %s response contains invalid XML (%d %s)" +msgstr "响应 %s 包含非法 XML (%d %s)" + +#: ../libsvn_ra_serf/xml.c:674 +#, c-format +msgid "Missing XML attribute: '%s'" +msgstr "缺少 XML 属性: '%s'" + +#: ../libsvn_ra_serf/xml.c:749 +msgid "The response contains invalid XML" +msgstr "此响应包含非法 XML" + +#: ../libsvn_ra_svn/client.c:141 #, c-format msgid "Unknown hostname '%s'" msgstr "未知的主机“%s”" +#: ../libsvn_ra_svn/client.c:166 #, c-format msgid "Can't connect to host '%s'" msgstr "无法连接主机“%s”" +#: ../libsvn_ra_svn/client.c:204 msgid "Prop diffs element not a list" msgstr "Prop diffs 元素不是一个列表" +#: ../libsvn_ra_svn/client.c:402 #, c-format msgid "Undefined tunnel scheme '%s'" msgstr "无法识别的隧道方案 “%s”" +#: ../libsvn_ra_svn/client.c:419 #, c-format msgid "Tunnel scheme %s requires environment variable %s to be defined" msgstr "隧道方案 %s 需要设定环境变量 %s" +#: ../libsvn_ra_svn/client.c:430 #, c-format msgid "Can't tokenize command '%s'" msgstr "不能解析命令“%s”" +#: ../libsvn_ra_svn/client.c:463 #, c-format msgid "Error in child process: %s" msgstr "子进程错误: %s" -#, c-format -msgid "Can't create tunnel" -msgstr "无法创建隧道" - -msgid "To better debug SSH connection problems, remove the -q option from 'ssh' in the [tunnels] section of your Subversion configuration file." -msgstr "为了更好的诊断 SSH 连接问题，请从你的 Subversion 配置文件中，[tunnels] 节，删除 ssh 命令行参数 -q 。" +#: ../libsvn_ra_svn/client.c:538 +msgid "" +"To better debug SSH connection problems, remove the -q option from 'ssh' in " +"the [tunnels] section of your Subversion configuration file." +msgstr "" +"为了更好的诊断 SSH 连接问题，请从你的 Subversion 配置文件中，[tunnels] 节，删" +"除 ssh 命令行参数 -q 。" +#: ../libsvn_ra_svn/client.c:556 #, c-format msgid "Illegal svn repository URL '%s'" msgstr "非法的svn版本库URL“%s”" +#: ../libsvn_ra_svn/client.c:636 #, c-format msgid "Server requires minimum version %d" msgstr "服务器要求的最低版本是 %d" +#: ../libsvn_ra_svn/client.c:640 #, c-format msgid "Server only supports versions up to %d" msgstr "服务器支持的版本不大于 %d" +#: ../libsvn_ra_svn/client.c:648 msgid "Server does not support edit pipelining" msgstr "服务器不支持流水线编辑" +#: ../libsvn_ra_svn/client.c:685 msgid "Impossibly long repository root from server" msgstr "服务器返回的版本库根路径太长" +#: ../libsvn_ra_svn/client.c:697 msgid "" "Module for accessing a repository using the svn network protocol.\n" " - with Cyrus SASL authentication" msgstr "使用 svn 网络协议访问版本库的模块。 - 使用 Cyrus SASL 认证" +#: ../libsvn_ra_svn/client.c:701 msgid "Module for accessing a repository using the svn network protocol." msgstr "使用 svn 网络协议访问版本库的模块。" +#: ../libsvn_ra_svn/client.c:911 msgid "Server did not send repository root" msgstr "服务器没有返回版本库根路径" -msgid "Server doesn't support setting arbitrary revision properties during commit" +#: ../libsvn_ra_svn/client.c:985 +msgid "" +"Server doesn't support setting arbitrary revision properties during commit" msgstr "在提交时，服务器不支持设置任意版本属性" +#: ../libsvn_ra_svn/client.c:1088 +msgid "Inherited proplist element not a list" +msgstr "继承的属性列表元素不是列表" + +#: ../libsvn_ra_svn/client.c:1163 msgid "Non-string as part of file contents" msgstr "部分文件内容不是字符串" +#: ../libsvn_ra_svn/client.c:1249 msgid "Dirlist element not a list" msgstr "目录列表元素不是列表" +#: ../libsvn_ra_svn/client.c:1334 msgid "Mergeinfo element is not a list" msgstr "Mergeinfo 元素不是列表" +#: ../libsvn_ra_svn/client.c:1539 msgid "Log entry not a list" msgstr "日志条目不是列表" +#: ../libsvn_ra_svn/client.c:1586 msgid "Changed-path entry not a list" msgstr "已修改路径条目不是列表" +#: ../libsvn_ra_svn/client.c:1711 msgid "'stat' not implemented" msgstr "未实现“stat”" +#: ../libsvn_ra_svn/client.c:1770 msgid "'get-locations' not implemented" msgstr "未实现“get-locations”" +#: ../libsvn_ra_svn/client.c:1785 msgid "Location entry not a list" msgstr "区域条目不是列表" +#: ../libsvn_ra_svn/client.c:1824 msgid "'get-location-segments' not implemented" msgstr "未实现 “get-location-segments”" +#: ../libsvn_ra_svn/client.c:1841 msgid "Location segment entry not a list" msgstr "位置分段入口不是列表" +#: ../libsvn_ra_svn/client.c:1851 +msgid "Expected valid revision range" +msgstr "期望合法的版本范围" + +#: ../libsvn_ra_svn/client.c:1892 msgid "'get-file-revs' not implemented" msgstr "未实现“get-file-revs”" +#: ../libsvn_ra_svn/client.c:1916 msgid "Revision entry not a list" msgstr "版本条目不是列表" +#: ../libsvn_ra_svn/client.c:1933 ../libsvn_ra_svn/client.c:1963 msgid "Text delta chunk not a string" msgstr "文本差异块不是字符串" +#: ../libsvn_ra_svn/client.c:1975 msgid "The get-file-revs command didn't return any revisions" msgstr "get-file-revs 命令没有返回任何版本" +#: ../libsvn_ra_svn/client.c:2022 msgid "Server doesn't support the lock command" msgstr "服务器不支持加锁" +#: ../libsvn_ra_svn/client.c:2086 msgid "Server doesn't support the unlock command" msgstr "服务器不支持解锁" +#: ../libsvn_ra_svn/client.c:2184 msgid "Lock response not a list" msgstr "加锁响应不是列表" +#: ../libsvn_ra_svn/client.c:2198 msgid "Unknown status for lock command" msgstr "加锁命令的状态未知" +#: ../libsvn_ra_svn/client.c:2222 msgid "Didn't receive end marker for lock responses" msgstr "加锁响应没有结束标记" +#: ../libsvn_ra_svn/client.c:2312 msgid "Unlock response not a list" msgstr "解锁响应不是列表" +#: ../libsvn_ra_svn/client.c:2326 msgid "Unknown status for unlock command" msgstr "未知的解锁命令状态" +#: ../libsvn_ra_svn/client.c:2349 msgid "Didn't receive end marker for unlock responses" msgstr "解锁响应没有结束标记" +#: ../libsvn_ra_svn/client.c:2373 ../libsvn_ra_svn/client.c:2425 msgid "Server doesn't support the get-lock command" msgstr "服务器不支持命令 get-lock" +#: ../libsvn_ra_svn/client.c:2439 msgid "Lock element not a list" msgstr "Lock元素不是列表" +#: ../libsvn_ra_svn/client.c:2482 msgid "Server doesn't support the replay command" msgstr "服务器不支持重放命令" +#: ../libsvn_ra_svn/client.c:2513 msgid "Server doesn't support the replay-range command" msgstr "服务器不支持重放范围命令" +#: ../libsvn_ra_svn/client.c:2531 #, c-format msgid "Expected 'revprops', found '%s'" msgstr "期望“revprops”，发现“%s”" +#: ../libsvn_ra_svn/client.c:2548 msgid "Error while replaying commit" msgstr "重演提交操作错误" +#: ../libsvn_ra_svn/client.c:2621 msgid "'get-deleted-rev' not implemented" msgstr "未实现 “get-deleted-rev”" +#: ../libsvn_ra_svn/client.c:2720 #, c-format msgid "Unsupported RA loader version (%d) for ra_svn" msgstr "不支持 ra_svn RA 加载器版本(%d)" +#: ../libsvn_ra_svn/cram.c:199 ../libsvn_ra_svn/cram.c:217 +#: ../libsvn_ra_svn/cyrus_auth.c:526 ../libsvn_ra_svn/cyrus_auth.c:582 +#: ../libsvn_ra_svn/internal_auth.c:66 msgid "Unexpected server response to authentication" msgstr "服务器意外响应认证请求" +#: ../libsvn_ra_svn/cyrus_auth.c:225 #, c-format msgid "SASL authentication error: %s%s" msgstr "SASL 认证错误: %s%s" -#, c-format -msgid "Could not initialize the SASL library" -msgstr "不能初始化 SASL 库" - +#: ../libsvn_ra_svn/cyrus_auth.c:242 #, c-format msgid "Could not initialized the SASL library: %s%s" msgstr "不能初始化 SASL 库: %s%s" +#: ../libsvn_ra_svn/cyrus_auth.c:415 #, c-format msgid "Could not create SASL context: %s%s" msgstr "不能创建 SASL 上下文: %s%s" +#: ../libsvn_ra_svn/cyrus_auth.c:921 ../libsvn_ra_svn/internal_auth.c:63 +#: ../libsvn_ra_svn/internal_auth.c:114 #, c-format msgid "Authentication error from server: %s" msgstr "服务器报告认证错误: %s" +#: ../libsvn_ra_svn/cyrus_auth.c:925 msgid "Can't get username or password" msgstr "无法取得用户名称或密码" +#: ../libsvn_ra_svn/editorp.c:145 msgid "Successful edit status returned too soon" msgstr "太快返回编辑成功状态" +#: ../libsvn_ra_svn/editorp.c:487 msgid "Invalid file or dir token during edit" msgstr "编辑时遇到无效的文件或目录令牌" +#: ../libsvn_ra_svn/editorp.c:715 msgid "Apply-textdelta already active" msgstr "已经激活 Apply-textdelta" +#: ../libsvn_ra_svn/editorp.c:737 ../libsvn_ra_svn/editorp.c:755 msgid "Apply-textdelta not active" msgstr "没有激活 Apply-textdelta" +#: ../libsvn_ra_svn/editorp.c:850 #, c-format msgid "Command 'finish-replay' invalid outside of replays" msgstr "finish-replay命令只在重放时有效" +#: ../libsvn_ra_svn/editorp.c:954 ../libsvn_ra_svn/marshal.c:1498 #, c-format -msgid "Unknown command '%s'" -msgstr "未知命令: “%s”" +msgid "Unknown editor command '%s'" +msgstr "未知编辑器命令“%s”" -#, c-format +#: ../libsvn_ra_svn/internal_auth.c:101 msgid "Can't get password" msgstr "无法取得密码" +#: ../libsvn_ra_svn/marshal.c:151 msgid "Capability entry is not a word" msgstr "容量类型不是 word " +#: ../libsvn_ra_svn/marshal.c:941 msgid "String length larger than maximum" msgstr "字符串长度超出上限" +#: ../libsvn_ra_svn/marshal.c:1007 msgid "Too many nested items" msgstr "太多嵌套的项" +#: ../libsvn_ra_svn/marshal.c:1027 ../libsvn_ra_svn/marshal.c:1105 msgid "Number is larger than maximum" msgstr "数字超过上限" +#: ../libsvn_ra_svn/marshal.c:1133 +msgid "Word too long" +msgstr "单词太长" + +#: ../libsvn_ra_svn/marshal.c:1351 msgid "Proplist element not a list" msgstr "Proplist 元素不是列表" +#: ../libsvn_ra_svn/marshal.c:1390 msgid "Empty error list" msgstr "错误列表为空" +#: ../libsvn_ra_svn/marshal.c:1399 ../libsvn_ra_svn/marshal.c:1425 msgid "Malformed error list" msgstr "错误列表非法" +#: ../libsvn_ra_svn/marshal.c:1454 #, c-format msgid "Unknown status '%s' in command response" msgstr "命令响应中的状态 “%s” 未知" +#: ../libsvn_ra_svn/streams.c:78 ../libsvn_ra_svn/streams.c:157 #, c-format msgid "Can't read from connection" msgstr "无法读取连接" +#: ../libsvn_ra_svn/streams.c:91 ../libsvn_ra_svn/streams.c:170 #, c-format msgid "Can't write to connection" msgstr "无法写入连接" +#: ../libsvn_ra_svn/streams.c:144 #, c-format msgid "Can't get socket timeout" msgstr "无法获得 socket 超时" +#: ../libsvn_repos/commit.c:170 #, c-format msgid "'%s' is out of date" msgstr "“%s” 已经过时" +#: ../libsvn_repos/commit.c:291 #, c-format msgid "Got source path but no source revision for '%s'" msgstr "获得源路径，但“%s”没有源版本" +#: ../libsvn_repos/commit.c:324 #, c-format msgid "Source url '%s' is from different repository" msgstr "源 URL “%s” 来自其它版本库" +#: ../libsvn_repos/commit.c:640 #, c-format msgid "" "Checksum mismatch for resulting fulltext\n" @@ -3557,12 +4964,15 @@ msgstr "" "结果的校验和不匹配: \n" "(%s)" +#: ../libsvn_repos/commit.c:685 msgid "(no error)" msgstr "(没有错误)" +#: ../libsvn_repos/commit.c:716 ../libsvn_repos/commit.c:722 msgid "post-commit hook failed with no error message." msgstr "调用 post-commit 钩子失败 (没有错误信息)。" +#: ../libsvn_repos/commit.c:725 #, c-format msgid "" "post commit FS processing had error:\n" @@ -3573,9 +4983,11 @@ msgstr "" "%s\n" "%s" +#: ../libsvn_repos/commit.c:726 ../libsvn_repos/commit.c:735 msgid "(no error message)" msgstr "(没有错误信息)" +#: ../libsvn_repos/commit.c:733 #, c-format msgid "" "post commit FS processing had error:\n" @@ -3584,26 +4996,40 @@ msgstr "" "提交后的文件系统进程出错:\n" "%s" +#: ../libsvn_repos/commit.c:1255 ../libsvn_repos/fs-wrap.c:98 +#: ../libsvn_repos/load-fs-vtable.c:978 +msgid "Commit succeeded, but post-commit hook failed" +msgstr "提交成功，但是后置提交钩子(post-commit)失败" + +#: ../libsvn_repos/delta.c:192 msgid "Unable to open root of edit" msgstr "无法打开根来编辑" +#: ../libsvn_repos/delta.c:247 msgid "Invalid target path" msgstr "无效目标路径" +#: ../libsvn_repos/delta.c:251 msgid "Delta depth 'exclude' not supported" msgstr "不支持差异深度 “exclude”" -msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry" +#: ../libsvn_repos/delta.c:277 +msgid "" +"Invalid editor anchoring; at least one of the input paths is not a directory " +"and there was no source entry" msgstr "无效编辑器定位；至少一个输入路径不是目录，并且没有源入口" +#: ../libsvn_repos/deprecated.c:614 ../svnadmin/svnadmin.c:812 #, c-format msgid "* Dumped revision %ld.\n" msgstr "* 已转存版本 %ld。\n" +#: ../libsvn_repos/deprecated.c:620 ../svnadmin/svnadmin.c:818 #, c-format msgid "* Verified revision %ld.\n" msgstr "* 已校验版本 %ld。\n" +#: ../libsvn_repos/deprecated.c:628 ../svnadmin/svnadmin.c:866 #, c-format msgid "" "\n" @@ -3614,6 +5040,7 @@ msgstr "" "------- 提交后版本 %ld >>>\n" "\n" +#: ../libsvn_repos/deprecated.c:634 ../svnadmin/svnadmin.c:872 #, c-format msgid "" "\n" @@ -3624,413 +5051,527 @@ msgstr "" "------- 提交新版本 %ld (从原始版本 %ld 装载) >>>\n" "\n" +#: ../libsvn_repos/deprecated.c:647 ../svnadmin/svnadmin.c:885 #, c-format msgid " * editing path : %s ..." msgstr " * 正在修改路径: %s ..." +#: ../libsvn_repos/deprecated.c:653 ../svnadmin/svnadmin.c:891 #, c-format msgid " * deleting path : %s ..." msgstr " * 正在删除路径: %s ..." +#: ../libsvn_repos/deprecated.c:659 ../svnadmin/svnadmin.c:897 #, c-format msgid " * adding path : %s ..." msgstr " * 正在增加路径: %s ..." +#: ../libsvn_repos/deprecated.c:665 ../svnadmin/svnadmin.c:903 #, c-format msgid " * replacing path : %s ..." msgstr " * 正在替换路径: %s ..." +#: ../libsvn_repos/deprecated.c:675 ../svnadmin/svnadmin.c:912 msgid " done.\n" msgstr "完成。\n" +#: ../libsvn_repos/deprecated.c:685 ../svnadmin/svnadmin.c:921 #, c-format msgid "<<< Started new transaction, based on original revision %ld\n" msgstr "<<< 开始新的事务，基于原始版本 %ld\n" +#: ../libsvn_repos/deprecated.c:692 ../svnadmin/svnadmin.c:934 #, c-format msgid " removing '\\r' from %s ..." msgstr "正在从 '%s' 删除 '\\r' ..." +#: ../libsvn_repos/dump.c:267 #, c-format msgid "E%06d: While validating fspath '%s': %s" msgstr "E%06d: 当验证文件系统路径“%s”时出错：%s" +#: ../libsvn_repos/dump.c:389 #, c-format -msgid "Referencing data in revision %ld, which is older than the oldest dumped revision (r%ld). Loading this dump into an empty repository will fail." -msgstr "版本 %ld 引用的数据比最旧的转存版本 (r%ld) 还旧。加载这个转存到空的版本库会失败。" +msgid "" +"Referencing data in revision %ld, which is older than the oldest dumped " +"revision (r%ld). Loading this dump into an empty repository will fail." +msgstr "" +"版本 %ld 引用的数据比最旧的转存版本 (r%ld) 还旧。加载这个转存到空的版本库会失" +"败。" +#: ../libsvn_repos/dump.c:494 #, c-format -msgid "Mergeinfo referencing revision(s) prior to the oldest dumped revision (r%ld). Loading this dump may result in invalid mergeinfo." -msgstr "合并信息引用的版本比最旧的转存版本 (r%ld) 还旧。加载这个转存可能导致非法的合并信息。" +msgid "" +"Mergeinfo referencing revision(s) prior to the oldest dumped revision (r" +"%ld). Loading this dump may result in invalid mergeinfo." +msgstr "" +"合并信息引用的版本比最旧的转存版本 (r%ld) 还旧。加载这个转存可能导致非法的合" +"并信息。" +#: ../libsvn_repos/dump.c:1124 ../libsvn_repos/dump.c:1416 #, c-format msgid "Start revision %ld is greater than end revision %ld" msgstr "起始版本 %ld 大于结束版本 %ld" +#: ../libsvn_repos/dump.c:1129 ../libsvn_repos/dump.c:1421 #, c-format msgid "End revision %ld is invalid (youngest revision is %ld)" msgstr "结束版本 %ld 无效 (最新版本是 %ld)" -msgid "The range of revisions dumped contained references to copy sources outside that range." +#: ../libsvn_repos/dump.c:1267 +msgid "" +"The range of revisions dumped contained references to copy sources outside " +"that range." msgstr "导出的版本范围包含的引用超出导出范围。" -msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range." +#: ../libsvn_repos/dump.c:1281 +msgid "" +"The range of revisions dumped contained mergeinfo which reference revisions " +"outside that range." msgstr "导出的版本范围包含的合并信息，其引用的版本超出导出范围。" +#: ../libsvn_repos/dump.c:1340 #, c-format msgid "Unexpected node kind %d for '%s'" msgstr "意外发现节点种类 %d 于“%s”" -msgid "Commit succeeded, but post-commit hook failed" -msgstr "提交成功，但是后置提交钩子(post-commit)失败" - +#: ../libsvn_repos/fs-wrap.c:183 #, c-format -msgid "Storage of non-regular property '%s' is disallowed through the repository interface, and could indicate a bug in your client" +msgid "" +"Storage of non-regular property '%s' is disallowed through the repository " +"interface, and could indicate a bug in your client" msgstr "不允许通过版本库接口存储非正规属性“%s”，它说明您的客户端有漏洞" +#: ../libsvn_repos/fs-wrap.c:198 #, c-format msgid "Cannot accept '%s' property because it is not encoded in UTF-8" msgstr "不能接受属性 “%s”，因为它的编码不是 UTF-8" +#: ../libsvn_repos/fs-wrap.c:208 #, c-format msgid "Cannot accept non-LF line endings in '%s' property" msgstr "不能接受属性 “%s” 的非 LF 行结束符" +#: ../libsvn_repos/fs-wrap.c:249 #, c-format -msgid "Commit rejected because mergeinfo on '%s' contains unexpected string terminator" +msgid "" +"Commit rejected because mergeinfo on '%s' contains unexpected string " +"terminator" msgstr "由于 '%s' 上的合并信息包含意外的字符串终结符，提交被拒绝" +#: ../libsvn_repos/fs-wrap.c:256 #, c-format msgid "Commit rejected because mergeinfo on '%s' is syntactically invalid" msgstr "由于 '%s' 上的合并信息非法，提交被拒绝" +#: ../libsvn_repos/fs-wrap.c:386 #, c-format msgid "Write denied: not authorized to read all of revision %ld" msgstr "拒绝写入: 未授权读取版本 %ld 的所有数据。" +#: ../libsvn_repos/fs-wrap.c:570 #, c-format msgid "Cannot unlock path '%s', no authenticated username available" msgstr "不能解除路径“%s”的锁定，没有可用的已授权用户名" +#: ../libsvn_repos/fs-wrap.c:586 msgid "Unlock succeeded, but post-unlock hook failed" msgstr "解锁成功，但是后置解锁钩子(post-unlock)失败" +#: ../libsvn_repos/hooks.c:92 #, c-format msgid "'%s' hook succeeded, but error output could not be read" msgstr "钩子执行“%s”成功，没有可用的错误输出" +#: ../libsvn_repos/hooks.c:107 msgid "[Error output could not be translated from the native locale to UTF-8.]" msgstr "[错误输出不能从本地区域转变为 UTF-8。]" +#: ../libsvn_repos/hooks.c:112 msgid "[Error output could not be read.]" msgstr "[没有可用的错误输出。]" +#: ../libsvn_repos/hooks.c:121 #, c-format -msgid "'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was %d). " +msgid "" +"'%s' hook failed (did not exit cleanly: apr_exit_why_e was %d, exitcode was " +"%d). " msgstr "钩子“%s”失败(没有干净的退出: apr_exit_why_e 是 %d，exitcode 是 %d)。" +#: ../libsvn_repos/hooks.c:130 msgid "Commit" msgstr "提交" +#: ../libsvn_repos/hooks.c:132 msgid "Revprop change" msgstr "版本属性改变" +#: ../libsvn_repos/hooks.c:134 msgid "Lock" msgstr "加锁" +#: ../libsvn_repos/hooks.c:136 msgid "Unlock" msgstr "解锁" +#: ../libsvn_repos/hooks.c:141 #, c-format msgid "%s hook failed (exit code %d)" msgstr "钩子 “%s” 失败(退出代码 %d)" +#: ../libsvn_repos/hooks.c:145 #, c-format msgid "%s blocked by %s hook (exit code %d)" msgstr "%s 被 %s 钩子阻塞(退出代码 %d)" +#: ../libsvn_repos/hooks.c:152 msgid " with output:\n" msgstr " 输出：\n" +#: ../libsvn_repos/hooks.c:158 msgid " with no output." msgstr " 没有输出。" +#: ../libsvn_repos/hooks.c:233 #, c-format msgid "Can't create null stdout for hook '%s'" msgstr "无法为钩子“%s”创建空标准输出" +#: ../libsvn_repos/hooks.c:260 #, c-format msgid "Failed to start '%s' hook" msgstr "启动钩子“%s”失败" -#, c-format -msgid "Error closing read end of stderr pipe" -msgstr "关闭读标准错误管道出错" - +#: ../libsvn_repos/hooks.c:282 #, c-format msgid "Error closing null file" msgstr "关闭空文件出错" +#: ../libsvn_repos/hooks.c:446 #, c-format msgid "Failed to run '%s' hook; broken symlink" msgstr "运行钩子“%s”失败；符号连接损坏" +#: ../libsvn_repos/hooks.c:664 msgid "" "Repository has not been enabled to accept revision propchanges;\n" "ask the administrator to create a pre-revprop-change hook" msgstr "此版本库不允许修改版本属性；请管理员创建 pre-revprop-change 钩子" +#: ../libsvn_repos/load-fs-vtable.c:565 ../svnrdump/load_editor.c:766 #, c-format msgid "Relative source revision %ld is not available in current repository" msgstr "当前版本库不存在相对源版本 %ld" +#: ../libsvn_repos/load-fs-vtable.c:579 #, c-format msgid "" "Copy source checksum mismatch on copy from '%s'@%ld\n" "to '%s' in rev based on r%ld" msgstr "从 “%s@%ld” 复制到 “%s”，基于版本 r%ld 的源校验和不匹配" +#: ../libsvn_repos/load-fs-vtable.c:638 msgid "Malformed dumpstream: Revision 0 must not contain node records" msgstr "非法的转存流: 版本 0 不能包含节点记录" +#: ../libsvn_repos/load-fs-vtable.c:654 #, c-format msgid "Unrecognized node-action on node '%s'" msgstr "节点“%s”的动作不能识别" +#: ../libsvn_repos/load.c:54 msgid "Premature end of content data in dumpstream" msgstr "转存流中内容数据过早结束" +#: ../libsvn_repos/load.c:61 msgid "Dumpstream data appears to be malformed" msgstr "转存流中出现非法数据" +#: ../libsvn_repos/load.c:110 #, c-format msgid "Dump stream contains a malformed header (with no ':') at '%.20s'" msgstr "转存流在“%.20s”包含错误头部(没有“:”)" +#: ../libsvn_repos/load.c:123 #, c-format msgid "Dump stream contains a malformed header (with no value) at '%.20s'" msgstr "转存流在“%.20s”包含错误头部(没有值)" +#: ../libsvn_repos/load.c:212 msgid "Incomplete or unterminated property block" msgstr "不完整或未结束的属性块" +#: ../libsvn_repos/load.c:360 msgid "Unexpected EOF writing contents" msgstr "写内容时意外结束" +#: ../libsvn_repos/load.c:390 #, c-format msgid "Malformed dumpfile header '%s'" msgstr "非法的转存文件头 '%s'" +#: ../libsvn_repos/load.c:397 #, c-format msgid "Unsupported dumpfile version: %d" msgstr "不支持的转存文件版本: %d" +#: ../libsvn_repos/load.c:538 msgid "Unrecognized record type in stream" msgstr "流中有无法识别的记录类型" +#: ../libsvn_repos/load.c:645 msgid "Sum of subblock sizes larger than total block content length" msgstr "子块大小之和大于块内容长度" +#: ../libsvn_repos/node_tree.c:244 #, c-format msgid "'%s' not found in filesystem" msgstr "在文件系统中找不到“%s”" +#: ../libsvn_repos/replay.c:546 ../libsvn_repos/replay.c:1267 #, c-format msgid "Filesystem path '%s' is neither a file nor a directory" msgstr "文件系统中路径“%s”既不是文件也不是目录" +#: ../libsvn_repos/reporter.c:205 #, c-format msgid "Invalid length (%%%s) when about to read a string" msgstr "长度 (%%%s) 对于字符串非法" +#: ../libsvn_repos/reporter.c:270 #, c-format msgid "Invalid depth (%c) for path '%s'" msgstr "非法深度(%c)于路径 “%s”" +#: ../libsvn_repos/reporter.c:951 #, c-format msgid "Working copy path '%s' does not exist in repository" msgstr "工作副本路径“%s”不在版本库中" +#: ../libsvn_repos/reporter.c:1348 msgid "Not authorized to open root of edit operation" msgstr "无权打开根进行编辑操作" +#: ../libsvn_repos/reporter.c:1365 #, c-format msgid "Target path '%s' does not exist" msgstr "目标路径 “%s” 不存在" +#: ../libsvn_repos/reporter.c:1373 msgid "Cannot replace a directory from within" msgstr "不能在子目录中替换目录" +#: ../libsvn_repos/reporter.c:1413 msgid "Invalid report for top level of working copy" msgstr "最上层工作副本报告无效" +#: ../libsvn_repos/reporter.c:1428 msgid "Two top-level reports with no target" msgstr "两个最上层报告没有目标" +#: ../libsvn_repos/reporter.c:1490 #, c-format msgid "Unsupported report depth '%s'" msgstr "不支持报告深度“%s”" +#: ../libsvn_repos/reporter.c:1520 msgid "Depth 'exclude' not supported for link" msgstr "深度 “exclude” 不支持链接" +#: ../libsvn_repos/reporter.c:1577 msgid "Request depth 'exclude' not supported" msgstr "不支持请求的深度 “exclude”" +#: ../libsvn_repos/repos.c:188 #, c-format msgid "'%s' exists and is non-empty" msgstr "“%s”已存在并且非空" +#: ../libsvn_repos/repos.c:234 msgid "Creating db logs lock file" msgstr "正在创建数据库日值锁文件" +#: ../libsvn_repos/repos.c:252 msgid "Creating db lock file" msgstr "正在创建数据库锁文件" +#: ../libsvn_repos/repos.c:262 msgid "Creating lock dir" msgstr "正在创建锁文件目录" +#: ../libsvn_repos/repos.c:291 msgid "Creating hook directory" msgstr "正在创建钩子目录" +#: ../libsvn_repos/repos.c:373 msgid "Creating start-commit hook" msgstr "正在创建 start-commit 钩子" +#: ../libsvn_repos/repos.c:465 msgid "Creating pre-commit hook" msgstr "正在创建 pre-commit 钩子" +#: ../libsvn_repos/repos.c:543 msgid "Creating pre-revprop-change hook" msgstr "正在创建 pre-revprop-change 钩子" +#: ../libsvn_repos/repos.c:783 msgid "Creating post-commit hook" msgstr "正在创建 post-commit 钩子" +#: ../libsvn_repos/repos.c:975 msgid "Creating post-revprop-change hook" msgstr "正在创建 post-revprop-change 钩子" +#: ../libsvn_repos/repos.c:987 msgid "Creating conf directory" msgstr "正在创建 conf 目录" +#: ../libsvn_repos/repos.c:1071 msgid "Creating svnserve.conf file" msgstr "正在创建 svnserve.conf 文件" +#: ../libsvn_repos/repos.c:1089 msgid "Creating passwd file" msgstr "正在创建 passwd 文件" +#: ../libsvn_repos/repos.c:1131 msgid "Creating authz file" msgstr "正在创建 authz 文件" +#: ../libsvn_repos/repos.c:1161 +msgid "Creating hooks-env file" +msgstr "正在创建 hooks-env 文件" + +#: ../libsvn_repos/repos.c:1217 msgid "Could not create top-level directory" msgstr "无法创建最上层目录" +#: ../libsvn_repos/repos.c:1227 msgid "Creating DAV sandbox dir" msgstr "正在创建 DAV 沙箱目录" +#: ../libsvn_repos/repos.c:1296 msgid "Error opening db lockfile" msgstr "打开数据库锁文件出错" +#: ../libsvn_repos/repos.c:1333 #, c-format msgid "'%s' is an existing repository" msgstr "版本库的“%s”已经存在" +#: ../libsvn_repos/repos.c:1337 #, c-format msgid "'%s' is a subdirectory of an existing repository rooted at '%s'" msgstr "“%s” 是当前根为 “%s” 的版本库的子目录" +#: ../libsvn_repos/repos.c:1345 msgid "Repository creation failed" msgstr "创建版本库失败" +#: ../libsvn_repos/repos.c:1430 #, c-format msgid "Expected repository format '%d' or '%d'; found format '%d'" msgstr "期望版本库格式是“%d”或“%d”；发现格式是“%d”" +#: ../libsvn_repos/repos.c:1674 #, c-format msgid "unknown capability '%s'" msgstr "未知特性“%s”" +#: ../libsvn_repos/rev_hunt.c:71 #, c-format msgid "Failed to find time on revision %ld" msgstr "无法找到版本 %ld 的时间" +#: ../libsvn_repos/rev_hunt.c:210 ../libsvn_repos/rev_hunt.c:325 #, c-format msgid "Invalid start revision %ld" msgstr "无效起始版本 %ld" +#: ../libsvn_repos/rev_hunt.c:518 msgid "Unreadable path encountered; access denied" msgstr "遇到不可读的路径；拒绝访问。" +#: ../libsvn_repos/rev_hunt.c:1156 ../libsvn_repos/rev_hunt.c:1495 #, c-format msgid "'%s' is not a file in revision %ld" msgstr "“%s” 不是文件，版本 %ld" +#: ../libsvn_subr/auth.c:221 #, c-format msgid "No provider registered for '%s' credentials" msgstr "没有提供程序为 '%s' 凭据注册" -#, c-format -msgid "Invalid config: unknown password store '%s'" -msgstr "无效配置: 未知的密码存储 “%s”" - +#: ../libsvn_subr/cache-membuffer.c:496 #, c-format msgid "Can't lock cache mutex" msgstr "不能锁定缓存互斥体" +#: ../libsvn_subr/cache-membuffer.c:527 ../libsvn_subr/cache-membuffer.c:543 +#, c-format +msgid "Can't write-lock cache mutex" +msgstr "不能获得缓存互斥体的写入锁" + +#: ../libsvn_subr/cache-membuffer.c:562 #, c-format msgid "Can't unlock cache mutex" msgstr "不能解锁缓存互斥体" +#: ../libsvn_subr/cache-membuffer.c:1299 #, c-format msgid "Can't create cache mutex" -msgstr "不能创建缓存互斥体" - -#. We are OOM. There is no need to proceed with "half a cache". -#. -#, c-format -msgid "OOM" -msgstr "内存不足" - -#, c-format -msgid "APR doesn't support threads" -msgstr "APR 不支持 线程" +msgstr "无法创建缓存互斥体" +#: ../libsvn_subr/cache-membuffer.c:2030 msgid "Can't iterate a membuffer-based cache" msgstr "不能迭代基于内存的缓存" +#: ../libsvn_subr/cache-memcache.c:170 #, c-format msgid "Unknown memcached error while reading" msgstr "当读取时出现未知的 memcached 错误" +#: ../libsvn_subr/cache-memcache.c:237 #, c-format msgid "Unknown memcached error while writing" msgstr "当写入时出现未知的 memcached 错误" +#: ../libsvn_subr/cache-memcache.c:343 msgid "Can't iterate a memcached cache" msgstr "不能迭代 memcached 缓存" +#: ../libsvn_subr/cache-memcache.c:443 #, c-format msgid "Error parsing memcache server '%s'" msgstr "解析 memcache 服务器 “%s” 时出错" +#: ../libsvn_subr/cache-memcache.c:451 #, c-format msgid "Scope not allowed in memcache server '%s'" msgstr "memcache 服务器 “%s” 中不允许出现范围" +#: ../libsvn_subr/cache-memcache.c:459 #, c-format msgid "Must specify host and port for memcache server '%s'" msgstr "memcache 服务器 “%s” 中必须指定主机和端口" +#: ../libsvn_subr/cache-memcache.c:479 #, c-format msgid "Unknown error creating memcache server" msgstr "创建 memcache 服务器时出现未知错误" +#: ../libsvn_subr/cache-memcache.c:487 #, c-format msgid "Unknown error adding server to memcache" msgstr "增加 memcache 服务器时出现未知错误" +#: ../libsvn_subr/cache-memcache.c:560 #, c-format msgid "Unknown error creating apr_memcache_t" msgstr "创建 memcache apr_memcache_t 时出现未知错误" +#: ../libsvn_subr/checksum.c:470 #, c-format msgid "" "%s:\n" @@ -4041,58 +5582,203 @@ msgstr "" " 期望: %s\n" " 实际: %s\n" +#: ../libsvn_subr/cmdline.c:646 #, c-format msgid "Error initializing command line arguments" msgstr "初始化命令行参数出错" +#: ../libsvn_subr/cmdline.c:735 msgid "Invalid syntax of argument of --config-option" msgstr "参数 --config-option 的语法无效" +#: ../libsvn_subr/cmdline.c:762 #, c-format msgid "Unrecognized file in argument of %s" msgstr "不能识别参数 %s 指定的文件" +#: ../libsvn_subr/cmdline.c:1008 +msgid "" +"The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-" +"time configuration option is empty or consists solely of whitespace. " +"Expected a shell command." +msgstr "" +"环境变量 EDITOR，SVN_EDITOR，或 VISUAL；或者运行时配置选项 “editor-cmd” 为空" +"或取值包含了不加引号的空格。期望外壳命令。" + +#: ../libsvn_subr/cmdline.c:1015 +msgid "" +"None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and " +"no 'editor-cmd' run-time configuration option was found" +msgstr "" +"没有设置 SVN_EDITOR，VISUAL 或 EDITOR 环境变量，运行时的配置参数中也没有 " +"“editor-cmd” 选项" + +#: ../libsvn_subr/cmdline.c:1040 ../libsvn_subr/cmdline.c:1124 +#, c-format +msgid "Can't get working directory" +msgstr "无法取得工作目录" + +#: ../libsvn_subr/cmdline.c:1051 ../libsvn_subr/cmdline.c:1135 +#: ../libsvn_subr/cmdline.c:1160 +#, c-format +msgid "Can't change working directory to '%s'" +msgstr "无法改变工作目录到“%s”" + +#: ../libsvn_subr/cmdline.c:1059 ../libsvn_subr/cmdline.c:1307 +#, c-format +msgid "Can't restore working directory" +msgstr "无法还原工作目录" + +#: ../libsvn_subr/cmdline.c:1066 ../libsvn_subr/cmdline.c:1242 +#, c-format +msgid "system('%s') returned %d" +msgstr "system('%s') 返回 %d" + +#: ../libsvn_subr/cmdline.c:1187 +#, c-format +msgid "Can't write to '%s'" +msgstr "无法写入“%s”" + +#: ../libsvn_subr/cmdline.c:1202 ../libsvn_subr/cmdline.c:1217 +#: ../libsvn_subr/cmdline.c:1251 ../libsvn_subr/io.c:3609 +#, c-format +msgid "Can't stat '%s'" +msgstr "不能取得“%s”的状态" + +#: ../libsvn_subr/cmdline.c:1276 +msgid "Error normalizing edited contents to internal format" +msgstr "将编辑内容规格化为内部格式出错" + +#: ../libsvn_subr/config.c:739 #, c-format msgid "Config error: invalid boolean value '%s' for '[%s] %s'" msgstr "配置错误: 无效布尔值 “%s”，对于 “[%s] %s”" +#: ../libsvn_subr/config.c:744 #, c-format msgid "Config error: invalid boolean value '%s' for '%s'" msgstr "配置错误: 无效布尔值 “%s”，对于 “%s”" +#: ../libsvn_subr/config.c:1173 #, c-format msgid "Config error: invalid integer value '%s'" msgstr "配置错误: 无效整数值“%s”" +#: ../libsvn_subr/config_auth.c:99 msgid "Unable to open auth file for reading" msgstr "不能打开认证文件读取数据" +#: ../libsvn_subr/config_auth.c:104 #, c-format msgid "Error parsing '%s'" msgstr "解析“%s”时出错" +#: ../libsvn_subr/config_auth.c:129 msgid "Unable to locate auth file" msgstr "无法定位认证文件文件" +#: ../libsvn_subr/config_auth.c:140 msgid "Unable to open auth file for writing" msgstr "无法打开认证文件写入数据" +#: ../libsvn_subr/config_auth.c:144 #, c-format msgid "Error writing hash to '%s'" msgstr "写哈希数据至“%s”时出错" +#: ../libsvn_subr/crypto.c:93 +#, c-format +msgid "Failed to initialize cryptography subsystem" +msgstr "初始化加密子系统失败" + +#: ../libsvn_subr/crypto.c:108 +#, c-format +msgid "code (%d), reason (\"%s\"), msg (\"%s\")" +msgstr "代码 (%d), 原因 (\"%s\"), 消息 (\"%s\")" + +#: ../libsvn_subr/crypto.c:134 +#, c-format +msgid "Fetching error from APR" +msgstr "从 APR 取出错误" + +#: ../libsvn_subr/crypto.c:154 +#, c-format +msgid "Error obtaining random data" +msgstr "获得随机数据失败" + +#: ../libsvn_subr/crypto.c:224 +msgid "OpenSSL crypto driver error" +msgstr "OpenSSL 加密的驱动程序错误" + +#: ../libsvn_subr/crypto.c:228 +msgid "Bad return value while loading crypto driver" +msgstr "加载加密的驱动程序时返回不正确的值" + +#: ../libsvn_subr/crypto.c:234 +msgid "Error creating OpenSSL crypto context" +msgstr "创建 OpenSSL 加密上下文失败" + +#: ../libsvn_subr/crypto.c:291 ../libsvn_subr/crypto.c:294 +#: ../libsvn_subr/crypto.c:419 ../libsvn_subr/crypto.c:422 +#: ../libsvn_subr/crypto.c:526 ../libsvn_subr/crypto.c:529 +#: ../libsvn_subr/crypto.c:641 ../libsvn_subr/crypto.c:644 +msgid "Error creating derived key" +msgstr "创建衍生密钥失败" + +#: ../libsvn_subr/crypto.c:297 ../libsvn_subr/crypto.c:425 +#: ../libsvn_subr/crypto.c:532 ../libsvn_subr/crypto.c:647 +msgid "Unexpected IV length returned" +msgstr "返回了意外的 IV 长度" + +#: ../libsvn_subr/crypto.c:308 ../libsvn_subr/crypto.c:543 +msgid "Error initializing block encryption" +msgstr "初始化块加密失败" + +#: ../libsvn_subr/crypto.c:347 ../libsvn_subr/crypto.c:444 +#: ../libsvn_subr/crypto.c:565 ../libsvn_subr/crypto.c:666 +msgid "Error fetching result length" +msgstr "获得结果的长度失败" + +#: ../libsvn_subr/crypto.c:360 ../libsvn_subr/crypto.c:578 +msgid "Error during block encryption" +msgstr "在块加密期间出错" + +#: ../libsvn_subr/crypto.c:372 ../libsvn_subr/crypto.c:590 +msgid "Error finalizing block encryption" +msgstr "在终结块加密时出错" + +#: ../libsvn_subr/crypto.c:428 ../libsvn_subr/crypto.c:650 +msgid "Provided IV has incorrect length" +msgstr "提供的 IV 的长度不正确" + +#: ../libsvn_subr/crypto.c:436 ../libsvn_subr/crypto.c:658 +msgid "Error initializing block decryption" +msgstr "初始化块解密失败" + +#: ../libsvn_subr/crypto.c:455 ../libsvn_subr/crypto.c:677 +msgid "Error during block decryption" +msgstr "在块解密期间出错" + +#: ../libsvn_subr/crypto.c:464 ../libsvn_subr/crypto.c:686 +msgid "Error finalizing block decryption" +msgstr "在终结块解密时出错" + +#: ../libsvn_subr/date.c:307 #, c-format msgid "Can't manipulate current date" msgstr "不能获得当前日期" +#: ../libsvn_subr/date.c:381 ../libsvn_subr/date.c:389 #, c-format msgid "Can't calculate requested date" msgstr "无法计算被请求的日期" +#: ../libsvn_subr/date.c:384 #, c-format msgid "Can't expand time" msgstr "无法明确时间" +#: ../libsvn_subr/deprecated.c:360 ../libsvn_subr/opt.c:302 msgid "" "\n" "Valid options:\n" @@ -4100,6 +5786,7 @@ msgstr "" "\n" "有效选项: \n" +#: ../libsvn_subr/deprecated.c:436 ../libsvn_subr/opt.c:417 #, c-format msgid "" "\"%s\": unknown command.\n" @@ -4108,241 +5795,335 @@ msgstr "" "“%s”: 未知命令。\n" "\n" +#: ../libsvn_subr/deprecated.c:614 ../libsvn_subr/opt.c:1237 +#: ../svnrdump/svnrdump.c:646 #, c-format msgid "Type '%s help' for usage.\n" msgstr "使用“%s help”得到用法。\n" +#: ../libsvn_subr/deprecated.c:1022 #, c-format msgid "'%s' is neither a file nor a directory name" msgstr "“%s”不是文件名也不是目录名" +#: ../libsvn_subr/dirent_uri.c:1604 #, c-format msgid "Couldn't determine absolute path of '%s'" msgstr "不能确定“%s”的绝对路径" +#: ../libsvn_subr/dirent_uri.c:2311 #, c-format msgid "Local URL '%s' does not contain 'file://' prefix" msgstr "本地URL“%s”没有“file://”前缀" +#: ../libsvn_subr/dirent_uri.c:2390 #, c-format msgid "Local URL '%s' contains only a hostname, no path" msgstr "本地URL“%s”只有主机名称，没有路径" +#: ../libsvn_subr/dirent_uri.c:2404 #, c-format msgid "Local URL '%s' contains unsupported hostname" msgstr "本地URL“%s”包含不支持的主机名称" -#, c-format -msgid "Can't create DSO mutex" -msgstr "无法创建 DSO 互斥体" - -#, c-format -msgid "Can't grab DSO mutex" -msgstr "无法获取 DSO 互斥体" - -#, c-format -msgid "Can't ungrab DSO mutex" -msgstr "不能释放 DSO 互斥体" +#: ../libsvn_subr/error.c:263 +msgid "Additional errors:" +msgstr "额外错误:" +#: ../libsvn_subr/error.c:524 msgid "Can't recode error string from APR" msgstr "无法重新编码 APR 的错误信息" +#: ../libsvn_subr/error.c:624 #, c-format msgid "%swarning: W%06d: %s\n" msgstr "%s 警告: W%06d: %s\n" +#: ../libsvn_subr/error.c:706 #, c-format msgid "In file '%s' line %d: assertion failed (%s)" msgstr "文件 “%s”，行 %d：断言失败(%s)" +#: ../libsvn_subr/error.c:710 #, c-format msgid "In file '%s' line %d: internal malfunction" msgstr "文件 “%s” 行 %d：内部故障" +#: ../libsvn_subr/error.c:766 +msgid "stream error" +msgstr "流写入错误" + +#: ../libsvn_subr/error.c:771 +msgid "out of memory" +msgstr "内存溢出" + +#: ../libsvn_subr/error.c:776 +msgid "buffer error" +msgstr "缓冲区写入错误" + +#: ../libsvn_subr/error.c:781 +msgid "version error" +msgstr "版本错误" + +#: ../libsvn_subr/error.c:786 +msgid "corrupt data" +msgstr "损坏的数据" + +#: ../libsvn_subr/error.c:791 +msgid "unknown error" +msgstr "未知错误" + +#: ../libsvn_subr/gpg_agent.c:342 ../libsvn_subr/prompt.c:631 +#, c-format +msgid "Password for '%s': " +msgstr "“%s”的密码: " + +#: ../libsvn_subr/gpg_agent.c:343 +#, c-format +msgid "Enter your Subversion password for %s" +msgstr "请为 %s 输入 Subversion 密码" + +#: ../libsvn_subr/hash.c:120 msgid "Serialized hash missing terminator" msgstr "序列化哈希值没有终结符" +#: ../libsvn_subr/hash.c:129 ../libsvn_subr/hash.c:142 +#: ../libsvn_subr/hash.c:153 ../libsvn_subr/hash.c:165 +#: ../libsvn_subr/hash.c:173 ../libsvn_subr/hash.c:183 +#: ../libsvn_subr/hash.c:196 ../libsvn_subr/hash.c:204 msgid "Serialized hash malformed" msgstr "畸形的序列化哈希值" -#, c-format -msgid "Error converting entry in directory '%s' to UTF-8" -msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败" +#: ../libsvn_subr/hash.c:244 +msgid "Cannot serialize negative length" +msgstr "不能序列化负数长度" +#: ../libsvn_subr/io.c:309 #, c-format msgid "Can't check path '%s'" msgstr "无法检查路径 “%s”" +#: ../libsvn_subr/io.c:537 ../libsvn_subr/io.c:4551 #, c-format msgid "Can't open '%s'" msgstr "不能打开 “%s”" +#: ../libsvn_subr/io.c:563 ../libsvn_subr/io.c:649 #, c-format msgid "Unable to make name for '%s'" msgstr "不能为 “%s” 产生名字" +#: ../libsvn_subr/io.c:636 #, c-format msgid "Can't create symbolic link '%s'" msgstr "无法创建符号连接 “%s”" +#: ../libsvn_subr/io.c:653 ../libsvn_subr/io.c:686 ../libsvn_subr/io.c:714 msgid "Symbolic links are not supported on this platform" msgstr "此平台不支持符号链接" +#: ../libsvn_subr/io.c:676 #, c-format msgid "Can't read contents of link" msgstr "不能读取链接的内容" +#: ../libsvn_subr/io.c:734 #, c-format msgid "Can't find a temporary directory" msgstr "无法找到临时目录" +#: ../libsvn_subr/io.c:852 #, c-format msgid "Can't copy '%s' to '%s'" msgstr "不能复制 “%s” 到 “%s”" +#: ../libsvn_subr/io.c:895 ../libsvn_subr/io.c:917 ../libsvn_subr/io.c:963 #, c-format msgid "Can't set permissions on '%s'" msgstr "不能在 “%s” 设置权限" +#: ../libsvn_subr/io.c:913 ../libsvn_subr/io.c:1977 ../libsvn_subr/io.c:2036 +#: ../libsvn_subr/io.c:4589 #, c-format msgid "Can't get file name" msgstr "无法获取文件名" +#: ../libsvn_subr/io.c:987 #, c-format msgid "Can't append '%s' to '%s'" msgstr "不能附加 “%s” 到 “%s”" -#, c-format -msgid "Source '%s' is not a directory" -msgstr "源 “%s” 不是目录" - -#, c-format -msgid "Destination '%s' is not a directory" -msgstr "目的 “%s” 不是目录" - +#: ../libsvn_subr/io.c:1033 #, c-format msgid "Destination '%s' already exists" msgstr "目的 “%s” 已存在" -#, c-format -msgid "Can't read directory '%s'" -msgstr "无法读取目录 “%s”" - -#, c-format -msgid "Error closing directory '%s'" -msgstr "关闭目录 “%s” 出错" - +#: ../libsvn_subr/io.c:1137 #, c-format msgid "Can't make directory '%s'" msgstr "无法创建目录 “%s”" +#: ../libsvn_subr/io.c:1206 #, c-format msgid "Can't set access time of '%s'" msgstr "不能设置 “%s” 的存取时间" +#: ../libsvn_subr/io.c:1523 ../libsvn_subr/io.c:1630 #, c-format msgid "Can't change perms of file '%s'" msgstr "不能改变文件 “%s” 的权限" +#: ../libsvn_subr/io.c:1796 #, c-format msgid "Can't set file '%s' read-only" msgstr "无法设置文件 “%s” 只读" +#: ../libsvn_subr/io.c:1828 #, c-format msgid "Can't set file '%s' read-write" msgstr "无法设置文件 “%s” 可读写" +#: ../libsvn_subr/io.c:1867 ../libsvn_subr/io.c:1901 #, c-format msgid "Error getting UID of process" msgstr "获取进程用户 ID(UID) 时出错" +#: ../libsvn_subr/io.c:2003 #, c-format msgid "Can't get shared lock on file '%s'" msgstr "不能获取文件 “%s” 的共享锁" +#: ../libsvn_subr/io.c:2041 +#, c-format +msgid "Can't unlock file '%s'" +msgstr "无法解锁文件“%s”" + +#: ../libsvn_subr/io.c:2096 ../libsvn_subr/io.c:3504 #, c-format msgid "Can't flush file '%s'" msgstr "不能刷新文件 “%s”" +#: ../libsvn_subr/io.c:2097 ../libsvn_subr/io.c:3505 #, c-format msgid "Can't flush stream" msgstr "不能刷新流" +#: ../libsvn_subr/io.c:2109 ../libsvn_subr/io.c:2126 #, c-format msgid "Can't flush file to disk" msgstr "不能刷新文件到磁盘" +#: ../libsvn_subr/io.c:2218 ../libsvn_subr/prompt.c:197 +#: ../svnserve/svnserve.c:822 #, c-format msgid "Can't open stdin" msgstr "无法打开标准输入" +#: ../libsvn_subr/io.c:2238 msgid "Reading from stdin is disallowed" msgstr "不接受从标准输入设备读取" +#: ../libsvn_subr/io.c:2305 #, c-format msgid "Can't remove file '%s'" msgstr "不能移动文件“%s”" +#: ../libsvn_subr/io.c:2392 #, c-format msgid "Can't remove '%s'" msgstr "无法删除“%s”" +#: ../libsvn_subr/io.c:2555 +#, c-format +msgid "Path '%s' not found, case obstructed by '%s'" +msgstr "没有发现路径“%s”，大小写障碍“%s”" + +#: ../libsvn_subr/io.c:2594 +#, c-format +msgid "Path '%s' not found" +msgstr "路径“%s”找不到" + +#: ../libsvn_subr/io.c:2668 #, c-format msgid "Can't create process '%s' attributes" msgstr "无法创建进程“%s”的属性" +#: ../libsvn_subr/io.c:2675 #, c-format msgid "Can't set process '%s' cmdtype" msgstr "无法设置进程“%s”的命令类型" +#: ../libsvn_subr/io.c:2687 #, c-format msgid "Can't set process '%s' directory" msgstr "无法设定进程“%s”的目录" +#: ../libsvn_subr/io.c:2701 #, c-format msgid "Can't set process '%s' child input" msgstr "无法设置“%s”的子进程输入文件" +#: ../libsvn_subr/io.c:2709 #, c-format msgid "Can't set process '%s' child outfile" msgstr "无法设置“%s”的子进程输出文件" +#: ../libsvn_subr/io.c:2717 #, c-format msgid "Can't set process '%s' child errfile" msgstr "无法设置“%s”的子进程错误输出文件" +#: ../libsvn_subr/io.c:2731 #, c-format msgid "Can't set process '%s' stdio pipes" msgstr "无法设置进程“%s”的标准 IO 管道" +#: ../libsvn_subr/io.c:2739 #, c-format msgid "Can't set process '%s' child errfile for error handler" msgstr "无法为错误处理函数设置“%s”的子进程错误输出文件" +#: ../libsvn_subr/io.c:2746 #, c-format msgid "Can't set process '%s' error handler" msgstr "无法设置进程“%s”的错误处理函数" +#: ../libsvn_subr/io.c:2769 #, c-format msgid "Can't start process '%s'" msgstr "不能取得进程“%s”状态" +#: ../libsvn_subr/io.c:2793 #, c-format msgid "Error waiting for process '%s'" msgstr "等待进程“%s”出错" +#: ../libsvn_subr/io.c:2802 #, c-format -msgid "Process '%s' failed (exitwhy %d)" -msgstr "进程“%s”失败(返回 %d)" +msgid "Process '%s' failed (signal %d, core dumped)" +msgstr "进程“%s”失败(信号 %d，已经核心转储)" +#: ../libsvn_subr/io.c:2807 +#, c-format +msgid "Process '%s' failed (signal %d)" +msgstr "进程“%s”失败(信号 %d)" + +#: ../libsvn_subr/io.c:2813 +#, c-format +msgid "Process '%s' failed (exitwhy %d, exitcode %d)" +msgstr "进程“%s”失败(exitwhy %d, exitcode %d)" + +#: ../libsvn_subr/io.c:2821 #, c-format msgid "Process '%s' returned error exitcode %d" msgstr "进程“%s”返回错误退出码 %d" +#: ../libsvn_subr/io.c:2928 #, c-format msgid "'%s' returned %d" msgstr "“%s” 返回 %d" +#: ../libsvn_subr/io.c:3048 #, c-format msgid "" "Error running '%s': exitcode was %d, args were:\n" @@ -4357,216 +6138,292 @@ msgstr "" "%s\n" "%s" +#: ../libsvn_subr/io.c:3189 #, c-format msgid "Can't detect MIME type of non-file '%s'" msgstr "不能检测非文件的“%s”之MIME类型" +#: ../libsvn_subr/io.c:3284 #, c-format msgid "Can't open file '%s'" msgstr "不能打开文件“%s”" +#: ../libsvn_subr/io.c:3324 #, c-format msgid "Can't close file '%s'" msgstr "无法关闭文件“%s”" +#: ../libsvn_subr/io.c:3325 #, c-format msgid "Can't close stream" msgstr "无法关闭流" +#: ../libsvn_subr/io.c:3334 ../libsvn_subr/io.c:3370 ../libsvn_subr/io.c:3395 #, c-format msgid "Can't read file '%s'" msgstr "不能读取文件“%s”" +#: ../libsvn_subr/io.c:3335 ../libsvn_subr/io.c:3371 ../libsvn_subr/io.c:3396 #, c-format msgid "Can't read stream" msgstr "无法读取流" +#: ../libsvn_subr/io.c:3344 #, c-format msgid "Can't write file '%s'" msgstr "无法写入文件“%s”" +#: ../libsvn_subr/io.c:3345 #, c-format msgid "Can't write stream" msgstr "无法写入流" +#: ../libsvn_subr/io.c:3359 #, c-format msgid "Can't get attribute information from file '%s'" msgstr "无法从文件“%s”获取属性信息" +#: ../libsvn_subr/io.c:3360 #, c-format msgid "Can't get attribute information from stream" msgstr "无法从流获取属性信息" +#: ../libsvn_subr/io.c:3407 #, c-format msgid "Can't set position pointer in file '%s'" msgstr "无法在文件“%s”设置定位指针" +#: ../libsvn_subr/io.c:3408 #, c-format msgid "Can't set position pointer in stream" msgstr "无法在流中设置定位指针" +#: ../libsvn_subr/io.c:3419 ../libsvn_subr/io.c:3466 #, c-format msgid "Can't write to file '%s'" msgstr "无法写入文件“%s”" +#: ../libsvn_subr/io.c:3420 ../libsvn_subr/io.c:3467 #, c-format msgid "Can't write to stream" msgstr "无法写入流" +#: ../libsvn_subr/io.c:3509 #, c-format msgid "Can't truncate file '%s'" msgstr "不能截断文件 “%s”" +#: ../libsvn_subr/io.c:3510 #, c-format msgid "Can't truncate stream" msgstr "无法截断流" +#: ../libsvn_subr/io.c:3583 #, c-format msgid "Can't read length line in file '%s'" msgstr "不能从文件 “%s” 中读取长行" +#: ../libsvn_subr/io.c:3587 msgid "Can't read length line in stream" msgstr "无法从流中读取长行" -#, c-format -msgid "Can't stat '%s'" -msgstr "不能取得“%s”的状态" - +#: ../libsvn_subr/io.c:3644 #, c-format msgid "Can't move '%s' to '%s'" msgstr "不能移动 “%s” 到 “%s”" +#: ../libsvn_subr/io.c:3725 #, c-format msgid "Can't create directory '%s'" msgstr "无法创建目录 “%s”" +#: ../libsvn_subr/io.c:3748 #, c-format msgid "Can't hide directory '%s'" msgstr "无法隐藏目录 “%s”" +#: ../libsvn_subr/io.c:3808 ../libsvn_subr/io.c:3931 #, c-format msgid "Can't open directory '%s'" msgstr "无法打开目录“%s”" +#: ../libsvn_subr/io.c:3843 #, c-format msgid "Can't remove directory '%s'" msgstr "无法删除目录 “%s”" +#: ../libsvn_subr/io.c:3861 #, c-format msgid "Can't read directory" msgstr "无法读取目录" +#: ../libsvn_subr/io.c:3881 #, c-format msgid "Error closing directory" msgstr "关闭目录失败" +#: ../libsvn_subr/io.c:3950 #, c-format msgid "Can't read directory entry in '%s'" msgstr "无法在 “%s” 读取目录内容" +#: ../libsvn_subr/io.c:4076 #, c-format msgid "Can't check directory '%s'" msgstr "无法检查目录 “%s”" +#: ../libsvn_subr/io.c:4138 #, c-format msgid "Reading '%s'" msgstr "正在读取 “%s”" +#: ../libsvn_subr/io.c:4157 #, c-format msgid "First line of '%s' contains non-digit" msgstr "“%s” 的第一行包含了非数字" +#: ../libsvn_subr/io.c:4472 #, c-format msgid "Can't create temporary file from template '%s'" msgstr "无法从模版“%s”创建临时文件" +#: ../libsvn_subr/io.c:4561 #, c-format msgid "Can't set aside '%s'" msgstr "不能撤销“%s”" +#: ../libsvn_subr/io.c:4573 #, c-format msgid "Unable to make name in '%s'" msgstr "不能按照“%s”生成名字" -#, c-format -msgid "Invalid revision number found parsing '%s'" -msgstr "解析 “%s” 时发现无效的版本号" - -#, c-format -msgid "Negative revision number found parsing '%s'" -msgstr "解析 “%s” 时发现负的版本号" - +#: ../libsvn_subr/mergeinfo.c:100 ../libsvn_subr/mergeinfo.c:677 msgid "Pathname not terminated by ':'" msgstr "路径名称没有以 “:” 结束" +#: ../libsvn_subr/mergeinfo.c:103 msgid "No pathname preceding ':'" msgstr "没有路径名称前缀 “:”" -#, c-format -msgid "Mergeinfo for '%s' maps to an empty revision range" -msgstr "“%s” 的合并信息映射到空的版本范围" - +#: ../libsvn_subr/mergeinfo.c:521 #, c-format msgid "Invalid character '%c' found in revision list" msgstr "在版本列表中发现无效字符 “%c”" +#: ../libsvn_subr/mergeinfo.c:529 #, c-format msgid "Invalid revision number '0' found in range list" msgstr "在范围列表中发现无效的版本号 “0”" +#: ../libsvn_subr/mergeinfo.c:540 #, c-format msgid "Unable to parse reversed revision range '%ld-%ld'" msgstr "不能解析反向的版本范围 “%ld - %ld”" +#: ../libsvn_subr/mergeinfo.c:545 #, c-format -msgid "Unable to parse revision range '%ld-%ld' with same start and end revisions" +msgid "" +"Unable to parse revision range '%ld-%ld' with same start and end revisions" msgstr "不能解析开始与结束版本相同的版本范围 “%ld-%ld”" +#: ../libsvn_subr/mergeinfo.c:582 ../libsvn_subr/mergeinfo.c:589 #, c-format msgid "Invalid character '%c' found in range list" msgstr "在范围列表中发现无效字符 “%c”" +#: ../libsvn_subr/mergeinfo.c:596 msgid "Range list parsing ended before hitting newline" msgstr "在遇到新行之前范围列表分析结束" +#: ../libsvn_subr/mergeinfo.c:637 #, c-format -msgid "Could not find end of line in range list line in '%s'" -msgstr "在“%s”的范围列表行中没有找到行结束符" +msgid "" +"Unable to parse overlapping revision ranges '%s' and '%s' with different " +"inheritance types" +msgstr "不支持解析重叠且继承类型不同的版本范围 “%s” 和 “%s”" +#: ../libsvn_subr/mergeinfo.c:685 #, c-format -msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types" -msgstr "不支持解析重叠且继承类型不同的版本范围 “%s” 和 “%s”" +msgid "Mergeinfo for '%s' maps to an empty revision range" +msgstr "“%s” 的合并信息映射到空的版本范围" + +#: ../libsvn_subr/mergeinfo.c:689 +#, c-format +msgid "Could not find end of line in range list line in '%s'" +msgstr "在“%s”的范围列表行中没有找到行结束符" +#: ../libsvn_subr/mergeinfo.c:753 #, c-format msgid "Could not parse mergeinfo string '%s'" msgstr "不能解析合并信息字符串“%s”" +#: ../libsvn_subr/mergeinfo.c:2301 msgid "NULL mergeinfo catalog\n" msgstr "空值合并信息目录\n" +#: ../libsvn_subr/mergeinfo.c:2306 msgid "empty mergeinfo catalog\n" msgstr "空合并信息目录\n" -msgid "NULL mergeinfo\n" -msgstr "空值合并信息\n" +#: ../libsvn_subr/mutex.c:45 +#, c-format +msgid "Can't create mutex" +msgstr "无法创建互斥体" + +#: ../libsvn_subr/mutex.c:62 +#, c-format +msgid "Can't lock mutex" +msgstr "不能锁定互斥体" + +#: ../libsvn_subr/mutex.c:78 +#, c-format +msgid "Can't unlock mutex" +msgstr "不能解锁互斥体" -msgid "empty mergeinfo\n" -msgstr "空合并信息\n" +#: ../libsvn_subr/named_atomic.c:335 +msgid "Not a valid atomic" +msgstr "不是合法的原子数据" +#: ../libsvn_subr/named_atomic.c:474 +#, c-format +msgid "MMAP failed for file '%s'" +msgstr "创建内存映射文件“%s”失败" + +#: ../libsvn_subr/named_atomic.c:486 +msgid "Number of atomics in namespace is too large." +msgstr "命名空间中的原子数量太多" + +#: ../libsvn_subr/named_atomic.c:537 +msgid "Atomic's name is too long." +msgstr "原子的名称太长" + +#: ../libsvn_subr/named_atomic.c:543 +msgid "Namespace has not been initialized." +msgstr "命名空间没有初始化" + +#: ../libsvn_subr/named_atomic.c:591 +msgid "Out of slots for named atomic." +msgstr "命名原子的槽位已满" + +#: ../libsvn_subr/nls.c:80 #, c-format msgid "Can't convert string to UCS-2: '%s'" msgstr "不能把字符串转换为 UCS-2: “%s”。" +#: ../libsvn_subr/nls.c:87 msgid "Can't get module file name" msgstr "无法获取模块文件名" +#: ../libsvn_subr/nls.c:102 #, c-format msgid "Can't convert module path to UTF-8 from UCS-2: '%s'" msgstr "不能把模块路径从UCS-2转换为UTF-8: “%s”" +#: ../libsvn_subr/opt.c:189 msgid " ARG" msgstr " ARG" +#: ../libsvn_subr/opt.c:324 msgid "" "\n" "Global options:\n" @@ -4574,99 +6431,148 @@ msgstr "" "\n" "全局选项: \n" +#: ../libsvn_subr/opt.c:816 #, c-format msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?" msgstr "解析铆钉版本 '%s' 时发生语法错误；你是不是想执行 '%s@'?" +#: ../libsvn_subr/opt.c:822 #, c-format msgid "Syntax error parsing peg revision '%s'" msgstr "解析铆钉版本 '%s' 时发生语法错误" +#: ../libsvn_subr/opt.c:959 msgid "Revision property pair is empty" msgstr "版本属性对为空" +#: ../libsvn_subr/opt.c:979 ../svn/propedit-cmd.c:87 ../svn/propget-cmd.c:336 +#: ../svn/propset-cmd.c:68 #, c-format msgid "'%s' is not a valid Subversion property name" msgstr "“%s”不是有效的 Subversion 属性名称" +#: ../libsvn_subr/opt.c:1016 #, c-format msgid "'%s' is just a peg revision. Maybe try '%s@' instead?" msgstr "“%s” 是铆钉版本。或许你应该使用 “%s@” ?" +#: ../libsvn_subr/opt.c:1062 #, c-format msgid "URL '%s' contains a '..' element" msgstr "URL“%s”包含“..”元素" +#: ../libsvn_subr/opt.c:1095 #, c-format msgid "Error resolving case of '%s'" msgstr "解析“%s”出错" +#: ../libsvn_subr/opt.c:1117 #, c-format msgid "" "%s, version %s\n" -" compiled %s, %s\n" +" compiled %s, %s on %s\n" "\n" msgstr "" "%s，版本 %s\n" -" 编译于 %s，%s\n" +" 编译于 %s，%s 在 %s\n" "\n" +#: ../libsvn_subr/opt.c:1134 msgid "" -"Copyright (C) 2012 The Apache Software Foundation.\n" -"This software consists of contributions made by many people; see the NOTICE\n" -"file for more information.\n" -"Subversion is open source software, see http://subversion.apache.org/\n" +"System information:\n" "\n" msgstr "" -"版权所有 (C) 2012 Apache 软件基金会。\n" -"此软件包含了许多人的贡献，请查看文件 NOTICE 以获得更多信息。\n" -"Subversion 是开放源代码软件，请参阅 http://subversion.apache.org/ 站点。\n" +"系统信息:\n" "\n" +#: ../libsvn_subr/opt.c:1135 +#, c-format +msgid "* running on %s\n" +msgstr "* 运行于 %s\n" + +#: ../libsvn_subr/opt.c:1139 +#, c-format +msgid " - %s\n" +msgstr " - %s\n" + +#: ../libsvn_subr/opt.c:1149 +msgid "* linked dependencies:\n" +msgstr "* 链接的依赖库:\n" + +#: ../libsvn_subr/opt.c:1174 +msgid "* loaded shared libraries:\n" +msgstr "* 已加载的共享库:\n" + +#: ../libsvn_subr/path.c:1114 #, c-format msgid "Can't determine the native path encoding" msgstr "不能确定本地路径编码" +#: ../libsvn_subr/path.c:1303 #, c-format -msgid "Invalid control character '0x%02x' in path '%s'" -msgstr "无效控制字符 “0x%02x” 在路径 “%s” 中" +msgid "Improper relative URL '%s'" +msgstr "不正确的相对 URL“%s”" + +#: ../libsvn_subr/prompt.c:147 +msgid "Can't close terminal" +msgstr "不能关闭终端" + +#: ../libsvn_subr/prompt.c:200 +#, c-format +msgid "Can't open stderr" +msgstr "不能打开标准错误" + +#: ../libsvn_subr/prompt.c:263 +#, c-format +msgid "Can't write to terminal" +msgstr "无法写入终端" +#: ../libsvn_subr/prompt.c:385 ../libsvn_subr/prompt.c:472 #, c-format -msgid "Can't read stdin" -msgstr "无法读取标准输入" +msgid "Can't read from terminal" +msgstr "无法读取终端" +#: ../libsvn_subr/prompt.c:540 +msgid "End of file while reading from terminal" +msgstr "从终端读到了文件结束标记" + +#: ../libsvn_subr/prompt.c:602 #, c-format msgid "Authentication realm: %s\n" msgstr "认证领域: %s\n" +#: ../libsvn_subr/prompt.c:629 ../libsvn_subr/prompt.c:652 msgid "Username: " msgstr "用户名: " -#, c-format -msgid "Password for '%s': " -msgstr "“%s”的密码: " - +#: ../libsvn_subr/prompt.c:674 #, c-format msgid "Error validating server certificate for '%s':\n" msgstr "验证“%s”的服务器证书时出错: \n" +#: ../libsvn_subr/prompt.c:680 msgid "" " - The certificate is not issued by a trusted authority. Use the\n" " fingerprint to validate the certificate manually!\n" msgstr " - 此证书并不是由信任的权威机权颁发。请使用此指纹手工验证其有效性！\n" +#: ../libsvn_subr/prompt.c:687 msgid " - The certificate hostname does not match.\n" msgstr " - 证书的主机名称不匹配。\n" +#: ../libsvn_subr/prompt.c:693 msgid " - The certificate is not yet valid.\n" msgstr " - 证书未生效。\n" +#: ../libsvn_subr/prompt.c:699 msgid " - The certificate has expired.\n" msgstr " - 证书已过期。\n" +#: ../libsvn_subr/prompt.c:705 msgid " - The certificate has an unknown error.\n" msgstr " - 证书发生未知错误。\n" +#: ../libsvn_subr/prompt.c:710 #, c-format msgid "" "Certificate information:\n" @@ -4681,37 +6587,48 @@ msgstr "" " - 发行者: %s\n" " - 指纹: %s\n" +#: ../libsvn_subr/prompt.c:725 msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? " msgstr "(R)拒绝，(t)暂时接受，或(p)永远接受？" +#: ../libsvn_subr/prompt.c:729 msgid "(R)eject or accept (t)emporarily? " msgstr "(R)拒绝 或 (t)暂时接受 ？" +#: ../libsvn_subr/prompt.c:769 msgid "Client certificate filename: " msgstr "客户证书文件名: " +#: ../libsvn_subr/prompt.c:793 #, c-format msgid "Passphrase for '%s': " msgstr "“%s”的密码: " +#: ../libsvn_subr/prompt.c:845 msgid "yes" msgstr "yes" +#: ../libsvn_subr/prompt.c:846 msgid "y" msgstr "y" +#: ../libsvn_subr/prompt.c:851 msgid "no" msgstr "no" +#: ../libsvn_subr/prompt.c:852 msgid "n" msgstr "n" +#: ../libsvn_subr/prompt.c:858 msgid "Please type 'yes' or 'no': " msgstr "请输入 'yes' 或 'no': " +#: ../libsvn_subr/prompt.c:872 msgid "Store password unencrypted (yes/no)? " msgstr "保存未加密的密码(yes/no)?" +#: ../libsvn_subr/prompt.c:874 #, c-format msgid "" "\n" @@ -4742,9 +6659,11 @@ msgstr "" "来避免再次出现此警告。\n" "-----------------------------------------------------------------------\n" +#: ../libsvn_subr/prompt.c:901 msgid "Store passphrase unencrypted (yes/no)? " msgstr "保存未加密的密码(yes/no)?" +#: ../libsvn_subr/prompt.c:903 #, c-format msgid "" "\n" @@ -4775,99 +6694,143 @@ msgstr "" " 或 “no” 来避免再次出现此警告。\n" "-----------------------------------------------------------------------\n" +#: ../libsvn_subr/prompt.c:949 #, c-format msgid "Password for '%s' GNOME keyring: " msgstr "GNOME keyring [%s] 的密码: " +#: ../libsvn_subr/simple_providers.c:449 +#: ../libsvn_subr/ssl_client_cert_pw_providers.c:296 #, c-format msgid "Config error: invalid value '%s' for option '%s'" msgstr "配置错误: 无效取值 “%s”，对于选项 “%s”" +#: ../libsvn_subr/sqlite.c:176 #, c-format -msgid "%s, executing statement '%s'" -msgstr "%s, 执行语句 '%s'" - -msgid "Expected database row missing" -msgstr "丢失了期待的数据库行" +msgid "sqlite[S%d]: %s, executing statement '%s'" +msgstr "sqlite[S%d]: %s, 执行语句 '%s'" -msgid "Extra database row found" -msgstr "发现了额外的数据库行" +#: ../libsvn_subr/sqlite.c:265 +msgid "sqlite: Expected database row missing" +msgstr "sqlite: 缺少期望的数据库行" -#, c-format -msgid "Schema format %d not recognized" -msgstr "不能识别方案格式 %d" +#: ../libsvn_subr/sqlite.c:266 +msgid "sqlite: Extra database row found" +msgstr "sqlite: 发现额外的数据库行" +#: ../libsvn_subr/sqlite.c:726 #, c-format msgid "SQLite compiled for %s, but running with %s" msgstr "SQLite 编译为 %s，但是运行于 %s" +#: ../libsvn_subr/sqlite.c:738 msgid "SQLite is required to be compiled and run in thread-safe mode" msgstr "SQLite 需要在编译和运行时都处于线程安全模式" -msgid "Could not configure SQLite" -msgstr "不能配置 SQLite" +#: ../libsvn_subr/sqlite.c:747 +#, c-format +msgid "Could not configure SQLite [S%d]" +msgstr "不能配置 SQLite [S%d]" +#: ../libsvn_subr/sqlite.c:749 msgid "Could not initialize SQLite" msgstr "不能初始化 SQLite" +#: ../libsvn_subr/sqlite.c:1178 #, c-format msgid "SQLite hotcopy failed for %s" msgstr "SQLite 由于 %s 导致热复制失败" +#: ../libsvn_subr/string.c:943 ../libsvn_subr/string.c:987 +#, c-format +msgid "Could not convert '%s' into a number" +msgstr "无法转换 '%s' 到数字" + +#: ../libsvn_subr/subst.c:1793 ../libsvn_wc/props.c:1660 #, c-format msgid "File '%s' has inconsistent newlines" msgstr "文件 “%s” 内的换行符不一致" -#, c-format -msgid "Could not convert '%s' into a number" -msgstr "无法转换 '%s' 到数字" +#: ../libsvn_subr/sysinfo.c:1075 +msgid "Intel" +msgstr "Intel" + +#: ../libsvn_subr/sysinfo.c:1076 +msgid "Intel 64-bit" +msgstr "Intel 64 位" + +#: ../libsvn_subr/sysinfo.c:1077 +msgid "PowerPC" +msgstr "PowerPC" + +#: ../libsvn_subr/sysinfo.c:1078 +msgid "PowerPC 64-bit" +msgstr "PowerPC 64 位" #. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000" +#: ../libsvn_subr/time.c:85 msgid " (%a, %d %b %Y)" msgstr " (%a, %Y-%m-%d)" +#: ../libsvn_subr/token.c:66 #, c-format msgid "Token '%s' is unrecognized" msgstr "无法识别令牌 “%s”" -msgid "Can't lock charset translation mutex" -msgstr "不能锁定字符转换互斥体" +#: ../libsvn_subr/types.c:48 +#, c-format +msgid "Invalid revision number found parsing '%s'" +msgstr "解析 “%s” 时发现无效的版本号" -msgid "Can't unlock charset translation mutex" -msgstr "不能解锁字符转换互斥体" +#: ../libsvn_subr/types.c:60 +#, c-format +msgid "Negative revision number found parsing '%s'" +msgstr "解析 “%s” 时发现负的版本号" +#: ../libsvn_subr/utf.c:240 #, c-format msgid "Can't create a character converter from native encoding to '%s'" msgstr "不能创建从本地编码到“%s”的字符转换器" +#: ../libsvn_subr/utf.c:244 #, c-format msgid "Can't create a character converter from '%s' to native encoding" msgstr "不能创建从“%s”到本地编码的字符转换器" +#: ../libsvn_subr/utf.c:248 #, c-format msgid "Can't create a character converter from '%s' to '%s'" msgstr "不能创建从“%s”到“%s”的字符转换器" +#: ../libsvn_subr/utf.c:590 #, c-format msgid "Can't convert string from native encoding to '%s':" msgstr "不能把字符串从本地编码转换为“%s”编码: " +#: ../libsvn_subr/utf.c:594 #, c-format msgid "Can't convert string from '%s' to native encoding:" msgstr "不能把字符串从”%s“编码转换为本地编码。" +#: ../libsvn_subr/utf.c:598 #, c-format msgid "Can't convert string from '%s' to '%s':" msgstr "不能把字符串从“%s”编码转换为“%s”编码。" +#: ../libsvn_subr/utf.c:643 #, c-format -msgid "Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from UTF-8" +msgid "" +"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from " +"UTF-8" msgstr "安全数据“%s”后面是非ASCII字节 %d: 不能转换到/自 UTF-8" +#: ../libsvn_subr/utf.c:651 #, c-format -msgid "Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" +msgid "" +"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8" msgstr "检测到非ASCII字符 (代码 %d)，并且不能转换到/自 UTF-8" +#: ../libsvn_subr/utf.c:696 #, c-format msgid "" "Valid UTF-8 data\n" @@ -4880,567 +6843,845 @@ msgstr "" "后面是无效 UTF-8 序列\n" "(16进制: %s)" +#: ../libsvn_subr/validate.c:56 #, c-format msgid "MIME type '%s' has empty media type" msgstr "MIME 类型“%s”含有空的媒体类型" +#: ../libsvn_subr/validate.c:61 #, c-format msgid "MIME type '%s' does not contain '/'" msgstr "MIME 类型 “%s” 没有包含 “/”" +#: ../libsvn_subr/validate.c:73 #, c-format msgid "MIME type '%s' contains invalid character '%c' in media type" msgstr "MIME 类型“%s”的媒体类型中包含非法字符“%c”" +#: ../libsvn_subr/validate.c:84 #, c-format msgid "MIME type '%s' contains invalid character '0x%02x' in postfix" msgstr "MIME 类型“%s”中包含非法字符“0x%02x”" +#: ../libsvn_subr/version.c:89 #, c-format msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s" msgstr "“%s”的版本不一致: 找到 %d.%d.%d%s，期望 %d.%d.%d%s" +#: ../libsvn_subr/version.c:132 +msgid "" +"Copyright (C) 2013 The Apache Software Foundation.\n" +"This software consists of contributions made by many people;\n" +"see the NOTICE file for more information.\n" +"Subversion is open source software, see http://subversion.apache.org/\n" +msgstr "" +"版权所有 (C) 2013 Apache 软件基金会。\n" +"此软件包含了许多人的贡献，请查看文件 NOTICE 以获得更多信息。\n" +"Subversion 是开放源代码软件，请参阅 http://subversion.apache.org/ 站点。\n" +"\n" + +#: ../libsvn_subr/version.c:210 ../libsvn_subr/version.c:221 +#: ../libsvn_subr/version.c:227 ../libsvn_subr/version.c:244 +#: ../libsvn_subr/version.c:251 +#, c-format +msgid "Failed to parse version number string '%s'" +msgstr "不能解析版本号字符串“%s”" + +#: ../libsvn_subr/xml.c:416 #, c-format msgid "Malformed XML: %s at line %ld" msgstr "非法 XML: %s 在第 %ld 行" +#: ../libsvn_wc/adm_crawler.c:114 #, c-format msgid "The existing node '%s' can not be restored." msgstr "已有节点 '%s' 不能恢复。" +#: ../libsvn_wc/adm_crawler.c:133 #, c-format msgid "The node '%s' can not be restored." msgstr "节点 '%s' 不能恢复。" +#: ../libsvn_wc/adm_crawler.c:851 msgid "Error aborting report" msgstr "取消报告出错" +#: ../libsvn_wc/adm_crawler.c:963 #, c-format msgid "Pristine checksum for file '%s' is missing" msgstr "文件“%s”的原始内容校验和丢失" +#: ../libsvn_wc/adm_crawler.c:1128 #, c-format msgid "Checksum mismatch for text base of '%s'" msgstr "'%s' 的文本校验和不匹配" +#: ../libsvn_wc/adm_crawler.c:1139 #, c-format msgid "While preparing '%s' for commit" msgstr "当为提交操作准备“%s”时" +#: ../libsvn_wc/adm_files.c:105 #, c-format msgid "'%s' is not a valid administrative directory name" msgstr "“%s”不是一个有效的管理目录名" +#: ../libsvn_wc/adm_files.c:185 ../libsvn_wc/adm_files.c:241 #, c-format msgid "Can only get the pristine contents of files; '%s' is not a file" msgstr "只能取得文件的原始内容；“%s”不是文件" +#: ../libsvn_wc/adm_files.c:194 ../libsvn_wc/adm_files.c:256 #, c-format -msgid "Cannot get the pristine contents of '%s' because its delete is already committed" +msgid "" +"Cannot get the pristine contents of '%s' because its delete is already " +"committed" msgstr "不能取得“%s”的原始内容，因为其删除操作已经提交" +#: ../libsvn_wc/adm_files.c:202 ../libsvn_wc/adm_files.c:264 #, c-format -msgid "Cannot get the pristine contents of '%s' because it has an unexpected status" +msgid "" +"Cannot get the pristine contents of '%s' because it has an unexpected status" msgstr "不能取得“%s”的原始内容，因为其状态未知" +#: ../libsvn_wc/adm_files.c:209 #, c-format msgid "Node '%s' has no pristine text" msgstr "节点 '%s' 没有原始内容" +#: ../libsvn_wc/adm_files.c:452 #, c-format msgid "Revision %ld doesn't match existing revision %ld in '%s'" msgstr "版本 %ld 不匹配现有版本 %ld 于 “%s”" +#: ../libsvn_wc/adm_files.c:489 #, c-format -msgid "URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" +msgid "" +"URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'" msgstr "URL “%s”(uuid: '%s') 不匹配现有 URL “%s”(uuid: '%s') 于 “%s”" -#, c-format -msgid "'%s' cannot be deleted" -msgstr "'%s' 不能被删除" - -#, c-format -msgid "'%s' is the root of a working copy and cannot be deleted" -msgstr "不能删除工作副本根目录 '%s'" - +#: ../libsvn_wc/adm_ops.c:601 ../libsvn_wc/update_editor.c:5206 #, c-format msgid "Can't find parent directory's node while trying to add '%s'" msgstr "增加 “%s” 时无法找到父目录节点" +#: ../libsvn_wc/adm_ops.c:610 ../libsvn_wc/update_editor.c:5200 #, c-format msgid "Can't add '%s' to a parent directory scheduled for deletion" msgstr "增加 “%s” 到调度删除的目录中" +#: ../libsvn_wc/adm_ops.c:617 ../libsvn_wc/update_editor.c:5213 #, c-format msgid "Can't schedule an addition of '%s' below a not-directory node" msgstr "不能在非目录节点 '%s' 下调度增加" +#: ../libsvn_wc/adm_ops.c:676 #, c-format msgid "Can't create an entry with a reserved name while trying to add '%s'" msgstr "增加 “%s” 时无法创建使用保留名称的条目" +#: ../libsvn_wc/adm_ops.c:880 #, c-format msgid "The URL '%s' has a different repository root than its parent" msgstr "URL “%s” 与其父目录的版本库根目录不相同" +#: ../libsvn_wc/adm_ops.c:898 #, c-format -msgid "Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' for addition under a working copy from repository '%s' with uuid '%s'." -msgstr "不能调度工作副本 '%s' (版本库 '%s'，uuid '%s') 在版本库 '%s' (uuid '%s') 的工作副本下增加。" +msgid "" +"Can't schedule the working copy at '%s' from repository '%s' with uuid '%s' " +"for addition under a working copy from repository '%s' with uuid '%s'." +msgstr "" +"不能调度工作副本 '%s' (版本库 '%s'，uuid '%s') 在版本库 '%s' (uuid '%s') 的工" +"作副本下增加。" +#: ../libsvn_wc/adm_ops.c:912 #, c-format msgid "Can't add '%s' with URL '%s', but with the data from '%s'" msgstr "不能增加 '%s' 为 URL '%s' (数据来自 '%s')" -#, c-format -msgid "File '%s' has local modifications" -msgstr "文件“%s”有本地修改" - +#: ../libsvn_wc/cleanup.c:58 #, c-format msgid "'%s' is not a working copy directory" msgstr "“%s” 不是工作副本目录" +#: ../libsvn_wc/cleanup.c:64 msgid "Log format too old, please use Subversion 1.6 or earlier" msgstr "日志格式太旧，请使用 Subversion 1.6 或更新的版本" +#: ../libsvn_wc/conflicts.c:83 +msgid "Not a conflict skel" +msgstr "不是冲突骨架" + +#: ../libsvn_wc/conflicts.c:610 ../libsvn_wc/conflicts.c:707 +msgid "Not a completed conflict skel" +msgstr "不是完整的冲突骨架" + +#: ../libsvn_wc/conflicts.c:788 ../libsvn_wc/conflicts.c:861 +#: ../libsvn_wc/conflicts.c:951 +msgid "Conflict not set" +msgstr "没有设置冲突" + +#: ../libsvn_wc/conflicts.c:1438 ../libsvn_wc/conflicts.c:1790 +msgid "Conflict callback violated API: returned no results" +msgstr "冲突的回调函数违反 API：没有返回结果。" + +#: ../libsvn_wc/conflicts.c:1482 +msgid "Conflict callback violated API: returned no merged file" +msgstr "冲突的回调函数违反 API：没有返回合并文件。" + +#: ../libsvn_wc/conflicts.c:2468 ../libsvn_wc/conflicts.c:2644 msgid "Invalid 'conflict_result' argument" msgstr "无效的 “conflict_result” 参数" +#: ../libsvn_wc/conflicts.c:2767 ../libsvn_wc/conflicts.c:2807 +#, c-format +msgid "" +"Tree conflict can only be resolved to 'working' or 'mine-conflict' state; " +"'%s' not resolved" +msgstr "树冲突只能解决为“working”或“mine-conflict”状态；“%s” 还没有解决" + +#: ../libsvn_wc/conflicts.c:2822 #, c-format -msgid "Tree conflicts can only be resolved to 'working' state; '%s' not resolved" -msgstr "树冲突只能解决为 “working” 状态；“%s” 还没有解决" +msgid "" +"Tree conflict can only be resolved to 'working' state; '%s' not resolved" +msgstr "树冲突只能解决为“working”状态；“%s” 还没有解决" + +#: ../libsvn_wc/conflicts.c:2924 +msgid "No conflict-callback and no pre-defined conflict-choice provided" +msgstr "没有提供冲突回调或预定义的冲突选择" +#: ../libsvn_wc/copy.c:86 #, c-format msgid "Source '%s' is unexpected kind" msgstr "源 “%s” 具有意外的类型" +#: ../libsvn_wc/copy.c:410 #, c-format msgid "cannot handle node kind for '%s'" msgstr "不能为 '%s'“处理节点类型" +#: ../libsvn_wc/copy.c:432 ../libsvn_wc/wc_db.c:4400 ../libsvn_wc/wc_db.c:4975 +#, c-format +msgid "Cannot handle status of '%s'" +msgstr "不能处理“%s”的状态" + +#: ../libsvn_wc/copy.c:441 ../libsvn_wc/wc_db.c:4391 ../libsvn_wc/wc_db.c:4969 +#: ../libsvn_wc/wc_db.c:5203 #, c-format msgid "Cannot copy '%s' excluded by server" msgstr "不能复制被服务器排除的 '%s'" +#: ../libsvn_wc/copy.c:578 #, c-format msgid "Deleted node '%s' can't be copied." msgstr "已经删除的节点“%s”不能被复制。" +#: ../libsvn_wc/copy.c:596 #, c-format -msgid "The node '%s' was not found." -msgstr "找不到节点 '%s'。" +msgid "'%s' is the root of a working copy and cannot be moved" +msgstr "“%s”是工作副本根目录，不能被移动" +#: ../libsvn_wc/copy.c:604 +#, c-format +msgid "'%s' represents the repository root and cannot be moved" +msgstr "“%s”是版本库根目录，不能被移动" + +#: ../libsvn_wc/copy.c:673 #, c-format msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'" msgstr "无法复制到“%s”，因为它不在版本库“%s”中；它来自“%s”" +#: ../libsvn_wc/copy.c:681 #, c-format msgid "Cannot copy to '%s' as it is scheduled for deletion" msgstr "无法复制到“%s”，因为它已调度删除" +#: ../libsvn_wc/copy.c:709 #, c-format msgid "'%s' is already under version control but is excluded." msgstr "'%s' 已纳入版本控制，却被排除。" +#: ../libsvn_wc/copy.c:724 #, c-format msgid "There is already a versioned item '%s'" msgstr "已有纳入版本控制项“%s”" +#: ../libsvn_wc/copy.c:740 #, c-format msgid "'%s' already exists and is in the way" msgstr "“%s”已存在，变成拦路虎" +#: ../libsvn_wc/copy.c:791 +#, c-format +msgid "" +"Cannot move mixed-revision subtree '%s' [%ld:%ld]; try updating it first" +msgstr "不能移动有混合版本的子树“%s”[%ld:%ld] 中；请先更新" + +#: ../libsvn_wc/crop.c:207 #, c-format msgid "Cannot exclude '%s': it is a working copy root" msgstr "不能排除 '%s': 它是工作副本根目录" +#: ../libsvn_wc/crop.c:215 #, c-format msgid "Cannot exclude '%s': it is a switched path" msgstr "不能排除 '%s':它是已切换的路径" +#: ../libsvn_wc/crop.c:242 #, c-format -msgid "Cannot exclude '%s': it is to be added to the repository. Try commit instead" +msgid "" +"Cannot exclude '%s': it is to be added to the repository. Try commit instead" msgstr "不能排除 '%s': 它将要增加到版本库中。请先提交" +#: ../libsvn_wc/crop.c:249 #, c-format -msgid "Cannot exclude '%s': it is to be deleted from the repository. Try commit instead" +msgid "" +"Cannot exclude '%s': it is to be deleted from the repository. Try commit " +"instead" msgstr "不能排除 '%s': 它将要从版本库中删除。请先提交" +#: ../libsvn_wc/crop.c:308 msgid "Can only crop a working copy with a restrictive depth" msgstr "只能修剪工作副本到有限深度" +#: ../libsvn_wc/crop.c:319 msgid "Can only crop directories" msgstr "只能修剪目录" +#: ../libsvn_wc/crop.c:332 #, c-format -msgid "Cannot crop '%s': it is going to be removed from repository. Try commit instead" +msgid "" +"Cannot crop '%s': it is going to be removed from repository. Try commit " +"instead" msgstr "无法修剪 “%s”: 它将要从版本库中删除；请先提交" +#: ../libsvn_wc/crop.c:339 #, c-format -msgid "Cannot crop '%s': it is to be added to the repository. Try commit instead" +msgid "" +"Cannot crop '%s': it is to be added to the repository. Try commit instead" msgstr "无法修剪 '%s': 它将要增加到版本库中。请先提交" +#: ../libsvn_wc/delete.c:237 ../libsvn_wc/delete.c:357 +#, c-format +msgid "'%s' cannot be deleted" +msgstr "'%s' 不能被删除" + +#: ../libsvn_wc/delete.c:255 ../libsvn_wc/delete.c:373 +#, c-format +msgid "'%s' is the root of a working copy and cannot be deleted" +msgstr "不能删除工作副本根目录 '%s'" + +#: ../libsvn_wc/delete.c:262 ../libsvn_wc/delete.c:379 +#, c-format +msgid "'%s' represents the repository root and cannot be deleted" +msgstr "“%s”是版本库根目录，不能被删除" + +#: ../libsvn_wc/delete.c:476 +#, c-format +msgid "File '%s' has local modifications" +msgstr "文件“%s”有本地修改" + +#: ../libsvn_wc/deprecated.c:2284 #, c-format msgid "Unexpectedly found '%s': path is marked 'missing'" msgstr "意外发现“%s”: 路径被标记为“丢失”" +#: ../libsvn_wc/entries.c:1044 #, c-format msgid "'%s' is not a versioned working copy" msgstr "“%s”不是已版本控制的工作副本" +#: ../libsvn_wc/entries.c:1290 #, c-format msgid "Admin area of '%s' is missing" msgstr "“%s”的管理目录丢失" +#: ../libsvn_wc/entries.c:1310 #, c-format msgid "'%s' is not of the right kind" msgstr "“%s” 的类型错误" +#: ../libsvn_wc/entries.c:1507 #, c-format msgid "The file '%s' has no checksum" msgstr "文件 '%s' 没有校验和。" +#: ../libsvn_wc/entries.c:1619 +#, c-format +msgid "Unable to upgrade '%s' at line %d" +msgstr "不能升级“%s”，第 %d 行" + +#: ../libsvn_wc/entries.c:1837 #, c-format msgid "No copyfrom URL for '%s'" msgstr "'%s' 没有 copyfrom URL" +#: ../libsvn_wc/entries.c:2051 #, c-format msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; " msgstr "'%s' 的基础的 MD5 校验和错误; 期望 '%s'; 发现 '%s'; " +#: ../libsvn_wc/entries.c:2398 #, c-format msgid "No default entry in directory '%s'" msgstr "在目录“%s”中没有默认入口" +#: ../libsvn_wc/entries.c:2554 #, c-format msgid "Directory '%s' has no THIS_DIR entry" msgstr "目录“%s”没有 THIS_DIR 入口" +#: ../libsvn_wc/entries.c:2735 ../libsvn_wc/node.c:528 #, c-format msgid "'%s' has an unrecognized node kind" msgstr "“%s”有无法识别的节点种类" +#: ../libsvn_wc/externals.c:154 ../libsvn_wc/externals.c:232 #, c-format msgid "Error parsing %s property on '%s': '%s'" msgstr "解析 %s 属性于“%s”出错: “%s”" +#: ../libsvn_wc/externals.c:202 #, c-format msgid "Can't split line into components: '%s'" msgstr "不能分割行到组件：“%s”" +#: ../libsvn_wc/externals.c:257 #, c-format -msgid "Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in an external; one must be a path where an absolute or relative URL is checked out to" -msgstr "非法属性 “%s” 于 “%s”: 不能在外部定义中使用 2 个绝对 URL(“%s” 和 “%s”)；绝对或相对 URL 必须检出到本地路径" +msgid "" +"Invalid %s property on '%s': cannot use two absolute URLs ('%s' and '%s') in " +"an external; one must be a path where an absolute or relative URL is checked " +"out to" +msgstr "" +"非法属性 “%s” 于 “%s”: 不能在外部定义中使用 2 个绝对 URL(“%s” 和 “%s”)；绝对" +"或相对 URL 必须检出到本地路径" +#: ../libsvn_wc/externals.c:266 ../libsvn_wc/externals.c:274 #, c-format -msgid "Invalid %s property on '%s': cannot use a URL '%s' as the target directory for an external definition" +msgid "" +"Invalid %s property on '%s': cannot use a URL '%s' as the target directory " +"for an external definition" msgstr "非法属性 “%s” 于 “%s”: 对于外部定义，不能使用 URL \"%s\" 作为目标目录" +#: ../libsvn_wc/externals.c:316 #, c-format -msgid "Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" +msgid "" +"Invalid %s property on '%s': target '%s' is an absolute path or involves '..'" msgstr "无效属性 %s 位于 “%s”: 目标 “%s” 包含 “..” 或是绝对路径" +#: ../libsvn_wc/externals.c:491 ../libsvn_wc/externals.c:514 #, c-format msgid "This editor can only update '%s'" msgstr "此编辑器只能更新“%s”" +#: ../libsvn_wc/externals.c:529 #, c-format msgid "Node '%s' is no existing file external" msgstr "节点 '%s' 的外部链接不是现存文件" +#: ../libsvn_wc/externals.c:1516 +#, c-format +msgid "URL '%s' does not begin with a scheme" +msgstr "URL “%s” 没有以方案开始" + +#: ../libsvn_wc/externals.c:1571 +#, c-format +msgid "Illegal parent directory URL '%s'" +msgstr "非法父目录 URL “%s”" + +#: ../libsvn_wc/externals.c:1610 +#, c-format +msgid "Illegal repository root URL '%s'" +msgstr "非法版本库根 URL “%s”" + +#: ../libsvn_wc/externals.c:1655 +#, c-format +msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'" +msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”" + +#: ../libsvn_wc/externals.c:1683 +#, c-format +msgid "Unrecognized format for the relative external URL '%s'" +msgstr "外部相对 URL “%s” 的格式无法识别" + +#: ../libsvn_wc/lock.c:529 #, c-format msgid "Path '%s' ends in '%s', which is unsupported for this operation" msgstr "路径“%s”以“%s”结束，此操作不支持" +#: ../libsvn_wc/lock.c:773 ../libsvn_wc/wc_db.c:13640 #, c-format msgid "Working copy '%s' locked" msgstr "工作副本“%s”已经锁定" +#: ../libsvn_wc/lock.c:918 #, c-format msgid "Unable to check path existence for '%s'" msgstr "无法检查路径“%s”是否存在" +#: ../libsvn_wc/lock.c:941 #, c-format msgid "Expected '%s' to be a directory but found a file" msgstr "期望“%s”是目录，但它是文件" +#: ../libsvn_wc/lock.c:951 #, c-format msgid "Can't retrieve an access baton for non-directory '%s'" msgstr "不能获取非目录对象 '%s' 的访问权" +#: ../libsvn_wc/lock.c:960 #, c-format msgid "Directory '%s' is missing" msgstr "目录“%s”丢失" +#: ../libsvn_wc/lock.c:968 #, c-format msgid "Working copy '%s' is not locked" msgstr "工作副本“%s”未被锁定" +#: ../libsvn_wc/lock.c:1382 #, c-format msgid "No write-lock in '%s'" msgstr "“%s”没有写入锁定" +#: ../libsvn_wc/lock.c:1496 #, c-format msgid "Can't obtain lock on non-directory '%s'." msgstr "不能获取非目录对象 '%s' 的锁" -msgid "Conflict callback violated API: returned no results" -msgstr "冲突的回调函数违反 API：没有返回结果。" +#: ../libsvn_wc/merge.c:1281 ../libsvn_wc/props.c:257 +#, c-format +msgid "Can't merge into conflicted node '%s'" +msgstr "无法合并到已经冲突的节点“%s”" -msgid "Conflict callback violated API: returned no merged file" -msgstr "冲突的回调函数违反 API：没有返回合并文件。" +#: ../libsvn_wc/merge.c:1324 ../libsvn_wc/props.c:273 +#, c-format +msgid "The property '%s' may not be merged into '%s'." +msgstr "属性 “%s” 不能合并到 “%s”。" + +#: ../libsvn_wc/node.c:1047 +#, c-format +msgid "Incomplete copy information on path '%s'." +msgstr "路径“%s”上的复制信息不完整" +#: ../libsvn_wc/node.c:1211 #, c-format msgid "'%s' is not the root of the working copy '%s'" msgstr "“%s”不是工作副本“%s”的根" +#: ../libsvn_wc/old-and-busted.c:123 msgid "Invalid escape sequence" msgstr "无效的转义序列" +#: ../libsvn_wc/old-and-busted.c:130 msgid "Invalid escaped character" msgstr "无效的转义字符" +#: ../libsvn_wc/old-and-busted.c:148 ../libsvn_wc/old-and-busted.c:177 +#: ../libsvn_wc/old-and-busted.c:241 ../libsvn_wc/old-and-busted.c:253 msgid "Unexpected end of entry" msgstr "入口意外结束" +#: ../libsvn_wc/old-and-busted.c:203 #, c-format msgid "Entry contains non-canonical path '%s'" msgstr "入口包含不规范的路径 “%s”" +#: ../libsvn_wc/old-and-busted.c:275 #, c-format msgid "Invalid value for field '%s'" msgstr "“%s”域的值无效" +#: ../libsvn_wc/old-and-busted.c:347 #, c-format msgid "Found an unexpected \\0 in the file external '%s'" msgstr "在外部引用的文件 “%s” 中，发现不期望的 \\0" +#: ../libsvn_wc/old-and-busted.c:391 #, c-format msgid "Illegal file external revision kind %d for path '%s'" msgstr "非法的外部引用文件的版本类型 %d，在路径 “%s” 中" +#: ../libsvn_wc/old-and-busted.c:489 ../libsvn_wc/old-and-busted.c:843 #, c-format msgid "Entry '%s' has invalid node kind" msgstr "入口“%s”有无效的节点种类" +#: ../libsvn_wc/old-and-busted.c:510 ../libsvn_wc/old-and-busted.c:823 #, c-format msgid "Entry for '%s' has invalid repository root" msgstr "“%s”条目的版本库根目录无效" +#: ../libsvn_wc/old-and-busted.c:531 ../libsvn_wc/old-and-busted.c:868 #, c-format msgid "Entry '%s' has invalid 'schedule' value" msgstr "入口 '%s' 有无效 'schedule' 值" +#: ../libsvn_wc/old-and-busted.c:681 #, c-format msgid "Entry '%s' has invalid 'depth' value" msgstr "入口 '%s' 有无效 'depth' 值" +#: ../libsvn_wc/old-and-busted.c:732 #, c-format msgid "Entry '%s' has invalid '%s' value" msgstr "入口“%s”有无效值“%s”" +#: ../libsvn_wc/old-and-busted.c:1081 #, c-format msgid "XML parser failed in '%s'" msgstr "XML 解析器失败于“%s”" +#: ../libsvn_wc/old-and-busted.c:1137 msgid "Missing default entry" msgstr "丢失默认条目" +#: ../libsvn_wc/old-and-busted.c:1142 msgid "Default entry has no revision number" msgstr "默认条目没有版本号" +#: ../libsvn_wc/old-and-busted.c:1147 msgid "Default entry is missing URL" msgstr "默认条目没有URL" +#: ../libsvn_wc/old-and-busted.c:1226 #, c-format msgid "Invalid version line in entries file of '%s'" msgstr "“%s”文件中的版本行无效" +#: ../libsvn_wc/old-and-busted.c:1243 msgid "Missing entry terminator" msgstr "条目终结符丢失" +#: ../libsvn_wc/old-and-busted.c:1246 msgid "Invalid entry terminator" msgstr "无效的条目终止符" +#: ../libsvn_wc/old-and-busted.c:1250 #, c-format msgid "Error at entry %d in entries file for '%s':" msgstr "条目文件中的条目 %d 出错于 “%s”" +#: ../libsvn_wc/props.c:236 #, c-format msgid "The node '%s' does not have properties in this state." msgstr "节点 '%s' 没有属性。" -#, c-format -msgid "The property '%s' may not be merged into '%s'." -msgstr "属性 “%s” 不能合并到 “%s”。" - +#: ../libsvn_wc/props.c:401 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property already exists.\n" msgstr "试图增加新属性 “%s”，但是它已经存在。\n" +#: ../libsvn_wc/props.c:410 #, c-format msgid "" "Trying to add new property '%s'\n" "but the property has been locally deleted.\n" msgstr "试图增加新属性 “%s”，但是它已经在本地被删除。\n" +#: ../libsvn_wc/props.c:424 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally added.\n" msgstr "试图删除属性 “%s”，但是它已经在本地被增加。\n" +#: ../libsvn_wc/props.c:440 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally modified.\n" msgstr "试图删除属性 “%s”，但是它已经在本地被修改。\n" +#: ../libsvn_wc/props.c:450 #, c-format msgid "" "Trying to delete property '%s'\n" "but the property has been locally deleted and had a different value.\n" msgstr "试图删除属性 “%s”，但是它已经在本地被修改，并且具有不同的取值。\n" +#: ../libsvn_wc/props.c:462 #, c-format msgid "" "Trying to delete property '%s'\n" "but the local property value is different.\n" msgstr "试图删除属性 “%s”，但是它的本地取值不同。\n" +#: ../libsvn_wc/props.c:481 #, c-format msgid "" "Trying to change property '%s'\n" "but the local property value conflicts with the incoming change.\n" msgstr "试图修改属性 “%s”，但是它的本地取值不同。\n" +#: ../libsvn_wc/props.c:489 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has already been locally changed to a different value.\n" msgstr "试图修改属性 “%s”，但是它的本地取值已经改变。\n" +#: ../libsvn_wc/props.c:496 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally deleted.\n" msgstr "试图修改属性 “%s”，但是它已经在本地被删除。\n" +#: ../libsvn_wc/props.c:502 #, c-format msgid "" "Trying to change property '%s'\n" "but the property has been locally added with a different value.\n" msgstr "试图修改属性 “%s”，但是它已经在本地被增加，并且取值不同。\n" +#: ../libsvn_wc/props.c:508 #, c-format msgid "" "Trying to change property '%s'\n" "but the property does not exist locally.\n" msgstr "试图修改属性 “%s”，但是它并不存在。\n" +#: ../libsvn_wc/props.c:612 msgid "<<<<<<< (local property value)" msgstr "<<<<<<< (本地属性值)" +#: ../libsvn_wc/props.c:613 msgid ">>>>>>> (incoming property value)" msgstr ">>>>>>> (服务器端属性值)" +#: ../libsvn_wc/props.c:648 msgid "Local property value:\n" msgstr "本地属性取值:\n" +#: ../libsvn_wc/props.c:650 ../libsvn_wc/props.c:661 msgid "Cannot display: property value is binary data\n" msgstr "无法显示: 属性取值为二进制数据\n" +#: ../libsvn_wc/props.c:659 msgid "Incoming property value:\n" msgstr "外部属性取值:\n" -msgid "Conflict callback violated API: returned no results." -msgstr "冲突的回调函数违反 API：没有返回结果。" - -msgid "Conflict callback violated API: returned no merged file." -msgstr "冲突的回调函数违反 API：没有返回合并文件。" - +#: ../libsvn_wc/props.c:1475 ../libsvn_wc/props.c:1884 +#: ../libsvn_wc/props.c:1985 #, c-format msgid "Property '%s' is an entry property" msgstr "属性 “%s” 是条目属性" +#: ../libsvn_wc/props.c:1512 ../libsvn_wc/props.c:1519 msgid "Failed to load properties" msgstr "加载属性失败" +#: ../libsvn_wc/props.c:1555 #, c-format msgid "Cannot set '%s' on a directory ('%s')" msgstr "无法设定“%s”于目录 (“%s”)" +#: ../libsvn_wc/props.c:1562 #, c-format msgid "Cannot set '%s' on a file ('%s')" msgstr "无法设定“%s”于文件 (“%s”)" +#: ../libsvn_wc/props.c:1641 #, c-format -msgid "'%s' is not a file or directory" -msgstr "“%s”不是文件或目录" +msgid "Can't set '%s': file '%s' has binary mime type property" +msgstr "不能设置“%s”: 文件“%s”有二进制的 mime 类型属性" -#, c-format -msgid "File '%s' has binary mime type property" -msgstr "文件“%s”有二进制的 mime 类型属性" +#: ../libsvn_wc/props.c:1686 +msgid "Failed to load current properties" +msgstr "加载当前属性失败" +#: ../libsvn_wc/props.c:1906 #, c-format msgid "Can't set properties on '%s': invalid status for updating properties." msgstr "不能对 '%s' 设置属性: 对于更新属性，状态非法。" -msgid "Failed to load current properties" -msgstr "加载当前属性失败" +#: ../libsvn_wc/props.c:1990 +#, c-format +msgid "Property '%s' is a WC property, not a regular property" +msgstr "“%s”是工作副本属性，不是常规属性" +#: ../libsvn_wc/props.c:2084 #, c-format msgid "Unrecognized line ending style '%s' for '%s'" msgstr "无法识别的行结束样式“%s”，对于“%s”" +#. scratch_ +#: ../libsvn_wc/props.c:2135 +#, c-format +msgid " (%d more duplicate targets found)" +msgstr " (发现了 %d 个或更多地重复目标)" + +#: ../libsvn_wc/props.c:2140 +#, c-format +msgid "Invalid %s property on '%s': target '%s' appears more than once%s" +msgstr "无效属性 %s 于“%s”: 目标“%s”出现多次%s" + +#: ../libsvn_wc/props.c:2171 #, c-format msgid "Cannot set non-inheritable mergeinfo on a non-directory ('%s')" msgstr "无法在非目录对象(“%s”)设定不可继承的合并信息" +#: ../libsvn_wc/relocate.c:111 #, c-format msgid "Cannot relocate '%s' as it is not the root of a working copy" msgstr "不能重新定位 '%s'，因为它不是工作副本根目录" +#: ../libsvn_wc/relocate.c:118 #, c-format -msgid "Cannot relocate '%s' as it is not the root of a working copy; try relocating '%s' instead" +msgid "" +"Cannot relocate '%s' as it is not the root of a working copy; try relocating " +"'%s' instead" msgstr "不能重新定位 '%s'，因为它不是工作副本根目录；请重新定位 '%s'" +#: ../libsvn_wc/relocate.c:136 msgid "Cannot relocate a single file" msgstr "无法重新定位单个文件" +#: ../libsvn_wc/relocate.c:144 #, c-format msgid "Invalid source URL prefix: '%s' (does not overlap target's URL '%s')" msgstr "非法源 URL 前缀: '%s' (不与目标的 URL '%s' 交叠)" +#: ../libsvn_wc/relocate.c:154 #, c-format msgid "Invalid relocation destination: '%s' (not a URL)" msgstr "非法迁移目标: '%s' (不是 URL)" +#: ../libsvn_wc/relocate.c:161 #, c-format msgid "Invalid relocation destination: '%s' (does not point to target)" msgstr "非法迁移目标: '%s' (没有指向目标)" +#: ../libsvn_wc/tree_conflicts.c:136 msgid "Unknown enumeration value in tree conflict description" msgstr "树冲突描述中有未知的枚举值" +#: ../libsvn_wc/tree_conflicts.c:160 msgid "Invalid version info in tree conflict description" msgstr "树冲突描述中有非法的版本信息" +#: ../libsvn_wc/tree_conflicts.c:218 #, c-format msgid "Invalid conflict info '%s' in tree conflict description" msgstr "树冲突描述中有非法的冲突信息 '%s'" +#: ../libsvn_wc/tree_conflicts.c:229 msgid "Empty 'victim' field in tree conflict description" msgstr "树冲突描述中的 “victim” 域为空" +#: ../libsvn_wc/tree_conflicts.c:237 msgid "Invalid 'node_kind' field in tree conflict description" msgstr "树冲突描述中有非法的 “node_kind” 域" +#: ../libsvn_wc/tree_conflicts.c:430 #, c-format msgid "Attempt to add tree conflict that already exists at '%s'" msgstr "试图增加已经位于“%s”的树冲突" +#: ../libsvn_wc/update_editor.c:998 #, c-format msgid "" "Checksum mismatch while updating '%s':\n" @@ -5451,25 +7692,47 @@ msgstr "" " 期望: %s\n" " 实际: %s\n" +#: ../libsvn_wc/update_editor.c:1129 #, c-format -msgid "Path '%s' is not in the working copy" -msgstr "路径 “%s” 不在工作副本中" +msgid "'%s' is not valid as filename in directory '%s'" +msgstr "“%s”不是合法文件名称于目录“%s”中" +#: ../libsvn_wc/update_editor.c:1606 #, c-format -msgid "Failed to add directory '%s': object of the same name as the administrative directory" +msgid "Unexpected attempt to add a node at path '%s'" +msgstr "意外的试图在路径“%s”增加节点" + +#: ../libsvn_wc/update_editor.c:1617 +#, c-format +msgid "Unexpected attempt to edit, delete, or replace a node at path '%s'" +msgstr "意外的试图在路径“%s”编辑，删除或替换节点" + +#: ../libsvn_wc/update_editor.c:2019 +#, c-format +msgid "" +"Failed to add directory '%s': object of the same name as the administrative " +"directory" msgstr "无法增加目录“%s”: 对象与管理目录同名" +#: ../libsvn_wc/update_editor.c:2667 msgid "Couldn't do property merge" msgstr "无法进行属性合并" +#: ../libsvn_wc/update_editor.c:3023 #, c-format -msgid "Failed to mark '%s' absent: item of the same name is already scheduled for addition" +msgid "" +"Failed to mark '%s' absent: item of the same name is already scheduled for " +"addition" msgstr "无法将“%s”标记为不存在: 同名项目已加入增加调度" +#: ../libsvn_wc/update_editor.c:3111 #, c-format -msgid "Failed to add file '%s': object of the same name as the administrative directory" +msgid "" +"Failed to add file '%s': object of the same name as the administrative " +"directory" msgstr "无法增加文件“%s”: 对象与管理目录同名" +#: ../libsvn_wc/update_editor.c:3623 #, c-format msgid "" "Checksum mismatch for '%s':\n" @@ -5480,216 +7743,378 @@ msgstr "" " 期望: %s\n" " 记录: %s\n" +#: ../libsvn_wc/update_editor.c:5181 #, c-format msgid "Node '%s' exists." msgstr "节点“%s”已存在" +#: ../libsvn_wc/update_editor.c:5241 #, c-format msgid "Copyfrom-url '%s' has different repository root than '%s'" msgstr "Copyfrom-url“%s”与“%s”的版本库根目录不相同" +#: ../libsvn_wc/update_editor.c:5439 +#, c-format +msgid "'%s' is not an unmodified copied directory" +msgstr "“%s”不是未修改的复制目录" + +#: ../libsvn_wc/update_editor.c:5450 +#, c-format +msgid "Copyfrom '%s' doesn't match original location of '%s'" +msgstr "Copyfrom“%s”与“%s”的原始位置不匹配" + +#: ../libsvn_wc/upgrade.c:255 #, c-format msgid "Missing end of line in wcprops file for '%s'" -msgstr "wcprops文件“%s”丢失了行结束符" +msgstr "“%s”的工作副本属性文件丢失了行结束符" +#: ../libsvn_wc/upgrade.c:631 #, c-format -msgid "Working copy '%s' can't be upgraded because the repository root is not available and can't be retrieved" +msgid "" +"Working copy '%s' can't be upgraded because the repository root is not " +"available and can't be retrieved" msgstr "由于版本库的根不可用，并且不能找回，所以工作副本“%s”不能被升级" +#: ../libsvn_wc/upgrade.c:638 #, c-format -msgid "Working copy '%s' can't be upgraded because the repository uuid is not available and can't be retrieved" +msgid "" +"Working copy '%s' can't be upgraded because the repository uuid is not " +"available and can't be retrieved" msgstr "由于版本库的 UUID 不可用，并且不能找回，所以工作副本“%s”不能被升级" +#: ../libsvn_wc/upgrade.c:645 #, c-format msgid "Working copy '%s' can't be upgraded because it doesn't have a url" msgstr "由于没有 URL，所以工作副本“%s”不能被升级" +#: ../libsvn_wc/upgrade.c:690 msgid "Error parsing tree conflict skel" msgstr "解析树冲突骨架出错" +#: ../libsvn_wc/upgrade.c:1173 #, c-format -msgid "The working copy at '%s' is format 22 with WORKING nodes; use a format 22 client to diff/revert before using this client" -msgstr "位于 '%s' 的工作副本是有 WORKING 节点的格式 22；请先使用支持格式 22 的客户端比较/还原后，再使用此客户端" +msgid "" +"The working copy at '%s' is format 22 with WORKING nodes; use a format 22 " +"client to diff/revert before using this client" +msgstr "" +"位于 '%s' 的工作副本是有 WORKING 节点的格式 22；请先使用支持格式 22 的客户端" +"比较/还原后，再使用此客户端" +#: ../libsvn_wc/upgrade.c:1217 #, c-format -msgid "The working copy at '%s' is format 26 with conflicts; use a format 26 client to resolve before using this client" -msgstr "位于 '%s' 的工作副本是有冲突的格式 26；请先使用支持格式 26 的客户端解决冲突后，再使用此客户端" +msgid "" +"The working copy at '%s' is format 26 with conflicts; use a format 26 client " +"to resolve before using this client" +msgstr "" +"位于 '%s' 的工作副本是有冲突的格式 26；请先使用支持格式 26 的客户端解决冲突" +"后，再使用此客户端" -msgid "Cannot upgrade with existing logs; run a cleanup operation on this working copy using a client version which is compatible with this working copy's format (such as the version you are upgrading from), then retry the upgrade with the current version" -msgstr "不能在有日志文件时升级；请先使用与此工作副本格式兼容的客户端(例如生成此工作副本的客户端)执行清理操作，再升级" +#: ../libsvn_wc/upgrade.c:1723 +msgid "" +"Cannot upgrade with existing logs; run a cleanup operation on this working " +"copy using a client version which is compatible with this working copy's " +"format (such as the version you are upgrading from), then retry the upgrade " +"with the current version" +msgstr "" +"不能在有日志文件时升级；请先使用与此工作副本格式兼容的客户端(例如生成此工作副" +"本的客户端)执行清理操作，再升级" -msgid "This working copy is corrupt and cannot be upgraded. Please check out a new working copy." +#: ../libsvn_wc/upgrade.c:1792 +msgid "" +"This working copy is corrupt and cannot be upgraded. Please check out a new " +"working copy." msgstr "此工作副本损坏，不能升级。请重新检出。" +#: ../libsvn_wc/upgrade.c:1837 msgid "(unreleased development version)" msgstr "(未发布的开发版本)" +#: ../libsvn_wc/upgrade.c:1853 #, c-format msgid "Working copy '%s' is too old (format %d, created by Subversion %s)" msgstr "工作副本 '%s' 格式太旧 (格式 %d, Subversion %s 创建)" +#: ../libsvn_wc/upgrade.c:1863 #, c-format -msgid "Working copy '%s' is an old development version (format %d); to upgrade it, use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use the current client" -msgstr "工作副本 '%s' 是旧开发版本的格式(%d); 请使用格式 18 客户端清理后， 再使用 'tools/dev/wc-ng/bump-to-19.py' 升级，最后使用当前客户端" +msgid "" +"Working copy '%s' is an old development version (format %d); to upgrade it, " +"use a format 18 client, then use 'tools/dev/wc-ng/bump-to-19.py', then use " +"the current client" +msgstr "" +"工作副本 '%s' 是旧开发版本的格式(%d); 请使用格式 18 客户端清理后， 再使用 " +"'tools/dev/wc-ng/bump-to-19.py' 升级，最后使用当前客户端" +#: ../libsvn_wc/upgrade.c:2088 #, c-format -msgid "Can't upgrade '%s' as it is not a pre-1.7 working copy directory" -msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本目录" +msgid "Can't upgrade '%s' as it is not a working copy" +msgstr "不能升级“%s”，因为它不是工作副本目录" +#: ../libsvn_wc/upgrade.c:2137 #, c-format -msgid "Can't upgrade '%s' as it is not a pre-1.7 working copy root, the root is '%s'" -msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本根目录，根目录是 '%s'" +msgid "Can't upgrade '%s' as it is not a working copy root, the root is '%s'" +msgstr "不能升级“%s”，因为它不是工作副本根目录，根目录是 '%s'" +#: ../libsvn_wc/wc_db.c:452 #, c-format msgid "No REPOSITORY table entry for id '%ld'" msgstr "对于标识 '%ld' 没有 REPOSITORY 表入口" +#: ../libsvn_wc/wc_db.c:718 #, c-format msgid "The file '%s' has no checksum." msgstr "文件 '%s' 没有校验和。" -#, c-format -msgid "The node '%s' is not in a workingcopy." -msgstr "节点 “%s” 不在工作副本中" - +#: ../libsvn_wc/wc_db.c:2456 ../libsvn_wc/wc_db.c:2837 +#: ../libsvn_wc/wc_db.c:8878 #, c-format msgid "The node '%s' has a corrupt checksum value." msgstr "节点 '%s' 的校验和损坏。" +#: ../libsvn_wc/wc_db.c:2641 #, c-format -msgid "The node '%s' is not an external." -msgstr "节点 “%s” 不是外部对象" +msgid "The node '%s' has a BASE status that has no properties." +msgstr "" +#: ../libsvn_wc/wc_db.c:3467 #, c-format -msgid "Cannot handle status of '%s'" -msgstr "不能处理“%s”的状态" +msgid "The node '%s' is not an external." +msgstr "节点 “%s” 不是外部对象" +#: ../libsvn_wc/wc_db.c:3874 #, c-format -msgid "Can't store properties for '%s' in '%s'." -msgstr "不能存储 '%s' 的属性，在 '%s' 中。" +msgid "Expected node '%s' to be deleted." +msgstr "期望节点“%s”被删除。" +#: ../libsvn_wc/wc_db.c:6355 ../libsvn_wc/wc_db.c:6433 #, c-format msgid "Can't revert '%s' without reverting children" msgstr "不能恢复 '%s'，而不恢复孩子。" +#: ../libsvn_wc/wc_db.c:6530 #, c-format msgid "Can't revert '%s' without reverting parent" msgstr "不能恢复 '%s'，而不恢复父亲。" +#: ../libsvn_wc/wc_db.c:6647 #, c-format msgid "Unsupported depth for revert of '%s'" msgstr "对于恢复 '%s'，其深度不受支持" +#: ../libsvn_wc/wc_db.c:7490 #, c-format msgid "Cannot delete '%s' as '%s' is excluded by server" msgstr "不能删除 '%s'，因为 '%s' 被服务器排除" +#: ../libsvn_wc/wc_db.c:7501 +#, c-format +msgid "Cannot delete '%s' as it is excluded by server" +msgstr "不能删除 '%s'，因为它被服务器排除" + +#: ../libsvn_wc/wc_db.c:7508 +#, c-format +msgid "Cannot delete '%s' as it is excluded" +msgstr "不能删除 '%s'，因为它被排除" + +#: ../libsvn_wc/wc_db.c:7922 +#, c-format +msgid "Cannot move '%s' to '%s' because they are not in the same working copy" +msgstr "不能移动 '%s' 到 '%s'，因为它们不是同一工作副本" + +#: ../libsvn_wc/wc_db.c:8280 #, c-format msgid "Corrupt data for '%s'" msgstr "'%s' 的数据损坏" +#: ../libsvn_wc/wc_db.c:8584 #, c-format -msgid "The node '%s' comes from unexpected repository '%s', expected '%s'; if this node is a file external using the correct URL in the external definition can fix the problem, see issue #4087" -msgstr "节点“%s”来自不期望的版本库“%s”，期望的版本库是“%s”；如果此节点是文件外部引用，那么在外部定义中使用正确的 URL 可以修正这个问题，请参见问题 #4087 以获得详细信息" +msgid "" +"The node '%s' comes from unexpected repository '%s', expected '%s'; if this " +"node is a file external using the correct URL in the external definition can " +"fix the problem, see issue #4087" +msgstr "" +"节点“%s”来自不期望的版本库“%s”，期望的版本库是“%s”；如果此节点是文件外部引" +"用，那么在外部定义中使用正确的 URL 可以修正这个问题，请参见问题 #4087 以获得" +"详细信息" +#: ../libsvn_wc/wc_db.c:9003 #, c-format msgid "The node '%s' is not in working copy '%s'" msgstr "节点“%s”不在工作副本“%s”中" +#: ../libsvn_wc/wc_db.c:9040 #, c-format msgid "The node '%s' is not installable" msgstr "节点 '%s' 不可安装" +#: ../libsvn_wc/wc_db.c:9469 ../libsvn_wc/wc_db.c:9728 +#, c-format +msgid "The node '%s' has a status that has no properties." +msgstr "节点 '%s' 有状态，没有属性。" + +#: ../libsvn_wc/wc_db.c:11568 #, c-format msgid "Expected node '%s' to be added." msgstr "期望节点“%s”被增加。" +#: ../libsvn_wc/wc_db.c:11914 #, c-format -msgid "Expected node '%s' to be deleted." -msgstr "期望节点“%s”被删除。" +msgid "Path '%s' was not moved here" +msgstr "路径“%s”不是移到这里" +#: ../libsvn_wc/wc_db.c:11983 #, c-format -msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530." +msgid "The base node '%s' was not found." +msgstr "找不到基础节点 '%s'。" + +#: ../libsvn_wc/wc_db.c:12415 +#, c-format +msgid "" +"The properties of '%s' are in an indeterminate state and cannot be upgraded. " +"See issue #2530." msgstr "'%s' 的属性处于不确定的状态，不能更新。详情参见问题 #2530。" +#: ../libsvn_wc/wc_db.c:12427 #, c-format msgid "Insufficient NODES rows for '%s'" msgstr "'%s' 的节点行数不足" +#: ../libsvn_wc/wc_db.c:12574 #, c-format msgid "Repository '%s' not found in the database" msgstr "在数据库中找不到版本库“%s”" +#: ../libsvn_wc/wc_db.c:13561 ../libsvn_wc/wc_db.c:13609 #, c-format msgid "'%s' is already locked." msgstr "'%s' 已经锁定。" +#: ../libsvn_wc/wc_db.c:13566 ../libsvn_wc/wc_db.c:13617 #, c-format msgid "Working copy '%s' locked." msgstr "工作副本 '%s' 已经锁定。" +#: ../libsvn_wc/wc_db.c:13689 #, c-format msgid "'%s' is already locked via '%s'." msgstr "'%s' 已经通过 '%s' 锁定。" +#: ../libsvn_wc/wc_db.c:13863 #, c-format msgid "Working copy not locked at '%s'." msgstr "工作副本 '%s' 未被锁定。" +#: ../libsvn_wc/wc_db.c:14246 #, c-format msgid "Modification of '%s' already exists" msgstr "“%s” 的修改已存在" -#, c-format -msgid "Invalid conflict file '%s' for '%s'" -msgstr "非法的冲突文件“%s”于“%s”" - -#, c-format -msgid "Invalid property reject file '%s' for '%s'" -msgstr "非法的属性拒绝文件“%s”于“%s”" - #. If EXPRESSION is false, cause the caller to return an SVN_ERR_WC_CORRUPT #. * error, showing EXPRESSION and the caller's LOCAL_RELPATH in the message. +#: ../libsvn_wc/wc_db.c:14888 #, c-format msgid "database inconsistency at local_relpath='%s' verifying expression '%s'" msgstr "数据库不一致，路径是“%s”，校验表达式是“%s”" +#: ../libsvn_wc/wc_db.c:15012 +#, c-format +msgid "Can't upgrade '%s' as it is not a working copy root" +msgstr "不能升级 '%s'，因为它不是工作副本目录" + +#: ../libsvn_wc/wc_db.c:15018 #, c-format -msgid "Pristine text not found" -msgstr "找不到原始内容" +msgid "" +"Working copy '%s' is too old and must be upgraded to at least format %d, as " +"created by Subversion %s" +msgstr "工作副本 '%s' 格式太旧，必须至少升级到格式 %d, 被 Subversion %s 创建" + +#: ../libsvn_wc/wc_db.c:15036 +msgid "Working copy upgrade failed" +msgstr "工作副本升级失败" + +#: ../libsvn_wc/wc_db_pristine.c:125 ../libsvn_wc/wc_db_pristine.c:457 +#, c-format +msgid "The pristine text with checksum '%s' was not found" +msgstr "找不到校验和为“%s”的原始内容" +#: ../libsvn_wc/wc_db_pristine.c:191 #, c-format msgid "Pristine text '%s' not present" msgstr "原始内容 “%s” 不存在" +#: ../libsvn_wc/wc_db_pristine.c:224 #, c-format msgid "Can't read '%s' from pristine store because no checksum supplied" msgstr "没有提供校验和，因此不能从原始内容仓库中读取 '%s'" +#: ../libsvn_wc/wc_db_pristine.c:328 #, c-format msgid "New pristine text '%s' has different size: %ld versus %ld" msgstr "新原始内容 '%s' 有不同的大小: %ld 与 %ld" -#, c-format -msgid "The pristine text with checksum '%s' was not found" -msgstr "找不到校验和为“%s”的原始内容" - +#: ../libsvn_wc/wc_db_pristine.c:496 #, c-format msgid "The pristine text with MD5 checksum '%s' was not found" msgstr "找不到 MD5 校验和为“%s”的原始内容" +#: ../libsvn_wc/wc_db_update_move.c:282 ../libsvn_wc/wc_db_update_move.c:306 +#, c-format +msgid "'%s' already in conflict" +msgstr "“%s” 已在冲突中" + +#: ../libsvn_wc/wc_db_update_move.c:1382 #, c-format -msgid "The pristine text with checksum '%s' was found in the DB but not on disk" -msgstr "在数据库中找到了校验和为“%s”的原始内容，但是它不在磁盘上" +msgid "'%s' is not in conflict" +msgstr "“%s”不在冲突中" +#: ../libsvn_wc/wc_db_update_move.c:1395 +#, c-format +msgid "'%s' is not a tree-conflict victim" +msgstr "'%s' 不是树冲突牺牲品" + +#: ../libsvn_wc/wc_db_update_move.c:1754 +#, c-format +msgid "Cannot auto-resolve tree-conflict on '%s'" +msgstr "不能在“%s”自动解决树冲突" + +#: ../libsvn_wc/wc_db_update_move.c:1817 +#, c-format +msgid "" +"Cannot apply update because move source %s' is a mixed-revision working copy" +msgstr "" + +#: ../libsvn_wc/wc_db_update_move.c:1828 +#, c-format +msgid "Cannot apply update because move source '%s' is a switched subtree" +msgstr "" + +#: ../libsvn_wc/wc_db_update_move.c:1879 +#, c-format +msgid "The node '%s' has not been moved away" +msgstr "节点“%s”没有被移走" + +#: ../libsvn_wc/wc_db_update_move.c:1908 +#, c-format +msgid "'%s' is not deleted" +msgstr "“%s”没有被删除" + +#: ../libsvn_wc/wc_db_util.c:69 #, c-format msgid "Missing a row in WCROOT." msgstr "WCROOT 中丢失了一行。" +#: ../libsvn_wc/wc_db_util.c:135 #, c-format -msgid "Working copy format of '%s' is too old (%d); please check out your working copy again" +msgid "Working copy database '%s' not found" +msgstr "找不到工作副本数据库“%s”" + +#: ../libsvn_wc/wc_db_wcroot.c:276 +#, c-format +msgid "" +"Working copy format of '%s' is too old (%d); please check out your working " +"copy again" msgstr "“%s”的工作副本格式太旧(%d)；请重新取出工作副本" +#: ../libsvn_wc/wc_db_wcroot.c:286 #, c-format msgid "" "This client is too old to work with the working copy at\n" @@ -5702,257 +8127,667 @@ msgstr "" " http://subversion.apache.org/faq.html#working-copy-format-change\n" "以获得更详细的信息。\n" +#: ../libsvn_wc/wc_db_wcroot.c:307 msgid "Cleanup with an older 1.7 client before upgrading with this client" msgstr "请在用此客户端升级之前，用旧的 1.7 客户端清理" +#: ../libsvn_wc/wc_db_wcroot.c:318 +#, c-format +msgid "" +"The working copy at '%s'\n" +"is too old (format %d) to work with client version '%s' (expects format %d). " +"You need to upgrade the working copy first.\n" +msgstr "" + +#: ../libsvn_wc/wc_db_wcroot.c:396 +#, c-format +msgid "The symlink at '%s' points nowhere" +msgstr "位于“%s”的符号连接没有指向任何地方" + +#: ../libsvn_wc/wc_db_wcroot.c:661 #, c-format msgid "Missing a row in WCROOT for '%s'." msgstr "WCROOT 中的 '%s' 丢失了一行。" +#: ../libsvn_wc/wc_db_wcroot.c:709 +#, c-format +msgid "The working copy at '%s' is corrupt." +msgstr "位于“%s”的工作副本已损坏。" + +#: ../libsvn_wc/wc_db_wcroot.c:725 +#, c-format +msgid "The working copy database at '%s' is missing." +msgstr "位于“%s”的工作副本数据库丢失。" + +#: ../libsvn_wc/wc_db_wcroot.c:734 +#, c-format +msgid "The working copy database at '%s' is corrupt." +msgstr "位于“%s”的工作副本数据库损坏。" + +#: ../libsvn_wc/wc_db_wcroot.c:881 #, c-format msgid "'%s' is not a working copy root" msgstr "'%s' 不是工作副本根目录" +#: ../libsvn_wc/workqueue.c:517 #, c-format -msgid "Can't install '%s' from pristine store, because no checksum is recorded for this file" +msgid "" +"Can't install '%s' from pristine store, because no checksum is recorded for " +"this file" msgstr "文件 '%s' 没有校验和记录，因此不能从原始内容仓库中安装" +#: ../libsvn_wc/workqueue.c:1498 +#, c-format +msgid "Unrecognized work item in the queue" +msgstr "队列中有无法识别的工作项" + +#: ../libsvn_wc/workqueue.c:1578 #, c-format -msgid "Unrecognized work item in the queue associated with '%s'" -msgstr "“%s” 关联的队列中的项目无法识别" +msgid "" +"Failed to run the WC DB work queue associated with '%s', work item %d %s" +msgstr "运行与“%s”关联的工作副本数据库工作队列失败，工作项 %d %s" +#: ../svn/add-cmd.c:101 msgid "Could not add all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能增加全部目标" +#: ../svn/add-cmd.c:105 msgid "Could not add all targets because some targets are already versioned" msgstr "因为一些目标已经版本化，所以不能增加全部目标" +#: ../svn/blame-cmd.c:303 ../svn/list-cmd.c:300 msgid "'verbose' option invalid in XML mode" msgstr "在XML模式中“verbose”选项无效" +#: ../svn/blame-cmd.c:315 ../svn/info-cmd.c:613 ../svn/list-cmd.c:312 +#: ../svn/status-cmd.c:302 msgid "'incremental' option only valid in XML mode" msgstr "只有在XML模式“incremental”选项才有效" +#: ../svn/blame-cmd.c:378 #, c-format -msgid "Skipping binary file: '%s'\n" -msgstr "略过二进制文件: “%s”\n" +msgid "Skipping binary file (use --force to treat as text): '%s'\n" +msgstr "略过二进制文件(使用 --force 将之视为纯文本):“%s”\n" +#: ../svn/blame-cmd.c:415 msgid "Could not perform blame on all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能追溯全部目标" +#: ../svn/cat-cmd.c:102 msgid "Could not cat all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能显示全部目标" +#: ../svn/cat-cmd.c:106 msgid "Could not cat all targets because some targets are not versioned" msgstr "因为一些目标没有版本化，所以不能显示全部目标" +#: ../svn/cat-cmd.c:110 msgid "Could not cat all targets because some targets are directories" msgstr "因为一些目标是目录，所以不能显示全部目标" -msgid "Could not set changelists on all targets because some targets don't exist" +#: ../svn/changelist-cmd.c:135 +msgid "" +"Could not set changelists on all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能对全部目标设置修改列表" -msgid "Could not set changelists on all targets because some targets are not versioned" +#: ../svn/changelist-cmd.c:140 +msgid "" +"Could not set changelists on all targets because some targets are not " +"versioned" msgstr "因为一些目标没有版本化，所以不能对全部目标设置修改列表" +#: ../svn/checkout-cmd.c:133 ../svn/switch-cmd.c:138 #, c-format msgid "'%s' does not appear to be a URL" msgstr "“%s”不像是URL" +#: ../svn/cl-conflicts.c:80 +msgid "local file edit" +msgstr "本地文件编辑" + +#: ../svn/cl-conflicts.c:82 +msgid "local file obstruction" +msgstr "本地文件障碍" + +#: ../svn/cl-conflicts.c:84 +msgid "local file delete" +msgstr "本地文件删除" + +#: ../svn/cl-conflicts.c:86 +msgid "local file missing" +msgstr "本地文件缺失" + +#: ../svn/cl-conflicts.c:88 +msgid "local file unversioned" +msgstr "本地文件未版本控制" + +#: ../svn/cl-conflicts.c:90 +msgid "local file add" +msgstr "本地文件增加" + +#: ../svn/cl-conflicts.c:92 +msgid "local file replace" +msgstr "本地文件替换" + +#: ../svn/cl-conflicts.c:94 +msgid "local file moved away" +msgstr "本地文件移走" + +#: ../svn/cl-conflicts.c:96 +msgid "local file moved here" +msgstr "本地文件移入" + +#: ../svn/cl-conflicts.c:103 +msgid "local dir edit" +msgstr "本地目录编辑" + +#: ../svn/cl-conflicts.c:105 +msgid "local dir obstruction" +msgstr "本地目录障碍" + +#: ../svn/cl-conflicts.c:107 +msgid "local dir delete" +msgstr "本地目录删除" + +#: ../svn/cl-conflicts.c:109 +msgid "local dir missing" +msgstr "本地目录缺失" + +#: ../svn/cl-conflicts.c:111 +msgid "local dir unversioned" +msgstr "本地目录未版本控制" + +#: ../svn/cl-conflicts.c:113 +msgid "local dir add" +msgstr "本地目录增加" + +#: ../svn/cl-conflicts.c:115 +msgid "local dir replace" +msgstr "本地目录替换" + +#: ../svn/cl-conflicts.c:117 +msgid "local dir moved away" +msgstr "本地目录移走" + +#: ../svn/cl-conflicts.c:119 +msgid "local dir moved here" +msgstr "本地目录移入" + +#: ../svn/cl-conflicts.c:141 +msgid "incoming file edit" +msgstr "进入的文件编辑" + +#: ../svn/cl-conflicts.c:143 +msgid "incoming file add" +msgstr "进入的文件增加" + +#: ../svn/cl-conflicts.c:145 +msgid "incoming file delete" +msgstr "进入的文件删除" + +#: ../svn/cl-conflicts.c:147 +msgid "incoming file replace" +msgstr "进入的文件替换" + +#: ../svn/cl-conflicts.c:154 +msgid "incoming dir edit" +msgstr "进入的目录编辑" + +#: ../svn/cl-conflicts.c:156 +msgid "incoming dir add" +msgstr "进入的目录增加" + +#: ../svn/cl-conflicts.c:158 +msgid "incoming dir delete" +msgstr "进入的目录删除" + +#: ../svn/cl-conflicts.c:160 +msgid "incoming dir replace" +msgstr "进入的目录替换" + +#: ../svn/cl-conflicts.c:178 +msgid "upon update" +msgstr "接着更新" + +#: ../svn/cl-conflicts.c:179 +msgid "upon switch" +msgstr "接着切换" + +#: ../svn/cl-conflicts.c:180 +msgid "upon merge" +msgstr "接着合并" + +#: ../svn/cl-conflicts.c:181 +msgid "upon none" +msgstr "无" + +#: ../svn/cl-conflicts.c:200 +msgid "local edit" +msgstr "本地编辑" + +#: ../svn/cl-conflicts.c:203 +msgid "local add" +msgstr "本地增加" + +#: ../svn/cl-conflicts.c:206 +msgid "local delete" +msgstr "本地删除" + +#: ../svn/cl-conflicts.c:209 +msgid "local obstruction" +msgstr "本地障碍" + +#: ../svn/cl-conflicts.c:212 +#, c-format +msgid "local %s" +msgstr "本地%s" + +#: ../svn/cl-conflicts.c:220 +msgid "incoming edit" +msgstr "进入的编辑" + +#: ../svn/cl-conflicts.c:223 +msgid "incoming add" +msgstr "进入的增加" + +#: ../svn/cl-conflicts.c:226 +msgid "incoming delete" +msgstr "进入的删除" + +#: ../svn/cl-conflicts.c:229 +#, c-format +msgid "incoming %s" +msgstr "进入的 %s" + +#: ../svn/cl-conflicts.c:235 ../svn/cl-conflicts.c:277 +#, c-format +msgid "%s, %s %s" +msgstr "%s, %s %s" + +#. A catch-all message for very rare or nominally impossible cases. +#. It will not be pretty, but is closer to an internal error than +#. an ordinary user-facing string. +#: ../svn/cl-conflicts.c:285 #, c-format -msgid "Working copy locked; try running 'svn cleanup' on the root of the working copy ('%s') instead." +msgid "local: %s %s incoming: %s %s %s" +msgstr "本地: %s %s 进入的: %s %s %s" + +#: ../svn/cleanup-cmd.c:92 +#, c-format +msgid "" +"Working copy locked; try running 'svn cleanup' on the root of the working " +"copy ('%s') instead." msgstr "工作副本被锁定；请先对工作副本(“%s”)根目录执行“svn cleanup”。" +#: ../svn/commit-cmd.c:80 #, c-format -msgid "svn: The depth of this commit is '%s', but copies are always performed recursively in the repository.\n" +msgid "" +"svn: The depth of this commit is '%s', but copies are always performed " +"recursively in the repository.\n" msgstr "svn: 此提交的深度是“%s”，但是在版本库中执行的复制总是递归的。\n" +#: ../svn/commit-cmd.c:116 msgid "Commit targets must be local paths" msgstr "提交目标必须是本地路径" +#: ../svn/conflict-callbacks.c:155 ../svn/conflict-callbacks.c:172 +msgid "MINE" +msgstr "我的" + +#: ../svn/conflict-callbacks.c:160 ../svn/conflict-callbacks.c:170 +msgid "THEIRS" +msgstr "别人的" + +#: ../svn/conflict-callbacks.c:163 +msgid "MERGED" +msgstr "已合并" + +#: ../svn/conflict-callbacks.c:220 ../svn/conflict-callbacks.c:276 msgid "||||||| ORIGINAL" msgstr "||||||| 原始版本" +#: ../svn/conflict-callbacks.c:221 msgid "<<<<<<< MINE (select with 'mc')" msgstr "<<<<<<< 我的版本 (使用 “mc” 选择)" +#: ../svn/conflict-callbacks.c:222 msgid ">>>>>>> THEIRS (select with 'tc')" msgstr ">>>>>>> 他人版本 (使用 “tc” 选择)" +#: ../svn/conflict-callbacks.c:277 +msgid "<<<<<<< MINE" +msgstr "<<<<<<< 我的" + +#: ../svn/conflict-callbacks.c:278 +msgid ">>>>>>> THEIRS" +msgstr ">>>>>>> 别人的" + +#: ../svn/conflict-callbacks.c:333 ../svn/file-merge.c:503 msgid "No editor found." msgstr "没有发现编辑器。" +#: ../svn/conflict-callbacks.c:342 ../svn/file-merge.c:515 msgid "Error running editor." msgstr "执行编辑器错误。" +#: ../svn/conflict-callbacks.c:352 #, c-format msgid "" "Invalid option; there's no merged version to edit.\n" "\n" msgstr "" -"非法选项；没有已合并的版本来编辑。\n" +"无效选项；没有已合并的版本来编辑。\n" "\n" -msgid "No merge tool found.\n" -msgstr "没有发现合并工具。\n" +#: ../svn/conflict-callbacks.c:411 +msgid "No merge tool found, try '(m) merge' instead.\n" +msgstr "没有发现合并工具，请尝试“(m) merge”。\n" -msgid "Error running merge tool." -msgstr "执行合并工具错误。" +#: ../svn/conflict-callbacks.c:419 +msgid "Error running merge tool, try '(m) merge' instead." +msgstr "执行合并工具错误，请尝试“(m) merge”。" -msgid "No editor found; leaving all conflicts." -msgstr "没有发现编辑器；不处理冲突。" +#: ../svn/conflict-callbacks.c:451 +msgid "change merged file in an editor [edit]" +msgstr "在编辑器中修改合并后的文件 [edit]" -msgid "Error running editor; leaving all conflicts." -msgstr "执行编辑器错误；不处理冲突。" +#. Translators: keep long_desc below 70 characters (wrap with a left +#. margin of 9 spaces if needed); don't translate the words within square +#. brackets. +#: ../svn/conflict-callbacks.c:451 +msgid "edit file" +msgstr "编辑文件" -msgid "No merge tool found; leaving all conflicts." -msgstr "没有发现合并工具；不处理冲突。" +#: ../svn/conflict-callbacks.c:454 +msgid "show all changes made to merged file" +msgstr "显示写入合并文件的所有改动" -msgid "Error running merge tool; leaving all conflicts." -msgstr "执行合并工具错误；不处理冲突。" +#: ../svn/conflict-callbacks.c:454 +msgid "show diff" +msgstr "显示差异" -#, c-format -msgid "Conflict discovered in '%s'.\n" -msgstr "在 “%s” 中发现冲突。\n" +#: ../svn/conflict-callbacks.c:456 +msgid "accept merged version of file" +msgstr "接受文件的合并版本" -#, c-format -msgid "Conflict for property '%s' discovered on '%s'.\n" -msgstr "属性 “%s” 冲突，位于 “%s”。\n" +#: ../svn/conflict-callbacks.c:456 ../svn/conflict-callbacks.c:504 +#: ../svn/conflict-callbacks.c:535 ../svn/conflict-callbacks.c:550 +#: ../svn/conflict-callbacks.c:566 ../svn/conflict-callbacks.c:582 +msgid "resolved" +msgstr "已解决" -#, c-format -msgid "They want to delete the property, you want to change the value to '%s'.\n" -msgstr "他人想删除此属性，你想改变其取值为 “%s”。\n" +#: ../svn/conflict-callbacks.c:459 ../svn/conflict-callbacks.c:501 +msgid "display conflict" +msgstr "显示冲突" -#, c-format -msgid "They want to change the property value to '%s', you want to delete the property.\n" -msgstr "他人想改变其取值为 “%s”，你想删除此属性。\n" +#: ../svn/conflict-callbacks.c:459 +msgid "show all conflicts (ignoring merged version)" +msgstr "显示所有冲突 (忽略已合并版本)" -msgid "Select: (p) postpone" -msgstr "选择: (p) 推迟" +#: ../svn/conflict-callbacks.c:461 +msgid "accept my version for all conflicts (same) [mine-conflict]" +msgstr "对于所有冲突，使用我的版本 [mine-conflict]" -msgid ", (df) diff-full, (e) edit" -msgstr "，(df) 显示全部差异，(e) 编辑" +#: ../svn/conflict-callbacks.c:461 ../svn/conflict-callbacks.c:547 +#: ../svn/conflict-callbacks.c:563 ../svn/conflict-callbacks.c:579 +msgid "my side of conflict" +msgstr "我这边的冲突" -msgid ", (r) resolved" -msgstr "，(r) 已解决" +#: ../svn/conflict-callbacks.c:464 +msgid "accept their version for all conflicts (same) [theirs-conflict]" +msgstr "对于所有冲突，使用他们的版本 [theirs-conflict]" -msgid "" -",\n" -" (mc) mine-conflict, (tc) theirs-conflict" +#: ../svn/conflict-callbacks.c:464 +msgid "their side of conflict" +msgstr "他们的冲突" + +#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:495 +msgid "accept my version of entire file (even non-conflicts) [mine-full]" +msgstr "整个文件使用我的版本(纵然没有冲突) [mine-full]" + +#: ../svn/conflict-callbacks.c:469 ../svn/conflict-callbacks.c:495 +#: ../svn/conflict-callbacks.c:518 +msgid "my version" +msgstr "我的版本" + +#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:498 +msgid "accept their version of entire file (same) [theirs-full]" +msgstr "整个文件使用他们的版本 [theirs-full]" + +#: ../svn/conflict-callbacks.c:472 ../svn/conflict-callbacks.c:498 +#: ../svn/conflict-callbacks.c:521 +msgid "their version" +msgstr "他们的版本" + +#: ../svn/conflict-callbacks.c:476 ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:515 +msgid "mark the conflict to be resolved later [postpone]" +msgstr "编辑冲突推迟解决 [postpone]" + +#: ../svn/conflict-callbacks.c:476 ../svn/conflict-callbacks.c:492 +#: ../svn/conflict-callbacks.c:515 ../svn/conflict-callbacks.c:533 +#: ../svn/conflict-callbacks.c:545 ../svn/conflict-callbacks.c:561 +#: ../svn/conflict-callbacks.c:577 +msgid "postpone" +msgstr "推迟" + +#: ../svn/conflict-callbacks.c:479 ../svn/util.c:774 +msgid "merge" +msgstr "合并" + +#: ../svn/conflict-callbacks.c:479 +msgid "use internal merge tool to resolve conflict" +msgstr "使用内部合并工具解决冲突" + +#: ../svn/conflict-callbacks.c:481 +msgid "launch external tool to resolve conflict [launch]" +msgstr "执行外部工具解决冲突 [launch]" + +#: ../svn/conflict-callbacks.c:481 +msgid "launch tool" +msgstr "执行工具" + +#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506 +#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537 +#: ../svn/conflict-callbacks.c:553 ../svn/conflict-callbacks.c:569 +#: ../svn/conflict-callbacks.c:585 +msgid "postpone all remaining conflicts" +msgstr "推迟解决所有剩余的冲突" + +#: ../svn/conflict-callbacks.c:483 ../svn/conflict-callbacks.c:506 +#: ../svn/conflict-callbacks.c:524 ../svn/conflict-callbacks.c:537 +#: ../svn/conflict-callbacks.c:553 ../svn/conflict-callbacks.c:569 +#: ../svn/conflict-callbacks.c:585 +msgid "quit resolution" +msgstr "退出解决冲突" + +#: ../svn/conflict-callbacks.c:485 +msgid "show all options" +msgstr "显示全部选项" + +#: ../svn/conflict-callbacks.c:485 +msgid "show this list (also 'h', '?')" +msgstr "显示此列表(同 'h' 或 '?')" + +#: ../svn/conflict-callbacks.c:501 +msgid "show conflicts in this property" +msgstr "显示此属性的冲突" + +#: ../svn/conflict-callbacks.c:502 +msgid "change merged property value in an editor [edit]" +msgstr "在编辑器中修改已经合并的属性值 [edit]" + +#: ../svn/conflict-callbacks.c:502 +msgid "edit property" +msgstr "编辑属性" + +#: ../svn/conflict-callbacks.c:504 +msgid "accept edited version of property" +msgstr "接受属性的编辑版本" + +#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526 +#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:555 +#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587 +msgid "help" +msgstr "帮助" + +#: ../svn/conflict-callbacks.c:508 ../svn/conflict-callbacks.c:526 +#: ../svn/conflict-callbacks.c:539 ../svn/conflict-callbacks.c:555 +#: ../svn/conflict-callbacks.c:571 ../svn/conflict-callbacks.c:587 +msgid "show this help (also '?')" +msgstr "显示此帮助(同 '?')" + +#: ../svn/conflict-callbacks.c:518 +msgid "accept pre-existing item (ignore upstream addition) [mine-full]" +msgstr "接受已有项 (覆盖进入的项) [mine-full]" + +#: ../svn/conflict-callbacks.c:521 +msgid "accept incoming item (overwrite pre-existing item) [theirs-full]" +msgstr "接受进入的项 (覆盖已有项) [theirs-full]" + +#: ../svn/conflict-callbacks.c:533 ../svn/conflict-callbacks.c:545 +#: ../svn/conflict-callbacks.c:561 ../svn/conflict-callbacks.c:577 +msgid "resolve the conflict later [postpone]" +msgstr "推迟解决冲突 [postpone]" + +#: ../svn/conflict-callbacks.c:535 +msgid "accept current working copy state" +msgstr "接受当前的工作副本路径状态" + +#: ../svn/conflict-callbacks.c:547 +msgid "apply update to the move destination [mine-conflict]" msgstr "" -",\n" -" (mc) 我的版本, (tc) 他人的版本" -msgid "" -",\n" -" (mf) mine-full, (tf) theirs-full" +#: ../svn/conflict-callbacks.c:550 +msgid "mark resolved (the move will become a copy)" +msgstr "" + +#: ../svn/conflict-callbacks.c:563 +msgid "keep any moves affected by this deletion [mine-conflict]" msgstr "" -",\n" -" (mf) 全用我的, (tf) 全用他人的" -msgid "(s) show all options: " -msgstr "(s) 显示全部选项: " +#: ../svn/conflict-callbacks.c:566 ../svn/conflict-callbacks.c:582 +msgid "mark resolved (any affected moves will become copies)" +msgstr "" + +#: ../svn/conflict-callbacks.c:579 +msgid "keep any moves affected by this replacement [mine-conflict]" +msgstr "" +#: ../svn/conflict-callbacks.c:616 +msgid "Select:" +msgstr "选择:" + +#: ../svn/conflict-callbacks.c:643 #, c-format +msgid " (%s) %s" +msgstr " (%s) %s" + +#: ../svn/conflict-callbacks.c:683 msgid "" -"\n" -" (e) edit - change merged file in an editor\n" -" (df) diff-full - show all changes made to merged file\n" -" (r) resolved - accept merged version of file\n" -"\n" -" (dc) display-conflict - show all conflicts (ignoring merged version)\n" -" (mc) mine-conflict - accept my version for all conflicts (same)\n" -" (tc) theirs-conflict - accept their version for all conflicts (same)\n" -"\n" -" (mf) mine-full - accept my version of entire file (even non-conflicts)\n" -" (tf) theirs-full - accept their version of entire file (same)\n" -"\n" -" (p) postpone - mark the conflict to be resolved later\n" -" (l) launch - launch external tool to resolve conflict\n" -" (s) show all - show this list\n" -"\n" +"Words in square brackets are the corresponding --accept option arguments.\n" msgstr "" + +#: ../svn/conflict-callbacks.c:722 +#, c-format +msgid "" +"Unrecognized option.\n" "\n" -" (e) 编辑 - 使用编辑器修改合并后的文件\n" -" (df) 显示全部差异 - 显示合并文件后的所有修改\n" -" (r) 解决 - 使用合并后的文件\n" -"\n" -" (dc) 显示冲突 - 显示全部冲突(忽略已经合并的版本)\n" -" (mc) 我的版本 - 使用我的版本解决冲突(同上)\n" -" (tc) 他人的版本 - 使用他人的版本解决冲突(同上)\n" -"\n" -" (mf) 全用我的 - 全部使用我的版本(包含不冲突的文件)\n" -" (tf) 全用他人的 - 全部使用他人的版本(同上)\n" -"\n" -" (p) 推迟 - 标记以后解决冲突\n" -" (l) 执行 - 使用第三方工具解决冲突\n" -" (s) 显示全部选项 - 显示这个列表\n" +msgstr "" +"不能识别的选项。\n" "\n" +#: ../svn/conflict-callbacks.c:750 +#, c-format +msgid "Conflict discovered in file '%s'.\n" +msgstr "在文件“%s”中发现冲突。\n" + +#: ../svn/conflict-callbacks.c:820 #, c-format msgid "" -"Invalid option; cannot choose based on conflicts in a binary file.\n" +"Invalid option; cannot display conflicts for a binary file.\n" "\n" msgstr "" -"非法选项；不能为二进制文件冲突选择基准。\n" +"无效选项；不能显示二进制文件的冲突。\n" "\n" +#: ../svn/conflict-callbacks.c:829 #, c-format msgid "" -"Invalid option; cannot choose based on conflicts for properties.\n" +"Invalid option; original files not available.\n" "\n" msgstr "" -"非法选项；不能为属性冲突选择基准。\n" +"无效选项；原始文件不可用。\n" "\n" +#: ../svn/conflict-callbacks.c:841 #, c-format msgid "" -"Invalid option; cannot display conflicts for a binary file.\n" +"Invalid option; there's no merged version to diff.\n" "\n" msgstr "" -"非法选项；不能显示二进制文件的冲突。\n" +"无效选项；没有已合并的版本来比较差异。\n" "\n" +#: ../svn/conflict-callbacks.c:861 #, c-format msgid "" -"Invalid option; cannot display conflicts for properties.\n" +"Invalid option; can only resolve text conflicts with the internal merge " +"tool.\n" "\n" msgstr "" -"非法选项；不能显示属性的冲突。\n" +"无效选项；只能使用内部合并工具来解决纯文本冲突。\n" "\n" +#: ../svn/conflict-callbacks.c:887 ../svn/conflict-callbacks.c:904 #, c-format msgid "" -"Invalid option; original files not available.\n" +"Invalid option.\n" "\n" msgstr "" -"非法选项；原始文件不可用。\n" +"无效选项。\n" "\n" +#: ../svn/conflict-callbacks.c:913 #, c-format msgid "" -"Invalid option; there's no merged version to diff.\n" +"Invalid option; cannot choose based on conflicts in a binary file.\n" "\n" msgstr "" -"非法选项；没有已合并的版本来比较差异。\n" +"无效选项；不能为二进制文件冲突选择基准。\n" "\n" +#: ../svn/conflict-callbacks.c:927 #, c-format msgid "" -"Invalid option; cannot resolve property conflicts with an external merge tool.\n" +"Invalid option; use diff/edit/merge/launch before choosing 'resolved'.\n" "\n" msgstr "" -"非法选项；不能使用外部合并工具来解决属性冲突。\n" -"\n" +#: ../svn/conflict-callbacks.c:968 +#, c-format +msgid "Conflict for property '%s' discovered on '%s'.\n" +msgstr "属性 “%s” 冲突，位于 “%s”。\n" + +#: ../svn/conflict-callbacks.c:1026 #, c-format msgid "" -"Invalid option.\n" +"Invalid option; please edit the property first.\n" "\n" msgstr "" -"无效选项。\n" +"无效选项；请先编辑属性。\n" "\n" +#: ../svn/conflict-callbacks.c:1063 +#, c-format +msgid "" +"Tree conflict on '%s'\n" +" > %s\n" +msgstr "" +"树冲突于“%s”\n" +" > %s\n" + +#: ../svn/conflict-callbacks.c:1128 #, c-format msgid "" "Conflict discovered when trying to add '%s'.\n" @@ -5961,50 +8796,126 @@ msgstr "" "增加 “%s” 时出现冲突。\n" "同名对象已存在。\n" -msgid "Select: (p) postpone, (mf) mine-full, (tf) theirs-full, (h) help:" -msgstr "选择：(p) 推迟，(mf) 全用我的，(tf) 全用他人的，(h) 帮助：" +#: ../svn/conflict-callbacks.c:1226 +msgid "No editor found; leaving all conflicts." +msgstr "没有发现编辑器；不处理冲突。" -#, c-format -msgid "" -" (p) postpone - resolve the conflict later\n" -" (mf) mine-full - accept pre-existing item (ignore upstream addition)\n" -" (tf) theirs-full - accept incoming item (overwrite pre-existing item)\n" -" (h) help - show this help\n" -"\n" -msgstr "" -" (p) 推迟 - 以后解决冲突\n" -" (mf) 全用我的 - 使用先前的项目(忽略上游的修改)\n" -" (tf) 全用他人的 - 使用引入的项目(覆盖先前的项目)\n" -" (h) 帮助 - 显示这个列表\n" -"\n" +#: ../svn/conflict-callbacks.c:1235 +msgid "Error running editor; leaving all conflicts." +msgstr "执行编辑器错误；不处理冲突。" -msgid "Local, non-commit operations do not take a log message or revision properties" -msgstr "本地操作，非提交操作无须日志信息或版本属性" +#: ../svn/conflict-callbacks.c:1271 +msgid "No merge tool found; leaving all conflicts." +msgstr "没有发现合并工具；不处理冲突。" -#, c-format -msgid "Can't open stdout" -msgstr "无法打开标准输出" +#: ../svn/conflict-callbacks.c:1280 +msgid "Error running merge tool; leaving all conflicts." +msgstr "执行合并工具错误；不处理冲突。" +#: ../svn/copy-cmd.c:123 ../svn/util.c:957 #, c-format -msgid "Can't open stderr" -msgstr "无法打开标准错误" +msgid "'%s': a peg revision is not allowed here" +msgstr "'%s': 此处不允许铆钉版本范围" + +#: ../svn/copy-cmd.c:163 ../svn/delete-cmd.c:69 ../svn/mkdir-cmd.c:68 +#: ../svn/move-cmd.c:77 ../svn/propedit-cmd.c:260 +msgid "" +"Local, non-commit operations do not take a log message or revision properties" +msgstr "本地操作，非提交操作无须日志信息或版本属性" +#: ../svn/diff-cmd.c:208 msgid "'--xml' option only valid with '--summarize' option" msgstr "“--xml” 选项只能与 “--summarize” 同时使用" +#: ../svn/diff-cmd.c:299 msgid "'--new' option only valid with '--old' option" msgstr "“--new” 选项只能与 “--old” 同时使用" +#: ../svn/diff-cmd.c:317 +msgid "" +"'svn diff [-r N[:M]] [TARGET[@REV]...]' does not support mixed target types. " +"Try using the --old and --new options or one of the shorthand invocations " +"listed in 'svn help diff'." +msgstr "" +"“svn diff [-r N[:M]] [TARGET[@REV]...]”不支持混合目标类型。请尝试使用 --old " +"和 --new 选项或者“svn help diff”列出的缩写。" + +#: ../svn/diff-cmd.c:355 #, c-format msgid "Path '%s' not relative to base URLs" msgstr "路径“%s”不是相对于基础 URL" -msgid "Destination directory exists; please remove the directory or use --force to overwrite" +#: ../svn/export-cmd.c:113 +msgid "" +"Destination directory exists; please remove the directory or use --force to " +"overwrite" msgstr "目的目录已存在；请删除目录或用 --force 来覆盖目录" +#: ../svn/export-cmd.c:122 ../svn/list-cmd.c:412 ../svn/switch-cmd.c:188 +#: ../svn/update-cmd.c:177 msgid "Failure occurred processing one or more externals definitions" msgstr "处理一个或更多的外部定义失败" +#: ../svn/file-merge.c:135 ../svn/file-merge.c:785 +msgid "Could not write data to merged file" +msgstr "无法写入数据到已经合并文件" + +#: ../svn/file-merge.c:491 +msgid "Could not write data to temporary file" +msgstr "无法写入数据到临时文件" + +#: ../svn/file-merge.c:600 +msgid "Conflicting section found during merge:" +msgstr "" + +#: ../svn/file-merge.c:603 +#, c-format +msgid "(1) their version (at line %lu)" +msgstr "(1) 他们的版本 (第 %lu 行)" + +#: ../svn/file-merge.c:608 +#, c-format +msgid "(2) your version (at line %lu)" +msgstr "(2) 你的版本 (第 %lu 行)" + +#: ../svn/file-merge.c:657 +msgid "" +"Select: (1) use their version, (2) use your version,\n" +" (e1) edit their version and use the result,\n" +" (e2) edit your version and use the result,\n" +" (eb) edit both versions and use the result,\n" +" (p) postpone this conflicting section leaving conflict markers,\n" +" (a) abort file merge and return to main menu: " +msgstr "" + +#: ../svn/file-merge.c:868 +#, c-format +msgid "Merging '%s'.\n" +msgstr "正在合并“%s”。\n" + +#: ../svn/file-merge.c:915 +#, c-format +msgid "Merge of '%s' aborted.\n" +msgstr "路径 '%s' 的合并中止。\n" + +#: ../svn/file-merge.c:933 +#, c-format +msgid "" +"Could not write merged result to '%s', saved instead at '%s'.\n" +"'%s' remains in conflict.\n" +msgstr "" + +#: ../svn/file-merge.c:951 +#, c-format +msgid "Merge of '%s' completed (remains in conflict).\n" +msgstr "“%s”的合并完成(仍旧处于冲突状态)。\n" + +#: ../svn/file-merge.c:955 +#, c-format +msgid "Merge of '%s' completed.\n" +msgstr "“%s”的合并完成。\n" + +#: ../svn/help-cmd.c:53 #, c-format msgid "" "usage: svn <subcommand> [options] [args]\n" @@ -6030,6 +8941,7 @@ msgstr "" "\n" "可用的子命令: \n" +#: ../svn/help-cmd.c:66 msgid "" "Subversion is a tool for version control.\n" "For additional information, see http://subversion.apache.org/\n" @@ -6037,6 +8949,7 @@ msgstr "" "Subversion 是版本控制工具。\n" "欲取得详细资料，请参阅 http://subversion.apache.org/\n" +#: ../svn/help-cmd.c:73 ../svnrdump/svnrdump.c:659 ../svnsync/svnsync.c:1856 msgid "" "The following repository access (RA) modules are available:\n" "\n" @@ -6044,165 +8957,229 @@ msgstr "" "可使用以下的版本库访问模块: \n" "\n" +#: ../svn/help-cmd.c:127 +msgid "" +"WARNING: Plaintext password storage is enabled!\n" +"\n" +msgstr "" + +#: ../svn/import-cmd.c:87 msgid "Repository URL required when importing" msgstr "导入时必须提供版本库的URL" +#: ../svn/import-cmd.c:91 msgid "Too many arguments to import command" msgstr "导入命令参数太多" +#: ../svn/import-cmd.c:107 #, c-format msgid "Invalid URL '%s'" msgstr "无效URL“%s”" +#: ../svn/info-cmd.c:95 msgid "Resource is not under version control." msgstr "资源尚未纳入版本控制" +#: ../svn/info-cmd.c:266 ../svnadmin/svnadmin.c:1774 #, c-format msgid "Path: %s\n" msgstr "路径: %s\n" +#: ../svn/info-cmd.c:273 #, c-format msgid "Name: %s\n" msgstr "名称: %s\n" +#: ../svn/info-cmd.c:277 #, c-format msgid "Working Copy Root Path: %s\n" msgstr "工作副本根目录: %s\n" +#: ../svn/info-cmd.c:283 #, c-format msgid "URL: %s\n" msgstr "URL: %s\n" +#: ../svn/info-cmd.c:286 +#, c-format +msgid "Relative URL: ^/%s\n" +msgstr "正确的相对 URL: ^/%s\n" + +#: ../svn/info-cmd.c:293 #, c-format msgid "Repository Root: %s\n" msgstr "版本库根: %s\n" +#: ../svn/info-cmd.c:297 #, c-format msgid "Repository UUID: %s\n" msgstr "版本库 UUID: %s\n" +#: ../svn/info-cmd.c:301 #, c-format msgid "Revision: %ld\n" msgstr "版本: %ld\n" +#: ../svn/info-cmd.c:306 #, c-format msgid "Node Kind: file\n" msgstr "节点种类: 文件\n" +#: ../svn/info-cmd.c:310 #, c-format msgid "Node Kind: directory\n" msgstr "节点种类: 目录\n" +#: ../svn/info-cmd.c:314 #, c-format msgid "Node Kind: none\n" msgstr "节点种类: 无\n" +#: ../svn/info-cmd.c:319 #, c-format msgid "Node Kind: unknown\n" msgstr "节点种类: 未知\n" +#: ../svn/info-cmd.c:328 #, c-format msgid "Schedule: normal\n" msgstr "调度: 正常\n" +#: ../svn/info-cmd.c:332 #, c-format msgid "Schedule: add\n" msgstr "调度: 增加\n" +#: ../svn/info-cmd.c:336 #, c-format msgid "Schedule: delete\n" msgstr "调度: 删除\n" +#: ../svn/info-cmd.c:340 #, c-format msgid "Schedule: replace\n" msgstr "调度: 替换\n" +#: ../svn/info-cmd.c:356 #, c-format msgid "Depth: empty\n" msgstr "深度: 空\n" +#: ../svn/info-cmd.c:360 #, c-format msgid "Depth: files\n" msgstr "深度: 文件\n" +#: ../svn/info-cmd.c:364 #, c-format msgid "Depth: immediates\n" msgstr "深度: 直接\n" +#: ../svn/info-cmd.c:368 #, c-format msgid "Depth: exclude\n" msgstr "深度: 排除\n" #. Other depths should never happen here. +#: ../svn/info-cmd.c:379 #, c-format msgid "Depth: INVALID\n" msgstr "深度: 非法\n" +#: ../svn/info-cmd.c:383 #, c-format msgid "Copied From URL: %s\n" msgstr "从URL %s 复制: \n" +#: ../svn/info-cmd.c:387 #, c-format msgid "Copied From Rev: %ld\n" msgstr "从版本 %ld 复制: \n" +#: ../svn/info-cmd.c:396 ../svn/info-cmd.c:398 +#, c-format +msgid "Moved From: %s\n" +msgstr "移自: %s\n" + +#: ../svn/info-cmd.c:409 ../svn/info-cmd.c:411 +#, c-format +msgid "Moved To: %s\n" +msgstr "移到: %s\n" + +#: ../svn/info-cmd.c:417 #, c-format msgid "Last Changed Author: %s\n" msgstr "最后修改的作者: %s\n" +#: ../svn/info-cmd.c:421 #, c-format msgid "Last Changed Rev: %ld\n" msgstr "最后修改的版本: %ld\n" +#: ../svn/info-cmd.c:426 msgid "Last Changed Date" msgstr "最后修改的时间" +#: ../svn/info-cmd.c:432 msgid "Text Last Updated" msgstr "文本最后更新" +#: ../svn/info-cmd.c:435 #, c-format msgid "Checksum: %s\n" msgstr "校验和: %s\n" +#: ../svn/info-cmd.c:456 #, c-format msgid "Conflict Previous Base File: %s\n" msgstr "与之前的参考文件冲突: %s\n" +#: ../svn/info-cmd.c:463 #, c-format msgid "Conflict Previous Working File: %s\n" msgstr "与之前的工作文件冲突: %s\n" +#: ../svn/info-cmd.c:470 #, c-format msgid "Conflict Current Base File: %s\n" msgstr "与当前的参考文件冲突: %s\n" +#: ../svn/info-cmd.c:479 #, c-format msgid "Conflict Properties File: %s\n" msgstr "属性冲突的文件: %s\n" +#: ../svn/info-cmd.c:491 msgid "Tree conflict" msgstr "树冲突" +#: ../svn/info-cmd.c:517 msgid "Source left" msgstr "源 左边" +#: ../svn/info-cmd.c:526 msgid "Source right" msgstr "源 右边" +#: ../svn/info-cmd.c:535 #, c-format msgid "Lock Token: %s\n" msgstr "锁定令牌: %s\n" +#: ../svn/info-cmd.c:539 #, c-format msgid "Lock Owner: %s\n" msgstr "锁定所有者: %s\n" +#: ../svn/info-cmd.c:544 msgid "Lock Created" msgstr "已创建锁定" +#: ../svn/info-cmd.c:548 msgid "Lock Expires" msgstr "锁定过期" +#: ../svn/info-cmd.c:556 #, c-format msgid "" "Lock Comment (%i line):\n" @@ -6214,129 +9191,954 @@ msgstr[0] "" "锁定注释(%i 行): \n" "%s\n" +#: ../svn/info-cmd.c:565 #, c-format msgid "Changelist: %s\n" msgstr "修改列表: %s\n" +#: ../svn/info-cmd.c:679 msgid "Could not display info for all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能显示全部目标" +#: ../svn/list-cmd.c:73 msgid "%b %d %H:%M" msgstr "%b %d %H:%M" +#: ../svn/list-cmd.c:75 msgid "%b %d %Y" msgstr "%Y-%m-%d" +#: ../svn/list-cmd.c:101 +#, fuzzy, c-format +msgid "Listing external '%s' defined on '%s':\n" +msgstr "" +"\n" +"正在取得外部项目至 '%s':\n" + +#: ../svn/list-cmd.c:421 msgid "Could not list all targets because some targets don't exist" msgstr "因为一些目标不存在，所以不能列出全部目标" +#: ../svn/lock-cmd.c:58 msgid "Lock comment contains a zero byte" msgstr "加锁注释中有一个零字节" +#: ../svn/log-cmd.c:144 +msgid "\n" +msgstr "\n" + +#: ../svn/log-cmd.c:354 msgid "(no author)" msgstr "(没有作者信息)" +#: ../svn/log-cmd.c:360 msgid "(no date)" msgstr "(没有时间信息)" +#: ../svn/log-cmd.c:385 #, c-format msgid " | %d line" msgid_plural " | %d lines" msgstr[0] " | %d 行" +#: ../svn/log-cmd.c:401 #, c-format msgid "Changed paths:\n" msgstr "改变的路径: \n" +#: ../svn/log-cmd.c:418 #, c-format msgid " (from %s:%ld)" msgstr " (从 %s:%ld)" +#: ../svn/log-cmd.c:434 #, c-format msgid "Reverse merged via:" msgstr "已经撤销合并，通过:" +#: ../svn/log-cmd.c:436 #, c-format msgid "Merged via:" msgstr "合并通过: " -#, c-format -msgid "\n" -msgstr "\n" - +#: ../svn/log-cmd.c:689 msgid "'with-all-revprops' option only valid in XML mode" msgstr "只有在 XML 模式 “with-all-revprops” 选项才有效" +#: ../svn/log-cmd.c:693 msgid "'with-no-revprops' option only valid in XML mode" msgstr "只有在 XML 模式 “with-no-revprops” 选项才有效" +#: ../svn/log-cmd.c:697 msgid "'with-revprop' option only valid in XML mode" msgstr "只有在 XML 模式 “with-revprop” 选项才有效" +#: ../svn/log-cmd.c:704 msgid "'diff' option is not supported in XML mode" msgstr "在 XML 模式不支持 'diff' 选项" +#: ../svn/log-cmd.c:710 msgid "'quiet' and 'diff' options are mutually exclusive" msgstr "'quiet' 与 'diff' 选项是互斥的" +#: ../svn/log-cmd.c:714 msgid "'diff-cmd' option requires 'diff' option" msgstr "'diff-cmd' 选项需要 'diff' 选项" +#: ../svn/log-cmd.c:718 msgid "'internal-diff' option requires 'diff' option" msgstr "'internal-diff' 选项需要 'diff' 选项" +#: ../svn/log-cmd.c:722 msgid "'extensions' option requires 'diff' option" msgstr "'extensions' 选项徐啊哟 'diff' 选项" +#: ../svn/log-cmd.c:727 msgid "'depth' option requires 'diff' option" msgstr "'depth' 选项需要 'diff' 选项" +#: ../svn/log-cmd.c:743 msgid "-c and -r are mutually exclusive" msgstr "-c 与 -r 是互斥的" +#: ../svn/log-cmd.c:775 #, c-format -msgid "Only relative paths can be specified after a URL for 'svn log', but '%s' is not a relative path" +msgid "" +"Only relative paths can be specified after a URL for 'svn log', but '%s' is " +"not a relative path" msgstr "对于 'svn log'，在 URL 后只能指定相对路径，但 '%s' 不是相对路径" +#: ../svn/log-cmd.c:821 #, c-format msgid "cannot assign with 'with-revprop' option (drop the '=')" msgstr "选项 'with-revprop' 不接受赋值(请删除 '=')" +#: ../svn/merge-cmd.c:107 ../svn/merge-cmd.c:131 +#, c-format +msgid "--- Merging\n" +msgstr "--- 正在合并\n" + +#: ../svn/merge-cmd.c:175 +msgid "-r and -c can't be used with --reintegrate" +msgstr "-r 和 -c 不能与 --reintegrate 共存" + +#: ../svn/merge-cmd.c:230 +msgid "Merge source required" +msgstr "需要合并源" + +#: ../svn/merge-cmd.c:276 +msgid "Second revision required" +msgstr "需要第二个版本" + +#: ../svn/merge-cmd.c:285 ../svn/merge-cmd.c:312 ../svn/mergeinfo-cmd.c:267 +#: ../svnadmin/svnadmin.c:1749 ../svnlook/svnlook.c:2060 +#: ../svnlook/svnlook.c:2253 ../svnlook/svnlook.c:2357 +#: ../svnlook/svnlook.c:2392 +msgid "Too many arguments given" +msgstr "参数过多" + +#: ../svn/merge-cmd.c:302 +msgid "Cannot specify a revision range with two URLs" +msgstr "不能对两个 URL 指定版本范围" + +#: ../svn/merge-cmd.c:406 +msgid "--reintegrate cannot be used with --ignore-ancestry" +msgstr "--reintegrate 不能与 --ignore-ancestry 共存" + +#: ../svn/merge-cmd.c:411 +msgid "--reintegrate cannot be used with --record-only" +msgstr "--reintegrate 不能与 --record-only 共存" + +#: ../svn/merge-cmd.c:416 +msgid "--depth cannot be used with --reintegrate" +msgstr "--depth 不能与 --reintegrate 共存" + +#: ../svn/merge-cmd.c:421 +msgid "--force cannot be used with --reintegrate" +msgstr "--force 不能与 --reintegrate 共存" + +#: ../svn/merge-cmd.c:426 +msgid "--reintegrate can only be used with a single merge source" +msgstr "--reintegrate 只能用于单一合并源" + +#: ../svn/merge-cmd.c:430 +msgid "--allow-mixed-revisions cannot be used with --reintegrate" +msgstr "--allow-mixed-revisions 不能与 --reintegrate 共存" + +#: ../svn/merge-cmd.c:445 +msgid "" +"Merge tracking not possible, use --ignore-ancestry or\n" +"fix invalid mergeinfo in target with 'svn propset'" +msgstr "" +"不能执行合并跟踪，对目标使用“svn propset”修正非法合并信息，或者使用选项\n" +"--ignore-ancestry" + +#: ../svn/mergeinfo-cmd.c:171 +msgid "last full merge" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:171 +msgid "youngest common ancestor" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:172 +msgid "repository path" +msgstr "版本库路径" + +#: ../svn/mergeinfo-cmd.c:172 +msgid "tip of branch" +msgstr "" + +#: ../svn/mergeinfo-cmd.c:264 +msgid "Not enough arguments given" +msgstr "没有提供足够的参数" + +#: ../svn/mergeinfo-cmd.c:342 +msgid "--revision (-r) option valid only with --show-revs option" +msgstr "--revision (-r) 选项只能与 --show-revs 同时使用" + +#: ../svn/mergeinfo-cmd.c:346 +msgid "Depth specification options valid only with --show-revs option" +msgstr "" + +#: ../svn/mkdir-cmd.c:92 +msgid "Try 'svn add' or 'svn add --non-recursive' instead?" +msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替？" + +#: ../svn/mkdir-cmd.c:98 +msgid "Try 'svn mkdir --parents' instead?" +msgstr "尝试 “svn mkdir --parents”？" + +#: ../svn/notify.c:132 +#, c-format +msgid "%d remaining" +msgid_plural "%d remaining" +msgstr[0] "剩余 %d" + +#: ../svn/notify.c:141 +#, c-format +msgid "and %d already resolved" +msgid_plural "and %d already resolved" +msgstr[0] "%d 个已经解决" + +#: ../svn/notify.c:163 ../svn/status-cmd.c:90 +#, c-format +msgid "Summary of conflicts:\n" +msgstr "冲突概要：\n" + +#: ../svn/notify.c:169 +#, c-format +msgid " Text conflicts: %d\n" +msgstr " 正文冲突：%d\n" + +#: ../svn/notify.c:173 +#, c-format +msgid " Property conflicts: %d\n" +msgstr " 属性冲突：%d\n" + +#: ../svn/notify.c:177 +#, c-format +msgid " Tree conflicts: %d\n" +msgstr " 树冲突：%d\n" + +#: ../svn/notify.c:184 +#, c-format +msgid " Text conflicts: %s (%s)\n" +msgstr " 正文冲突：%s (%s)\n" + +#: ../svn/notify.c:189 +#, c-format +msgid " Property conflicts: %s (%s)\n" +msgstr " 属性冲突：%s (%s)\n" + +#: ../svn/notify.c:194 +#, c-format +msgid " Tree conflicts: %s (%s)\n" +msgstr " 树冲突：%s (%s)\n" + +#: ../svn/notify.c:200 +#, c-format +msgid " Skipped paths: %d\n" +msgstr " 跳过的路径：%d\n" + +#: ../svn/notify.c:235 +#, c-format +msgid "Skipped missing target: '%s'\n" +msgstr "跳过缺少的目标: “%s”\n" + +#: ../svn/notify.c:242 +#, c-format +msgid "Skipped target: '%s' -- copy-source is missing\n" +msgstr "跳过目标: '%s' -- copy-source 丢失\n" + +#: ../svn/notify.c:249 +#, c-format +msgid "Skipped '%s'\n" +msgstr "跳过“%s”\n" + +#: ../svn/notify.c:256 +#, c-format +msgid "Skipped '%s' -- An obstructing working copy was found\n" +msgstr "忽略“%s” -- 发现障碍工作副本\n" + +#: ../svn/notify.c:263 +#, c-format +msgid "Skipped '%s' -- Has no versioned parent\n" +msgstr "已跳过 '%s' -- 没有已版本控制的父亲\n" + +#: ../svn/notify.c:270 +#, c-format +msgid "Skipped '%s' -- Access denied\n" +msgstr "已跳过 '%s' -- 拒绝访问\n" + +#: ../svn/notify.c:277 +#, c-format +msgid "Skipped '%s' -- Node remains in conflict\n" +msgstr "已跳过 '%s' -- 节点处于冲突状态\n" + +#: ../svn/notify.c:358 +#, c-format +msgid "Restored '%s'\n" +msgstr "已还原“%s”\n" + +#: ../svn/notify.c:364 +#, c-format +msgid "Reverted '%s'\n" +msgstr "已恢复“%s”\n" + +#: ../svn/notify.c:370 +#, c-format +msgid "Failed to revert '%s' -- try updating instead.\n" +msgstr "无法恢复“%s”-- 请改用更新试试。\n" + +#: ../svn/notify.c:378 +#, c-format +msgid "Resolved conflicted state of '%s'\n" +msgstr "“%s”的冲突状态已解决\n" + +#: ../svn/notify.c:473 ../svn/notify.c:513 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" +msgstr "> 已应用块 ## -%lu,%lu +%lu,%lu ##，偏移 %s" + +#: ../svn/notify.c:490 ../svn/notify.c:527 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" +msgstr "> 已应用块 @@ -%lu,%lu +%lu,%lu @@ 偏移 %s" + +#: ../svn/notify.c:548 +#, c-format +msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" +msgstr "> 已应用块 ## -%lu,%lu +%lu,%lu ## 模糊 %lu (%s)\n" + +#: ../svn/notify.c:558 +#, c-format +msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" +msgstr "> 已应用块 @@ -%lu,%lu +%lu,%lu @@ 模糊 %lu\n" + +#: ../svn/notify.c:576 +#, c-format +msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" +msgstr "> 已拒绝块 ## -%lu,%lu +%lu,%lu ## (%s)\n" + +#: ../svn/notify.c:585 +#, c-format +msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" +msgstr "> 已拒绝的块 @@ -%lu,%lu +%lu,%lu @@\n" + +#: ../svn/notify.c:599 +#, c-format +msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" +msgstr "> 块 ## -%lu,%lu +%lu,%lu ## 已经应用 (%s)\n" + +#: ../svn/notify.c:609 +#, c-format +msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" +msgstr "> 块 @@ -%lu,%lu +%lu,%lu @@ 已经应用\n" + +#: ../svn/notify.c:669 +#, c-format +msgid "" +"\n" +"Fetching external item into '%s':\n" +msgstr "" +"\n" +"正在取得外部项目至 '%s':\n" + +#: ../svn/notify.c:695 +#, c-format +msgid "Error handling externals definition for '%s':" +msgstr "处理外部引用“%s”时出错：" + +#: ../svn/notify.c:708 +#, c-format +msgid "Updating '%s':\n" +msgstr "正在升级 '%s':\n" + +#: ../svn/notify.c:722 +#, c-format +msgid "Exported external at revision %ld.\n" +msgstr "已导出版本 %ld 的外部项目。\n" + +#: ../svn/notify.c:723 +#, c-format +msgid "Exported revision %ld.\n" +msgstr "已导出版本 %ld。\n" + +#: ../svn/notify.c:731 +#, c-format +msgid "Checked out external at revision %ld.\n" +msgstr "取出版本 %ld 的外部项目。\n" + +#: ../svn/notify.c:732 +#, c-format +msgid "Checked out revision %ld.\n" +msgstr "取出版本 %ld。\n" + +#: ../svn/notify.c:743 +#, c-format +msgid "Updated external to revision %ld.\n" +msgstr "更新外部项目至版本 %ld。\n" + +#: ../svn/notify.c:744 +#, c-format +msgid "Updated to revision %ld.\n" +msgstr "更新到版本 %ld。\n" + +#: ../svn/notify.c:752 +#, c-format +msgid "External at revision %ld.\n" +msgstr "外部项目版本 %ld。\n" + +#: ../svn/notify.c:753 +#, c-format +msgid "At revision %ld.\n" +msgstr "版本 %ld。\n" + +#: ../svn/notify.c:765 +#, c-format +msgid "External export complete.\n" +msgstr "完成外部项目导出。\n" + +#: ../svn/notify.c:766 +#, c-format +msgid "Export complete.\n" +msgstr "完成导出。\n" + +#: ../svn/notify.c:773 +#, c-format +msgid "External checkout complete.\n" +msgstr "完成取出外部项目。\n" + +#: ../svn/notify.c:774 +#, c-format +msgid "Checkout complete.\n" +msgstr "完成取出。\n" + +#: ../svn/notify.c:781 +#, c-format +msgid "External update complete.\n" +msgstr "完成外部项目更新。\n" + +#: ../svn/notify.c:782 +#, c-format +msgid "Update complete.\n" +msgstr "完成更新。\n" + +#: ../svn/notify.c:798 +#, c-format +msgid "" +"\n" +"Performing status on external item at '%s':\n" +msgstr "" +"\n" +"对外部项目“%s”进行状态检查:\n" + +#: ../svn/notify.c:806 +#, c-format +msgid "Status against revision: %6ld\n" +msgstr "版本 %6ld 的状态\n" + +#: ../svn/notify.c:815 +#, c-format +msgid "Sending copy of %s\n" +msgstr "正在发送副本 %s\n" + +#: ../svn/notify.c:816 +#, c-format +msgid "Sending %s\n" +msgstr "正在发送 %s\n" + +#: ../svn/notify.c:827 +#, c-format +msgid "Adding copy of (bin) %s\n" +msgstr "正在增加 (二进制) %s\n" + +#: ../svn/notify.c:828 +#, c-format +msgid "Adding (bin) %s\n" +msgstr "正在增加 (二进制) %s\n" + +#: ../svn/notify.c:836 +#, c-format +msgid "Adding copy of %s\n" +msgstr "正在增加副本 %s\n" + +#: ../svn/notify.c:837 +#, c-format +msgid "Adding %s\n" +msgstr "正在增加 %s\n" + +#: ../svn/notify.c:846 +#, c-format +msgid "Deleting copy of %s\n" +msgstr "正在删除副本 %s\n" + +#: ../svn/notify.c:847 +#, c-format +msgid "Deleting %s\n" +msgstr "正在删除 %s\n" + +#: ../svn/notify.c:856 +#, c-format +msgid "Replacing copy of %s\n" +msgstr "正在替换副本 %s\n" + +#: ../svn/notify.c:857 +#, c-format +msgid "Replacing %s\n" +msgstr "正在替换 %s\n" + +#: ../svn/notify.c:867 ../svnsync/sync.c:327 +#, c-format +msgid "Transmitting file data " +msgstr "传输文件数据" + +#: ../svn/notify.c:876 ../svnadmin/svnadmin.c:1728 +#, c-format +msgid "'%s' locked by user '%s'.\n" +msgstr "“%s”被用户“%s”锁定。\n" + +#: ../svn/notify.c:882 +#, c-format +msgid "'%s' unlocked.\n" +msgstr "“%s”解除锁定。\n" + +#: ../svn/notify.c:909 +#, c-format +msgid "--- Merging differences between repository URLs into '%s':\n" +msgstr "--- 正在合并版本库 URL 之间的差异到 “%s”：\n" + +#: ../svn/notify.c:914 +#, c-format +msgid "--- Merging r%ld into '%s':\n" +msgstr "--- 正在合并 r%ld 到 “%s”:\n" + +#: ../svn/notify.c:918 +#, c-format +msgid "--- Reverse-merging r%ld into '%s':\n" +msgstr "--- 正在反向合并 r%ld 到 “%s”:\n" + +#: ../svn/notify.c:922 +#, c-format +msgid "--- Merging r%ld through r%ld into '%s':\n" +msgstr "--- 正在合并 r%ld，经由 r%ld，到 “%s”:\n" + +#: ../svn/notify.c:928 +#, c-format +msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" +msgstr "--- 正在反向合并 r%ld，经由 r%ld，到 “%s”:\n" + +#: ../svn/notify.c:940 +#, c-format +msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" +msgstr "--- 记录版本库 URL 之间的合并信息到“%s”：\n" + +#: ../svn/notify.c:950 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" +msgstr "--- 记录合并 r%ld 到“%s”的信息:\n" + +#: ../svn/notify.c:955 +#, c-format +msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" +msgstr "--- 记录反向合并 r%ld 到“%s”的信息:\n" + +#: ../svn/notify.c:960 +#, c-format +msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" +msgstr "--- 记录合并 r%ld，经由 r%ld，到“%s”的信息:\n" + +#: ../svn/notify.c:965 +#, c-format +msgid "" +"--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" +msgstr "--- 记录反向合并 r%ld，经由 r%ld，到“%s”的信息:\n" + +#: ../svn/notify.c:975 +#, c-format +msgid "--- Eliding mergeinfo from '%s':\n" +msgstr "--- 正在从 '%s' 删除合并信息:\n" + +#: ../svn/notify.c:983 +#, c-format +msgid "--- Merging differences between foreign repository URLs into '%s':\n" +msgstr "--- 正在合并外部版本库 URL 之间的差异到 “%s”：\n" + +#: ../svn/notify.c:989 +#, c-format +msgid "--- Merging (from foreign repository) r%ld into '%s':\n" +msgstr "--- 正在合并(从外部版本库) r%ld 到 “%s”：\n" + +#: ../svn/notify.c:994 +#, c-format +msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" +msgstr "--- 正在反向合并(从外部版本库) r%ld 到 “%s”:\n" + +#: ../svn/notify.c:999 +#, c-format +msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "--- 正在合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n" + +#: ../svn/notify.c:1005 +#, c-format +msgid "" +"--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" +msgstr "--- 正在反向合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n" + +#: ../svn/notify.c:1041 +#, c-format +msgid "property '%s' set on '%s'\n" +msgstr "设置属性 “%s” 于 “%s”\n" + +#: ../svn/notify.c:1049 +#, c-format +msgid "property '%s' deleted from '%s'.\n" +msgstr "删除属性 “%s” 于 “%s”。\n" + +#: ../svn/notify.c:1057 +#, c-format +msgid "Attempting to delete nonexistent property '%s' on '%s'\n" +msgstr "试图删除不存在的属性“%s”于“%s”\n" + +#: ../svn/notify.c:1066 +#, c-format +msgid "property '%s' set on repository revision %ld\n" +msgstr "设定属性 “%s” 于版本库版本 %ld\n" + +#: ../svn/notify.c:1074 +#, c-format +msgid "property '%s' deleted from repository revision %ld\n" +msgstr "删除属性 “%s” 于版本库版本 %ld\n" + +#: ../svn/notify.c:1081 +#, c-format +msgid "Upgraded '%s'\n" +msgstr "已升级的“%s”\n" + +#: ../svn/notify.c:1087 +#, c-format +msgid "Redirecting to URL '%s':\n" +msgstr "正在重定向到 URL '%s':\n" + +#: ../svn/notify.c:1115 +#, c-format +msgid "--- Copying from foreign repository URL '%s':\n" +msgstr "--- 正在从外部版本库 URL '%s' 复制:\n" + +#: ../svn/notify.c:1124 +#, c-format +msgid "Breaking move with source path '%s'\n" +msgstr "源路径“%s”移动失败\n" + +#: ../svn/propdel-cmd.c:88 +#, c-format +msgid "Cannot specify revision for deleting versioned property '%s'" +msgstr "删除纳入版本控制的属性 “%s” 时不可指定版本" + +#: ../svn/propedit-cmd.c:62 ../svn/propedit-cmd.c:341 +#, c-format +msgid "Set new value for property '%s' on '%s'\n" +msgstr "属性 “%s” 于 “%s” 被设为新值\n" + +#: ../svn/propedit-cmd.c:96 ../svn/propset-cmd.c:97 +msgid "" +"--encoding option applies only to textual Subversion-controlled properties" +msgstr "--encoding 选项只能用于 Subversion 的文本属性" + +#: ../svn/propedit-cmd.c:162 +#, c-format +msgid "Set new value for property '%s' on revision %ld\n" +msgstr "属性 “%s” 于版本 %ld 被设为新值\n" + +#: ../svn/propedit-cmd.c:168 +#, c-format +msgid "No changes to property '%s' on revision %ld\n" +msgstr "属性 “%s” 于版本 %ld 没有改变\n" + +#: ../svn/propedit-cmd.c:176 +#, c-format +msgid "Cannot specify revision for editing versioned property '%s'" +msgstr "编辑纳入版本控制的属性 “%s” 时不可指定版本" + +#: ../svn/propedit-cmd.c:204 ../svn/propset-cmd.c:172 +msgid "Explicit target argument required" +msgstr "必须明确地提供目标参数" + +#: ../svn/propedit-cmd.c:271 +#, c-format +msgid "'%s' does not appear to be a working copy path" +msgstr "“%s”不像是工作副本路径" + +#: ../svn/propedit-cmd.c:348 +#, c-format +msgid "No changes to property '%s' on '%s'\n" +msgstr "属性 “%s” 于 “%s” 没有改变\n" + +#: ../svn/propget-cmd.c:66 +msgid "Error writing to stream" +msgstr "写入流出错" + +#: ../svn/propget-cmd.c:186 ../svn/proplist-cmd.c:156 +#: ../svn/proplist-cmd.c:160 ../svnlook/svnlook.c:1753 +#: ../svnlook/svnlook.c:1907 +#, fuzzy, c-format +msgid "" +"Inherited properties on '%s',\n" +"from '%s':\n" +msgstr "版本 %ld 上的未纳入版本控制的属性: \n" + +#. Not a --revprop +#: ../svn/propget-cmd.c:196 ../svn/proplist-cmd.c:175 +#: ../svnlook/svnlook.c:1789 ../svnlook/svnlook.c:1942 +#, c-format +msgid "Properties on '%s':\n" +msgstr "“%s” 上的属性: \n" + +#: ../svn/propget-cmd.c:326 +msgid "--verbose cannot be used with --revprop or --strict or --xml" +msgstr "--verbose 不能与 --revprop， --strict 或 --xml 共存" + +#: ../svn/propget-cmd.c:358 ../svn/proplist-cmd.c:214 +msgid "--show-inherited-props can't be used with --revprop" +msgstr "--show-inherited-props 不能与 --revprop 共存" + +#: ../svn/propget-cmd.c:425 +msgid "" +"Strict output of property values only available for single-target, non-" +"recursive propget operations" +msgstr "精确的输出属性值只适用于单一目标的非递归操作 propget" + +#: ../svn/proplist-cmd.c:246 +#, c-format +msgid "Unversioned properties on revision %ld:\n" +msgstr "版本 %ld 上的未纳入版本控制的属性: \n" + +#: ../svn/proplist-cmd.c:321 +msgid "" +"Could not display properties of all targets because some targets don't exist" +msgstr "因为一些目标不存在，所以不能显示全部目标的属性" + +#: ../svn/proplist-cmd.c:326 +msgid "" +"Could not display properties of all targets because some targets are not " +"versioned" +msgstr "因为一些目标没有版本化，所以不能显示全部目标的属性" + +#: ../svn/props.c:66 +msgid "" +"Must specify the revision as a number, a date or 'HEAD' when operating on a " +"revision property" +msgstr "操作版本属性时，必须指定数字、日期形式的版本号或“HEAD”。" + +#: ../svn/props.c:73 +msgid "Wrong number of targets specified" +msgstr "指定的目标数目错误" + +#: ../svn/props.c:82 +msgid "Either a URL or versioned item is required" +msgstr "必须提供URL或纳入版本控制的项目" + +#: ../svn/props.c:107 +#, c-format +msgid "" +"To turn off the %s property, use 'svn propdel';\n" +"setting the property to '%s' will not turn it off." +msgstr "" +"使用 “svn propdel” 关闭属性 %s；\n" +"设置属性为 “%s” 不会关闭它。" + +#: ../svn/props.c:177 +#, c-format +msgid "(To set the '%s' property, re-run with '--force'.)" +msgstr "(请使用“--force”重新执行，设置“%s”属性。)" + +#: ../svn/props.c:182 +#, c-format +msgid "(To edit the '%s' property, re-run with '--force'.)" +msgstr "(请使用“--force”重新执行，编辑“%s”属性。)" + +#: ../svn/props.c:188 +#, c-format +msgid "(To use the '%s' property, re-run with '--force'.)" +msgstr "(请使用“--force”重新执行，使用“%s”属性。)" + +#: ../svn/props.c:202 +#, fuzzy, c-format +msgid "'%s' is not a valid %s property name; re-run with '--force' to set it" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/props.c:208 +#, fuzzy, c-format +msgid "'%s' is not a valid %s property name; re-run with '--force' to edit it" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/props.c:215 +#, fuzzy, c-format +msgid "'%s' is not a valid %s property name; re-run with '--force' to use it" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/props.c:281 ../svn/props.c:332 +#, fuzzy, c-format +msgid "" +"'%s' is not a valid %s property name; did you mean '%s'?\n" +"%s" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/props.c:340 +#, fuzzy, c-format +msgid "" +"'%s' is not a valid %s property name\n" +"Did you mean '%s' or '%s'?\n" +"%s" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/props.c:350 +#, fuzzy, c-format +msgid "" +"'%s' is not a valid %s property name\n" +"Did you mean '%s', '%s' or '%s'?\n" +"%s" +msgstr "“%s”不是有效的 Subversion 属性名称" + +#: ../svn/propset-cmd.c:132 +#, c-format +msgid "Cannot specify revision for setting versioned property '%s'" +msgstr "设置受版本控制的属性 “%s” 时不能指定版本" + +#: ../svn/propset-cmd.c:165 +#, c-format +msgid "Explicit target required ('%s' interpreted as prop value)" +msgstr "必须明确地提供目的 (“%s”解释为属性内容)" + +#: ../svn/resolve-cmd.c:79 +msgid "missing --accept option" +msgstr "缺少选项 --accept" + +#: ../svn/resolve-cmd.c:84 +msgid "invalid 'accept' ARG" +msgstr "无效的 “accept” 参数" + +#: ../svn/resolve-cmd.c:127 +msgid "Failure occurred resolving one or more conflicts" +msgstr "处理一个或更多的冲突失败" + +#: ../svn/revert-cmd.c:77 +msgid "Try 'svn revert --depth infinity' instead?" +msgstr "尝试 “svn revert --depth infinity”？" + +#: ../svn/status-cmd.c:94 +#, c-format +msgid " Text conflicts: %u\n" +msgstr " 正文冲突：%u\n" + +#: ../svn/status-cmd.c:98 +#, c-format +msgid " Property conflicts: %u\n" +msgstr " 属性冲突：%u\n" + +#: ../svn/status-cmd.c:102 +#, c-format +msgid " Tree conflicts: %u\n" +msgstr " 树冲突：%u\n" + +#: ../svn/status-cmd.c:388 +#, c-format +msgid "" +"\n" +"--- Changelist '%s':\n" +msgstr "" +"\n" +"--- 修改列表 '%s':\n" + +#: ../svn/status.c:302 +#, c-format +msgid "swapped places with %s" +msgstr "" + +#: ../svn/status.c:316 +#, c-format +msgid "moved from %s" +msgstr "移自 %s" + +#: ../svn/status.c:327 +#, c-format +msgid "moved to %s" +msgstr "移到 %s" + +#: ../svn/svn.c:146 msgid "force operation to run" msgstr "强制操作运行" +#: ../svn/svn.c:148 msgid "force validity of log message source" msgstr "强制校验日志信息资源" +#: ../svn/svn.c:149 ../svn/svn.c:150 ../svnadmin/svnadmin.c:208 +#: ../svnadmin/svnadmin.c:211 ../svndumpfilter/svndumpfilter.c:1018 +#: ../svndumpfilter/svndumpfilter.c:1021 ../svnlook/svnlook.c:113 +#: ../svnlook/svnlook.c:125 ../svnsync/svnsync.c:243 ../svnsync/svnsync.c:245 msgid "show help on a subcommand" msgstr "显示子命令帮助信息" +#: ../svn/svn.c:151 msgid "specify log message ARG" msgstr "指定日志信息ARG" +#: ../svn/svn.c:152 msgid "print nothing, or only summary information" msgstr "不打印信息，或只打印概要信息" +#: ../svn/svn.c:153 msgid "descend recursively, same as --depth=infinity" msgstr "向下递归，与 --depth=infinity 相同" +#: ../svn/svn.c:154 msgid "obsolete; try --depth=files or --depth=immediates" msgstr "过时；尝试 --depth=files 或 --depth=immediates" +#: ../svn/svn.c:156 msgid "" "the change made by revision ARG (like -r ARG-1:ARG)\n" -" If ARG is negative this is like -r ARG:ARG-1" +" If ARG is negative this is like -r ARG:ARG-1\n" +" If ARG is of the form ARG1-ARG2 then this is " +"like\n" +" ARG1:ARG2, where ARG1 is inclusive" msgstr "" -"在ARG版本(如同 -r ARG-1:ARG)作的修改\n" -" 如果ARG为负数则等价于 -r ARG:ARG-1" +"版本 ARG (如同 -r ARG-1:ARG) 做的修改\n" +" 如果 ARG 为负数则等价于 -r ARG:" +"ARG-1 如果 ARG 的格式是 ARG1-ARG2，那么它等价于\n" +" ARG1:ARG2，包含 ARG1" +#: ../svn/svn.c:164 msgid "" "ARG (some commands also take ARG1:ARG2 range)\n" " A revision argument can be one of:\n" " NUMBER revision number\n" " '{' DATE '}' revision at start of the date\n" " 'HEAD' latest in repository\n" -" 'BASE' base rev of item's working copy\n" +" 'BASE' base rev of item's working " +"copy\n" " 'COMMITTED' last commit at or before BASE\n" " 'PREV' revision just before COMMITTED" msgstr "" @@ -6349,47 +10151,58 @@ msgstr "" " 'COMMITTED' 最后提交或基线之前\n" " 'PREV' COMMITTED的前一版本" +#: ../svn/svn.c:179 msgid "read log message from file ARG" msgstr "从文件ARG读取日志信息" +#: ../svn/svn.c:181 msgid "give output suitable for concatenation" msgstr "给予适合串联的输出" +#: ../svn/svn.c:183 msgid "treat value as being in charset encoding ARG" msgstr "将ARG的值视为字符编码" +#: ../svn/svn.c:184 ../svnadmin/svnadmin.c:214 +#: ../svndumpfilter/svndumpfilter.c:1024 ../svnlook/svnlook.c:167 +#: ../svnrdump/svnrdump.c:144 ../svnserve/svnserve.c:288 +#: ../svnsync/svnsync.c:241 ../svnversion/svnversion.c:140 msgid "show program version information" msgstr "显示程序版本信息" +#: ../svn/svn.c:185 msgid "print extra information" msgstr "打印附加信息" +#: ../svn/svn.c:186 msgid "display update information" msgstr "显示更新信息" +#: ../svn/svn.c:187 ../svnrdump/svnrdump.c:128 msgid "specify a username ARG" msgstr "指定用户名称 ARG" +#: ../svn/svn.c:188 ../svnrdump/svnrdump.c:130 msgid "specify a password ARG" msgstr "指定密码 ARG" -msgid "" -"Default: '-u'. When Subversion is invoking an\n" -" external diff program, ARG is simply passed along\n" -" to the program. But when Subversion is using its\n" -" default internal diff implementation, or when\n" -" Subversion is displaying blame annotations, ARG\n" -" could be any of the following:\n" -" -u (--unified):\n" -" Output 3 lines of unified context.\n" -" -b (--ignore-space-change):\n" -" Ignore changes in the amount of white space.\n" -" -w (--ignore-all-space):\n" -" Ignore all white space.\n" -" --ignore-eol-style:\n" -" Ignore changes in EOL style.\n" -" -p (--show-c-function):\n" -" Show C function name in diff output." +#: ../svn/svn.c:190 +#, fuzzy +msgid "" +"Specify differencing options for external diff or\n" +" internal diff or blame. Default: '-u'. Options " +"are\n" +" separated by spaces. Internal diff and blame " +"take:\n" +" -u, --unified: Show 3 lines of unified " +"context\n" +" -b, --ignore-space-change: Ignore changes in\n" +" amount of white space\n" +" -w, --ignore-all-space: Ignore all white " +"space\n" +" --ignore-eol-style: Ignore changes in EOL " +"style\n" +" -p, --show-c-function: Show C function name" msgstr "" "缺省: “-u”。当 Subversion 调用外部比较程序时，ARG 直接传给它。但是当\n" " Subversion 使用缺省的内置比较实现，或者正\n" @@ -6401,12 +10214,15 @@ msgstr "" " -w (--ignore-all-space):\n" " 忽略所有的空白。\n" " --ignore-eol-style:\n" -" 忽略行尾样式的改变。 -p (--show-c-function):\n" +" 忽略行尾样式的改变。\n" +" -p (--show-c-function):\n" " 在比较输出中显示 C 函数名称。" +#: ../svn/svn.c:208 msgid "pass contents of file ARG as additional args" msgstr "传递文件 ARG 内容为附件参数" +#: ../svn/svn.c:210 msgid "" "limit operation by depth ARG ('empty', 'files',\n" " 'immediates', or 'infinity')" @@ -6414,6 +10230,7 @@ msgstr "" "限制操作深度是 ARG ('empty', 'files',\n" " 'immediates', 或 'infinity')" +#: ../svn/svn.c:214 msgid "" "set new working copy depth to ARG ('exclude',\n" " 'empty', 'files', 'immediates', or 'infinity')" @@ -6421,72 +10238,98 @@ msgstr "" "设置工作副本的新深度为 ARG('exclude',\n" " 'empty', 'files', 'immediates', 或 'infinity')" +#: ../svn/svn.c:217 ../svnlook/svnlook.c:170 msgid "output in XML" msgstr "输出为 XML" +#: ../svn/svn.c:218 msgid "use strict semantics" msgstr "使用严格的语法" +#: ../svn/svn.c:220 msgid "do not cross copies while traversing history" msgstr "查看历史不要跨越不同的副本" -msgid "disregard default and svn:ignore property ignores" +#: ../svn/svn.c:222 +#, fuzzy +msgid "" +"disregard default and svn:ignore and\n" +" svn:global-ignores property ignores" msgstr "忽略默认值和 svn:ignore 属性" +#: ../svn/svn.c:226 ../svnrdump/svnrdump.c:140 ../svnsync/svnsync.c:187 msgid "do not cache authentication tokens" msgstr "不要缓存用户认证令牌" +#: ../svn/svn.c:228 ../svnrdump/svnrdump.c:154 ../svnsync/svnsync.c:197 msgid "" "accept SSL server certificates from unknown\n" -" certificate authorities without prompting (but only\n" +" certificate authorities without prompting (but " +"only\n" " with '--non-interactive')" -msgstr "不提示的接受未知的证书颁发机构发行的 SSL 服务器证书(只用于选项 “--non-interactive”)" +msgstr "" +"不提示的接受未知的证书颁发机构发行的 SSL 服务器证书(只用于选项 “--non-" +"interactive”)" + +#: ../svn/svn.c:234 ../svnrdump/svnrdump.c:132 ../svnsync/svnsync.c:179 +msgid "" +"do no interactive prompting (default is to prompt\n" +" only if standard input is a terminal device)" +msgstr "" -msgid "do no interactive prompting" -msgstr "不要交互提示" +#: ../svn/svn.c:238 ../svnrdump/svnrdump.c:136 ../svnsync/svnsync.c:183 +#, fuzzy +msgid "" +"do interactive prompting even if standard input\n" +" is not a terminal device" +msgstr "如果版本库被其他进程占用，等待而不直接退出" +#: ../svn/svn.c:242 msgid "try operation but make no changes" msgstr "尝试操作但没有修改" -msgid "do not print differences for deleted files" -msgstr "不要输出删除文件造成的差异" - -msgid "notice ancestry when calculating differences" -msgstr "比较差异时提示原始信息" - -msgid "ignore ancestry when calculating merges" -msgstr "合并时忽略原始信息" +#: ../svn/svn.c:244 +msgid "disable merge tracking; diff nodes as if related" +msgstr "" +#: ../svn/svn.c:246 msgid "ignore externals definitions" msgstr "忽略外部项目" -msgid "use ARG as diff command" -msgstr "使用 ARG 作为比较命令" - +#: ../svn/svn.c:247 msgid "use ARG as merge command" msgstr "使用 ARG 作为合并命令" +#: ../svn/svn.c:248 msgid "use ARG as external editor" msgstr "使用 ARG 作为外部编辑器" +#: ../svn/svn.c:250 msgid "merge only mergeinfo differences" msgstr "只合并合并信息的差异" +#: ../svn/svn.c:251 msgid "use ARG as the older target" msgstr "使用 ARG 作为旧目标" +#: ../svn/svn.c:252 msgid "use ARG as the newer target" msgstr "使用 ARG 作为新目标" +#: ../svn/svn.c:254 msgid "operate on a revision property (use with -r)" msgstr "在版本属性上操作(使用-r参数)" +#: ../svn/svn.c:255 msgid "relocate via URL-rewriting" msgstr "通过URL改写重新定位" +#: ../svn/svn.c:257 ../svnadmin/svnadmin.c:256 ../svnrdump/svnrdump.c:126 +#: ../svnsync/svnsync.c:211 msgid "read user configuration files from directory ARG" msgstr "从目录 ARG 读取用户配置文件" +#: ../svn/svn.c:259 ../svnrdump/svnrdump.c:146 ../svnsync/svnsync.c:213 msgid "" "set user configuration option in the format:\n" " FILE:SECTION:OPTION=[VALUE]\n" @@ -6498,12 +10341,15 @@ msgstr "" " 例如：\n" " servers:global:http-library=serf" +#: ../svn/svn.c:266 msgid "enable automatic properties" msgstr "启用自动属性" +#: ../svn/svn.c:267 msgid "disable automatic properties" msgstr "关闭自动属性" +#: ../svn/svn.c:269 msgid "" "use a different EOL marker than the standard\n" " system marker for files with the svn:eol-style\n" @@ -6514,33 +10360,39 @@ msgstr "" " 系统中立的文件标记 svn:eol-style 属性取值为 “native”。\n" " ARG 可以是以下之一“LF”，“CR”，“CRLF”" +#: ../svn/svn.c:276 msgid "maximum number of log entries" msgstr "日值项最大值" +#: ../svn/svn.c:277 msgid "don't unlock the targets" msgstr "不要解锁目标" -msgid "show a summary of the results" -msgstr "显示结果的概要" - +#: ../svn/svn.c:278 msgid "remove changelist association" msgstr "删除修改列表耦合" +#: ../svn/svn.c:280 msgid "operate only on members of changelist ARG" msgstr "只能对修改列表 ARG 的成员操作" +#: ../svn/svn.c:282 msgid "don't delete changelists after commit" msgstr "不要在提交后删除修改列表" +#: ../svn/svn.c:283 msgid "keep path in working copy" msgstr "在工作副本中保留路径" +#: ../svn/svn.c:285 msgid "retrieve all revision properties" msgstr "获取所有版本属性" +#: ../svn/svn.c:287 msgid "retrieve no revision properties" msgstr "没有找回版本属性" +#: ../svn/svn.c:289 msgid "" "set revision property ARG in new revision\n" " using the name[=value] format" @@ -6548,27 +10400,35 @@ msgstr "" "在新版本设置版本属性 ARG\n" " 使用格式 name[=value]" +#: ../svn/svn.c:292 msgid "make intermediate directories" msgstr "创建中间目录" +#: ../svn/svn.c:294 msgid "" "use/display additional information from merge\n" " history" msgstr "从合并历史使用/显示额外信息" +#: ../svn/svn.c:298 msgid "" "specify automatic conflict resolution action\n" -" ('postpone', 'working', 'base', 'mine-conflict',\n" +" ('postpone', 'working', 'base', 'mine-" +"conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full',\n" " 'edit', 'launch')\n" -" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')" +" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', " +"'l')" msgstr "" "指定自动解决冲突动作\n" -" ('postpone', 'working', 'base', 'mine-conflict',\n" +" ('postpone', 'working', 'base', 'mine-" +"conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full',\n" " 'edit', 'launch')\n" -" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', 'l')" +" (shorthand: 'p', 'mc', 'tc', 'mf', 'tf', 'e', " +"'l')" +#: ../svn/svn.c:309 msgid "" "specify which collection of revisions to display\n" " ('merged', 'eligible')" @@ -6576,18 +10436,22 @@ msgstr "" "指定显示哪个版本集合\n" " ('merged', 'eligible')" -msgid "merge a branch back into its parent branch" -msgstr "合并分支回父分支" +#: ../svn/svn.c:313 +msgid "deprecated" +msgstr "已经淘汰" +#: ../svn/svn.c:315 msgid "" "number of leading path components to strip from\n" " paths parsed from the patch file. --strip 0\n" " is the default and leaves paths unmodified.\n" " --strip 1 would change the path\n" -" 'doc/fudge/crunchy.html' to 'fudge/crunchy.html'.\n" +" 'doc/fudge/crunchy.html' to 'fudge/crunchy." +"html'.\n" " --strip 2 would leave just 'crunchy.html'\n" " The expected component separator is '/' on all\n" -" platforms. A leading '/' counts as one component." +" platforms. A leading '/' counts as one " +"component." msgstr "" "需要从补丁文件中的路径中裁剪的前导路径组件数量。\n" " 默认 --strip 0 不修改路径。指定 --strip 1 会将\n" @@ -6596,29 +10460,78 @@ msgstr "" " 'crunchy.html' 。在所有平台中期望的组件分隔符\n" " 都是 '/'。前导 '/' 被计算为一个组件。" -msgid "don't diff copied or moved files with their source" -msgstr "请不要将复制或移动的文件与其源文件比较" - +#: ../svn/svn.c:331 msgid "don't expand keywords" msgstr "不要展开关键字" +#: ../svn/svn.c:333 msgid "apply the unidiff in reverse" msgstr "反向应用补丁" +#: ../svn/svn.c:335 msgid "ignore whitespace during pattern matching" msgstr "在模式匹配时，忽略空白" +#: ../svn/svn.c:336 msgid "produce diff output" msgstr "产生差异输出" +#. maps to show_diff +#. diff options +#: ../svn/svn.c:338 ../svnlook/svnlook.c:137 +msgid "use ARG as diff command" +msgstr "使用 ARG 作为比较命令" + +#: ../svn/svn.c:340 msgid "override diff-cmd specified in config file" msgstr "覆盖配置文件中指定的 diff-cmd" +#: ../svn/svn.c:342 ../svnlook/svnlook.c:131 +msgid "do not print differences for added files" +msgstr "不要输出增加文件造成的差异" + +#: ../svn/svn.c:344 ../svnlook/svnlook.c:134 +msgid "do not print differences for deleted files" +msgstr "不要输出删除文件造成的差异" + +#: ../svn/svn.c:346 +msgid "don't diff copied or moved files with their source" +msgstr "请不要将复制或移动的文件与其源文件比较" + +#: ../svn/svn.c:348 +msgid "diff unrelated nodes as delete and add" +msgstr "" + +#: ../svn/svn.c:349 +msgid "show a summary of the results" +msgstr "显示结果的概要" + +#: ../svn/svn.c:351 msgid "use git's extended diff format" msgstr "使用 git 的扩展差异格式" +#: ../svn/svn.c:353 ../svnlook/svnlook.c:140 +msgid "ignore properties during the operation" +msgstr "操作时忽略属性" + +#: ../svn/svn.c:355 ../svnlook/svnlook.c:143 +msgid "show only properties during the operation" +msgstr "操作时只显示属性" + +#: ../svn/svn.c:357 +#, fuzzy +msgid "" +"generate diff suitable for generic third-party\n" +" patch tools; currently the same as\n" +" --show-copies-as-adds --ignore-properties" +msgstr "" +"生成适用于第三方工具的差异格式；当前等价于\n" +" --show-copies-as-adds --ignore-properties\n" + +#: ../svn/svn.c:365 +#, fuzzy msgid "" -"Allow merge into mixed-revision working copy.\n" +"Allow operation on mixed-revision working copy.\n" " Use of this option is not recommended!\n" " Please run 'svn update' instead." msgstr "" @@ -6626,6 +10539,27 @@ msgstr "" " 不建议使用此选项!\n" " 请先执行 'svn update' 。" +#: ../svn/svn.c:371 +msgid "" +"Also commit file and dir externals reached by\n" +" recursion. This does not include externals with " +"a\n" +" fixed revision. (See the svn:externals property)" +msgstr "" + +#: ../svn/svn.c:377 +msgid "retrieve target's inherited properties" +msgstr "获取目标继承的属性" + +#: ../svn/svn.c:379 +msgid "use ARG as search pattern (glob syntax)" +msgstr "" + +#: ../svn/svn.c:381 +msgid "combine ARG with the previous search pattern" +msgstr "" + +#: ../svn/svn.c:429 msgid "" "Put files and directories under version control, scheduling\n" "them for addition to repository. They will be added in next commit.\n" @@ -6634,9 +10568,11 @@ msgstr "" "把文件和目录纳入版本控制，通过调度加到版本库。它们会在下一次提交时加入。\n" "用法: add 路径...\n" +#: ../svn/svn.c:434 msgid "add intermediate parents" msgstr "增加中间父目录" +#: ../svn/svn.c:437 msgid "" "Output the content of specified files or\n" "URLs with revision and author information in-line.\n" @@ -6652,6 +10588,7 @@ msgstr "" " 如果指定了版本，将从指定的版本开始查找。\n" " \n" +#: ../svn/svn.c:446 msgid "" "Output the content of specified files or URLs.\n" "usage: cat TARGET[@REV]...\n" @@ -6665,6 +10602,7 @@ msgstr "" " 如果指定了版本，将从指定的版本开始查找。\n" " \n" +#: ../svn/svn.c:454 msgid "" "Associate (or dissociate) changelist CLNAME with the named files.\n" "usage: 1. changelist CLNAME PATH...\n" @@ -6674,6 +10612,7 @@ msgstr "" "使用: 1. changelist CLNAME PATH...\n" " 2. changelist --remove PATH...\n" +#: ../svn/svn.c:460 msgid "" "Check out a working copy from a repository.\n" "usage: checkout URL[@REV]... [PATH]\n" @@ -6710,12 +10649,15 @@ msgstr "" "\n" " 如果使用了 “--force” 选项，在工作副本中未版本控制的障碍路径，不会自动导\n" " 致签出失败。 如果障碍路径与版本库中的对应路径类型相同(文件或目录),它将成\n" -" 为受版本控制的路径，但是内容不改变。它意味着障碍路径的孩子，如果也是障碍路\n" -" 径，那么也会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，将视为工\n" +" 为受版本控制的路径，但是内容不改变。它意味着障碍路径的孩子，如果也是障碍" +"路\n" +" 径，那么也会受版本控制。对于障碍路径中的文件，如果与版本库内的不同，将视为" +"工\n" " 作副本发生本地修改。版本库中的所有属性都应用于障碍路径。\n" "\n" " 参见 “svn help update” 以获取报告执行动作的字符列表。\n" +#: ../svn/svn.c:487 msgid "" "Recursively clean up the working copy, removing locks, resuming\n" "unfinished operations, etc.\n" @@ -6724,6 +10666,7 @@ msgstr "" "递归清理工作副本，删除锁，继续未完成操作，等等。\n" "用法: cleanup [路径...]\n" +#: ../svn/svn.c:493 msgid "" "Send changes from your working copy to the repository.\n" "usage: commit [PATH...]\n" @@ -6740,26 +10683,25 @@ msgstr "" " 选项，编辑器会被启动。如果有目标是锁定的或者包含锁定条目，则在成功\n" " 提交后会被解锁。\n" +#: ../svn/svn.c:504 +#, fuzzy msgid "" -"Duplicate something in working copy or repository, remembering\n" -"history.\n" +"Copy files and directories in a working copy or repository.\n" "usage: copy SRC[@REV]... DST\n" "\n" -"When copying multiple sources, they will be added as children of DST,\n" -"which must be a directory.\n" -"\n" " SRC and DST can each be either a working copy (WC) path or URL:\n" " WC -> WC: copy and schedule for addition (with history)\n" " WC -> URL: immediately commit a copy of WC to URL\n" " URL -> WC: check out URL into WC, schedule for addition\n" " URL -> URL: complete server-side copy; used to branch and tag\n" -" All the SRCs must be of the same type.\n" +" All the SRCs must be of the same type. When copying multiple sources,\n" +" they will be added as children of DST, which must be a directory.\n" "\n" -"WARNING: For compatibility with previous versions of Subversion,\n" -"copies performed using two working copy paths (WC -> WC) will not\n" -"contact the repository. As such, they may not, by default, be able\n" -"to propagate merge tracking information from the source of the copy\n" -"to the destination.\n" +" WARNING: For compatibility with previous versions of Subversion,\n" +" copies performed using two working copy paths (WC -> WC) will not\n" +" contact the repository. As such, they may not, by default, be able\n" +" to propagate merge tracking information from the source of the copy\n" +" to the destination.\n" msgstr "" "在工作副本或版本库中复制数据，保留历史。\n" "用法: copy SRC[@REV]... DST\n" @@ -6777,6 +10719,7 @@ msgstr "" "操作不会与版本库通信。同样地，在缺省情况下，不能从复制源到目的地传播合\n" "并跟踪信息。\n" +#: ../svn/svn.c:523 msgid "" "Remove files and directories from version control.\n" "usage: 1. delete PATH...\n" @@ -6804,30 +10747,48 @@ msgstr "" "\n" " 2、每个 URL 指定的项目会通过立即提交从版本库中删除。\n" +#: ../svn/svn.c:539 +#, fuzzy msgid "" -"Display the differences between two revisions or paths.\n" -"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" -" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] \\\n" +"Display local changes or differences between two revisions or paths.\n" +"usage: 1. diff\n" +" 2. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" +" 3. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] " +"\\\n" " [PATH...]\n" -" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" +" 4. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n" +" 5. diff OLD-URL[@OLDREV] NEW-PATH[@NEWREV]\n" +" 6. diff OLD-PATH[@OLDREV] NEW-URL[@NEWREV]\n" +"\n" +" 1. Use just 'svn diff' to display local modifications in a working copy.\n" "\n" -" 1. Display the changes made to TARGETs as they are seen in REV between\n" +" 2. Display the changes made to TARGETs as they are seen in REV between\n" " two revisions. TARGETs may be all working copy paths or all URLs.\n" " If TARGETs are working copy paths, N defaults to BASE and M to the\n" " working copy; if URLs, N must be specified and M defaults to HEAD.\n" " The '-c M' option is equivalent to '-r N:M' where N = M-1.\n" " Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n" "\n" -" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n" +" 3. Display the differences between OLD-TGT as it was seen in OLDREV and\n" " NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n" " OLD-TGT and NEW-TGT and restrict the output to differences for those\n" " paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV].\n" -" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV default\n" +" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV " +"default\n" " to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n" +" If OLDREV or NEWREV are not specified, they default to WORKING for\n" +" working copy targets and to HEAD for URL targets.\n" "\n" -" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +" Either or both OLD-TGT and NEW-TGT may also be paths to unversioned\n" +" targets. Revisions cannot be specified for unversioned targets.\n" +" Both targets must be of the same node kind (file or directory).\n" +" Diffing unversioned targets against URL targets is not supported.\n" "\n" -" Use just 'svn diff' to display local modifications in a working copy.\n" +" 4. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n" +" 5. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-PATH" +"[@NEWREV]'\n" +" 6. Shorthand for 'svn diff --old=OLD-PATH[@OLDREV] --new=NEW-URL" +"[@NEWREV]'\n" msgstr "" "显示两个版本或路径的差异。\n" "用法: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n" @@ -6837,17 +10798,20 @@ msgstr "" "\n" " 1、显示版本 REV 中 TARGET 在两个不同的版本之间的差异。TARGET 要么全是\n" " 工作副本路径，要么全是 URL。如果 TARGET 是工作副本路径，N 默认为\n" -" BASE，M 默认为工作副本；如果 TARGET 是 URL，N 必须指定， M 默认为 HEAD。\n" +" BASE，M 默认为工作副本；如果 TARGET 是 URL，N 必须指定， M 默认为 " +"HEAD。\n" " “-c M” 等价于 “-r M-1:M”，“-c -M” 等价于 “-r M:M-1”。\n" "\n" " 2、显示新旧版本中对应目标的差异。PATH 是相对于新旧目标的相对路径，\n" -" 它限制只输出这些路径上的差异。新旧目标可以是工作副本路径或地址 URL[@REV]。\n" +" 它限制只输出这些路径上的差异。新旧目标可以是工作副本路径或地址 URL" +"[@REV]。\n" " 新目标默认与旧目标相同，OLDREV 默认为 N，NEWREV 默认为 M。\n" "\n" " 3、“svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]” 的简写。\n" "\n" " 使用不加参数的 “svn diff” 显示工作副本中的本地修改。\n" +#: ../svn/svn.c:580 msgid "" "Create an unversioned copy of a tree.\n" "usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n" @@ -6885,6 +10849,7 @@ msgstr "" " 如果指定了 PEGREV ，将从指定的版本本开始查找。\n" "\n" +#: ../svn/svn.c:602 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: help [SUBCOMMAND...]\n" @@ -6892,6 +10857,7 @@ msgstr "" "描述本程序或其子命令的用法。\n" "用法: help [子命令...]\n" +#: ../svn/svn.c:608 msgid "" "Commit an unversioned file or tree into the repository.\n" "usage: import [PATH] URL\n" @@ -6911,8 +10877,10 @@ msgstr "" " 如果省略 PATH，则默认为 “.”。\n" " 父目录会根据需要在版本库内创建。\n" " 如果 PATH 是目录，则其下的内容直接加入到 URL 指定的位置内。\n" -" 如果使用了 “--force”，那么不能纳入版本控制的项目，例如设备文件，管道等，会被忽略。\n" +" 如果使用了 “--force”，那么不能纳入版本控制的项目，例如设备文件，管道等，会" +"被忽略。\n" +#: ../svn/svn.c:622 msgid "" "Display information about a local or remote item.\n" "usage: info [TARGET[@REV]...]\n" @@ -6928,6 +10896,7 @@ msgstr "" " TARGET 可以是工作副本中的路径或版本库中的 URL。REV 指定从哪个\n" " 版本开始查找目标。\n" +#: ../svn/svn.c:632 msgid "" "List directory entries in the repository.\n" "usage: list [TARGET[@REV]...]\n" @@ -6964,6 +10933,11 @@ msgstr "" " 大小 (以字节为单位)\n" " 最后一次提交的日期与时间\n" +#: ../svn/svn.c:652 +msgid "include externals definitions" +msgstr "包含外部定义" + +#: ../svn/svn.c:655 msgid "" "Lock working copy paths or URLs in the repository, so that\n" "no other user can commit changes to them.\n" @@ -6976,15 +10950,20 @@ msgstr "" "\n" " 使用 --force 选项可以从其他用户或工作副本窃取到锁。\n" +#: ../svn/svn.c:661 msgid "read lock comment from file ARG" msgstr "从文件 ARG 读取加锁注释" +#: ../svn/svn.c:662 msgid "specify lock comment ARG" msgstr "指定加锁注释ARG" +#: ../svn/svn.c:663 msgid "force validity of lock comment source" msgstr "强制校验锁定注释源" +#: ../svn/svn.c:666 +#, fuzzy msgid "" "Show the log messages for a set of revision(s) and/or path(s).\n" "usage: 1. log [PATH][@REV]\n" @@ -7018,34 +10997,70 @@ msgid "" " The --depth option is only valid in combination with the --diff option\n" " and limits the scope of the displayed diff to the specified depth.\n" "\n" +" If the --search option is used, log messages are displayed only if the\n" +" provided search pattern matches any of the author, date, log message\n" +" text (unless --quiet is used), or, if the --verbose option is also\n" +" provided, a changed path.\n" +" The search pattern may include \"glob syntax\" wildcards:\n" +" ? matches any single character\n" +" * matches a sequence of arbitrary characters\n" +" [abc] matches any of the characters listed inside the brackets\n" +" If multiple --search options are provided, a log message is shown if\n" +" it matches any of the provided search patterns. If the --search-and\n" +" option is used, that option's argument is combined with the pattern\n" +" from the previous --search or --search-and option, and a log message\n" +" is shown only if it matches the combined search pattern.\n" +" If --limit is used in combination with --search, --limit restricts the\n" +" number of log messages searched, rather than restricting the output\n" +" to a particular number of matching log messages.\n" +"\n" " Examples:\n" -" svn log\n" -" svn log foo.c\n" -" svn log bar.c@42\n" -" svn log http://www.example.com/repo/project/foo.c\n" -" svn log http://www.example.com/repo/project foo.c bar.c\n" -" svn log http://www.example.com/repo/project@50 foo.c bar.c\n" +"\n" +" Show the latest 5 log messages for the current working copy\n" +" directory and display paths changed in each commit:\n" +" svn log -l 5 -v\n" +"\n" +" Show the log for bar.c as of revision 42:\n" +" svn log bar.c@42\n" +"\n" +" Show log messages and diffs for each commit to foo.c:\n" +" svn log --diff http://www.example.com/repo/project/foo.c\n" +" (Because the above command uses a full URL it does not require\n" +" a working copy.)\n" +"\n" +" Show log messages for the children foo.c and bar.c of the directory\n" +" '/trunk' as it appeared in revision 50, using the ^/ URL shortcut:\n" +" svn log ^/trunk@50 foo.c bar.c\n" +"\n" +" Show the log messages for any incoming changes to foo.c during the\n" +" next 'svn update':\n" +" svn log -r BASE:HEAD foo.c\n" +"\n" +" Show the log message for the revision in which /branches/foo\n" +" was created:\n" +" svn log --stop-on-copy --limit 1 -r0:HEAD ^/branches/foo\n" msgstr "" "显示一组版本与/或路径的日志信息。\n" "用法: 1、log [PATH][@REV]\n" " 2、log URL[@REV] [PATH...]\n" "\n" -" 1、显示与本地 PATH (默认: “.”) 对应的 URL 的日志信息。如果指定了 REV，版本\n" +" 1、显示与本地 PATH (默认: “.”) 对应的 URL 的日志信息。如果指定了 REV，版" +"本\n" " 范围是 REV:1。默认的版本范围是 BASE:1，因为 URL 未必在 HEAD 中存在。\n" "\n" " 2、显示 URL 中 PATH (默认: “.”) 的日志信息。如果指定了 REV，版本范围是\n" " REV:1。否则版本范围是 HEAD:1。\n" "\n" -" 可以指定多个 “-c” 或 “-r” 选项 (但是不允许同时使用 “-c” 和 “-r” 选项)，以及\n" +" 可以指定多个 “-c” 或 “-r” 选项 (但是不允许同时使用 “-c” 和 “-r” 选项)，以" +"及\n" " 混合使用前向和后向范围。\n" "\n" " 使用 -v 时，在日志信息中显示受影响的路径名。\n" " 使用 -q 时，不显示日志信息主体 (请注意，它可与 -v 并存)。\n" "\n" " 每条日志信息只会显示一次，即使指定了此版本涉及到的多个路径。默认日志信息\n" -" 会追溯复制历史；使用 --stop-on-copy 可以关闭这种行为，这可以用来找出分支点。\n" -"\n" -" 选项 --depth 只能与选项 --diff 组合使用，用来限制在指定路径上显示差异的范围。\n" +" 会追溯复制历史；使用 --stop-on-copy 可以关闭这种行为，这可以用来找出分支" +"点。\n" "\n" " 范例: \n" " svn log\n" @@ -7055,37 +11070,37 @@ msgstr "" " svn log http://www.example.com/repo/project foo.c bar.c\n" " svn log http://www.example.com/repo/project@50 foo.c bar.c\n" +#: ../svn/svn.c:744 msgid "retrieve revision property ARG" msgstr "获取版本属性 ARG" +#: ../svn/svn.c:745 msgid "the change made in revision ARG" msgstr "版本 ARG 引起的改变" #. For this large section, let's keep it unindented for easier #. * viewing/editing. It has been vim-treated with a textwidth=75 and 'gw' #. * (with quotes and newlines removed). +#: ../svn/svn.c:751 msgid "" "Merge changes into a working copy.\n" "usage: 1. merge SOURCE[@REV] [TARGET_WCPATH]\n" -" (the 'sync' merge)\n" +" (the 'complete' merge)\n" " 2. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [TARGET_WCPATH]\n" " (the 'cherry-pick' merge)\n" -" 3. merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n" -" (the 'reintegrate' merge)\n" -" 4. merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n" +" 3. merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" " (the '2-URL' merge)\n" "\n" -" 1. This form is called a 'sync' (or 'catch-up') merge:\n" +" 1. This form, with one source path and no revision range, is called\n" +" a 'complete' merge:\n" "\n" " svn merge SOURCE[@REV] [TARGET_WCPATH]\n" "\n" -" A sync merge is used to fetch all the latest changes made on a parent\n" -" branch. In other words, the target branch has originally been created\n" -" by copying the source branch, and any changes committed on the source\n" -" branch since branching are applied to the target branch. This uses\n" -" merge tracking to skip all those revisions that have already been\n" -" merged, so a sync merge can be repeated periodically to stay up-to-\n" -" date with the source branch.\n" +" The complete merge is used for the 'sync' and 'reintegrate' merges\n" +" in the 'feature branch' pattern described below. It finds all the\n" +" changes on the source branch that have not already been merged to the\n" +" target branch, and merges them into the working copy. Merge tracking\n" +" is used to know which changes have already been merged.\n" "\n" " SOURCE specifies the branch from where the changes will be pulled, and\n" " TARGET_WCPATH specifies a working copy of the target branch to which\n" @@ -7101,27 +11116,61 @@ msgid "" " used, and the default value of 'REV' is the base revision (usually the\n" " revision last updated to).\n" "\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is assumed.\n" +" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +" assumed. There are some special cases:\n" "\n" -" - Sync Merge Example -\n" +" - If SOURCE is a URL:\n" +"\n" +" - If the basename of the URL and the basename of '.' are the\n" +" same, then the differences are applied to '.'. Otherwise,\n" +" if a file with the same basename as that of the URL is found\n" +" within '.', then the differences are applied to that file.\n" +" In all other cases, the target defaults to '.'.\n" +"\n" +" - If SOURCE is a working copy path:\n" "\n" -" A feature is being developed on a branch called 'feature', which has\n" -" originally been a copy of trunk. The feature branch has been regularly\n" -" synced with trunk to keep up with the changes made there. The previous\n" -" sync merges are not shown on this diagram, and the last of them was\n" -" done when HEAD was r100. Currently, HEAD is r200.\n" +" - If the source is a file, then differences are applied to that\n" +" file (useful for reverse-merging earlier changes). Otherwise,\n" +" if the source is a directory, then the target defaults to '.'.\n" "\n" -" feature +------------------------o-----\n" -" / ^\n" -" / ............ |\n" -" / . . /\n" -" trunk ------+------------L--------------R------\n" -" r100 r200\n" +" In normal usage the working copy should be up to date, at a single\n" +" revision, with no local modifications and no switched subtrees.\n" +"\n" +" - The 'Feature Branch' Merging Pattern -\n" +"\n" +" In this commonly used work flow, known also as the 'development\n" +" branch' pattern, a developer creates a branch and commits a series of\n" +" changes that implement a new feature. The developer periodically\n" +" merges all the latest changes from the parent branch so as to keep the\n" +" development branch up to date with those changes. When the feature is\n" +" complete, the developer performs a merge from the feature branch to\n" +" the parent branch to re-integrate the changes.\n" +"\n" +" parent --+----------o------o-o-------------o--\n" +" \\ \\ \\ /\n" +" \\ merge merge merge\n" +" \\ \\ \\ /\n" +" feature +--o-o-------o----o-o----o-------\n" +"\n" +" A merge from the parent branch to the feature branch is called a\n" +" 'sync' or 'catch-up' merge, and a merge from the feature branch to the\n" +" parent branch is called a 'reintegrate' merge.\n" +"\n" +" - Sync Merge Example -\n" +" ............\n" +" . .\n" +" trunk --+------------L--------------R------\n" +" \\ \\\n" +" \\ |\n" +" \\ v\n" +" feature +------------------------o-----\n" +" r100 r200\n" "\n" " Subversion will locate all the changes on 'trunk' that have not yet\n" " been merged into the 'feature' branch. In this case that is a single\n" -" range, r100:200. In the diagram above, L marks the left side\n" -" (trunk@100) and R marks the right side (trunk@200) of the merge. The\n" +" range, r100:200. In the diagram above, L marks the left side " +"(trunk@100)\n" +" and R marks the right side (trunk@200) of the merge source. The\n" " difference between L and R will be applied to the target working copy\n" " path. In this case, the working copy is a clean checkout of the entire\n" " 'feature' branch.\n" @@ -7136,6 +11185,39 @@ msgid "" " others. You can review the changes and you may have to resolve\n" " conflicts before you commit the merge.\n" "\n" +" - Reintegrate Merge Example -\n" +"\n" +" The feature branch was last synced with trunk up to revision X. So the\n" +" difference between trunk@X and feature@HEAD contains the complete set\n" +" of changes that implement the feature, and no other changes. These\n" +" changes are applied to trunk.\n" +"\n" +" rW rX\n" +" trunk ------+--------------------L------------------o\n" +" \\ . ^\n" +" \\ ............. /\n" +" \\ . /\n" +" feature +--------------------------------R\n" +"\n" +" In the diagram above, L marks the left side (trunk@X) and R marks the\n" +" right side (feature@HEAD) of the merge. The difference between the\n" +" left and right side is merged into trunk, the target.\n" +"\n" +" To perform the merge, have a clean working copy of trunk and run the\n" +" following command in its top-level directory:\n" +"\n" +" svn merge ^/feature\n" +"\n" +" To prevent unnecessary merge conflicts, a reintegrate merge requires\n" +" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" +" modifications, and has no switched subtrees.\n" +"\n" +" A reintegrate merge also requires that the source branch is coherently\n" +" synced with the target -- in the above example, this means that all\n" +" revisions between the branch point W and the last merged revision X\n" +" are merged to the feature branch, so that there are no unmerged\n" +" revisions in-between.\n" +"\n" "\n" " 2. This form is called a 'cherry-pick' merge:\n" "\n" @@ -7153,7 +11235,9 @@ msgid "" " path, the corresponding URL of the path is used, and the default value\n" " of 'REV' is the base revision (usually the revision last updated to).\n" "\n" -" TARGET_WCPATH is a working copy path; if omitted, '.' is assumed.\n" +" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +" assumed. The special cases noted above in the 'complete' merge form\n" +" also apply here.\n" "\n" " The revision ranges to be merged are specified by the '-r' and/or '-c'\n" " options. '-r N:M' refers to the difference in the history of the\n" @@ -7170,7 +11254,8 @@ msgid "" " source and target refer to the same branch, a previously committed\n" " revision can be 'undone'. In a reverse range, N is greater than M in\n" " '-r N:M', or the '-c' option is used with a negative number: '-c -M'\n" -" is equivalent to '-r M:<M-1>'.\n" +" is equivalent to '-r M:<M-1>'. Undoing changes like this is also known\n" +" as performing a 'reverse merge'.\n" "\n" " Multiple '-c' and/or '-r' options may be specified and mixing of\n" " forward and reverse ranges is allowed.\n" @@ -7206,87 +11291,27 @@ msgid "" " svn merge -c50,54,60 -r65:68 ^/trunk\n" "\n" "\n" -" 3. This form is called a 'reintegrate merge':\n" -"\n" -" svn merge --reintegrate SOURCE[@REV] [TARGET_WCPATH]\n" -"\n" -" In a reintegrate merge, an (e.g. feature) branch is merged back to its\n" -" originating branch. In other words, the source branch has originally\n" -" been created by copying the target branch, development has concluded\n" -" on the source branch and it should now be merged back into the target\n" -" branch.\n" -" \n" -" SOURCE is the URL of a branch to be merged back. If REV is specified,\n" -" it is used as the peg revision for SOURCE; if REV is not specified,\n" -" the HEAD revision is assumed.\n" -"\n" -" TARGET_WCPATH is a working copy of the branch the changes will be\n" -" applied to.\n" -"\n" -" - Reintegrate Merge Example -\n" -"\n" -" A feature has been developed on a branch called 'feature'. The feature\n" -" branch started as a copy of trunk@W. Work on the feature has completed\n" -" and it should be merged back into the trunk.\n" -"\n" -" The feature branch was last synced with trunk up to revision X. So the\n" -" difference between trunk@X and feature@HEAD contains the complete set\n" -" of changes that implement the feature, and no other changes. These\n" -" changes are applied to trunk.\n" -"\n" -" feature +--------------------------------R\n" -" / . \\\n" -" / ............. \\\n" -" / . v\n" -" trunk ------+--------------------L------------------o\n" -" rW rX\n" -"\n" -" In the diagram above, L marks the left side (trunk@X) and R marks the\n" -" right side (feature@HEAD) of the merge. The difference between the\n" -" left and right side is merged into trunk, the target.\n" -"\n" -" To perform the merge, have a clean working copy of trunk and run the\n" -" following command in its top-level directory:\n" -"\n" -" svn merge --reintegrate ^/feature\n" -"\n" -" To prevent unnecessary merge conflicts, a reintegrate merge requires\n" -" that TARGET_WCPATH is not a mixed-revision working copy, has no local\n" -" modifications, and has no switched subtrees.\n" -"\n" -" A reintegrate merge also requires that the source branch is coherently\n" -" synced with the target -- in the above example, this means that all\n" -" revisions between the branch point W and the last merged revision X\n" -" are merged to the feature branch, so that there are no unmerged\n" -" revisions in-between.\n" -"\n" -" After the reintegrate merge, the feature branch cannot be synced to\n" -" the trunk again without merge conflicts. If further work must be done\n" -" on the feature branch, it should be deleted and then re-created.\n" -"\n" +" 3. This form is called a '2-URL merge':\n" "\n" -" 4. This form is called a '2-URL merge':\n" -"\n" -" svn merge SOURCE1[@N] SOURCE2[@M] [TARGET_WCPATH]\n" -"\n" -" Two source URLs are specified, together with two revisions N and M.\n" -" The two sources are compared at the specified revisions, and the\n" -" difference is applied to TARGET_WCPATH, which is a path to a working\n" -" copy of another branch. The three branches involved can be completely\n" -" unrelated.\n" +" svn merge SOURCE1[@REV1] SOURCE2[@REV2] [TARGET_WCPATH]\n" "\n" " You should use this merge variant only if the other variants do not\n" " apply to your situation, as this variant can be quite complex to\n" " master.\n" "\n" -" If TARGET_WCPATH is omitted, a default value of '.' is assumed.\n" -" However, in the special case where both sources refer to a file node\n" -" with the same basename and a similarly named file is also found within\n" -" '.', the differences will be applied to that local file. The source\n" -" revisions default to HEAD if omitted.\n" +" Two source URLs are specified, identifying two trees on the same\n" +" branch or on different branches. The trees are compared and the\n" +" difference from SOURCE1@REV1 to SOURCE2@REV2 is applied to the\n" +" working copy of the target branch at TARGET_WCPATH. The target\n" +" branch may be the same as one or both sources, or different again.\n" +" The three branches involved can be completely unrelated.\n" +"\n" +" TARGET_WCPATH is a working copy path; if omitted, '.' is generally\n" +" assumed. The special cases noted above in the 'complete' merge form\n" +" also apply here.\n" "\n" -" The sources can also be specified as working copy paths, in which case\n" -" the URLs of the merge sources are derived from the working copies.\n" +" SOURCE1 and/or SOURCE2 can also be specified as a working copy path,\n" +" in which case the merge source URL is derived from the working copy.\n" "\n" " - 2-URL Merge Example -\n" "\n" @@ -7388,26 +11413,39 @@ msgid "" " repositories.\n" msgstr "" +#: ../svn/svn.c:1083 msgid "" "Display merge-related information.\n" -"usage: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" -"\n" -" Display information related to merges (or potential merges) between\n" -" SOURCE and TARGET (default: '.'). Display the type of information\n" -" specified by the --show-revs option. If --show-revs isn't passed,\n" -" it defaults to --show-revs='merged'.\n" +"usage: 1. mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" +" 2. mergeinfo --show-revs=WHICH SOURCE[@REV] [TARGET[@REV]]\n" +"\n" +" 1. Summarize the history of merging between SOURCE and TARGET. The graph\n" +" shows, from left to right:\n" +" the youngest common ancestor of the branches;\n" +" the latest full merge in either direction, and thus the common base\n" +" that will be used for the next complete merge;\n" +" the repository path and revision number of the tip of each branch.\n" +"\n" +" 2. Print the revision numbers on SOURCE that have been merged to TARGET\n" +" (with --show-revs=merged), or that have not been merged to TARGET\n" +" (with --show-revs=eligible). Print only revisions in which there was\n" +" at least one change in SOURCE.\n" +"\n" +" If --revision (-r) is provided, filter the displayed information to\n" +" show only that which is associated with the revisions within the\n" +" specified range. Revision numbers, dates, and the 'HEAD' keyword are\n" +" valid range values.\n" +"\n" +" SOURCE and TARGET are the source and target branch URLs, respectively.\n" +" (If a WC path is given, the corresponding base URL is used.) The default\n" +" TARGET is the current working directory ('.'). REV specifies the revision\n" +" to be considered the tip of the branch; the default for SOURCE is HEAD,\n" +" and the default for TARGET is HEAD for a URL or BASE for a WC path.\n" "\n" " The depth can be 'empty' or 'infinity'; the default is 'empty'.\n" msgstr "" -"显示合并的相关信息。\n" -"用法: mergeinfo SOURCE[@REV] [TARGET[@REV]]\n" -"\n" -" 显示 SOURCE 与 TARGET(默认为“.”) 之间的合并(或潜在合并)信息。显示选项\n" -" --show-revs 指定的信息类型。如果没有传入 --show-revs，那么就使用其默认值\n" -" --show-revs='merged'。\n" -"\n" -" 深度可以是“empty”或“infinity”；默认值是“empty”\n" +#: ../svn/svn.c:1114 msgid "" "Create a new directory under version control.\n" "usage: 1. mkdir PATH...\n" @@ -7438,34 +11476,30 @@ msgstr "" " 在这两个情况下，所有的中间目录都必须事先存在，\n" " 除非使用选项 --parents。\n" +#: ../svn/svn.c:1131 msgid "" -"Move and/or rename something in working copy or repository.\n" +"Move (rename) an item in a working copy or repository.\n" "usage: move SRC... DST\n" "\n" -"When moving multiple sources, they will be added as children of DST,\n" -"which must be a directory.\n" -"\n" -" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n" -" Note: the --revision option has no use and is deprecated.\n" -"\n" " SRC and DST can both be working copy (WC) paths or URLs:\n" -" WC -> WC: move and schedule for addition (with history)\n" -" URL -> URL: complete server-side rename.\n" -" All the SRCs must be of the same type.\n" -msgstr "" -"在工作副本或版本库中移动或改名文件或目录。\n" -"用法: move SRC... DST\n" +" WC -> WC: move an item in a working copy, as a local change to\n" +" be committed later (with or without further changes)\n" +" URL -> URL: move an item in the repository directly, immediately\n" +" creating a new revision in the repository\n" +" All the SRCs must be of the same type. When moving multiple sources,\n" +" they will be added as children of DST, which must be a directory.\n" "\n" -"当移动多个源时，它们作为 DST 的子节点增加，DST 必须是目录。\n" +" SRC and DST of WC -> WC moves must be committed in the same revision.\n" +" Furthermore, WC -> WC moves will refuse to move a mixed-revision subtree.\n" +" To avoid unnecessary conflicts, it is recommended to run 'svn update'\n" +" to update the subtree to a single revision before moving it.\n" +" The --allow-mixed-revisions option is provided for backward " +"compatibility.\n" "\n" -" 注意: 本子命令等同于先 “copy”，然后 “delete”。\n" -" 注意: 此命令中 --revision 选项没有作用，已经淘汰。\n" -"\n" -" SRC 可同时为工作副本(WC) 路径或 URL: \n" -" WC -> WC : 移动并加入新增调度 (连同历史记录)\n" -" URL -> URL : 完全是服务器端更名。\n" -" 所有 SRC 必须是同一类型。\n" +" The --revision option has no use and is deprecated.\n" +msgstr "" +#: ../svn/svn.c:1153 msgid "" "Apply a patch to a working copy.\n" "usage: patch PATCHFILE [WCPATH]\n" @@ -7475,7 +11509,8 @@ msgid "" "\n" " A unidiff patch suitable for application to a working copy can be\n" " produced with the 'svn diff' command or third-party diffing tools.\n" -" Any non-unidiff content of PATCHFILE is ignored.\n" +" Any non-unidiff content of PATCHFILE is ignored, except for Subversion\n" +" property diffs as produced by 'svn diff'.\n" "\n" " Changes listed in the patch will either be applied or rejected.\n" " If a change does not match at its exact line offset, it may be applied\n" @@ -7505,12 +11540,13 @@ msgid "" "\n" " Hint: If the patch file was created with Subversion, it will contain\n" " the number of a revision N the patch will cleanly apply to\n" -" (look for lines like \"--- foo/bar.txt (revision N)\").\n" -" To avoid rejects, first update to the revision N using \n" +" (look for lines like '--- foo/bar.txt (revision N)').\n" +" To avoid rejects, first update to the revision N using\n" " 'svn update -r N', apply the patch, and then update back to the\n" " HEAD revision. This way, conflicts can be resolved interactively.\n" msgstr "" +#: ../svn/svn.c:1201 msgid "" "Remove a property from files, dirs, or revisions.\n" "usage: 1. propdel PROPNAME [PATH...]\n" @@ -7527,6 +11563,8 @@ msgstr "" " 1、删除工作副本中纳入版本管理的文件或目录的属性。\n" " 2、删除版本库中版本的属性。TARGET只用来判断访问哪个版本库。\n" +#: ../svn/svn.c:1211 +#, fuzzy msgid "" "Edit a property with an external editor.\n" "usage: 1. propedit PROPNAME TARGET...\n" @@ -7536,7 +11574,7 @@ msgid "" " 2. Edits unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -"See 'svn help propset' for more on setting properties.\n" +" See 'svn help propset' for more on setting properties.\n" msgstr "" "使用外部编辑器编辑属性。\n" "用法: 1、propedit PROPNAME TARGET...\n" @@ -7548,6 +11586,8 @@ msgstr "" "\n" "参见 “svn help propset” 以获得更多设置属性的信息。\n" +#: ../svn/svn.c:1223 +#, fuzzy msgid "" "Print the value of a property on files, dirs, or revisions.\n" "usage: 1. propget PROPNAME [TARGET[@REV]...]\n" @@ -7558,13 +11598,15 @@ msgid "" " 2. Prints unversioned remote prop on repos revision.\n" " TARGET only determines which repository to access.\n" "\n" -" By default, this subcommand will add an extra newline to the end\n" -" of the property values so that the output looks pretty. Also,\n" -" whenever there are multiple paths involved, each property value\n" -" is prefixed with the path with which it is associated. Use the\n" -" --strict option to disable these beautifications (useful when\n" -" redirecting a binary property value to a file, but available only\n" -" if you supply a single TARGET to a non-recursive propget operation).\n" +" With --verbose, the target path and the property name are printed on\n" +" separate lines before each value, like 'svn proplist --verbose'.\n" +" Otherwise, if there is more than one TARGET or a depth other than\n" +" 'empty', the target path is printed on the same line before each value.\n" +"\n" +" By default, an extra newline is printed after the property value so that\n" +" the output looks pretty. With a single TARGET and depth 'empty', you can\n" +" use the --strict option to disable this (useful when redirecting a binary\n" +" property value to a file, for example).\n" msgstr "" "显示目录、文件或版本的属性取值。\n" "用法: 1、propget PROPNAME [TARGET[@REV]...]\n" @@ -7579,6 +11621,16 @@ msgstr "" " 使用 --strict 选项可以关闭这些美化行为 (它很有用，例如将二进制属\n" " 性内容重定向到一个文件，但是仅用于单一目标的非递归操作)。\n" +#: ../svn/svn.c:1243 ../svn/svn.c:1260 +msgid "print path, name and value on separate lines" +msgstr "在单独的行打印路径，名称和取值" + +#: ../svn/svn.c:1244 +msgid "don't print an extra newline" +msgstr "不打印额外的新行" + +#: ../svn/svn.c:1247 +#, fuzzy msgid "" "List all properties on files, dirs, or revisions.\n" "usage: 1. proplist [TARGET[@REV]...]\n" @@ -7588,6 +11640,10 @@ msgid "" " revision the target is first looked up.\n" " 2. Lists unversioned remote props on repos revision.\n" " TARGET only determines which repository to access.\n" +"\n" +" With --verbose, the property values are printed as well, like 'svn " +"propget\n" +" --verbose'. With --quiet, the paths are not printed.\n" msgstr "" "列出目录、文件或版本的所有属性。\n" "用法: 1、proplist [TARGET[@REV]...]\n" @@ -7596,6 +11652,11 @@ msgstr "" " 1、显示目标的属性。REV 指定从哪个版本开始查找目标。\n" " 2、列出版本库中版本的属性。TARGET 只用来判断访问哪个版本库。\n" +#: ../svn/svn.c:1261 +msgid "don't print the path" +msgstr "不要打印路径" + +#: ../svn/svn.c:1264 msgid "" "Set the value of a property on files, dirs, or revisions.\n" "usage: 1. propset PROPNAME PROPVAL PATH...\n" @@ -7607,18 +11668,36 @@ msgid "" "\n" " The value may be provided with the --file option instead of PROPVAL.\n" "\n" -" Note: svn recognizes the following special versioned properties\n" -" but will store any arbitrary properties set:\n" -" svn:ignore - A newline separated list of file glob patterns to ignore.\n" +" Property names starting with 'svn:' are reserved. Subversion recognizes\n" +" the following special versioned properties on a file:\n" " svn:keywords - Keywords to be expanded. Valid keywords are:\n" -" URL, HeadURL - The URL for the head version of the object.\n" +" URL, HeadURL - The URL for the head version of the file.\n" " Author, LastChangedBy - The last person to modify the file.\n" -" Date, LastChangedDate - The date/time the object was last modified.\n" -" Rev, Revision, - The last revision the object changed.\n" -" LastChangedRevision\n" -" Id - A compressed summary of the previous\n" -" 4 keywords.\n" +" Date, LastChangedDate - The date/time the file was last modified.\n" +" Rev, Revision, - The last revision the file changed.\n" +" LastChangedRevision\n" +" Id - A compressed summary of the previous four.\n" " Header - Similar to Id but includes the full URL.\n" +"\n" +" Custom keywords can be defined with a format string separated from\n" +" the keyword name with '='. Valid format substitutions are:\n" +" %a - The author of the revision given by %r.\n" +" %b - The basename of the URL of the file.\n" +" %d - Short format of the date of the revision given by %r.\n" +" %D - Long format of the date of the revision given by %r.\n" +" %P - The file's path, relative to the repository root.\n" +" %r - The number of the revision which last changed the file.\n" +" %R - The URL to the root of the repository.\n" +" %u - The URL of the file.\n" +" %_ - A space (keyword definitions cannot contain a literal " +"space).\n" +" %% - A literal '%'.\n" +" %H - Equivalent to %P%_%r%_%d%_%a.\n" +" %I - Equivalent to %b%_%r%_%d%_%a.\n" +" Example custom keyword definition: MyKeyword=%r%_%a%_%P\n" +" Once a custom keyword has been defined for a file, it can be used\n" +" within the file like any other keyword: $MyKeyword$\n" +"\n" " svn:executable - If present, make the file executable. Use\n" " 'svn propdel svn:executable PATH...' to clear.\n" " svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n" @@ -7626,102 +11705,45 @@ msgid "" " whether to merge the file, and how to serve it from Apache.\n" " A mimetype beginning with 'text/' (or an absent mimetype) is\n" " treated as text. Anything else is treated as binary.\n" -" svn:externals - A newline separated list of module specifiers,\n" -" each of which consists of a URL and a relative directory path,\n" -" similar to the syntax of the 'svn checkout' command:\n" -" http://example.com/repos/zig foo/bar\n" -" A revision to check out can optionally be specified to pin the\n" -" external to a known revision:\n" -" -r25 http://example.com/repos/zig foo/bar\n" -" To unambiguously identify an element at a path which has been\n" -" deleted (possibly even deleted multiple times in its history),\n" -" an optional peg revision can be appended to the URL:\n" -" -r25 http://example.com/repos/zig@42 foo/bar\n" -" Relative URLs are indicated by starting the URL with one\n" -" of the following strings:\n" -" ../ to the parent directory of the extracted external\n" -" ^/ to the repository root\n" -" // to the scheme\n" -" / to the server root\n" -" The ambiguous format 'relative_path relative_path' is taken as\n" -" 'relative_url relative_path' with peg revision support.\n" -" Lines in externals definitions starting with the '#' character\n" -" are considered comments and are ignored.\n" -" Subversion 1.4 and earlier only support the following formats\n" -" where peg revisions can only be specified using a -r modifier\n" -" and where URLs cannot be relative:\n" -" foo http://example.com/repos/zig\n" -" foo/bar -r 1234 http://example.com/repos/zag\n" -" Use of these formats is discouraged. They should only be used if\n" -" interoperability with 1.4 clients is desired.\n" " svn:needs-lock - If present, indicates that the file should be locked\n" " before it is modified. Makes the working copy file read-only\n" " when it is not locked. Use 'svn propdel svn:needs-lock PATH...'\n" " to clear.\n" "\n" -" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n" -" svn:needs-lock properties cannot be set on a directory. A non-recursive\n" -" attempt will fail, and a recursive attempt will set the property\n" -" only on the file children of the directory.\n" -msgstr "" -"设定目录、文件或版本的属性。\n" -"用法: 1. propset PROPNAME PROPVAL PATH...\n" -" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n" -"\n" -" 1、在工作副本中修改一个受版本控制的属性。\n" -" 2、在版本库的版本中修改一个非版本控制的属性。\n" -" (TARGET 只用来判断访问哪一个版本库。)\n" -"\n" -" 可以使用选项 --file 来代替 PROPVAL 赋值。\n" -"\n" -" 注意: svn 除了能存储任意属性外，还识别以下专用的版本控制属性: \n" -" svn:ignore - 以换行符隔开的文件忽略模式列表。\n" -" svn:keywords - 将被展开的关键字。有效的关键字为。\n" -" URL, HeadURL - 此对象最新版本的 URL。\n" -" Author, LastChangedBy - 最后修改文件的人。\n" -" Date, LastChangedDate - 此对象最后修改的日期。\n" -" Rev, Revision, - 此对象最后修改的版本号。\n" -" LastChangedRevision\n" -" Id - 前四个关键字的压缩摘要。\n" -" Header - 与 Id 类似，只是包含完整的 URL。\n" -" svn:executable - 如果存在此属性则设置文件为可执行的。\n" -" 使用 “svn propdel svn:executable PATH...” 清除。\n" -" svn:eol-style - “native”，“LF”，“CR”，“CRLF” 之一。\n" -" svn:mime-type - 文件的媒体类型。用以决定是否该合并该文件，\n" -" 以及 Apache 如何处理它。媒体类型以“text/”开头(或是没有指\n" -" 定媒体类型)的文件会被视为纯文本文件，否则就是二进制数据。\n" -" svn:externals - 以换行符隔开的模块说明列表，每项都由一个 URL 和\n" -" 相对目录路径组成，与命令“svn checkout”的句法类似：\n" +" Subversion recognizes the following special versioned properties on a\n" +" directory:\n" +" svn:ignore - A list of file glob patterns to ignore, one per " +"line.\n" +" svn:global-ignores - Like svn:ignore, but inheritable.\n" +" svn:externals - A list of module specifiers, one per line, in the\n" +" following format similar to the syntax of 'svn checkout':\n" +" [-r REV] URL[@PEG] LOCALPATH\n" +" Example:\n" " http://example.com/repos/zig foo/bar\n" -" 可以指定版本以钉住已知的版本：\n" +" The LOCALPATH is relative to the directory having this property.\n" +" To pin the external to a known revision, specify the optional REV:\n" " -r25 http://example.com/repos/zig foo/bar\n" -" 为了清楚的表明路径上的一个元素已经被删除（甚至可能被删除了多次），\n" -" 可以在 URL 后追加一个 peg 版本:\n" +" To unambiguously identify an element at a path which may have been\n" +" subsequently deleted or renamed, specify the optional PEG revision:\n" " -r25 http://example.com/repos/zig@42 foo/bar\n" -" 下列开始字符串指示相对 URL:\n" -" ../ 相对于外部引用的父目录\n" -" ^/ 相对于版本库的根\n" -" // 相对于方案\n" -" / 相对于服务器根\n" -" 相对路径“relative_path relative_path”这种不明确的格式来自\n" -" “relative_url relative_path”和 peg 版本支持。\n" -" 以字符 '#' 开始的外部定义行被认为是注释，并且忽略。\n" -" Subversion 1.4 和早期的仅支持下列格式，peg 版本只能使用 -r 指定，\n" -" 并且 URL 不能使用相对格式:\n" -" foo http://example.com/repos/zig\n" -" foo/bar -r 1234 http://example.com/repos/zag\n" -" 不赞同使用这些格式。它们只应该用于希望支持 1.4 客户端的情况。\n" -" svn:needs-lock - 此属性表明文件在修改前应该加锁。\n" -" 如果没有加锁，则此文件在工作副本中应被设为只读。使用\n" -" “svn propdel svn:needs-lock PATH...” 清除。\n" -"\n" -" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以及\n" -" svn:needs-lock 属性不能设置在目录上。使用非递归选项(-N)在目录上\n" -" 设置这些属性时会失败，递归操作时只会作用于指定目录中的文件子孙上。\n" +" The URL may be a full URL or a relative URL starting with one of:\n" +" ../ to the parent directory of the extracted external\n" +" ^/ to the repository root\n" +" / to the server root\n" +" // to the URL scheme\n" +" Use of the following format is discouraged but is supported for\n" +" interoperability with Subversion 1.4 and earlier clients:\n" +" LOCALPATH [-r PEG] URL\n" +" The ambiguous format 'relative_path relative_path' is taken as\n" +" 'relative_url relative_path' with peg revision support.\n" +" Lines starting with a '#' character are ignored.\n" +msgstr "" +#: ../svn/svn.c:1343 msgid "read property value from file ARG" msgstr "从文件 ARG 读取属性值" +#: ../svn/svn.c:1346 msgid "" "Relocate the working copy to point to a different repository root URL.\n" "usage: 1. relocate FROM-PREFIX TO-PREFIX [PATH...]\n" @@ -7762,17 +11784,20 @@ msgstr "" " svn relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" +#: ../svn/svn.c:1369 msgid "" "Resolve conflicts on working copy files or directories.\n" -"usage: resolve --accept=ARG [PATH...]\n" +"usage: resolve [PATH...]\n" "\n" -" Note: the --accept option is currently required.\n" -msgstr "" -"解决工作副本中目录或文件的冲突。\n" -"用法: resolve --accept=ARG [PATH...]\n" +" By default, perform interactive conflict resolution on PATH.\n" +" In this mode, the command is recursive by default (depth 'infinity').\n" "\n" -" 注意: 当前需要选项 --accept 。\n" +" The --accept=ARG option prevents interactive prompting and forces\n" +" conflicts on PATH to be resolved in the manner specified by ARG.\n" +" In this mode, the command is not recursive by default (depth 'empty').\n" +msgstr "" +#: ../svn/svn.c:1379 msgid "" "specify automatic conflict resolution source\n" " ('base', 'working', 'mine-conflict',\n" @@ -7782,6 +11807,7 @@ msgstr "" " ('base', 'working', 'mine-conflict',\n" " 'theirs-conflict', 'mine-full', 'theirs-full')" +#: ../svn/svn.c:1386 msgid "" "Remove 'conflicted' state on working copy files or directories.\n" "usage: resolved PATH...\n" @@ -7798,18 +11824,21 @@ msgstr "" " 附加文件，让 PATH 可以被再次提交。它已经过时，被\n" " “svn resolve --accept working”取代。\n" +#: ../svn/svn.c:1396 msgid "" -"Restore pristine working copy file (undo most local edits).\n" +"Restore pristine working copy state (undo local changes).\n" "usage: revert PATH...\n" "\n" -" Note: this subcommand does not require network access, and resolves\n" -" any conflicted states.\n" -msgstr "" -"将工作副本文件恢复到原始版本(恢复大部分的本地修改)。\n" -"用法: revert PATH...\n" +" Revert changes in the working copy at or within PATH, and remove\n" +" conflict markers as well, if any.\n" "\n" -" 注意: 本子命令不会访问网络，它解除任何冲突的状态。\n" +" This subcommand does not revert already committed changes.\n" +" For information about undoing already committed changes, search\n" +" the output of 'svn help merge' for 'undo'.\n" +msgstr "" +#: ../svn/svn.c:1408 +#, fuzzy msgid "" "Print the status of working copy files and directories.\n" "usage: status [PATH...]\n" @@ -7836,9 +11865,10 @@ msgid "" " ' ' no modifications\n" " 'C' Conflicted\n" " 'M' Modified\n" -" Third column: Whether the working copy directory is locked\n" -" ' ' not locked\n" -" 'L' locked\n" +" Third column: Whether the working copy is locked for writing by\n" +" another Subversion client modifying the working copy\n" +" ' ' not locked for writing\n" +" 'L' locked for writing\n" " Fourth column: Scheduled commit will contain addition-with-history\n" " ' ' no history scheduled with commit\n" " '+' history scheduled with commit\n" @@ -7846,16 +11876,18 @@ msgid "" " ' ' normal\n" " 'S' the item has a Switched URL relative to the parent\n" " 'X' a versioned file created by an eXternals definition\n" -" Sixth column: Repository lock token\n" +" Sixth column: Whether the item is locked in repository for exclusive " +"commit\n" " (without -u)\n" -" ' ' no lock token\n" -" 'K' lock token present\n" +" ' ' not locked by this working copy\n" +" 'K' locked by this working copy, but lock might be stolen or broken\n" " (with -u)\n" -" ' ' not locked in repository, no lock token\n" -" 'K' locked in repository, lock toKen present\n" -" 'O' locked in repository, lock token in some Other working copy\n" -" 'T' locked in repository, lock token present but sTolen\n" -" 'B' not locked in repository, lock token present but Broken\n" +" ' ' not locked in repository, not locked by this working copy\n" +" 'K' locked in repository, lock owned by this working copy\n" +" 'O' locked in repository, lock owned by another working copy\n" +" 'T' locked in repository, lock owned by this working copy was stolen\n" +" 'B' not locked in repository, lock owned by this working copy is " +"broken\n" " Seventh column: Whether the item is the victim of a tree conflict\n" " ' ' normal\n" " 'C' tree-Conflicted\n" @@ -7880,20 +11912,20 @@ msgid "" "\n" " Example output:\n" " svn status wc\n" -" M wc/bar.c\n" -" A + wc/qax.c\n" +" M wc/bar.c\n" +" A + wc/qax.c\n" "\n" " svn status -u wc\n" -" M 965 wc/bar.c\n" -" * 965 wc/foo.c\n" -" A + - wc/qax.c\n" +" M 965 wc/bar.c\n" +" * 965 wc/foo.c\n" +" A + - wc/qax.c\n" " Status against revision: 981\n" "\n" " svn status --show-updates --verbose wc\n" -" M 965 938 kfogel wc/bar.c\n" -" * 965 922 sussman wc/foo.c\n" -" A + - 687 joe wc/qax.c\n" -" 965 687 joe wc/zig.c\n" +" M 965 938 kfogel wc/bar.c\n" +" * 965 922 sussman wc/foo.c\n" +" A + - 687 joe wc/qax.c\n" +" 965 687 joe wc/zig.c\n" " Status against revision: 981\n" "\n" " svn status\n" @@ -7962,25 +11994,26 @@ msgstr "" " 工作副本路径总是最后一栏，所以它可以包含空白字符。\n" "\n" " 问号标记 (“?”) 出现在工作版本，最后提交的版本，或最后提交的作者位置时，\n" -" 它指示信息未知，或者给出此项目的状态是不恰当的 (例如项目是复制操作的结果)。\n" +" 它指示信息未知，或者给出此项目的状态是不恰当的 (例如项目是复制操作的结" +"果)。\n" " 问号标记用来作为一个视觉占位符，易于解析\n" "\n" " 范例输出: \n" " svn status wc\n" -" M wc/bar.c\n" -" A + wc/qax.c\n" +" M wc/bar.c\n" +" A + wc/qax.c\n" "\n" " svn status -u wc\n" -" M 965 wc/bar.c\n" -" * 965 wc/foo.c\n" -" A + - wc/qax.c\n" +" M 965 wc/bar.c\n" +" * 965 wc/foo.c\n" +" A + - wc/qax.c\n" " 版本 981 的状态\n" "\n" " svn status --show-updates --verbose wc\n" -" M 965 938 kfogel wc/bar.c\n" -" * 965 922 sussman wc/foo.c\n" -" A + - 687 joe wc/qax.c\n" -" 965 687 joe wc/zig.c\n" +" M 965 938 kfogel wc/bar.c\n" +" * 965 922 sussman wc/foo.c\n" +" A + - 687 joe wc/qax.c\n" +" 965 687 joe wc/zig.c\n" " 版本 981 的状态\n" "\n" " svn status\n" @@ -7989,9 +12022,11 @@ msgstr "" " > local missing, incoming edit upon update\n" " D wc/qax.c\n" +#: ../svn/svn.c:1501 msgid "don't print unversioned items" msgstr "不打印未版本控制的条目" +#: ../svn/svn.c:1504 msgid "" "Update the working copy to a different URL within the same repository.\n" "usage: 1. switch URL[@PEGREV] [PATH]\n" @@ -8009,7 +12044,8 @@ msgid "" " or directory) as the corresponding path in the repository it becomes\n" " versioned but its contents are left 'as-is' in the working copy.\n" " This means that an obstructing directory's unversioned children may\n" -" also obstruct and become versioned. For files, any content differences\n" +" also obstruct and become versioned. For files, any content " +"differences\n" " between the obstruction and the repository are treated like a local\n" " modification to the working copy. All properties from the repository\n" " are applied to the obstructing path.\n" @@ -8037,7 +12073,8 @@ msgstr "" "用法: 1、switch URL[@PEGREV] [PATH]\n" " 2、switch --relocate FROM-PREFIX TO-PREFIX [PATH...]\n" "\n" -" 1、更新工作副本，与同一版本库中的新 URL 对应。其行为跟 “svn update” 很像，\n" +" 1、更新工作副本，与同一版本库中的新 URL 对应。其行为跟 “svn update” 很" +"像，\n" " 也是将工作副本切换到同一版本库中某个分支或者标签的方法。PEGREV 决定从\n" " 哪个版本查找目标。\n" "\n" @@ -8049,7 +12086,8 @@ msgstr "" "\n" " 使用 “--set-depth” 选项设置此操作目标的工作副本之新深度。\n" "\n" -" 如果新 URL 与工作副本路径没有版本继承关系，Subversion 将会拒绝操作。选项\n" +" 如果新 URL 与工作副本路径没有版本继承关系，Subversion 将会拒绝操作。选" +"项\n" " '--ignore-ancestry' 可以禁止此检查。\n" "\n" " 2、选项 “--relocate” 已经淘汰。它的句法等价于\n" @@ -8063,6 +12101,11 @@ msgstr "" " svn switch --relocate http://www.example.com/repo/project \\\n" " svn://svn.example.com/repo/project\n" +#: ../svn/svn.c:1546 +msgid "allow switching to a node with no common ancestor" +msgstr "" + +#: ../svn/svn.c:1550 msgid "" "Unlock working copy paths or URLs.\n" "usage: unlock TARGET...\n" @@ -8074,6 +12117,7 @@ msgstr "" "\n" " 使用 --force 终止锁定。\n" +#: ../svn/svn.c:1557 msgid "" "Bring changes from the repository into the working copy.\n" "usage: update [PATH...]\n" @@ -8156,6 +12200,7 @@ msgstr "" "\n" " 使用“--set-depth”选项设置此操作目标的工作副本之新深度。\n" +#: ../svn/svn.c:1607 msgid "" "Upgrade the metadata storage format for a working copy.\n" "usage: upgrade [WCPATH...]\n" @@ -8167,75 +12212,117 @@ msgstr "" "\n" " 保留本地修改。\n" +#: ../svn/svn.c:1653 ../svnadmin/svnadmin.c:90 ../svnlook/svnlook.c:379 +#: ../svnrdump/svnrdump.c:65 ../svnsync/svnsync.c:296 msgid "Caught signal" msgstr "捕捉到信号" +#: ../svn/svn.c:1806 ../svnlook/svnlook.c:2564 msgid "Non-numeric limit argument given" msgstr "--limit 取值不是数字" +#: ../svn/svn.c:1812 ../svnlook/svnlook.c:2570 msgid "Argument to --limit must be positive" msgstr "--limit 取值必须为正" +#: ../svn/svn.c:1833 ../svn/svn.c:2110 msgid "Can't specify -c with --old" msgstr "不能同时指定 -c 和 --old" +#: ../svn/svn.c:1864 #, c-format msgid "Negative number in range (%s) not supported with -c" msgstr "-c 选项不支持负数在范围 (%s) 中" +#: ../svn/svn.c:1877 #, c-format msgid "Non-numeric change argument (%s) given to -c" msgstr "-c 选项的取值(%s)不是数字" +#: ../svn/svn.c:1885 msgid "There is no change 0" msgstr "没有版本 0" +#: ../svn/svn.c:1928 ../svnadmin/svnadmin.c:2067 ../svnrdump/svnrdump.c:937 +#: ../svnsync/svnsync.c:2051 #, c-format msgid "Syntax error in revision argument '%s'" msgstr "版本参数“%s”中有语法错误" +#: ../svn/svn.c:1994 ../svn/svn.c:2013 #, c-format msgid "Error converting depth from locale to UTF-8" msgstr "将深度从本地编码转换到 UTF8 失败" +#: ../svn/svn.c:2002 #, c-format -msgid "'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" -msgstr "“%s” 不是有效的深度；尝试 “empty”，“files”，“immediates”，或 “infinity”" +msgid "" +"'%s' is not a valid depth; try 'empty', 'files', 'immediates', or 'infinity'" +msgstr "" +"“%s” 不是有效的深度；尝试 “empty”，“files”，“immediates”，或 “infinity”" +#: ../svn/svn.c:2021 #, c-format -msgid "'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or 'infinity'" -msgstr "“%s” 不是有效的深度；尝试 “exclude”，“empty”，“files”，“immediates”，或 “infinity”" +msgid "" +"'%s' is not a valid depth; try 'exclude', 'empty', 'files', 'immediates', or " +"'infinity'" +msgstr "" +"“%s” 不是有效的深度；尝试 “exclude”，“empty”，“files”，“immediates”，或 " +"“infinity”" +#: ../svn/svn.c:2150 #, c-format msgid "Syntax error in native-eol argument '%s'" msgstr "原生换行符号参数 “%s” 中有语法错误" +#: ../svn/svn.c:2170 msgid "Changelist names must not be empty" msgstr "修改列表的名称不能为空" +#: ../svn/svn.c:2204 #, c-format msgid "'%s' is not a valid --accept value" msgstr "“%s” 是非法 --accept 取值" +#: ../svn/svn.c:2212 #, c-format msgid "'%s' is not a valid --show-revs value" msgstr "“%s” 是非法 --show-revs 取值" +#: ../svn/svn.c:2224 #, c-format msgid "Invalid strip count '%s'" msgstr "无效修剪计数 '%s'" +#: ../svn/svn.c:2230 msgid "Argument to --strip must be positive" msgstr "--strip 参数的取值必须为正" +#: ../svn/svn.c:2285 ../svnmucc/svnmucc.c:1207 ../svnrdump/svnrdump.c:993 +#: ../svnsync/svnsync.c:2095 +msgid "--non-interactive and --force-interactive are mutually exclusive" +msgstr "--non-interactive 与 --force-interactive 是互斥的" + +#: ../svn/svn.c:2339 ../svndumpfilter/svndumpfilter.c:1509 +#: ../svnlook/svnlook.c:2666 #, c-format msgid "Subcommand argument required\n" msgstr "必须提供子命令参数\n" +#: ../svn/svn.c:2356 ../svnadmin/svnadmin.c:2250 +#: ../svndumpfilter/svndumpfilter.c:1529 ../svnlook/svnlook.c:2685 +#: ../svnrdump/svnrdump.c:1039 +#, c-format +msgid "Unknown subcommand: '%s'\n" +msgstr "未知子命令: “%s”\n" + +#: ../svn/svn.c:2365 #, c-format -msgid "Unknown command: '%s'\n" -msgstr "未知命令: “%s”\n" +msgid "" +"Undo is done using either the 'svn revert' or the 'svn merge' command.\n" +msgstr "" +#: ../svn/svn.c:2400 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -8244,582 +12331,146 @@ msgstr "" "子命令“%s”不接受选项“%s”\n" "输入“svn help %s”得到用法。\n" -msgid "Multiple revision arguments encountered; can't specify -c twice, or both -c and -r" +#: ../svn/svn.c:2414 +msgid "" +"Multiple revision arguments encountered; can't specify -c twice, or both -c " +"and -r" msgstr "遇到了多个版本参数；不能指定 -c 两次或者同时使用 -c 和 -r" +#: ../svn/svn.c:2426 msgid "--depth and --set-depth are mutually exclusive" msgstr "--depth 与 --set-depth 是互斥的" +#: ../svn/svn.c:2436 msgid "--with-all-revprops and --with-no-revprops are mutually exclusive" msgstr "--with-all-revprops 与 --with-no-revprops 是互斥的" +#: ../svn/svn.c:2446 msgid "--with-revprop and --with-no-revprops are mutually exclusive" msgstr "--with-revprop 与 --with-no-revprops 是互斥的" +#: ../svn/svn.c:2459 msgid "--message (-m) and --file (-F) are mutually exclusive" msgstr "--message (-m) 与 --file (-F) 是互斥的" +#: ../svn/svn.c:2468 ../svnmucc/svnmucc.c:1218 ../svnrdump/svnrdump.c:1098 +#: ../svnsync/svnsync.c:2146 msgid "--trust-server-cert requires --non-interactive" msgstr "--trust-server-cert 需要 --non-interactive" +#: ../svn/svn.c:2478 msgid "--diff-cmd and --internal-diff are mutually exclusive" msgstr "--diff-cmd 与 --internal-diff 是互斥的" +#: ../svn/svn.c:2520 +msgid "--relocate and --depth are mutually exclusive" +msgstr "--relocate 与 --depth 是互斥的" + +#: ../svn/svn.c:2528 +msgid "--relocate and --non-recursive (-N) are mutually exclusive" +msgstr "--relocate 与 --non-recursive (-N) 是互斥的" + +#: ../svn/svn.c:2650 msgid "Log message file is a versioned file; use '--force-log' to override" msgstr "日志信息文件受版本控制；请使用 “--force-log” 强制执行" +#: ../svn/svn.c:2657 msgid "Lock comment file is a versioned file; use '--force-log' to override" msgstr "锁注释文件受版本控制；请使用 “--force-log” 强制执行" -msgid "The log message is a pathname (was -F intended?); use '--force-log' to override" -msgstr "日志信息是路径名称 (本来想用 -F 选项的吗？)；请使用“--force-log”强制执行" +#: ../svn/svn.c:2678 +msgid "" +"The log message is a pathname (was -F intended?); use '--force-log' to " +"override" +msgstr "" +"日志信息是路径名称 (本来想用 -F 选项的吗？)；请使用“--force-log”强制执行" -msgid "The lock comment is a pathname (was -F intended?); use '--force-log' to override" +#: ../svn/svn.c:2685 +msgid "" +"The lock comment is a pathname (was -F intended?); use '--force-log' to " +"override" msgstr "锁注释是路径名称 (本来想用-F 选项的吗？)；请使用“--force-log”强制执行" -msgid "--relocate and --depth are mutually exclusive" -msgstr "--relocate 与 --depth 是互斥的" - -msgid "--relocate and --non-recursive (-N) are mutually exclusive" -msgstr "--relocate 与 --non-recursive (-N) 是互斥的" - +#: ../svn/svn.c:2709 msgid "--auto-props and --no-auto-props are mutually exclusive" msgstr "--auto-props 与 --no-auto-props 是互斥的" -msgid "--reintegrate cannot be used with --ignore-ancestry or --record-only" -msgstr "--reintegrate 不能与 --ignore-ancestry 或 --record-only 共存" - -msgid "--reintegrate cannot be used with --ignore-ancestry" -msgstr "--reintegrate 不能与 --ignore-ancestry 共存" - -msgid "--reintegrate cannot be used with --record-only" -msgstr "--reintegrate 不能与 --record-only 共存" - +#: ../svn/svn.c:2814 ../svn/svn.c:2821 #, c-format msgid "--accept=%s incompatible with --non-interactive" msgstr "--accept=%s 与 --non-interactive 不兼容" -msgid "Try 'svn help' for more info" -msgstr "请使用 “svn help” 以得到更多信息" +#: ../svn/svn.c:2877 +#, c-format +msgid "Try 'svn help %s' for more information" +msgstr "请使用 “svn help %s” 以得到更多信息" +#: ../svn/svn.c:2883 msgid "Please see the 'svn upgrade' command" msgstr "请参阅命令 'svn upgrade'" -msgid "svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)\n" -msgstr "svn: 运行“svn cleanup”删除锁定 (输入“svn help cleanup”得到用法)\n" - -msgid "-r and -c can't be used with --reintegrate" -msgstr "-r 和 -c 不能与 --reintegrate 共存" - -msgid "Merge source required" -msgstr "需要合并源" - -msgid "Second revision required" -msgstr "需要第二个版本" - -msgid "Too many arguments given" -msgstr "参数过多" - -msgid "Cannot specify a revision range with two URLs" -msgstr "不能对两个 URL 指定版本范围" - -msgid "A working copy merge source needs an explicit revision" -msgstr "工作副本的合并来源需要指定版本" - -msgid "--depth cannot be used with --reintegrate" -msgstr "--depth 不能与 --reintegrate 共存" - -msgid "--force cannot be used with --reintegrate" -msgstr "--force 不能与 --reintegrate 共存" - -msgid "--reintegrate can only be used with a single merge source" -msgstr "--reintegrate 只能用于单一合并源" - -msgid "--allow-mixed-revisions cannot be used with --reintegrate" -msgstr "--allow-mixed-revisions 不能与 --reintegrate 共存" - +#: ../svn/svn.c:2889 ../svnmucc/svnmucc.c:1449 ../svnrdump/svnrdump.c:1175 msgid "" -"Merge tracking not possible, use --ignore-ancestry or\n" -"fix invalid mergeinfo in target with 'svn propset'" +"Authentication failed and interactive prompting is disabled; see the --force-" +"interactive option" msgstr "" -"不能执行合并跟踪，对目标使用“svn propset”修正非法合并信息，或者使用选项\n" -"--ignore-ancestry" - -msgid "Not enough arguments given" -msgstr "没有提供足够的参数" - -msgid "Try 'svn add' or 'svn add --non-recursive' instead?" -msgstr "尝试用 “svn add”或 “svn add --non-recursive”代替？" - -msgid "Try 'svn mkdir --parents' instead?" -msgstr "尝试 “svn mkdir --parents”？" - -msgid "Summary of conflicts:\n" -msgstr "冲突概要：\n" - -#, c-format -msgid " Text conflicts: %u\n" -msgstr " 正文冲突：%u\n" -#, c-format -msgid " Property conflicts: %u\n" -msgstr " 属性冲突：%u\n" - -#, c-format -msgid " Tree conflicts: %u\n" -msgstr " 树冲突：%u\n" - -#, c-format -msgid " Skipped paths: %u\n" -msgstr " 跳过的路径：%u\n" - -#, c-format -msgid "Skipped missing target: '%s'\n" -msgstr "跳过缺少的目标: “%s”\n" - -#, c-format -msgid "Skipped target: '%s' -- copy-source is missing\n" -msgstr "跳过目标: '%s' -- copy-source 丢失\n" - -#, c-format -msgid "Skipped '%s'\n" -msgstr "跳过“%s”\n" - -#, c-format -msgid "Skipped '%s' -- An obstructing working copy was found\n" -msgstr "忽略“%s” -- 发现障碍工作副本\n" - -#, c-format -msgid "Skipped '%s' -- Has no versioned parent\n" -msgstr "已跳过 '%s' -- 没有已版本控制的父亲\n" - -#, c-format -msgid "Skipped '%s' -- Access denied\n" -msgstr "已跳过 '%s' -- 拒绝访问\n" - -#, c-format -msgid "Skipped '%s' -- Node remains in conflict\n" -msgstr "已跳过 '%s' -- 节点处于冲突状态\n" - -#, c-format -msgid "Restored '%s'\n" -msgstr "已还原“%s”\n" - -#, c-format -msgid "Reverted '%s'\n" -msgstr "已恢复“%s”\n" - -#, c-format -msgid "Failed to revert '%s' -- try updating instead.\n" -msgstr "无法恢复“%s”-- 请改用更新试试。\n" - -#, c-format -msgid "Resolved conflicted state of '%s'\n" -msgstr "“%s”的冲突状态已解决\n" - -#, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with offset %s" -msgstr "> 已应用块 ## -%lu,%lu +%lu,%lu ##，偏移 %s" - -#, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with offset %s" -msgstr "> 已应用块 @@ -%lu,%lu +%lu,%lu @@ 偏移 %s" - -#, c-format -msgid "> applied hunk ## -%lu,%lu +%lu,%lu ## with fuzz %lu (%s)\n" -msgstr "> 已应用块 ## -%lu,%lu +%lu,%lu ## 模糊 %lu (%s)\n" - -#, c-format -msgid "> applied hunk @@ -%lu,%lu +%lu,%lu @@ with fuzz %lu\n" -msgstr "> 已应用块 @@ -%lu,%lu +%lu,%lu @@ 模糊 %lu\n" - -#, c-format -msgid "> rejected hunk ## -%lu,%lu +%lu,%lu ## (%s)\n" -msgstr "> 已拒绝块 ## -%lu,%lu +%lu,%lu ## (%s)\n" - -#, c-format -msgid "> rejected hunk @@ -%lu,%lu +%lu,%lu @@\n" -msgstr "> 已拒绝的块 @@ -%lu,%lu +%lu,%lu @@\n" - -#, c-format -msgid "> hunk ## -%lu,%lu +%lu,%lu ## already applied (%s)\n" -msgstr "> 块 ## -%lu,%lu +%lu,%lu ## 已经应用 (%s)\n" - -#, c-format -msgid "> hunk @@ -%lu,%lu +%lu,%lu @@ already applied\n" -msgstr "> 块 @@ -%lu,%lu +%lu,%lu @@ 已经应用\n" - -#, c-format +#: ../svn/svn.c:2894 msgid "" -"\n" -"Fetching external item into '%s':\n" +"Reading file from standard input because of -F option; this can interfere " +"with interactive prompting" msgstr "" -"\n" -"正在取得外部项目至 '%s':\n" - -#, c-format -msgid "Error handling externals definition for '%s':" -msgstr "处理外部引用“%s”时出错：" - -#, c-format -msgid "Updating '%s':\n" -msgstr "正在升级 '%s':\n" - -#, c-format -msgid "Exported external at revision %ld.\n" -msgstr "已导出版本 %ld 的外部项目。\n" - -#, c-format -msgid "Exported revision %ld.\n" -msgstr "已导出版本 %ld。\n" - -#, c-format -msgid "Checked out external at revision %ld.\n" -msgstr "取出版本 %ld 的外部项目。\n" - -#, c-format -msgid "Checked out revision %ld.\n" -msgstr "取出版本 %ld。\n" - -#, c-format -msgid "Updated external to revision %ld.\n" -msgstr "更新外部项目至版本 %ld。\n" - -#, c-format -msgid "Updated to revision %ld.\n" -msgstr "更新到版本 %ld。\n" - -#, c-format -msgid "External at revision %ld.\n" -msgstr "外部项目版本 %ld。\n" - -#, c-format -msgid "At revision %ld.\n" -msgstr "版本 %ld。\n" - -#, c-format -msgid "External export complete.\n" -msgstr "完成外部项目导出。\n" - -#, c-format -msgid "Export complete.\n" -msgstr "完成导出。\n" - -#, c-format -msgid "External checkout complete.\n" -msgstr "完成取出外部项目。\n" - -#, c-format -msgid "Checkout complete.\n" -msgstr "完成取出。\n" - -#, c-format -msgid "External update complete.\n" -msgstr "完成外部项目更新。\n" -#, c-format -msgid "Update complete.\n" -msgstr "完成更新。\n" +#: ../svn/svn.c:2905 +msgid "Run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)" +msgstr "运行“svn cleanup”删除锁 (运行“svn help cleanup”以得到详细信息)" -#, c-format +#: ../svn/svn.c:2912 msgid "" -"\n" -"Performing status on external item at '%s':\n" +"Another process is blocking the working copy database, or the underlying " +"filesystem does not support file locking; if the working copy is on a " +"network filesystem, make sure file locking has been enabled on the file " +"server" msgstr "" -"\n" -"对外部项目“%s”进行状态检查:\n" - -#, c-format -msgid "Status against revision: %6ld\n" -msgstr "版本 %6ld 的状态\n" - -#, c-format -msgid "Sending copy of %s\n" -msgstr "正在发送副本 %s\n" - -#, c-format -msgid "Sending %s\n" -msgstr "正在发送 %s\n" - -#, c-format -msgid "Adding copy of (bin) %s\n" -msgstr "正在增加 (二进制) %s\n" - -#, c-format -msgid "Adding (bin) %s\n" -msgstr "正在增加 (二进制) %s\n" - -#, c-format -msgid "Adding copy of %s\n" -msgstr "正在增加副本 %s\n" - -#, c-format -msgid "Adding %s\n" -msgstr "正在增加 %s\n" -#, c-format -msgid "Deleting copy of %s\n" -msgstr "正在删除副本 %s\n" - -#, c-format -msgid "Deleting %s\n" -msgstr "正在删除 %s\n" - -#, c-format -msgid "Replacing copy of %s\n" -msgstr "正在替换副本 %s\n" - -#, c-format -msgid "Replacing %s\n" -msgstr "正在替换 %s\n" - -#, c-format -msgid "Transmitting file data " -msgstr "传输文件数据" - -#, c-format -msgid "'%s' locked by user '%s'.\n" -msgstr "“%s”被用户“%s”锁定。\n" - -#, c-format -msgid "'%s' unlocked.\n" -msgstr "“%s”解除锁定。\n" - -#, c-format -msgid "--- Merging differences between repository URLs into '%s':\n" -msgstr "--- 正在合并版本库 URL 之间的差异到 “%s”：\n" - -#, c-format -msgid "--- Merging r%ld into '%s':\n" -msgstr "--- 正在合并 r%ld 到 “%s”:\n" - -#, c-format -msgid "--- Reverse-merging r%ld into '%s':\n" -msgstr "--- 正在反向合并 r%ld 到 “%s”:\n" - -#, c-format -msgid "--- Merging r%ld through r%ld into '%s':\n" -msgstr "--- 正在合并 r%ld，经由 r%ld，到 “%s”:\n" - -#, c-format -msgid "--- Reverse-merging r%ld through r%ld into '%s':\n" -msgstr "--- 正在反向合并 r%ld，经由 r%ld，到 “%s”:\n" - -#, c-format -msgid "--- Recording mergeinfo for merge between repository URLs into '%s':\n" -msgstr "--- 记录版本库 URL 之间的合并信息到“%s”：\n" - -#, c-format -msgid "--- Recording mergeinfo for merge of r%ld into '%s':\n" -msgstr "--- 记录合并 r%ld 到“%s”的信息:\n" - -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld into '%s':\n" -msgstr "--- 记录反向合并 r%ld 到“%s”的信息:\n" - -#, c-format -msgid "--- Recording mergeinfo for merge of r%ld through r%ld into '%s':\n" -msgstr "--- 记录合并 r%ld，经由 r%ld，到“%s”的信息:\n" - -#, c-format -msgid "--- Recording mergeinfo for reverse merge of r%ld through r%ld into '%s':\n" -msgstr "--- 记录反向合并 r%ld，经由 r%ld，到“%s”的信息:\n" - -#, c-format -msgid "--- Eliding mergeinfo from '%s':\n" -msgstr "--- 正在从 '%s' 删除合并信息:\n" - -#, c-format -msgid "--- Merging differences between foreign repository URLs into '%s':\n" -msgstr "--- 正在合并外部版本库 URL 之间的差异到 “%s”：\n" - -#, c-format -msgid "--- Merging (from foreign repository) r%ld into '%s':\n" -msgstr "--- 正在合并(从外部版本库) r%ld 到 “%s”：\n" - -#, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld into '%s':\n" -msgstr "--- 正在反向合并(从外部版本库) r%ld 到 “%s”:\n" - -#, c-format -msgid "--- Merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "--- 正在合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n" - -#, c-format -msgid "--- Reverse-merging (from foreign repository) r%ld through r%ld into '%s':\n" -msgstr "--- 正在反向合并(从外部版本库) r%ld，经由 r%ld，到 “%s”:\n" - -#, c-format -msgid "property '%s' set on '%s'\n" -msgstr "设置属性 “%s” 于 “%s”\n" - -#, c-format -msgid "property '%s' deleted from '%s'.\n" -msgstr "删除属性 “%s” 于 “%s”。\n" - -#, c-format -msgid "Attempting to delete nonexistent property '%s' on '%s'\n" -msgstr "试图删除不存在的属性“%s”于“%s”\n" - -#, c-format -msgid "property '%s' set on repository revision %ld\n" -msgstr "设定属性 “%s” 于版本库版本 %ld\n" - -#, c-format -msgid "property '%s' deleted from repository revision %ld\n" -msgstr "删除属性 “%s” 于版本库版本 %ld\n" - -#, c-format -msgid "Upgraded '%s'\n" -msgstr "已升级的“%s”\n" - -#, c-format -msgid "Redirecting to URL '%s':\n" -msgstr "正在重定向到 URL '%s':\n" - -#, c-format -msgid "Cannot specify revision for deleting versioned property '%s'" -msgstr "删除纳入版本控制的属性 “%s” 时不可指定版本" - -#, c-format -msgid "Set new value for property '%s' on '%s'\n" -msgstr "属性 “%s” 于 “%s” 被设为新值\n" - -msgid "--encoding option applies only to textual Subversion-controlled properties" -msgstr "--encoding 选项只能用于 Subversion 的文本属性" - -#, c-format -msgid "Set new value for property '%s' on revision %ld\n" -msgstr "属性 “%s” 于版本 %ld 被设为新值\n" - -#, c-format -msgid "No changes to property '%s' on revision %ld\n" -msgstr "属性 “%s” 于版本 %ld 没有改变\n" - -#, c-format -msgid "Cannot specify revision for editing versioned property '%s'" -msgstr "编辑纳入版本控制的属性 “%s” 时不可指定版本" - -msgid "Explicit target argument required" -msgstr "必须明确地提供目标参数" - -#, c-format -msgid "'%s' does not appear to be a working copy path" -msgstr "“%s”不像是工作副本路径" - -#, c-format -msgid "No changes to property '%s' on '%s'\n" -msgstr "属性 “%s” 于 “%s” 没有改变\n" - -msgid "Error writing to stream" -msgstr "写入流出错" - -#, c-format -msgid "Properties on '%s':\n" -msgstr "“%s” 上的属性: \n" - -msgid "--verbose cannot be used with --revprop or --strict or --xml" -msgstr "--verbose 不能与 --revprop， --strict 或 --xml 共存" - -msgid "Strict output of property values only available for single-target, non-recursive propget operations" -msgstr "精确的输出属性值只适用于单一目标的非递归操作 propget" - -#, c-format -msgid "Unversioned properties on revision %ld:\n" -msgstr "版本 %ld 上的未纳入版本控制的属性: \n" - -msgid "Could not display properties of all targets because some targets don't exist" -msgstr "因为一些目标不存在，所以不能显示全部目标的属性" - -msgid "Could not display properties of all targets because some targets are not versioned" -msgstr "因为一些目标没有版本化，所以不能显示全部目标的属性" - -msgid "Must specify the revision as a number, a date or 'HEAD' when operating on a revision property" -msgstr "操作版本属性时，必须指定数字、日期形式的版本号或“HEAD”。" - -msgid "Wrong number of targets specified" -msgstr "指定的目标数目错误" - -msgid "Either a URL or versioned item is required" -msgstr "必须提供URL或纳入版本控制的项目" - -#, c-format +#: ../svn/svn.c:2925 msgid "" -"To turn off the %s property, use 'svn propdel';\n" -"setting the property to '%s' will not turn it off." +"When using svn+ssh:// URLs, keep in mind that the --username and --password " +"options are ignored because authentication is performed by SSH, not " +"Subversion" msgstr "" -"使用 “svn propdel” 关闭属性 %s；\n" -"设置属性为 “%s” 不会关闭它。" - -#, c-format -msgid "Cannot specify revision for setting versioned property '%s'" -msgstr "设置受版本控制的属性 “%s” 时不能指定版本" - -#, c-format -msgid "Explicit target required ('%s' interpreted as prop value)" -msgstr "必须明确地提供目的 (“%s”解释为属性内容)" - -msgid "missing --accept option" -msgstr "缺少选项 --accept" - -msgid "invalid 'accept' ARG" -msgstr "无效的 “accept” 参数" - -msgid "Try 'svn revert --depth infinity' instead?" -msgstr "尝试 “svn revert --depth infinity”？" - -#, c-format -msgid "" -"\n" -"--- Changelist '%s':\n" -msgstr "" -"\n" -"--- 修改列表 '%s':\n" +#: ../svn/switch-cmd.c:63 #, c-format msgid "'%s' to '%s' is not a valid relocation" msgstr "“%s”到“%s”不是有效的重定位" +#: ../svn/switch-cmd.c:170 #, c-format -msgid "Path '%s' does not share common version control ancestry with the requested switch location. Use --ignore-ancestry to disable this check." -msgstr "路径“%s”与请求的切换位置没有共同的祖先。使用 --ignore-ancestry 可以禁用此检查。" - -msgid "edit" -msgstr "编辑" - -msgid "delete" -msgstr "删除" - -msgid "add" -msgstr "增加" - -msgid "replace" -msgstr "替换" - -msgid "missing" -msgstr "失踪" - -msgid "obstruction" -msgstr "阻塞" - -msgid "unversioned" -msgstr "未版本控制" +msgid "" +"Path '%s' does not share common version control ancestry with the requested " +"switch location. Use --ignore-ancestry to disable this check." +msgstr "" +"路径“%s”与请求的切换位置没有共同的祖先。使用 --ignore-ancestry 可以禁用此检" +"查。" -#, c-format -msgid "local %s, incoming %s upon %s" -msgstr "本地 %s，动作 %s，操作 %s" +#: ../svn/switch-cmd.c:180 +msgid "" +"'svn switch' does not support switching a working copy to a different " +"repository" +msgstr "“svn switch”不支持将工作副本切换到不同的版本库" +#: ../svn/update-cmd.c:93 #, c-format msgid "Summary of updates:\n" msgstr "更新概要：\n" -#. Print an update summary for this target, removing the current -#. working directory prefix from PATH (if PATH is at or under -#. $CWD), and converting the path to local style for display. +#: ../svn/update-cmd.c:97 #, c-format msgid " Updated '%s' to r%ld.\n" msgstr "更新 '%s' 到版本 %ld。\n" +#: ../svn/util.c:79 #, c-format msgid "" "\n" @@ -8828,9 +12479,11 @@ msgstr "" "\n" "提交后的版本为 %ld%s。\n" +#: ../svn/util.c:83 msgid " (the answer to life, the universe, and everything)" msgstr " (生命，宇宙，和一切的答案)" +#: ../svn/util.c:92 #, c-format msgid "" "\n" @@ -8839,67 +12492,59 @@ msgstr "" "\n" "警告: %s\n" -msgid "The EDITOR, SVN_EDITOR or VISUAL environment variable or 'editor-cmd' run-time configuration option is empty or consists solely of whitespace. Expected a shell command." -msgstr "环境变量 EDITOR，SVN_EDITOR，或 VISUAL；或者运行时配置选项 “editor-cmd” 为空或取值包含了不加引号的空格。期望外壳命令。" - -msgid "None of the environment variables SVN_EDITOR, VISUAL or EDITOR are set, and no 'editor-cmd' run-time configuration option was found" -msgstr "没有设置 SVN_EDITOR，VISUAL 或 EDITOR 环境变量，运行时的配置参数中也没有 “editor-cmd” 选项" - -#, c-format -msgid "Can't get working directory" -msgstr "无法取得工作目录" - -#, c-format -msgid "Can't change working directory to '%s'" -msgstr "无法改变工作目录到“%s”" - -#, c-format -msgid "Can't restore working directory" -msgstr "无法还原工作目录" - -#, c-format -msgid "system('%s') returned %d" -msgstr "system('%s') 返回 %d" - -msgid "The SVN_MERGE environment variable is empty or consists solely of whitespace. Expected a shell command.\n" +#: ../svn/util.c:133 +msgid "" +"The SVN_MERGE environment variable is empty or consists solely of " +"whitespace. Expected a shell command.\n" msgstr "环境变量 SVN_MERGE 没有设置或者由空白组成。期望外壳命令。\n" -msgid "The environment variable SVN_MERGE and the merge-tool-cmd run-time configuration option were not set.\n" -msgstr "环境变量 SVN_MERGE 没有设置，运行时的配置中也没有设置 “merge-tool-cmd”。\n" +#: ../svn/util.c:139 +msgid "" +"The environment variable SVN_MERGE and the merge-tool-cmd run-time " +"configuration option were not set.\n" +msgstr "" +"环境变量 SVN_MERGE 没有设置，运行时的配置中也没有设置 “merge-tool-cmd”。\n" +#: ../svn/util.c:169 #, c-format msgid "The external merge tool exited with exit code %d" msgstr "外部合并工具已经退出，代码是 %d" -#, c-format -msgid "Can't write to '%s'" -msgstr "无法写入“%s”" - -msgid "Error normalizing edited contents to internal format" -msgstr "将编辑内容规格化为内部格式出错" - +#: ../svn/util.c:211 msgid "Log message contains a zero byte" msgstr "日志信息中有一个零字节" +#: ../svn/util.c:269 #, c-format msgid " '%s'" msgstr " '%s'" +#: ../svn/util.c:273 msgid "Your commit message was left in a temporary file:" msgstr "您的提交信息保留在临时文件中: " +#: ../svn/util.c:325 msgid "--This line, and those below, will be ignored--" msgstr "--此行及以下内容将会被忽略--" +#: ../svn/util.c:360 msgid "Error normalizing log message to internal format" msgstr "将日志内容规格化为内部格式出错" +#: ../svn/util.c:447 ../svnmucc/svnmucc.c:763 msgid "Cannot invoke editor to get log message when non-interactive" msgstr "在非交互式环境中不能调用编辑器获得日志信息" -msgid "Could not use external editor to fetch log message; consider setting the $SVN_EDITOR environment variable or using the --message (-m) or --file (-F) options" -msgstr "无法使用外部编辑器获得日志信息；考虑设置环境变量 $SVN_EDITOR，或者使用 --message (-m) 或 --file (-F) 选项" +#: ../svn/util.c:460 +msgid "" +"Could not use external editor to fetch log message; consider setting the " +"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) " +"options" +msgstr "" +"无法使用外部编辑器获得日志信息；考虑设置环境变量 $SVN_EDITOR，或者使用 --" +"message (-m) 或 --file (-F) 选项" +#: ../svn/util.c:496 msgid "" "\n" "Log message unchanged or not specified\n" @@ -8909,103 +12554,130 @@ msgstr "" "日志信息未修改，或未指定\n" "a)终止，c)继续，e)编辑：\n" -msgid "Use --force to override this restriction (local modifications may be lost)" +#: ../svn/util.c:549 +msgid "" +"Use --force to override this restriction (local modifications may be lost)" msgstr "请使用 --force 选项强制执行(可能会丢失本地修改)" +#: ../svn/util.c:738 ../svn/util.c:771 msgid "none" msgstr "无" +#: ../svn/util.c:739 msgid "file" msgstr "文件" +#: ../svn/util.c:740 msgid "dir" msgstr "目录" +#: ../svn/util.c:772 msgid "update" msgstr "更新" +#: ../svn/util.c:773 msgid "switch" msgstr "切换" -msgid "merge" -msgstr "合并" - +#: ../svn/util.c:896 msgid "(invalid date)" msgstr "(非法日期)" +#: ../svn/util.c:1069 +#, c-format +msgid "" +"svn: warning: '%s' is a binary mime-type but file '%s' looks like text; " +"diff, merge, blame, and other operations will stop working on this file\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:217 ../svnrdump/svnrdump.c:120 msgid "specify revision number ARG (or X:Y range)" msgstr "指定版本 ARG (或 X:Y 范围)" -msgid "dump incrementally" -msgstr "以增量方式进行转存" +#: ../svnadmin/svnadmin.c:220 ../svnlook/svnlook.c:161 +msgid "specify transaction name ARG" +msgstr "指定事务名称 ARG" + +#: ../svnadmin/svnadmin.c:223 +msgid "dump or hotcopy incrementally" +msgstr "以增量方式进行转存或热复制" +#: ../svnadmin/svnadmin.c:226 msgid "use deltas in dump output" msgstr "在转存输出中使用差异" +#: ../svnadmin/svnadmin.c:229 msgid "bypass the repository hook system" msgstr "跳过版本库钩子系统" +#: ../svnadmin/svnadmin.c:232 msgid "bypass property validation logic" msgstr "跳过属性校验逻辑" +#: ../svnadmin/svnadmin.c:235 ../svnlook/svnlook.c:192 +#: ../svnrdump/svnrdump.c:122 ../svnserve/svnserve.c:290 +#: ../svnversion/svnversion.c:142 msgid "no progress (only errors) to stderr" msgstr "在标准错误输出不显示进度 (仅错误)" +#: ../svnadmin/svnadmin.c:238 msgid "ignore any repos UUID found in the stream" msgstr "忽略所有流中的版本库 UUID" +#: ../svnadmin/svnadmin.c:241 msgid "set repos UUID to that found in stream, if any" msgstr "如果流中存在UUID,则设定为版本库的 UUID" +#: ../svnadmin/svnadmin.c:244 msgid "type of repository: 'fsfs' (default) or 'bdb'" msgstr "版本库类型: “fsfs”(默认)或“bdb”" +#: ../svnadmin/svnadmin.c:247 msgid "load at specified directory in repository" msgstr "加载到版本库指定的目录中" +#: ../svnadmin/svnadmin.c:250 msgid "disable fsync at transaction commit [Berkeley DB]" msgstr "在提交事务时禁用fsync [BDB]" +#: ../svnadmin/svnadmin.c:253 msgid "disable automatic log file removal [Berkeley DB]" msgstr "禁用自动删除日志文件 [BDB]" +#: ../svnadmin/svnadmin.c:259 msgid "" "remove redundant Berkeley DB log files\n" " from source repository [Berkeley DB]" msgstr "删除源版本库中多余的BDB日志文件 [BDB]" +#: ../svnadmin/svnadmin.c:263 msgid "call pre-commit hook before committing revisions" msgstr "提交版本前调用 pre-commit 钩子" +#: ../svnadmin/svnadmin.c:266 msgid "call post-commit hook after committing revisions" msgstr "提交版本后调用 post-commit 钩子" +#: ../svnadmin/svnadmin.c:269 msgid "call hook before changing revision property" msgstr "修改属性前调用钩子" +#: ../svnadmin/svnadmin.c:272 msgid "call hook after changing revision property" msgstr "修改属性后调用钩子" +#: ../svnadmin/svnadmin.c:275 msgid "" "wait instead of exit if the repository is in\n" " use by another process" msgstr "如果版本库被其他进程占用，等待而不直接退出" -msgid "" -"use format compatible with Subversion versions\n" -" earlier than 1.4" -msgstr "使用与1.4之前版本兼容的格式" - -msgid "" -"use format compatible with Subversion versions\n" -" earlier than 1.5" -msgstr "使用 Subversion 1.5 之前版本的格式" - -msgid "" -"use format compatible with Subversion versions\n" -" earlier than 1.6" -msgstr "使用与 1.6 之前版本兼容的格式" +#: ../svnadmin/svnadmin.c:279 ../svnadmin/svnadmin.c:282 +#: ../svnadmin/svnadmin.c:285 +msgid "deprecated; see --compatible-version" +msgstr "已经淘汰; 参见 --compatible-version" +#: ../svnadmin/svnadmin.c:288 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations. Default: 16.\n" @@ -9015,6 +12687,18 @@ msgstr "" " 默认值: 16。\n" " [仅用于 FSFS 仓库]" +#: ../svnadmin/svnadmin.c:293 +#, fuzzy +msgid "" +"use repository format compatible with Subversion\n" +" version ARG (\"1.5.5\", \"1.7\", etc.)" +msgstr "使用 Subversion 1.5 之前版本的格式" + +#: ../svnadmin/svnadmin.c:296 +msgid "read repository paths from file ARG" +msgstr "从文件 ARG 读取版本库路径" + +#: ../svnadmin/svnadmin.c:308 msgid "" "usage: svnadmin crashtest REPOS_PATH\n" "\n" @@ -9023,8 +12707,10 @@ msgid "" msgstr "" "用法: svnadmin crashtest REPOS_PATH\n" "\n" -"打开位于 REPOS_PATH 的版本库, 然后终止, 从而模拟一个持有版本库句柄进程的崩溃。\n" +"打开位于 REPOS_PATH 的版本库, 然后终止, 从而模拟一个持有版本库句柄进程的崩" +"溃。\n" +#: ../svnadmin/svnadmin.c:314 msgid "" "usage: svnadmin create REPOS_PATH\n" "\n" @@ -9034,6 +12720,7 @@ msgstr "" "\n" "在 REPOS_PATH 创建一个新的空版本库。\n" +#: ../svnadmin/svnadmin.c:323 msgid "" "usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n" "\n" @@ -9048,6 +12735,7 @@ msgstr "" "在指定的版本范围中，对其中变动的路径增量计算。借助只储存与以前版本的差异，\n" "它本质上可压缩版本库。如果没有指定版本则直接对 HEAD 版本进行。\n" +#: ../svnadmin/svnadmin.c:332 msgid "" "usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" @@ -9063,12 +12751,28 @@ msgid "" msgstr "" "用法: svnadmin dump REPOS_PATH [-r LOWER[:UPPER] [--incremental]]\n" "\n" -"将文件系统的内容，以可移植“转存”格式输出到标准输出，并将反馈输出到标准错误。\n" +"将文件系统的内容，以可移植“转存”格式输出到标准输出，并将反馈输出到标准错" +"误。\n" "转存 LOWER 与 UPPER 版本之间的内容。如果没有指定版本，则转储所有的版本树。\n" -"如果只有指定 LOWER ，则只转储一个版本树。如果使用了 --incremental 选项，那么\n" -"第一个转存的版本只描述它改变的路径；否则它会描述此版本在版本库中涉及到的每个\n" +"如果只有指定 LOWER ，则只转储一个版本树。如果使用了 --incremental 选项，那" +"么\n" +"第一个转存的版本只描述它改变的路径；否则它会描述此版本在版本库中涉及到的每" +"个\n" "路径。(在任何情况下，第二个以及后续的版本，只描述这些版本改变的路径。)\n" +#: ../svnadmin/svnadmin.c:345 +msgid "" +"usage: 1. svnadmin freeze REPOS_PATH PROGRAM [ARG...]\n" +" 2. svnadmin freeze -F FILE PROGRAM [ARG...]\n" +"\n" +"1. Run PROGRAM passing ARGS while holding a write-lock on REPOS_PATH.\n" +"\n" +"2. Like 1 except all repositories listed in FILE are locked. The file\n" +" format is repository paths separated by newlines. Repositories are\n" +" locked in the same order as they are listed in the file.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:355 msgid "" "usage: svnadmin help [SUBCOMMAND...]\n" "\n" @@ -9078,15 +12782,17 @@ msgstr "" "\n" "显示本程序或其子命令的用法。\n" +#: ../svnadmin/svnadmin.c:360 msgid "" "usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" "\n" -"Makes a hot copy of a repository.\n" +"Make a hot copy of a repository.\n" +"If --incremental is passed, data which already exists at the destination\n" +"is not copied again. Incremental mode is implemented for FSFS " +"repositories.\n" msgstr "" -"用法: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n" -"\n" -"产生版本库的即时副本。\n" +#: ../svnadmin/svnadmin.c:367 msgid "" "usage: svnadmin list-dblogs REPOS_PATH\n" "\n" @@ -9101,6 +12807,7 @@ msgstr "" "\n" "警告: 修改或删除仍在使用中的记录文件将导致版本库损坏。\n" +#: ../svnadmin/svnadmin.c:374 msgid "" "usage: svnadmin list-unused-dblogs REPOS_PATH\n" "\n" @@ -9112,6 +12819,7 @@ msgstr "" "列出无用的BDB日志文件。\n" "\n" +#: ../svnadmin/svnadmin.c:379 msgid "" "usage: svnadmin load REPOS_PATH\n" "\n" @@ -9119,13 +12827,26 @@ msgid "" "new revisions into the repository's filesystem. If the repository\n" "was previously empty, its UUID will, by default, be changed to the\n" "one specified in the stream. Progress feedback is sent to stdout.\n" +"If --revision is specified, limit the loaded revisions to only those\n" +"in the dump stream whose revision numbers match the specified range.\n" msgstr "" "用法: svnadmin load REPOS_PATH\n" "\n" "从标准输入读取“转存”格式的流，将新的版本提交至版本库的文件\n" "系统中。如果版本库原先是空的，默认会将其 UUID 以流中的数值代替。\n" -"进度报告会送至标准输出。\n" +"进度报告会送至标准输出。如果使用了 --revision，那么就只加载转存\n" +"流中与指定范围一致的版本。\n" + +#: ../svnadmin/svnadmin.c:391 +msgid "" +"usage: svnadmin lock REPOS_PATH PATH USERNAME COMMENT-FILE [TOKEN]\n" +"\n" +"Lock PATH by USERNAME setting comments from COMMENT-FILE.\n" +"If provided, use TOKEN as lock token. Use --bypass-hooks to avoid\n" +"triggering the pre-lock and post-lock hook scripts.\n" +msgstr "" +#: ../svnadmin/svnadmin.c:398 msgid "" "usage: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" @@ -9134,9 +12855,11 @@ msgid "" msgstr "" "用法: svnadmin lslocks REPOS_PATH [PATH-IN-REPOS]\n" "\n" -"显示位于 PATH-IN-REPOS 或其子孙上的所有锁的描述(如果没有提供 PATH-IN-REPOS，\n" +"显示位于 PATH-IN-REPOS 或其子孙上的所有锁的描述(如果没有提供 PATH-IN-" +"REPOS，\n" "那么显示版本库根的信息)。\n" +#: ../svnadmin/svnadmin.c:404 msgid "" "usage: svnadmin lstxns REPOS_PATH\n" "\n" @@ -9146,6 +12869,7 @@ msgstr "" "\n" "显示所有未提交事务的名称。\n" +#: ../svnadmin/svnadmin.c:409 msgid "" "usage: svnadmin pack REPOS_PATH\n" "\n" @@ -9157,6 +12881,7 @@ msgstr "" "使用更有效的存储模型压缩版本库。\n" "它可能不适用于所有的版本库，此时直接结束。\n" +#: ../svnadmin/svnadmin.c:415 msgid "" "usage: svnadmin recover REPOS_PATH\n" "\n" @@ -9170,6 +12895,7 @@ msgstr "" "对版本库运行修复程序。当你遇到应当执行修复的错误指示时，请执行此命令。\n" "修复 Berkeley DB 需要独占访问，如果版本库被其它进程使用，它会立即退出。\n" +#: ../svnadmin/svnadmin.c:423 msgid "" "usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n" "\n" @@ -9179,6 +12905,7 @@ msgstr "" "\n" "无条件地从每个 LOCKED_PATH 删除锁。\n" +#: ../svnadmin/svnadmin.c:428 msgid "" "usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n" "\n" @@ -9188,6 +12915,7 @@ msgstr "" "\n" "从版本库删除命名事务。\n" +#: ../svnadmin/svnadmin.c:433 msgid "" "usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n" "\n" @@ -9209,6 +12937,7 @@ msgstr "" "\n" " 注意: 修订属性并未纳入版本管理，所以这个命令会覆盖以前的属性取值。\n" +#: ../svnadmin/svnadmin.c:445 msgid "" "usage: svnadmin setrevprop REPOS_PATH -r REVISION NAME FILE\n" "\n" @@ -9229,6 +12958,7 @@ msgstr "" "\n" " 注意: 修订属性并未纳入版本管理，所以这个命令会覆盖以前的属性取值。\n" +#: ../svnadmin/svnadmin.c:456 msgid "" "usage: svnadmin setuuid REPOS_PATH [NEW_UUID]\n" "\n" @@ -9241,6 +12971,16 @@ msgstr "" "重置位于 REPOS_PATH 的版本库 UUID。如果提供 NEW_UUID，那么它就成为版本库的\n" "新 UUID；否则就为版本库生成一个新的 UUID。\n" +#: ../svnadmin/svnadmin.c:463 +msgid "" +"usage: svnadmin unlock REPOS_PATH LOCKED_PATH USERNAME TOKEN\n" +"\n" +"Unlock LOCKED_PATH (as USERNAME) after verifying that the token\n" +"associated with the lock matches TOKEN. Use --bypass-hooks to avoid\n" +"triggering the pre-unlock and post-unlock hook scripts.\n" +msgstr "" + +#: ../svnadmin/svnadmin.c:470 msgid "" "usage: svnadmin upgrade REPOS_PATH\n" "\n" @@ -9264,42 +13004,77 @@ msgstr "" "提下执行最少的工作来完成升级。它不担保版本库的状态与导出后加载的升级方\n" "案一样最优化。\n" +#: ../svnadmin/svnadmin.c:483 msgid "" "usage: svnadmin verify REPOS_PATH\n" "\n" -"Verifies the data stored in the repository.\n" +"Verify the data stored in the repository.\n" msgstr "" "用法: svnadmin verify REPOS_PATH\n" "\n" "校验版本库中的数据。\n" +#: ../svnadmin/svnadmin.c:545 msgid "Invalid revision specifier" msgstr "无效的版本说明" +#: ../svnadmin/svnadmin.c:549 #, c-format msgid "Revisions must not be greater than the youngest revision (%ld)" msgstr "版本号不能大于最新的版本号(%ld)" +#: ../svnadmin/svnadmin.c:656 +#, c-format +msgid "" +"%swarning: The \"%s\" repository back-end is deprecated, consider using \"%s" +"\" instead.\n" +msgstr "%s警告: “%s”版本库后端已经淘汰，请考虑使用“%s”来代替。\n" + +#: ../svnadmin/svnadmin.c:696 +msgid "Repositories compatible with 1.0.x must use --fs-type=bdb" +msgstr "" + +#: ../svnadmin/svnadmin.c:739 ../svnadmin/svnadmin.c:1041 +#: ../svnadmin/svnadmin.c:1222 msgid "First revision cannot be higher than second" msgstr "第一个版本不可大于第二个" +#: ../svnadmin/svnadmin.c:748 #, c-format msgid "Deltifying revision %ld..." msgstr "正在计算版本 %ld 差异..." +#: ../svnadmin/svnadmin.c:752 ../svnadmin/svnadmin.c:844 +#: ../svnadmin/svnadmin.c:859 #, c-format msgid "done.\n" msgstr "完成。\n" +#: ../svnadmin/svnadmin.c:825 +msgid "* Verifying repository metadata ...\n" +msgstr "* 正在校验版本库元数据 ...\n" + +#: ../svnadmin/svnadmin.c:828 +#, c-format +msgid "* Verifying metadata at revision %ld ...\n" +msgstr "* 正在校验版本 %ld 的元数据 ...\n" + +#: ../svnadmin/svnadmin.c:838 #, c-format msgid "Packing revisions in shard %s..." msgstr "正在打包版本碎片 %s ..." +#: ../svnadmin/svnadmin.c:853 #, c-format msgid "Packing revprops in shard %s..." msgstr "正在打包版本属性碎片 %s ..." +#: ../svnadmin/svnadmin.c:928 #, c-format +msgid "<<< Skipped original revision %ld\n" +msgstr "<<< 已跳过原始版本 %ld\n" + +#: ../svnadmin/svnadmin.c:945 msgid "" "Repository lock acquired.\n" "Please wait; recovering the repository may take some time...\n" @@ -9307,7 +13082,7 @@ msgstr "" "已取得版本库锁定。\n" "请稍候；修复版本库可能需要一段时间...\n" -#, c-format +#: ../svnadmin/svnadmin.c:952 msgid "" "Repository lock acquired.\n" "Please wait; upgrading the repository may take some time...\n" @@ -9315,6 +13090,11 @@ msgstr "" "已取得版本库锁定。\n" "请稍候；升级版本库可能需要一段时间...\n" +#: ../svnadmin/svnadmin.c:1102 +msgid "No program provided" +msgstr "没有提供程序" + +#: ../svnadmin/svnadmin.c:1138 msgid "" "general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n" @@ -9328,6 +13108,8 @@ msgstr "" "\n" "可用的子命令: \n" +#: ../svnadmin/svnadmin.c:1145 ../svnlook/svnlook.c:2225 +#: ../svnserve/svnserve.c:336 msgid "" "The following repository back-end (FS) modules are available:\n" "\n" @@ -9335,9 +13117,24 @@ msgstr "" "下列版本库后端(FS) 模块可用: \n" "\n" -msgid "Invalid property value found in dumpstream; consider repairing the source or using --bypass-prop-validation while loading." -msgstr "在转储流中发现非法的属性值；考虑修复，或者在加载时使用选项 '--bypass-prop-validation' 。" +#: ../svnadmin/svnadmin.c:1174 +#, c-format +msgid "Invalid revision number (%ld) specified" +msgstr "指定了无效的版本 (%ld)" + +#: ../svnadmin/svnadmin.c:1184 +msgid "Non-numeric revision specified" +msgstr "指定了非数字版本" +#: ../svnadmin/svnadmin.c:1243 +msgid "" +"Invalid property value found in dumpstream; consider repairing the source or " +"using --bypass-prop-validation while loading." +msgstr "" +"在转储流中发现非法的属性值；考虑修复，或者在加载时使用选项 '--bypass-prop-" +"validation' 。" + +#: ../svnadmin/svnadmin.c:1309 ../svnadmin/svnadmin.c:1941 msgid "" "Failed to get exclusive repository access; perhaps another process\n" "such as httpd, svnserve or svn has it open?" @@ -9345,10 +13142,12 @@ msgstr "" "无法独占访问版本库；可能是其它如 httpd，svnserve 或 svn 等进程已经打开它，\n" "尚未关闭？" +#: ../svnadmin/svnadmin.c:1314 ../svnadmin/svnadmin.c:1946 #, c-format msgid "Waiting on repository lock; perhaps another process has it open?\n" msgstr "等待版本库锁定中；也许其它的进程把它打开了？\n" +#: ../svnadmin/svnadmin.c:1322 #, c-format msgid "" "\n" @@ -9357,38 +13156,52 @@ msgstr "" "\n" "完成修复。\n" +#: ../svnadmin/svnadmin.c:1329 #, c-format msgid "The latest repos revision is %ld.\n" msgstr "最新的版本库版本是 %ld。\n" +#: ../svnadmin/svnadmin.c:1444 #, c-format msgid "Transaction '%s' removed.\n" msgstr "事务“%s”被删除。\n" +#: ../svnadmin/svnadmin.c:1506 ../svnadmin/svnadmin.c:1551 #, c-format msgid "Missing revision" msgstr "丢失版本" +#: ../svnadmin/svnadmin.c:1509 ../svnadmin/svnadmin.c:1554 #, c-format msgid "Only one revision allowed" msgstr "只允许一个版本" +#: ../svnadmin/svnadmin.c:1608 +#, c-format +msgid "--revision (-r) and --transaction (-t) are mutually exclusive" +msgstr "--revision (-r) 与 --transaction (-t) 是互斥的" + +#: ../svnadmin/svnadmin.c:1775 ../svnlook/svnlook.c:2288 #, c-format msgid "UUID Token: %s\n" msgstr "UUID 标识: %s\n" +#: ../svnadmin/svnadmin.c:1776 ../svnlook/svnlook.c:2289 #, c-format msgid "Owner: %s\n" msgstr "所有者: %s\n" +#: ../svnadmin/svnadmin.c:1777 ../svnlook/svnlook.c:2290 #, c-format msgid "Created: %s\n" msgstr "已创建: %s\n" +#: ../svnadmin/svnadmin.c:1778 ../svnlook/svnlook.c:2291 #, c-format msgid "Expires: %s\n" msgstr "过期: %s\n" +#: ../svnadmin/svnadmin.c:1780 #, c-format msgid "" "Comment (%i line):\n" @@ -9403,23 +13216,38 @@ msgstr[0] "" "%s\n" "\n" +#: ../svnadmin/svnadmin.c:1826 msgid "No paths to unlock provided" msgstr "没有提供解锁的路径" +#: ../svnadmin/svnadmin.c:1844 #, c-format msgid "Path '%s' isn't locked.\n" msgstr "路径 “%s” 没有被锁定。\n" +#: ../svnadmin/svnadmin.c:1856 #, c-format msgid "Removed lock on '%s'.\n" msgstr "删除 “%s” 上的锁。\n" -msgid "Upgrade of this repository's underlying versioned filesystem is not supported; consider dumping and loading the data elsewhere" +#: ../svnadmin/svnadmin.c:1909 +#, c-format +msgid "'%s' unlocked by user '%s'.\n" +msgstr "“%s”被用户“%s”解锁。\n" + +#: ../svnadmin/svnadmin.c:1956 +msgid "" +"Upgrade of this repository's underlying versioned filesystem is not " +"supported; consider dumping and loading the data elsewhere" msgstr "文件系统不支持升级此版本库；请考虑使用导出后加载数据的升级方案" -msgid "Upgrade of this repository is not supported; consider dumping and loading the data elsewhere" +#: ../svnadmin/svnadmin.c:1963 +msgid "" +"Upgrade of this repository is not supported; consider dumping and loading " +"the data elsewhere" msgstr "不支持升级此版本库；请考虑使用导出后加载数据的升级方案" +#: ../svnadmin/svnadmin.c:1969 #, c-format msgid "" "\n" @@ -9428,20 +13256,36 @@ msgstr "" "\n" "完成升级。\n" -msgid "Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" +#: ../svnadmin/svnadmin.c:2054 ../svnrdump/svnrdump.c:923 +msgid "" +"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'" msgstr "遇到了多个版本参数；请使用“-r N:M”代替“-r M -r N”" +#: ../svnadmin/svnadmin.c:2132 +#, c-format +msgid "Cannot create pre-1.0-compatible repositories" +msgstr "不能创建与早于 1.0 版本兼容的版本库" + +#: ../svnadmin/svnadmin.c:2145 +#, c-format +msgid "Cannot guarantee compatibility beyond the current running version (%s)" +msgstr "" + +#: ../svnadmin/svnadmin.c:2234 #, c-format msgid "subcommand argument required\n" msgstr "必须提供子命令参数\n" +#: ../svnadmin/svnadmin.c:2269 msgid "Repository argument required" msgstr "需要版本库参数" +#: ../svnadmin/svnadmin.c:2282 #, c-format msgid "'%s' is a URL when it should be a local path" msgstr "“%s”应该是本地路径，实际上却是 URL" +#: ../svnadmin/svnadmin.c:2313 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -9450,70 +13294,98 @@ msgstr "" "子命令“%s”不接受选项“%s”\n" "使用“svnadmin help %s”得到用法。\n" +#: ../svnadmin/svnadmin.c:2356 msgid "Try 'svnadmin help' for more info" msgstr "请使用“svnadmin help”以得到更多信息" +#: ../svndumpfilter/svndumpfilter.c:78 #, c-format msgid "Can't open stdio file" msgstr "无法打开标准输出/入文件" +#: ../svndumpfilter/svndumpfilter.c:405 msgid "This is an empty revision for padding." msgstr "这是一个用来填充的空版本。" +#: ../svndumpfilter/svndumpfilter.c:488 #, c-format msgid "Revision %ld committed as %ld.\n" msgstr "版本 %ld 提交为 %ld。\n" +#: ../svndumpfilter/svndumpfilter.c:511 #, c-format msgid "Revision %ld skipped.\n" msgstr "跳过版本 %ld。\n" +#: ../svndumpfilter/svndumpfilter.c:605 #, c-format msgid "Invalid copy source path '%s'" msgstr "复制源路径“%s”无效" +#: ../svndumpfilter/svndumpfilter.c:662 #, c-format msgid "No valid copyfrom revision in filtered stream" msgstr "在过滤流中没有有效的copyfrom版本" +#: ../svndumpfilter/svndumpfilter.c:787 #, c-format msgid "Missing merge source path '%s'; try with --skip-missing-merge-sources" msgstr "缺少合并源路径 “%s”；尝试 --skip-missing-merge-sources" +#: ../svndumpfilter/svndumpfilter.c:809 #, c-format msgid "No valid revision range 'start' in filtered stream" msgstr "在过滤流中没有有效的版本范围 “start”" +#: ../svndumpfilter/svndumpfilter.c:816 #, c-format msgid "No valid revision range 'end' in filtered stream" msgstr "在过滤流中没有有效的版本范围 “end”" -msgid "Delta property block detected - not supported by svndumpfilter" -msgstr "检测到 Delta 属性块 - svndumpfilter 不支持" +#: ../svndumpfilter/svndumpfilter.c:862 ../svndumpfilter/svndumpfilter.c:893 +#, c-format +msgid "" +"Delta property block detected, but deltas are not enabled for node '%s' in " +"original revision %ld" +msgstr "" +#: ../svndumpfilter/svndumpfilter.c:1026 msgid "Do not display filtering statistics." msgstr "不显示过滤的统计数据。" +#: ../svndumpfilter/svndumpfilter.c:1028 msgid "Treat the path prefixes as file glob patterns." msgstr "将路径前缀视为文件统配模式。" +#: ../svndumpfilter/svndumpfilter.c:1030 msgid "Remove revisions emptied by filtering." msgstr "删除因过滤而产生的空版本。" +#: ../svndumpfilter/svndumpfilter.c:1032 +msgid "" +"Remove all empty revisions found in dumpstream\n" +" except revision 0." +msgstr "" + +#: ../svndumpfilter/svndumpfilter.c:1035 msgid "Renumber revisions left after filtering." msgstr "过滤后重编余下的版本。" +#: ../svndumpfilter/svndumpfilter.c:1038 msgid "Skip missing merge sources." msgstr "跳过缺少的合并源" +#: ../svndumpfilter/svndumpfilter.c:1040 msgid "Don't filter revision properties." msgstr "不过滤版本属性。" +#: ../svndumpfilter/svndumpfilter.c:1042 msgid "" "Read additional prefixes, one per line, from\n" " file ARG." msgstr "从文件 ARG 中读取额外的前缀，每个一行。" +#: ../svndumpfilter/svndumpfilter.c:1054 msgid "" "Filter out nodes with given prefixes from dumpstream.\n" "usage: svndumpfilter exclude PATH_PREFIX...\n" @@ -9521,6 +13393,7 @@ msgstr "" "从转存流删除匹配指定前缀的节点。\n" "用法: svndumpfilter exclude PATH_PREFIX...\n" +#: ../svndumpfilter/svndumpfilter.c:1063 msgid "" "Filter out nodes without given prefixes from dumpstream.\n" "usage: svndumpfilter include PATH_PREFIX...\n" @@ -9528,6 +13401,7 @@ msgstr "" "从转储串流中删除未包含指定前缀的节点。\n" "用法: svndumpfilter include PATH_PREFIX...\n" +#: ../svndumpfilter/svndumpfilter.c:1072 msgid "" "Describe the usage of this program or its subcommands.\n" "usage: svndumpfilter help [SUBCOMMAND...]\n" @@ -9535,6 +13409,7 @@ msgstr "" "描述本程序或其子命令的用法。\n" "用法: svndumpfilter help [SUBCOMMAND...]\n" +#: ../svndumpfilter/svndumpfilter.c:1148 msgid "" "general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n" "Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n" @@ -9548,38 +13423,47 @@ msgstr "" "\n" "可用的子命令: \n" +#: ../svndumpfilter/svndumpfilter.c:1206 #, c-format msgid "Excluding (and dropping empty revisions for) prefix patterns:\n" msgstr "排除(以及丢弃空版本)的前缀匹配模式: \n" +#: ../svndumpfilter/svndumpfilter.c:1208 #, c-format msgid "Excluding prefix patterns:\n" msgstr "排除前缀匹配模式: \n" +#: ../svndumpfilter/svndumpfilter.c:1211 #, c-format msgid "Including (and dropping empty revisions for) prefix patterns:\n" msgstr "包含(以及丢弃空版本)的前缀匹配模式: \n" +#: ../svndumpfilter/svndumpfilter.c:1213 #, c-format msgid "Including prefix patterns:\n" msgstr "包含的前缀匹配模式: \n" +#: ../svndumpfilter/svndumpfilter.c:1221 #, c-format msgid "Excluding (and dropping empty revisions for) prefixes:\n" msgstr "排除 (以及丢弃空版本) 的前缀: \n" +#: ../svndumpfilter/svndumpfilter.c:1223 #, c-format msgid "Excluding prefixes:\n" msgstr "排除前缀: \n" +#: ../svndumpfilter/svndumpfilter.c:1226 #, c-format msgid "Including (and dropping empty revisions for) prefixes:\n" msgstr "包含 (以及丢弃空版本) 的前缀: \n" +#: ../svndumpfilter/svndumpfilter.c:1228 #, c-format msgid "Including prefixes:\n" msgstr "包含的前缀: \n" +#: ../svndumpfilter/svndumpfilter.c:1256 #, c-format msgid "" "Dropped %d revision.\n" @@ -9591,18 +13475,26 @@ msgstr[0] "" "删除 %d 个版本。\n" "\n" +#: ../svndumpfilter/svndumpfilter.c:1264 msgid "Revisions renumbered as follows:\n" msgstr "版本被重新编号如下: \n" +#: ../svndumpfilter/svndumpfilter.c:1292 #, c-format msgid " %ld => (dropped)\n" msgstr " %ld => (丢弃)\n" +#: ../svndumpfilter/svndumpfilter.c:1307 #, c-format msgid "Dropped %d node:\n" msgid_plural "Dropped %d nodes:\n" msgstr[0] "丢弃 %d 个节点: \n" +#: ../svndumpfilter/svndumpfilter.c:1476 +msgid "--drop-empty-revs cannot be used with --drop-all-empty-revs" +msgstr "--drop-empty-rev 不能与 --drop-all-empty-revs 共存" + +#: ../svndumpfilter/svndumpfilter.c:1596 #, c-format msgid "" "\n" @@ -9611,6 +13503,7 @@ msgstr "" "\n" "错误: 没有提供前缀。\n" +#: ../svndumpfilter/svndumpfilter.c:1627 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -9619,59 +13512,65 @@ msgstr "" "子命令“%s”不接受选项“%s”\n" "使用“svndumpfilter help %s”得到用法。\n" +#: ../svndumpfilter/svndumpfilter.c:1645 msgid "Try 'svndumpfilter help' for more info" msgstr "请使用“svndumpfilter help”以得到更多信息" +#: ../svnlook/svnlook.c:116 msgid "show details for copies" msgstr "显示每个副本的详细信息" +#: ../svnlook/svnlook.c:119 msgid "print differences against the copy source" msgstr "显示与原始内容的差异" +#: ../svnlook/svnlook.c:122 msgid "show full paths instead of indenting them" msgstr "显示完整路径(代替缩进)" +#: ../svnlook/svnlook.c:128 msgid "maximum number of history entries" msgstr "历史项最大数量" -msgid "do not print differences for added files" -msgstr "不要输出增加文件造成的差异" - +#: ../svnlook/svnlook.c:146 msgid "operate on single directory only" msgstr "只在单个目录操作" +#: ../svnlook/svnlook.c:149 msgid "specify revision number ARG" msgstr "指定版本编号 ARG" +#: ../svnlook/svnlook.c:152 msgid "operate on a revision property (use with -r or -t)" msgstr "操作版本的属性(使用 -r 或 -t)" +#: ../svnlook/svnlook.c:155 msgid "show node revision ids for each path" msgstr "为每个路径显示节点版本编号" -msgid "specify transaction name ARG" -msgstr "指定事务名称 ARG" +#: ../svnlook/svnlook.c:158 +msgid "show path's inherited properties" +msgstr "显示路径继承的属性" +#: ../svnlook/svnlook.c:164 msgid "be verbose" msgstr "详细" -msgid "" -"Default: '-u'. When Subversion is invoking an\n" -" external diff program, ARG is simply passed along\n" -" to the program. But when Subversion is using its\n" -" default internal diff implementation, or when\n" -" Subversion is displaying blame annotations, ARG\n" -" could be any of the following:\n" -" -u (--unified):\n" -" Output 3 lines of unified context.\n" -" -b (--ignore-space-change):\n" -" Ignore changes in the amount of white space.\n" -" -w (--ignore-all-space):\n" -" Ignore all white space.\n" -" --ignore-eol-style:\n" -" Ignore changes in EOL style\n" -" -p (--show-c-function):\n" -" Show C function name in diff output." +#: ../svnlook/svnlook.c:173 +#, fuzzy +msgid "" +"Specify differencing options for external diff or\n" +" internal diff. Default: '-u'. Options are\n" +" separated by spaces. Internal diff takes:\n" +" -u, --unified: Show 3 lines of unified " +"context\n" +" -b, --ignore-space-change: Ignore changes in\n" +" amount of white space\n" +" -w, --ignore-all-space: Ignore all white " +"space\n" +" --ignore-eol-style: Ignore changes in EOL " +"style\n" +" -p, --show-c-function: Show C function name" msgstr "" "缺省: “-u”。当 Subversion 调用外部比较程序时，ARG 直接传给它。但是当\n" " Subversion 使用缺省的内置比较实现，或者正\n" @@ -9687,6 +13586,7 @@ msgstr "" " -p (--show-c-function):\n" " 在比较输出中显示 C 函数名称。" +#: ../svnlook/svnlook.c:204 msgid "" "usage: svnlook author REPOS_PATH\n" "\n" @@ -9696,6 +13596,7 @@ msgstr "" "\n" "显示作者。\n" +#: ../svnlook/svnlook.c:209 msgid "" "usage: svnlook cat REPOS_PATH FILE_PATH\n" "\n" @@ -9705,6 +13606,7 @@ msgstr "" "\n" "显示文件的内容。可省略 FILE_PATH 前的“/”。\n" +#: ../svnlook/svnlook.c:214 msgid "" "usage: svnlook changed REPOS_PATH\n" "\n" @@ -9714,6 +13616,7 @@ msgstr "" "\n" "显示已改变的路径。\n" +#: ../svnlook/svnlook.c:219 msgid "" "usage: svnlook date REPOS_PATH\n" "\n" @@ -9723,6 +13626,7 @@ msgstr "" "\n" "显示时戳。\n" +#: ../svnlook/svnlook.c:224 msgid "" "usage: svnlook diff REPOS_PATH\n" "\n" @@ -9732,6 +13636,7 @@ msgstr "" "\n" "以 GNU 样式，显示版本库中改变的文件与属性差异。\n" +#: ../svnlook/svnlook.c:231 msgid "" "usage: svnlook dirs-changed REPOS_PATH\n" "\n" @@ -9742,6 +13647,7 @@ msgstr "" "\n" "显示本身改变 (编辑属性) 的目录，或是其中的文件修改过的目录。\n" +#: ../svnlook/svnlook.c:237 msgid "" "usage: svnlook filesize REPOS_PATH PATH_IN_REPOS\n" "\n" @@ -9752,6 +13658,7 @@ msgstr "" "\n" "显示位于 PATH_IN_REPOS 的文件在版本库中展现的大小(字节)\n" +#: ../svnlook/svnlook.c:243 msgid "" "usage: svnlook help [SUBCOMMAND...]\n" "\n" @@ -9761,6 +13668,7 @@ msgstr "" "\n" "显示本程序或其子命令的用法。\n" +#: ../svnlook/svnlook.c:248 msgid "" "usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -9771,6 +13679,7 @@ msgstr "" "\n" "显示版本库中，某个路径的历史记录信息 (如果没有指定路径，则为根目录)。\n" +#: ../svnlook/svnlook.c:254 msgid "" "usage: svnlook info REPOS_PATH\n" "\n" @@ -9780,6 +13689,7 @@ msgstr "" "\n" "显示作者，时戳，日志信息大小，以及日志信息。\n" +#: ../svnlook/svnlook.c:259 msgid "" "usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n" "\n" @@ -9789,6 +13699,7 @@ msgstr "" "\n" "如果版本库中的路径存在锁，显示其详细信息。\n" +#: ../svnlook/svnlook.c:264 msgid "" "usage: svnlook log REPOS_PATH\n" "\n" @@ -9798,6 +13709,7 @@ msgstr "" "\n" "显示日志信息。\n" +#: ../svnlook/svnlook.c:269 msgid "" "usage: 1. svnlook propget REPOS_PATH PROPNAME PATH_IN_REPOS\n" " 2. svnlook propget --revprop REPOS_PATH PROPNAME\n" @@ -9811,6 +13723,7 @@ msgstr "" "显示版本库中指定路径上属性的原始值。\n" "用 --revprop 选项显示版本属性的原始值。\n" +#: ../svnlook/svnlook.c:278 msgid "" "usage: 1. svnlook proplist REPOS_PATH PATH_IN_REPOS\n" " 2. svnlook proplist --revprop REPOS_PATH\n" @@ -9826,6 +13739,7 @@ msgstr "" "使用 --revprop 选项列出版本属性。\n" "使用 -v 选项显示属性的内容。\n" +#: ../svnlook/svnlook.c:289 msgid "" "usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n" "\n" @@ -9837,6 +13751,7 @@ msgstr "" "显示目录树，从 PATH_IN_REPOS 开始 (如果省略此参数就从版本库的根目录开始)，\n" "可选的显示节点版本 id。\n" +#: ../svnlook/svnlook.c:295 msgid "" "usage: svnlook uuid REPOS_PATH\n" "\n" @@ -9846,6 +13761,7 @@ msgstr "" "\n" "显示版本库的 UUID。\n" +#: ../svnlook/svnlook.c:300 msgid "" "usage: svnlook youngest REPOS_PATH\n" "\n" @@ -9855,22 +13771,28 @@ msgstr "" "\n" "显示最新的版本号。\n" +#: ../svnlook/svnlook.c:860 #, c-format msgid "Copied: %s (from rev %ld, %s)\n" msgstr "已复制: %s (来自版本 %ld，%s)\n" +#: ../svnlook/svnlook.c:928 msgid "Added" msgstr "已增加" +#: ../svnlook/svnlook.c:929 msgid "Deleted" msgstr "已删除" +#: ../svnlook/svnlook.c:930 msgid "Modified" msgstr "已修改" +#: ../svnlook/svnlook.c:931 msgid "Index" msgstr "索引" +#: ../svnlook/svnlook.c:942 msgid "" "(Binary files differ)\n" "\n" @@ -9878,24 +13800,30 @@ msgstr "" "(二进制文件不同)\n" "\n" +#: ../svnlook/svnlook.c:1221 msgid "unknown" msgstr "未知" +#: ../svnlook/svnlook.c:1278 #, c-format msgid "Transaction '%s' is not based on a revision; how odd" msgstr "事务“%s”并非基于某个版本；多神秘啊！" +#: ../svnlook/svnlook.c:1421 #, c-format msgid "'%s' is a URL, probably should be a path" msgstr "“%s”是 URL，也许应该是路径。" +#: ../svnlook/svnlook.c:1444 ../svnlook/svnlook.c:1467 #, c-format msgid "Path '%s' is not a file" msgstr "路径“%s”不是文件" +#: ../svnlook/svnlook.c:1603 msgid "History item limit reached" msgstr "达到历史项目限制" +#: ../svnlook/svnlook.c:1622 #, c-format msgid "" "REVISION PATH <ID>\n" @@ -9904,6 +13832,7 @@ msgstr "" "修 订 版 路径 <ID>\n" "-------- ---------\n" +#: ../svnlook/svnlook.c:1627 #, c-format msgid "" "REVISION PATH\n" @@ -9912,21 +13841,40 @@ msgstr "" "修 订 版 路径\n" "-------- ----\n" +#: ../svnlook/svnlook.c:1699 #, c-format msgid "Property '%s' not found on revision %ld" msgstr "属性“%s”在版本 %ld 中找不到" +#: ../svnlook/svnlook.c:1708 +#, fuzzy, c-format +msgid "" +"Property '%s' not found on path '%s' or inherited from a parent in revision " +"%ld" +msgstr "属性 “%s” 不在路径 “%s” 的版本 %ld 中" + +#: ../svnlook/svnlook.c:1714 #, c-format msgid "Property '%s' not found on path '%s' in revision %ld" msgstr "属性 “%s” 不在路径 “%s” 的版本 %ld 中" +#: ../svnlook/svnlook.c:1722 +#, fuzzy, c-format +msgid "" +"Property '%s' not found on path '%s' or inherited from a parent in " +"transaction %s" +msgstr "属性 “%s” 不在路径 “%s” 中，事务 “%s”" + +#: ../svnlook/svnlook.c:1728 #, c-format msgid "Property '%s' not found on path '%s' in transaction %s" msgstr "属性 “%s” 不在路径 “%s” 中，事务 “%s”" +#: ../svnlook/svnlook.c:2063 msgid "Missing repository path argument" msgstr "未提供版本库路径参数" +#: ../svnlook/svnlook.c:2215 msgid "" "general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n" "Note: any subcommand which takes the '--revision' and '--transaction'\n" @@ -9945,6 +13893,7 @@ msgstr "" "\n" "可用的子命令: \n" +#: ../svnlook/svnlook.c:2293 #, c-format msgid "" "Comment (%i line):\n" @@ -9956,31 +13905,50 @@ msgstr[0] "" "注释 (%i 行): \n" "%s\n" +#: ../svnlook/svnlook.c:2345 #, c-format msgid "Missing propname argument" msgstr "丢失属性名参数" +#: ../svnlook/svnlook.c:2346 #, c-format msgid "Missing propname and repository path arguments" msgstr "未提供属性名称与版本库路径参数" +#: ../svnlook/svnlook.c:2352 msgid "Missing propname or repository path argument" msgstr "未提供属性名称或版本库路径参数" +#: ../svnlook/svnlook.c:2516 msgid "Invalid revision number supplied" msgstr "提供了无效的版本号码" -msgid "The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" +#: ../svnlook/svnlook.c:2628 +msgid "" +"The '--transaction' (-t) and '--revision' (-r) arguments cannot co-exist" msgstr "“--transaction” (-t) 与 “--revision” (-r) 参数不能同时存在" +#: ../svnlook/svnlook.c:2635 +msgid "" +"Cannot use the '--show-inherited-props' option with the '--revprop' option" +msgstr "" + +#: ../svnlook/svnlook.c:2694 +#, c-format +msgid "Try 'svnadmin verify' instead.\n" +msgstr "请运行“svnadmin verify”。\n" + +#: ../svnlook/svnlook.c:2728 #, c-format msgid "Repository argument required\n" msgstr "需要版本库参数\n" +#: ../svnlook/svnlook.c:2737 #, c-format msgid "'%s' is a URL when it should be a path\n" msgstr "“%s”应该是路径，却是URL\n" +#: ../svnlook/svnlook.c:2789 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -9989,16 +13957,72 @@ msgstr "" "子命令“%s”并不接受选项“%s”\n" "使用“svnlook help %s”得到用法。\n" +#: ../svnlook/svnlook.c:2832 msgid "Try 'svnlook help' for more info" msgstr "请使用“svnlook help”以得到更多信息" +#: ../svnmucc/svnmucc.c:926 +msgid "" +"Subversion multiple URL command client\n" +"usage: svnmucc ACTION...\n" +"\n" +" Perform one or more Subversion repository URL-based ACTIONs, committing\n" +" the result as a (single) new revision.\n" +"\n" +"Actions:\n" +" cp REV SRC-URL DST-URL : copy SRC-URL@REV to DST-URL\n" +" mkdir URL : create new directory URL\n" +" mv SRC-URL DST-URL : move SRC-URL to DST-URL\n" +" rm URL : delete URL\n" +" put SRC-FILE URL : add or modify file URL with contents copied from\n" +" SRC-FILE (use \"-\" to read from standard input)\n" +" propset NAME VALUE URL : set property NAME on URL to VALUE\n" +" propsetf NAME FILE URL : set property NAME on URL to value read from FILE\n" +" propdel NAME URL : delete property NAME from URL\n" +"\n" +"Valid options:\n" +" -h, -? [--help] : display this text\n" +" -m [--message] ARG : use ARG as a log message\n" +" -F [--file] ARG : read log message from file ARG\n" +" -u [--username] ARG : commit the changes as username ARG\n" +" -p [--password] ARG : use ARG as the password\n" +" -U [--root-url] ARG : interpret all action URLs relative to ARG\n" +" -r [--revision] ARG : use revision ARG as baseline for changes\n" +" --with-revprop ARG : set revision property in the following format:\n" +" NAME[=VALUE]\n" +" --non-interactive : do no interactive prompting (default is to\n" +" prompt only if standard input is a terminal)\n" +" --force-interactive : do interactive prompting even if standard\n" +" input is not a terminal\n" +" --trust-server-cert : accept SSL server certificates from unknown\n" +" certificate authorities without prompting (but\n" +" only with '--non-interactive')\n" +" -X [--extra-args] ARG : append arguments from file ARG (one per line;\n" +" use \"-\" to read from standard input)\n" +" --config-dir ARG : use ARG to override the config directory\n" +" --config-option ARG : use ARG to override a configuration option\n" +" --no-auth-cache : do not cache authentication tokens\n" +" --version : print version information\n" +msgstr "" + +#: ../svnmucc/svnmucc.c:1002 +msgid "" +"--message (-m), --file (-F), and --with-revprop=svn:log are mutually " +"exclusive" +msgstr "--message (-m)，--file (-F) 与 --with-revprop=svn:log 是互斥的" + +#: ../svnrdump/load_editor.c:382 ../svnsync/svnsync.c:326 #, c-format msgid "Failed to get lock on destination repos, currently held by '%s'\n" msgstr "从目标版本库获得锁失败，当前被“%s”持有\n" -msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7." +#: ../svnrdump/load_editor.c:526 +msgid "" +"Target server does not support atomic revision property edits; consider " +"upgrading it to 1.7." msgstr "目标服务器不支持原子版本的属性编辑; 请考虑升级到 1.7 。" +#: ../svnrdump/svnrdump.c:101 msgid "" "usage: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" @@ -10008,9 +14032,11 @@ msgid "" msgstr "" "用法: svnrdump dump URL [-r LOWER[:UPPER]]\n" "\n" -"以可移植的 'dumpfile' 格式导出远程版本库 URL 中的 LOWER 到 UPPER 的所有版本到标准输出。\n" +"以可移植的 'dumpfile' 格式导出远程版本库 URL 中的 LOWER 到 UPPER 的所有版本到" +"标准输出。\n" "如果只给出 LOWER，那么就导出这一个版本。\n" +#: ../svnrdump/svnrdump.c:107 msgid "" "usage: svnrdump load URL\n" "\n" @@ -10020,6 +14046,7 @@ msgstr "" "\n" "从标准输入加载 'dumpfile' 到远程版本库 URL。\n" +#: ../svnrdump/svnrdump.c:111 msgid "" "usage: svnrdump help [SUBCOMMAND...]\n" "\n" @@ -10029,9 +14056,16 @@ msgstr "" "\n" "显示本程序或其子命令的用法。\n" +#: ../svnrdump/svnrdump.c:124 +msgid "dump incrementally" +msgstr "以增量方式进行转存" + +#: ../svnrdump/svnrdump.c:142 ../svnserve/svnserve.c:282 +#: ../svnversion/svnversion.c:138 msgid "display this help" msgstr "显示本帮助" +#: ../svnrdump/svnrdump.c:731 msgid "" "general usage: svnrdump SUBCOMMAND URL [-r LOWER[:UPPER]]\n" "Type 'svnrdump help <subcommand>' for help on a specific subcommand.\n" @@ -10045,16 +14079,22 @@ msgstr "" "\n" "可用的子命令: \n" +#: ../svnrdump/svnrdump.c:775 ../svnrdump/svnrdump.c:809 msgid "Unsupported revision specifier used; use only integer values or 'HEAD'" msgstr "使用了不支持的版本格式；请只使用 'HEAD' 或整数" +#: ../svnrdump/svnrdump.c:783 ../svnrdump/svnrdump.c:817 #, c-format msgid "Revision '%ld' does not exist" msgstr "版本 '%ld' 不存在" -msgid "LOWER revision cannot be greater than UPPER revision; consider reversing your revision range" +#: ../svnrdump/svnrdump.c:827 +msgid "" +"LOWER revision cannot be greater than UPPER revision; consider reversing " +"your revision range" msgstr "LOWER 版本号不能大于 UPPER 版本号；考虑将你的版本范围翻转" +#: ../svnrdump/svnrdump.c:1072 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -10063,78 +14103,126 @@ msgstr "" "子命令“%s”不接受选项“%s”\n" "输入“svnrdump help %s”得到用法。\n" +#: ../svnserve/cyrus_auth.c:119 +msgid "Could not initialize the SASL library" +msgstr "不能初始化 SASL 库" + +#: ../svnserve/cyrus_auth.c:260 #, c-format msgid "Can't get hostname" msgstr "无法获取主机名称" +#: ../svnserve/cyrus_auth.c:325 msgid "Could not obtain the list of SASL mechanisms" msgstr "不能获得SASL机制列表" +#: ../svnserve/cyrus_auth.c:367 msgid "Couldn't obtain the authenticated username" msgstr "不能获得已经认证的用户名称" +#: ../svnserve/serve.c:2042 +msgid "Path is not a string" +msgstr "路径不是字符串" + +#: ../svnserve/serve.c:2199 +msgid "Log revprop entry not a string" +msgstr "日志 revprop 入口不是字符串" + +#: ../svnserve/serve.c:2205 +#, c-format +msgid "Unknown revprop word '%s' in log command" +msgstr "日志命令中有未知的 revprop 单词 “%s”" + +#: ../svnserve/serve.c:2221 +msgid "Log path entry not a string" +msgstr "日志路径入口不是字符串" + +#: ../svnserve/svnserve.c:161 msgid "daemon mode" msgstr "后台模式" +#: ../svnserve/svnserve.c:162 msgid "inetd mode" msgstr "inetd 模式" +#: ../svnserve/svnserve.c:163 msgid "tunnel mode" msgstr "隧道模式" +#: ../svnserve/svnserve.c:164 msgid "listen-once mode (useful for debugging)" msgstr "监听一次方式(调试用)" +#: ../svnserve/svnserve.c:167 msgid "Windows service mode (Service Control Manager)" msgstr "Windows 服务方式(服务管理器)" +#: ../svnserve/svnserve.c:169 msgid "root of directory to serve" msgstr "服务的根目录" +#: ../svnserve/svnserve.c:171 msgid "force read only, overriding repository config file" msgstr "强制只读；覆盖版本库配置文件" +#: ../svnserve/svnserve.c:173 msgid "read configuration from file ARG" msgstr "从文件 ARG 读取配置" +#: ../svnserve/svnserve.c:176 +#, fuzzy msgid "" -"listen port\n" +"listen port. The default port is 3690.\n" " [mode: daemon, service, listen-once]" msgstr "" -"监听端口\n" -" [方式: daemon, service, listen-once]" +"写进程 PID 到文件 ARG\n" +" [方式: daemon, listen-once]" +#: ../svnserve/svnserve.c:180 +#, fuzzy msgid "" -"listen port\n" +"listen port. The default port is 3690.\n" " [mode: daemon, listen-once]" msgstr "" -"监听端口\n" +"写进程 PID 到文件 ARG\n" " [方式: daemon, listen-once]" +#: ../svnserve/svnserve.c:186 +#, fuzzy msgid "" "listen hostname or IP address\n" +" By default svnserve listens on all addresses.\n" " [mode: daemon, service, listen-once]" msgstr "" "监听主机名称或IP地址\n" " [方式: daemon, service, listen-once]" +#: ../svnserve/svnserve.c:192 +#, fuzzy msgid "" "listen hostname or IP address\n" +" By default svnserve listens on all addresses.\n" " [mode: daemon, listen-once]" msgstr "" "监听主机名称或IP地址\n" " [方式: daemon, listen-once]" +#: ../svnserve/svnserve.c:199 msgid "" "prefer IPv6 when resolving the listen hostname\n" -" [IPv4 is preferred by default. Using IPv4 and IPv6\n" -" at the same time is not supported in daemon mode.\n" +" [IPv4 is preferred by default. Using IPv4 and " +"IPv6\n" +" at the same time is not supported in daemon " +"mode.\n" " Use inetd mode or tunnel mode if you need this.]" msgstr "" "在使用主机名称监听时，首选 IPv6\n" -" [默认首选 IPv4。不支持在守护进程模式中同时使用 IPv4\n" -" 和 IPv6。如果需要，请使用 inetd 模式或隧道模式。]" +" [默认首选 IPv4。不支持在守护进程模式中同时使用 " +"IPv4\n" +" 和 IPv6。如果需要，请使用 inetd 模式或隧道模" +"式。]" +#: ../svnserve/svnserve.c:207 msgid "" "compression level to use for network transmissions\n" " [0 .. no compression, 5 .. default, \n" @@ -10144,6 +14232,7 @@ msgstr "" " [0 .. 不压缩, 5 .. 默认, \n" " 9 .. 最大压缩]" +#: ../svnserve/svnserve.c:213 msgid "" "size of the extra in-memory cache in MB used to\n" " minimize redundant operations.\n" @@ -10152,9 +14241,11 @@ msgid "" " [used for FSFS repositories only]" msgstr "" "用来减少冗余操作的内存中的额外高速缓存的大小(MB)\n" -" 线程模型的默认值是 128，非线程模型的默认值是 16。\n" +" 线程模型的默认值是 128，非线程模型的默认值是 " +"16。\n" " [仅用于 FSFS 仓库]" +#: ../svnserve/svnserve.c:223 msgid "" "enable or disable caching of deltas between older\n" " revisions.\n" @@ -10165,6 +14256,7 @@ msgstr "" " 默认值: 否。\n" " [仅用于 FSFS 仓库]" +#: ../svnserve/svnserve.c:231 msgid "" "enable or disable caching of file contents\n" " Default is yes.\n" @@ -10174,11 +14266,39 @@ msgstr "" " 默认值: 是。\n" " [仅用于 FSFS 仓库]" +#: ../svnserve/svnserve.c:237 +#, fuzzy +msgid "" +"enable or disable caching of revision properties.\n" +" Consult the documentation before activating " +"this.\n" +" Default is no.\n" +" [used for FSFS repositories only]" +msgstr "" +"是否对旧版本之间的差异启用缓存\n" +" 默认值: 否。\n" +" [仅用于 FSFS 仓库]" + +#: ../svnserve/svnserve.c:245 +#, fuzzy +msgid "" +"Optimize network handling based on the assumption\n" +" that most clients are connected with a bitrate " +"of\n" +" ARG Mbit/s.\n" +" Default is 0 (optimizations disabled)." +msgstr "" +"是否对旧版本之间的差异启用缓存\n" +" 默认值: 否。\n" +" [仅用于 FSFS 仓库]" + #. ### Making the assumption here that WIN32 never has fork and so #. * ### this option never exists when --service exists. +#: ../svnserve/svnserve.c:255 msgid "use threads instead of fork [mode: daemon]" msgstr "使用线程代替进程 [方式: daemon]" +#: ../svnserve/svnserve.c:259 msgid "" "run in foreground (useful for debugging)\n" " [mode: daemon]" @@ -10186,9 +14306,17 @@ msgstr "" "在前台运行(调试用)\n" " [方式: daemon]" +#: ../svnserve/svnserve.c:263 +msgid "" +"handle one connection at a time in the parent process\n" +" (useful for debugging)" +msgstr "" + +#: ../svnserve/svnserve.c:267 msgid "svnserve log file" msgstr "svnserve 日志文件" +#: ../svnserve/svnserve.c:270 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once, service]" @@ -10196,6 +14324,7 @@ msgstr "" "写进程 PID 到文件 ARG\n" " [方式: daemon, listen-once, service]" +#: ../svnserve/svnserve.c:274 msgid "" "write server process ID to file ARG\n" " [mode: daemon, listen-once]" @@ -10203,6 +14332,7 @@ msgstr "" "写进程 PID 到文件 ARG\n" " [方式: daemon, listen-once]" +#: ../svnserve/svnserve.c:279 msgid "" "tunnel username (default is current uid's name)\n" " [mode: tunnel]" @@ -10210,10 +14340,18 @@ msgstr "" "隧道用户名(默认是当前UID对应的用户名)\n" " [方式: tunnel]" +#: ../svnserve/svnserve.c:284 +msgid "" +"virtual host mode (look for repo in directory\n" +" of provided hostname)" +msgstr "" + +#: ../svnserve/svnserve.c:301 #, c-format msgid "Type '%s --help' for usage.\n" msgstr "使用“%s --help”得到用法。\n" +#: ../svnserve/svnserve.c:311 msgid "" "usage: svnserve [-d | -i | -t | -X | --service] [options]\n" "\n" @@ -10223,6 +14361,7 @@ msgstr "" "\n" "有效选项: \n" +#: ../svnserve/svnserve.c:317 msgid "" "usage: svnserve [-d | -i | -t | -X] [options]\n" "\n" @@ -10232,6 +14371,7 @@ msgstr "" "\n" "有效选项: \n" +#: ../svnserve/svnserve.c:345 msgid "" "\n" "Cyrus SASL authentication is available.\n" @@ -10239,85 +14379,103 @@ msgstr "" "\n" "Cyrus SASL 认证可用。\n" +#: ../svnserve/svnserve.c:616 #, c-format msgid "Invalid port '%s'" msgstr "无效端口“%s”" +#: ../svnserve/svnserve.c:657 #, c-format msgid "svnserve: Root path '%s' does not exist or is not a directory.\n" msgstr "svnserve: 根路径“%s”不存在，或者不是目录。\n" +#: ../svnserve/svnserve.c:770 msgid "You must specify exactly one of -d, -i, -t, --service or -X.\n" msgstr "您必须指定 -d, -i, -t, --service 或 -X 中的一个。\n" +#: ../svnserve/svnserve.c:773 msgid "You must specify exactly one of -d, -i, -t or -X.\n" msgstr "您必须指定 -d, -i, -t 或 -X 中的一个。\n" +#: ../svnserve/svnserve.c:782 +msgid "You may only specify one of -T or --single-thread\n" +msgstr "" + +#: ../svnserve/svnserve.c:810 #, c-format msgid "Option --tunnel-user is only valid in tunnel mode.\n" msgstr "选项 --tunnel-user 只在隧道模式有效。\n" +#: ../svnserve/svnserve.c:829 +#, c-format +msgid "Can't open stdout" +msgstr "无法打开标准输出" + +#: ../svnserve/svnserve.c:883 #, c-format -msgid "svnserve: The --service flag is only valid if the process is started by the Service Control Manager.\n" +msgid "" +"svnserve: The --service flag is only valid if the process is started by the " +"Service Control Manager.\n" msgstr "svnserve: 只有被服务控制管理器启动时 --service 选项才有效。\n" +#: ../svnserve/svnserve.c:933 #, c-format msgid "Can't get address info" msgstr "不能获取地址信息" +#: ../svnserve/svnserve.c:947 #, c-format msgid "Can't create server socket" msgstr "无法创建服务器套接字" +#: ../svnserve/svnserve.c:958 #, c-format msgid "Can't bind server socket" msgstr "不能绑定服务器套接字" +#: ../svnserve/svnserve.c:1056 #, c-format msgid "Can't accept client connection" msgstr "无法接受客户连接" +#: ../svnserve/svnserve.c:1137 #, c-format msgid "Can't create threadattr" msgstr "无法创建线程属性" +#: ../svnserve/svnserve.c:1145 #, c-format msgid "Can't set detached state" msgstr "不能设置分离的状态" +#: ../svnserve/svnserve.c:1158 #, c-format msgid "Can't create thread" msgstr "无法创建线程" -msgid "Path is not a string" -msgstr "路径不是字符串" - -msgid "Log revprop entry not a string" -msgstr "日志 revprop 入口不是字符串" - -#, c-format -msgid "Unknown revprop word '%s' in log command" -msgstr "日志命令中有未知的 revprop 单词 “%s”" - -msgid "Log path entry not a string" -msgstr "日志路径入口不是字符串" - +#: ../svnserve/winservice.c:346 #, c-format msgid "Failed to create winservice_start_event" msgstr "创建 Windows 服务启动事件失败" +#: ../svnserve/winservice.c:357 #, c-format msgid "The service failed to start" msgstr "启动服务失败" +#: ../svnserve/winservice.c:405 #, c-format msgid "Failed to connect to Service Control Manager" msgstr "连接服务管理器失败" +#: ../svnserve/winservice.c:416 #, c-format -msgid "The service failed to start; an internal error occurred while starting the service" +msgid "" +"The service failed to start; an internal error occurred while starting the " +"service" msgstr "发生内部错误，启动服务失败" +#: ../svnsync/svnsync.c:91 msgid "" "usage: svnsync initialize DEST_URL SOURCE_URL\n" "\n" @@ -10356,6 +14514,7 @@ msgstr "" "除了 svnsync 外，你不应该在目标版本库中提交，或者修改版本属性。也就是说，\n" "目标版本库应该是源版本库的只读镜像。\n" +#: ../svnsync/svnsync.c:117 msgid "" "usage: svnsync synchronize DEST_URL [SOURCE_URL]\n" "\n" @@ -10376,6 +14535,7 @@ msgstr "" "源 URL。如果有不信任的用户/管理员可以写入位于 DEST_URL 的版本库，那么特别\n" "推荐指定 SOURCE_URL。\n" +#: ../svnsync/svnsync.c:130 msgid "" "usage:\n" "\n" @@ -10411,6 +14571,7 @@ msgstr "" "\n" "格式 2 是已经废弃的语法，等价于指定 \"-rREV[:REV2]\" 。\n" +#: ../svnsync/svnsync.c:151 msgid "" "usage: svnsync info DEST_URL\n" "\n" @@ -10421,6 +14582,7 @@ msgstr "" "\n" "打印位于 DEST_URL 的同步目标版本库信息。\n" +#: ../svnsync/svnsync.c:157 msgid "" "usage: svnsync help [SUBCOMMAND...]\n" "\n" @@ -10430,9 +14592,11 @@ msgstr "" "\n" "显示本程序或其子命令的用法。\n" +#: ../svnsync/svnsync.c:167 msgid "print as little as possible" msgstr "尽可能少打印" +#: ../svnsync/svnsync.c:169 msgid "" "operate on revision ARG (or range ARG1:ARG2)\n" " A revision argument can be one of:\n" @@ -10444,9 +14608,11 @@ msgstr "" " 整数 版本号\n" " 'HEAD' 最新版本" +#: ../svnsync/svnsync.c:177 msgid "allow a non-empty destination repository" msgstr "允许非空目标版本库" +#: ../svnsync/svnsync.c:189 msgid "" "specify a username ARG (deprecated;\n" " see --source-username and --sync-username)" @@ -10454,6 +14620,7 @@ msgstr "" "指定用户名称 ARG (已经过时;\n" " 参看 --source-username 和 --sync-username)" +#: ../svnsync/svnsync.c:193 msgid "" "specify a password ARG (deprecated;\n" " see --source-password and --sync-password)" @@ -10461,135 +14628,191 @@ msgstr "" "指定密码 ARG (已经过时;\n" " 参看 --source-password 和 --sync-password)" +#: ../svnsync/svnsync.c:203 msgid "connect to source repository with username ARG" msgstr "使用用户名称 ARG 连接源版本库" +#: ../svnsync/svnsync.c:205 msgid "connect to source repository with password ARG" msgstr "使用密码 ARG 连接源版本库" +#: ../svnsync/svnsync.c:207 msgid "connect to sync repository with username ARG" msgstr "使用用户名称 ARG 连接目的版本库" +#: ../svnsync/svnsync.c:209 msgid "connect to sync repository with password ARG" msgstr "使用密码 ARG 连接目的版本库" +#: ../svnsync/svnsync.c:221 msgid "" "convert translatable properties from encoding ARG\n" -" to UTF-8. If not specified, then properties are\n" +" to UTF-8. If not specified, then properties " +"are\n" " presumed to be encoded in UTF-8." msgstr "" "将可翻译的属性从编码 ARG 转换到 UTF-8。如果不指定，那么假定属性的编码是\n" " UTF-8。" +#: ../svnsync/svnsync.c:227 msgid "" "Disable built-in locking. Use of this option can\n" -" corrupt the mirror unless you ensure that no other\n" +" corrupt the mirror unless you ensure that no " +"other\n" " instance of svnsync is running concurrently." msgstr "" "禁用内置锁。使用此选项可能\n" " 会损坏镜像，除非你能确认没有其它 svnsync\n" " 实例同时运行。" +#: ../svnsync/svnsync.c:233 msgid "" "Steal locks as necessary. Use, with caution,\n" " if your mirror repository contains stale locks\n" -" and is not being concurrently accessed by another\n" +" and is not being concurrently accessed by " +"another\n" " svnsync instance." msgstr "" "在需要时窃取锁。请小心使用\n" " 如果你的镜像包含过时的锁，并且没有其它 svnsync\n" " 实例同时运行。" -msgid "Target server does not support atomic revision property edits; consider upgrading it to 1.7 or using an external locking program" -msgstr "目标服务器不支持原子版本的属性编辑; 请考虑升级到 1.7 或者使用外部加锁程序" +#: ../svnsync/svnsync.c:356 +msgid "" +"Target server does not support atomic revision property edits; consider " +"upgrading it to 1.7 or using an external locking program" +msgstr "" +"目标服务器不支持原子版本的属性编辑; 请考虑升级到 1.7 或者使用外部加锁程序" +#: ../svnsync/svnsync.c:370 #, c-format msgid "Stole lock previously held by '%s'\n" msgstr "窃取被 '%s' 持有的锁\n" +#: ../svnsync/svnsync.c:459 #, c-format msgid "Session is rooted at '%s' but the repos root is '%s'" msgstr "会话根是“%s”，但是版本库根是“%s”" +#: ../svnsync/svnsync.c:601 #, c-format msgid "Copied properties for revision %ld (%s* properties skipped).\n" msgstr "从版本 %ld (忽略 %s* 属性)复制属性。\n" +#: ../svnsync/svnsync.c:606 #, c-format msgid "Copied properties for revision %ld.\n" msgstr "复制版本 %ld 的属性。\n" +#: ../svnsync/svnsync.c:622 #, c-format -msgid "NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-props).\n" +msgid "" +"NOTE: Normalized %s* properties to LF line endings (%d rev-props, %d node-" +"props).\n" msgstr "注意: 已经标准化 %s* 属性为 LF 行尾 (%d rev-props, %d node-props)。\n" -msgid "Destination repository already contains revision history; consider using --allow-non-empty if the repository's revisions are known to mirror their respective revisions in the source repository" +#: ../svnsync/svnsync.c:752 +msgid "" +"Destination repository already contains revision history; consider using --" +"allow-non-empty if the repository's revisions are known to mirror their " +"respective revisions in the source repository" msgstr "" "目标版本库已经包含版本历史；如果你确信它们是镜像源版本库的对应版本的话，\n" "考虑使用选项 '--allow-non-empty'" +#: ../svnsync/svnsync.c:761 #, c-format msgid "Destination repository is already synchronizing from '%s'" msgstr "目标版本库已经与“%s”同步" +#: ../svnsync/svnsync.c:796 msgid "Destination repository has more revisions than source repository" msgstr "目标版本库的版本数量比源版本库多" +#: ../svnsync/svnsync.c:861 ../svnsync/svnsync.c:864 ../svnsync/svnsync.c:1517 +#: ../svnsync/svnsync.c:1524 ../svnsync/svnsync.c:1761 +#: ../svnsync/svnsync.c:1764 ../svnsync/svnsync.c:1808 #, c-format msgid "Path '%s' is not a URL" msgstr "路径“%s”不是URL" +#: ../svnsync/svnsync.c:891 #, c-format msgid "Committed revision %ld.\n" msgstr "已提交版本 %ld。\n" +#: ../svnsync/svnsync.c:934 msgid "Destination repository has not been initialized" msgstr "目标版本库没有初始化" +#: ../svnsync/svnsync.c:1300 #, c-format msgid "Commit created rev %ld but should have created %ld" msgstr "提交创建版本 %ld，应该创建版本 %ld" +#: ../svnsync/svnsync.c:1415 #, c-format -msgid "Revision being currently copied (%ld), last merged revision (%ld), and destination HEAD (%ld) are inconsistent; have you committed to the destination without using svnsync?" -msgstr "当前复制版本(%ld), 最后合并版本(%ld), 和目标 HEAD (%ld) 不一致；你是否使用非svnsync方法提交到目标版本库？" +msgid "" +"Revision being currently copied (%ld), last merged revision (%ld), and " +"destination HEAD (%ld) are inconsistent; have you committed to the " +"destination without using svnsync?" +msgstr "" +"当前复制版本(%ld), 最后合并版本(%ld), 和目标 HEAD (%ld) 不一致；你是否使用非" +"svnsync方法提交到目标版本库？" +#: ../svnsync/svnsync.c:1452 #, c-format -msgid "Destination HEAD (%ld) is not the last merged revision (%ld); have you committed to the destination without using svnsync?" -msgstr "目标 HEAD (%ld)不是最后合并版本(%ld)；你是否使用非 svnsync 方法提交到目标版本库？" +msgid "" +"Destination HEAD (%ld) is not the last merged revision (%ld); have you " +"committed to the destination without using svnsync?" +msgstr "" +"目标 HEAD (%ld)不是最后合并版本(%ld)；你是否使用非 svnsync 方法提交到目标版本" +"库？" +#: ../svnsync/svnsync.c:1575 ../svnsync/svnsync.c:1580 #, c-format -msgid "Cannot copy revprops for a revision (%ld) that has not been synchronized yet" +msgid "" +"Cannot copy revprops for a revision (%ld) that has not been synchronized yet" msgstr "不能在尚未同步时复制版本(%ld)的 revprops" +#: ../svnsync/svnsync.c:1644 ../svnsync/svnsync.c:1664 #, c-format msgid "Invalid revision number (%ld)" msgstr "无效的版本号 (%ld)" -msgid "Cannot specify revisions via both command-line arguments and the --revision (-r) option" +#: ../svnsync/svnsync.c:1714 +msgid "" +"Cannot specify revisions via both command-line arguments and the --revision " +"(-r) option" msgstr "不能同时使用 " +#: ../svnsync/svnsync.c:1722 ../svnsync/svnsync.c:2065 #, c-format msgid "Invalid revision range '%s' provided" msgstr "提供了无效的版本范围 '%s'" +#: ../svnsync/svnsync.c:1821 #, c-format msgid "Repository '%s' is not initialized for synchronization" msgstr "版本库“%s”没有为同步初始化" #. Print the info. +#: ../svnsync/svnsync.c:1827 #, c-format msgid "Source URL: %s\n" msgstr "源 URL: %s\n" +#: ../svnsync/svnsync.c:1829 #, c-format msgid "Source Repository UUID: %s\n" msgstr "源版本库 UUID: %s\n" +#: ../svnsync/svnsync.c:1832 #, c-format msgid "Last Merged Revision: %s\n" msgstr "最后合并的版本: %s\n" +#: ../svnsync/svnsync.c:1849 msgid "" "general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n" "Type 'svnsync help <subcommand>' for help on a specific subcommand.\n" @@ -10603,12 +14826,19 @@ msgstr "" "\n" "可用的子命令: \n" -msgid "Cannot use --username or --password with any of --source-username, --source-password, --sync-username, or --sync-password.\n" -msgstr "不能将 --username 或 --password 与 --source-username, --source-password, --sync-username, 或 --sync-password 一起使用。\n" +#: ../svnsync/svnsync.c:2113 +msgid "" +"Cannot use --username or --password with any of --source-username, --source-" +"password, --sync-username, or --sync-password.\n" +msgstr "" +"不能将 --username 或 --password 与 --source-username, --source-password, --" +"sync-username, 或 --sync-password 一起使用。\n" +#: ../svnsync/svnsync.c:2137 msgid "--disable-locking and --steal-lock are mutually exclusive" msgstr "--disable-locking 与 --steal-lock 是互斥的" +#: ../svnsync/svnsync.c:2213 #, c-format msgid "" "Subcommand '%s' doesn't accept option '%s'\n" @@ -10617,30 +14847,33 @@ msgstr "" "子命令“%s”不接受选项“%s”\n" "使用“svnsync help %s”得到用法。\n" +#: ../svnsync/svnsync.c:2296 msgid "Try 'svnsync help' for more info" msgstr "请使用 “svnsync help” 以得到更多信息" +#: ../svnversion/svnversion.c:49 #, c-format msgid "Type 'svnversion --help' for usage.\n" msgstr "使用 “svnversion --help” 得到用法。\n" -#, c-format +#: ../svnversion/svnversion.c:60 +#, fuzzy, c-format msgid "" "usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n" "\n" -" Produce a compact 'version number' for the working copy path\n" +" Produce a compact version identifier for the working copy path\n" " WC_PATH. TRAIL_URL is the trailing portion of the URL used to\n" " determine if WC_PATH itself is switched (detection of switches\n" -" within WC_PATH does not rely on TRAIL_URL). The version number\n" +" within WC_PATH does not rely on TRAIL_URL). The version identifier\n" " is written to standard output. For example:\n" "\n" " $ svnversion . /repos/svn/trunk\n" " 4168\n" "\n" -" The version number will be a single number if the working\n" +" The version identifier will be a single number if the working\n" " copy is single revision, unmodified, not switched and with\n" -" an URL that matches the TRAIL_URL argument. If the working\n" -" copy is unusual the version number will be more complex:\n" +" a URL that matches the TRAIL_URL argument. If the working\n" +" copy is unusual the version identifier will be more complex:\n" "\n" " 4123:4168 mixed revision working copy\n" " 4168M modified working copy\n" @@ -10685,36 +14918,41 @@ msgstr "" "\n" "有效选项: \n" +#: ../svnversion/svnversion.c:136 msgid "do not output the trailing newline" msgstr "不输出其后的换行符" +#: ../svnversion/svnversion.c:137 msgid "last changed rather than current revisions" msgstr "最近一次改变的，而不是目前的版本" +#: ../svnversion/svnversion.c:245 #, c-format msgid "Unversioned symlink%s" msgstr "未版本控制的符号链接 %s" +#: ../svnversion/svnversion.c:248 #, c-format msgid "Unversioned directory%s" msgstr "目录 %s 未版本控制" +#: ../svnversion/svnversion.c:251 #, c-format msgid "Unversioned file%s" msgstr "文件 %s 未版本控制" +#: ../svnversion/svnversion.c:257 #, c-format msgid "'%s' doesn't exist\n" msgstr "“%s” 不存在\n" +#: ../svnversion/svnversion.c:258 #, c-format msgid "'%s' is of unknown type\n" msgstr "“%s” 的类型未知\n" #. Local uncommitted modifications, no revision info was found. +#: ../svnversion/svnversion.c:273 #, c-format msgid "Uncommitted local addition, copy or move%s" msgstr "未提交的本地增加，复制或移动 %s" - -#~ msgid "'%s' is scheduled for addition within unversioned parent" -#~ msgstr "在未纳入版本控制的父目录，“%s” 被加入增加调度" |