You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ar...@apache.org on 2012/07/30 08:39:38 UTC
svn commit: r1367002 [16/21] - in /subversion/branches/svn-bisect: ./ build/
build/ac-macros/ build/generator/ build/generator/templates/
contrib/client-side/emacs/ contrib/server-side/mod_dontdothat/ notes/
notes/api-errata/1.7/ notes/http-and-webdav/...
Modified: subversion/branches/svn-bisect/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/svn-bisect/subversion/po/zh_CN.po?rev=1367002&r1=1367001&r2=1367002&view=diff
==============================================================================
--- subversion/branches/svn-bisect/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/svn-bisect/subversion/po/zh_CN.po [UTF-8] Mon Jul 30 06:39:28 2012
@@ -20,14 +20,13 @@
#
# Update to new pot:
# ../../tools/po/po-update.sh zh_CN
-# msgmerge --update zh_CN.po subversion.pot
#
# Check translation:
# msgfmt --statistics -c -o zh_CN.mo zh_CN.po
#
# Please format and remove '#: filename:line' lines before commit:
-# msgcat --width=80 --sort-by-file -o zh_CN_new.po zh_CN.po
-# msgcat --width=80 --no-location -o zh_CN.po zh_CN_new.po
+# msgmerge --sort-by-file -o zh_CN_new.po zh_CN.po subversion.pot
+# msgcat --no-wrap --no-location -o zh_CN.po zh_CN_new.po
# /bin/rm zh_CN_new.po
#
# Dictionary:
@@ -39,6 +38,7 @@
# HEAD revision 最新版本
# Obliteration 灭迹
# overlay 重载
+# peg 铆钉
# remove 删除
# rename 改名
# repository 版本库
@@ -55,8 +55,8 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.7\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2011-07-22 13:18+0800\n"
-"PO-Revision-Date: 2011-07-22 13:18+0800\n"
+"POT-Creation-Date: 2012-02-27 09:24+0000\n"
+"PO-Revision-Date: 2012-02-27 09:24+0000\n"
"Last-Translator: Subversion Developers <de...@subversion.apache.org>\n"
"Language-Team: Simplified Chinese <de...@subversion.apache.org>\n"
"Language: \n"
@@ -902,9 +902,7 @@ msgstr "不支持 SQLite 数据库中的
msgid "The SQLite db is busy"
msgstr "SQLite 数据库繁忙"
-msgid ""
-"SQLite busy at transaction rollback; resetting all busy SQLite statements to "
-"allow rollback"
+msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句，以便允许回滚"
msgid "Constraint error in SQLite db"
@@ -960,9 +958,7 @@ msgid "'%s' prevents creating parent of
msgstr "'%s' 阻止创建 '%s' 的父亲"
#, 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”处于冲突状态；请在新增之前标记冲突为已经解决"
#, c-format
@@ -982,6 +978,10 @@ msgid "'%s' is not a local path"
msgstr "“%s”不是本地路径"
#, c-format
+msgid "There is no valid uri above '%s'"
+msgstr "在 '%s' 的上级没有合法的 URI"
+
+#, c-format
msgid "Cannot calculate blame information for binary file '%s'"
msgstr "无法为二进制文件 “%s” 计算追溯信息"
@@ -1034,12 +1034,14 @@ msgstr "不正确的相对 URL“%s”"
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"
+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” 是未知类型或不可纳入版本控制"
@@ -1075,9 +1077,7 @@ msgid "Error bumping revisions post-comm
msgstr "执行 post-commit 出错 (细节如下): "
#, 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”非空，因此不能在非递归提交中删除它"
#, c-format
@@ -1092,6 +1092,14 @@ msgstr ""
"是否所有目标都属于同一工作副本？"
#, 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 ""
+
+#, 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 ""
+
+#, c-format
msgid "Directory '%s' is out of date"
msgstr "目录 “%s” 已经过时"
@@ -1136,15 +1144,8 @@ msgid "'%s' is scheduled for addition, b
msgstr "丢失了预定增加的“%s”"
#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "在未纳入版本控制的父目录，“%s” 被加入增加调度"
-
-#, c-format
-msgid ""
-"'%s' is not under version control and is not part of the commit, yet its "
-"child '%s' is part of the commit"
-msgstr ""
-"“%s” 尚未纳入版本控制，也不是提交的一部份，但是它的子路径 “%s” 是提交的一部份"
+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” 是提交的一部分"
#, c-format
msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
@@ -1204,9 +1205,7 @@ msgid "Cannot copy path '%s' into its ow
msgstr "无法复制路径 “%s” 到其子目录 “%s” 中"
#, 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 。"
msgid "Moves between the working copy and the repository are not supported"
@@ -1233,9 +1232,7 @@ msgid "'%s' has local modifications -- c
msgstr "“%s” 已有本地修改 -- 请先提交或撤销"
#, 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"
msgid "Cannot specify revisions (except HEAD) with move operations"
@@ -1283,26 +1280,36 @@ msgid "Not all required revisions are sp
msgstr "没有全部提供需要的版本"
msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于 peg 差异，必须至少有一个非本地版本"
+msgstr "对于铆钉差异，必须至少有一个非本地版本"
#, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "“%s” 不在版本库版本 %ld 中"
+msgid "Diff target '%s' was not found in the repository at revision '%ld'"
+msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 中"
-msgid "Sorry, svn_client_diff5 was called in a way that is not yet supported"
-msgstr "抱歉，svn_client_diff5 尚不支持这种调用方式"
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
+msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 或 '%ld' 中"
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
+#, c-format
+msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
+msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
+
+#, c-format
+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_diff6 was called in a way that is not yet supported"
+msgstr "抱歉，svn_client_diff6 尚不支持这种调用方式"
+
+msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "当前 diff 只支持参考文件与其工作文件比较"
#, c-format
msgid "Directory '%s' has no URL"
msgstr "目录 “%s” 没有 URL"
-msgid "Summarizing diff can only compare repository to repository"
-msgstr "只有版本库和版本库才能比较差异概要"
+msgid "Summarizing diff cannot compare repository to WC"
+msgstr "版本库和工作副本不能比较差异概要"
#, c-format
msgid "'%s' is not a valid EOL value"
@@ -1331,15 +1338,12 @@ msgstr "“%s” 已存在"
msgid "Checksum mismatch for '%s'"
msgstr "'%s' 的校验和不匹配"
-#, fuzzy, c-format
-msgid ""
-"Cannot insert a file external defined on '%s' into the working copy '%s'."
-msgstr "不能从 “%s” 插入外部引用的文件到工作副本，它来源于不同的版本库根 “%s”"
+#, c-format
+msgid "Cannot insert a file external defined on '%s' into the working copy '%s'."
+msgstr "不能将在“%s”定义的文件外部引用插入到工作副本“%s”。"
#, 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” 的已存版本控制条目"
#, c-format
@@ -1347,26 +1351,6 @@ msgid "The file external '%s' can not be
msgstr "不能创建文件外部引用 '%s'，节点已经存在。"
#, c-format
-msgid "URL '%s' does not begin with a scheme"
-msgstr "URL “%s” 没有以方案开始"
-
-#, c-format
-msgid "Illegal parent directory URL '%s'"
-msgstr "非法父目录 URL “%s”"
-
-#, c-format
-msgid "Illegal repository root URL '%s'"
-msgstr "非法版本库根 URL “%s”"
-
-#, c-format
-msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
-msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”"
-
-#, c-format
-msgid "Unrecognized format for the relative external URL '%s'"
-msgstr "外部相对 URL “%s” 的格式无法识别"
-
-#, c-format
msgid "URL '%s' at revision %ld doesn't exist"
msgstr "URL “%s” 在版本 %ld 中不存在"
@@ -1375,17 +1359,21 @@ msgid "URL '%s' at revision %ld is not a
msgstr "URL “%s” 在版本 %ld 中不是文件或目录"
#, c-format
-msgid "Traversal of '%s' found no ambient depth"
-msgstr "在 “%s” 中找不到深度"
+msgid "Unsupported external: URL of file external '%s' is not in repository '%s'"
+msgstr "不支持的外部对象：文件外部对象“%s”的 URL 不在版本库“%s”中"
#, c-format
-msgid "Server does not support retrieving information about the repository root"
-msgstr "服务器不支持取得版本库根的信息"
+msgid "Traversal of '%s' found no ambient depth"
+msgstr "在 “%s” 中找不到深度"
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL “%s” 不在版本 %ld 中"
+#, c-format
+msgid "Server does not support retrieving information about the repository root"
+msgstr "服务器不支持取得版本库根的信息"
+
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "没有找到公共父节点，不能在分离的参数上操作"
@@ -1425,6 +1413,10 @@ msgstr "条目“%s”没有URL"
msgid "Url '%s' of '%s' is not in repository '%s'"
msgstr "URL“%s”(祖先“%s”)不在版本库“%s”中"
+#, c-format
+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
@@ -1439,9 +1431,7 @@ msgstr ".merge-left.r%ld"
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"
+msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "不能从路径的未来历史中反向合并范围；请先更新"
#, c-format
@@ -1458,21 +1448,17 @@ msgstr ""
msgid "Invalid mergeinfo detected on '%s', mergetracking not possible"
msgstr "在“%s”发现了非法的合并信息；合并跟踪是不可能的"
-msgid ""
-"Merge tracking not allowed with missing subtrees; try restoring these items "
-"first:\n"
+msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "合并跟踪不允许丢失子树; 请先恢复这些项目:\n"
#, c-format
-msgid ""
-"Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
+msgid "Invalid mergeinfo detected on merge target '%s', mergetracking not possible"
msgstr "在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的"
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "使用两个 URL 与合并信息修改不兼容"
-msgid ""
-"Merge from foreign repository is not compatible with mergeinfo modification"
+msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "从外部版本库合并与合并信息修改不兼容"
#, c-format
@@ -1483,8 +1469,7 @@ msgid "Cannot determine revision of work
msgstr "不能确定工作副本的版本"
#, c-format
-msgid ""
-"Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
+msgid "Cannot merge into mixed-revision working copy [%lu:%lu]; try updating first"
msgstr "不能合并到有混合版本的工作副本 [%lu:%lu] 中；请先更新"
msgid "Cannot merge into a working copy with a switched subtree"
@@ -1493,38 +1478,30 @@ msgstr "不能合并到已经切换子�
msgid "Cannot merge into a working copy that has local modifications"
msgstr "不能合并到有本地修改的工作副本中"
-msgid "Merge sources must both be either paths or URLs"
-msgstr "合并源必须同时是路径或 URL"
-
#, 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”发现了非法的合并信息；复兴合并是不可能的"
+msgid "Merge sources must both be either paths or URLs"
+msgstr "合并源必须同时是路径或 URL"
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系"
#, 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 "复兴源或目标都不能是版本库的根。"
+msgid "Reintegrate merge not possible"
+msgstr "复兴合并是不可能的"
+
#, 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"
msgid "Only depths 'infinity' and 'empty' are currently supported"
@@ -1575,25 +1552,18 @@ msgid "Setting property '%s' on non-loca
msgstr "不支持对非本地目标设置属性“%s”"
#, 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 出乎意料地不在版本库中(可能某人删除了？)"
#, 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 在版本库中出乎意料地取值(可能某人修改了？)"
#, 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"
+msgid "Author name should not contain a newline; value will not be set unless forced"
msgstr "作者名称不能包含换行；除非强迫为之，否则其值不会被设定"
#, c-format
@@ -1617,9 +1587,7 @@ msgid "Unable to find repository locatio
msgstr "“%s” 的版本库位置不在版本 %ld 中"
#, 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 中，或是指向一个无关对象"
#, c-format
@@ -1716,8 +1684,7 @@ msgid "Invalid diff stream: [src] insn %
msgstr "无效的差异流: [src] insn %d 溢出源视图"
#, 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 起点超过目标视图位置"
#, c-format
@@ -1772,20 +1739,11 @@ msgid "'%s' does not define '%s()'"
msgstr "“%s” 未定义 “%s()”"
#, c-format
-msgid "Can't grab FS mutex"
-msgstr "无法获取文件系统互斥体"
-
-#, c-format
-msgid "Can't ungrab FS mutex"
-msgstr "不能释放文件系统互斥体"
-
-#, c-format
msgid "Failed to load module for FS type '%s'"
msgstr "加载 “%s” 文件系统模块失败"
#, 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"
#, c-format
@@ -1793,10 +1751,6 @@ msgid "Unknown FS type '%s'"
msgstr "未知的文件系统类型 “%s”"
#, c-format
-msgid "Can't allocate FS mutex"
-msgstr "不能分配文件系统互斥体"
-
-#, c-format
msgid "Path '%s' is not in UTF-8"
msgstr "路径 “%s” 不是 UTF-8 编码"
@@ -1804,21 +1758,36 @@ msgstr "路径 “%s” 不是 UTF-8 编
msgid "Path '%s' contains '.' or '..' element"
msgstr "路径 “%s” 包含 “.” 或 “..” 元素"
+msgid "Hotcopy source and destination are equal"
+msgstr ""
+
+#, c-format
+msgid "'%s' already exists and is a file"
+msgstr "“%s”已存在，它是文件"
+
+#, c-format
+msgid "'%s' already exists and has an unknown node kind"
+msgstr "“%s”已存在，具有未知的节点类型"
+
+#, c-format
+msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')"
+msgstr ""
+
#, c-format
msgid "Malformed UUID '%s'"
msgstr "非法 UUID “%s”"
-#, fuzzy, c-format
+#, c-format
msgid "Lock token URI '%s' has bad scheme; expected '%s'"
-msgstr "版本库的 UUID“%s”与期望的 UUID“%s”不匹配"
+msgstr "锁令牌 URI '%s' 的方案错误；期望是 '%s'"
#, c-format
msgid "Lock token '%s' is not ASCII at byte %u"
-msgstr "锁令牌“%s”在字节 %u 处不是 ASCII 字符"
+msgstr "锁令牌 '%s' 在字节 %u 处不是 ASCII 字符"
-#, fuzzy, c-format
+#, c-format
msgid "Lock token URI '%s' is not XML-safe"
-msgstr "'%s' 的基础节点不是文件"
+msgstr "锁令牌 URI '%s' 不是 XML 安全的"
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "传递到 svn_fs_lock 的有效期非法"
@@ -1890,9 +1859,7 @@ msgid "reading copy"
msgstr "正在读取副本"
#, 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)不同"
msgid "storing node-origins record"
@@ -2136,15 +2103,17 @@ msgid "Berkeley DB error for filesystem
msgstr "打开文件系统“%s”的BDB环境句柄时出错: \n"
#, 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"
#, c-format
msgid "Expected FS format '%d'; found format '%d'"
msgstr "期望文件系统格式“%d”；发现格式“%d”"
+#, c-format
+msgid "BDB repositories do not support incremental hotcopy"
+msgstr ""
+
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -2203,9 +2172,7 @@ msgid "Diff version inconsistencies in r
msgstr "在修订版“%s”中diff的版本不一致"
#, 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”读差异链时检测到数据损坏"
#, c-format
@@ -2316,22 +2283,18 @@ msgid "Node-revision '%s' claims to have
msgstr "节点版本“%s”声称自己有合并信息，实际上却没有"
#, 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”声称自己是包含合并信息的树顶，实际上却不是目录"
msgid "Can't get entries of non-directory"
msgstr "不能获取非目录的条目"
#, 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"
#, 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)"
msgid "Empty noderev in cache"
@@ -2342,18 +2305,6 @@ msgid "Can't fetch FSFS shared data"
msgstr "不能获取文件系统互斥体"
#, c-format
-msgid "Can't create FSFS write-lock mutex"
-msgstr "不能创建文件系统写互斥体"
-
-#, 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 "不能创建文件系统事务列表互斥体"
-
-#, c-format
msgid "Can't store FSFS shared data"
msgstr "不能存储文件系统共享数据"
@@ -2365,22 +2316,6 @@ msgid "Unsupported FS loader version (%d
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 互斥体"
-
-#, c-format
msgid "Can't unlock unknown transaction '%s'"
msgstr "不能解锁未知事务“%s”"
@@ -2397,15 +2332,11 @@ msgid "Can't close prototype revision lo
msgstr "不能为事务“%s”关闭原型版本锁文件"
#, 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' 写入原型版本文件。"
#, 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' 写入原型版本文件。"
#, c-format
@@ -2425,12 +2356,8 @@ msgid "'%s' contains invalid filesystem
msgstr "“%s”包含非法文件系统格式选项“%s”"
#, 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"
#, c-format
msgid "Expected FS format between '1' and '%d'; found format '%d'"
@@ -2441,15 +2368,6 @@ msgid "'%s' is not a regular file. Pleas
msgstr "'%s' 不是普通文件。请移除后重试"
#, 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'。"
-
-#, c-format
msgid "Found malformed header '%s' in revision file"
msgstr "在版本文件中找到非法文件头“%s”"
@@ -2475,71 +2393,65 @@ msgstr "读取节点版本“%s”的偏
msgid "Missing id field in node-rev"
msgstr "node-rev 中没有 id"
-#, fuzzy, c-format
+#, c-format
msgid "Missing kind field in node-rev '%s'"
-msgstr "node-rev 中没有 kind"
+msgstr "node-rev '%s' 中没有 kind 字段"
-#, fuzzy, c-format
+#, c-format
msgid "Missing cpath field in node-rev '%s'"
-msgstr "node-rev 中没有 cpath"
+msgstr "node-rev '%s' 中没有 cpath 字段"
-#, fuzzy, c-format
+#, c-format
msgid "Malformed copyroot line in node-rev '%s'"
-msgstr "node-rev 中的 copyroot 行非法"
+msgstr "node-rev '%s' 中的 copyroot 行非法"
-#, fuzzy, c-format
+#, c-format
msgid "Malformed copyfrom line in node-rev '%s'"
-msgstr "node-rev 中的 copyfrom 行非法"
+msgstr "node-rev '%s' 中的 copyfrom 行非法"
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to write to non-transaction '%s'"
-msgstr "试图写至非事务"
+msgstr "试图写至非事务 '%s'"
-#, fuzzy, c-format
+#, c-format
msgid "Malformed representation header at %s"
-msgstr "非法的修订版头"
+msgstr "位于 %s 的修订版头非法"
-#, fuzzy, c-format
+#, c-format
msgid "Missing node-id in node-rev at r%ld (offset %s)"
-msgstr "node-rev 中没有 node-id"
+msgstr "node-rev r%ld (偏移 %s) 中没有 node-id"
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt node-id '%s' in node-rev at r%ld (offset %s)"
-msgstr "node-rev 中的 node-id 损坏"
+msgstr "node-id '%s' 损坏，位于 node-rev r%ld (偏移 %s)"
-#, fuzzy, c-format
+#, c-format
msgid "Revision file (r%ld) lacks trailing newline"
-msgstr "版本文件缺少结尾换行"
+msgstr "版本文件 (r%ld) 缺少结尾换行"
-#, fuzzy, c-format
+#, c-format
msgid "Final line in revision file (r%ld) longer than 64 characters"
-msgstr "版本文件的最后一行大于 64 个字符"
+msgstr "版本文件 (r%ld) 的最后一行大于 64 个字符"
-#, fuzzy, c-format
+#, c-format
msgid "Final line in revision file r%ld missing space"
-msgstr "版本文件的最后一行缺少空白字符"
+msgstr "版本文件 (r%ld) 的最后一行缺少空白字符"
msgid "Malformed svndiff data in representation"
-msgstr "修订版的svndiff 数据非法"
+msgstr "修订版的 svndiff 数据非法"
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 请求的位置超出了流的结尾"
-
msgid "svndiff window length is corrupt"
msgstr "svndiff 的窗体长度已损坏"
msgid "Checksum mismatch while reading representation"
msgstr "读取修订版时校验和不匹配"
-#, fuzzy, c-format
+#, c-format
msgid "Directory entry corrupt in '%s'"
-msgstr "目录条目损坏"
+msgstr "'%s' 的目录入口损坏"
msgid "Invalid changes line in rev-file"
msgstr "rev-file 中有非法修改行"
@@ -2566,13 +2478,13 @@ msgstr "内部错误: 向 get_txn_propli
msgid "next-id file corrupt"
msgstr "next-id 文件损坏"
-#, fuzzy, c-format
+#, c-format
msgid "Transaction '%s' cleanup failed"
-msgstr "事务清理失败"
+msgstr "事务 '%s' 清理失败"
-#, fuzzy, c-format
+#, c-format
msgid "Invalid change type %d"
-msgstr "无效的修改类型"
+msgstr "无效的修改类型 %d"
msgid "Can't set text contents of a directory"
msgstr "无法设定目录的文本内容"
@@ -2580,6 +2492,10 @@ msgstr "无法设定目录的文本内�
msgid "Corrupt 'current' file"
msgstr "文件 “current” 损坏"
+#, c-format
+msgid "predecessor count for the root node-revision is wrong: found %d, committing r%ld"
+msgstr "根节点版本的前驱计数错误：发现 %d，正在提交 r%ld"
+
msgid "Truncated protorev file detected"
msgstr "检测到文件 protorev 被截断"
@@ -2608,18 +2524,66 @@ msgid "Revision %ld has a non-file where
msgstr "版本 %ld 有非文件项目，与其属性文件的记录矛盾"
#, 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)不同"
-#, fuzzy, c-format
+#, c-format
msgid "No such transaction '%s'"
-msgstr "无此事务"
+msgstr "没有事务 '%s'"
-#, fuzzy, c-format
+#, c-format
msgid "FSFS format (%d) too old to pack; please upgrade the filesystem."
-msgstr "要打包的文件系统格式(%d)太旧，请升级。"
+msgstr "要打包的 FSFS 格式 (%d) 太旧，请升级。"
+
+#, c-format
+msgid "Error converting entry in directory '%s' to UTF-8"
+msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败"
+
+#, c-format
+msgid "Source '%s' is not a directory"
+msgstr "源 “%s” 不是目录"
+
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的 “%s” 不是目录"
+
+#, c-format
+msgid "Can't read directory '%s'"
+msgstr "无法读取目录 “%s”"
+
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "关闭目录 “%s” 出错"
+
+#, 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 ""
+
+msgid "The UUID of the hotcopy source does not match the UUID of the hotcopy destination"
+msgstr ""
+
+msgid "The sharding layout configuration of the hotcopy source does not match the sharding layout configuration of the hotcopy destination"
+msgstr ""
+
+#, 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”来创建它。"
+
+#, c-format
+msgid "The hotcopy destination already contains more revisions (%lu) than the hotcopy source contains (%lu); are source and destination swapped?"
+msgstr ""
+
+#, c-format
+msgid "The hotcopy destination already contains more packed revisions (%lu) than the hotcopy source contains (%lu)"
+msgstr ""
+
+#, 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 ""
+
+#, c-format
+msgid "Revision %lu disappeared from the hotcopy source while hotcopy was in progress"
+msgstr ""
#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
@@ -2648,13 +2612,8 @@ msgid "Only SHA1 checksums can be used a
msgstr "在表 rep_cache 中，只有 SHA1 校验和才能用作键。\n"
#, 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 "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)不同"
#, c-format
msgid "Node-revision #'%s' claims to have mergeinfo but doesn't"
@@ -2665,9 +2624,7 @@ msgid "Node-revision '%s@%ld' claims to
msgstr "节点版本“%s@%ld”声称有合并信息，实际上却没有"
#, 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"
msgid "Filesystem object has not been opened yet"
@@ -2690,14 +2647,14 @@ msgstr "“%s” 于版本 %ld 是一个
#, c-format
msgid "Invalid peg revision %ld"
-msgstr "无效 peg 版本 %ld"
+msgstr "无效的铆钉版本 %ld"
#, c-format
msgid "Invalid end revision %ld"
msgstr "无效结束版本 %ld"
msgid "Peg revision must precede end revision"
-msgstr "Peg 版本必须小于结束版本"
+msgstr "铆钉版本必须小于结束版本"
#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -2720,6 +2677,10 @@ msgid "Repository UUID '%s' doesn't matc
msgstr "版本库的 UUID“%s”与期望的 UUID“%s”不匹配"
#, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr "“%s”与“%s”并不在同一个版本库中"
+
+#, c-format
msgid "'%s' isn't a child of session URL '%s'"
msgstr "“%s” 不是会话 URL “%s” 的子节点"
@@ -2728,11 +2689,8 @@ msgid "'%s' isn't a child of repository
msgstr "“%s” 不是版本库根 URL “%s” 的子节点"
#, 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'，也说明您的客户端有问题"
#, c-format
msgid " - handles '%s' scheme\n"
@@ -2758,13 +2716,16 @@ msgstr "无法确定本地主机名称"
msgid "Couldn't get lock on destination repos after %d attempts"
msgstr "尝试 %d 次后，对目标版本库加锁失败"
+msgid "memory-cache-size invalid"
+msgstr "非法的 memory-cache-size"
+
#. ----------------------------------------------------------------
#. ** The RA vtable routines **
msgid "Module for accessing a repository on local disk."
msgstr "访问本地磁盘的版本库模块。"
msgid "Unable to open an ra_local session to URL"
-msgstr "无法为URL打开ra_local会话"
+msgstr "无法为 URL 打开 ra_local 会话"
#, c-format
msgid "URL '%s' is not a child of the session's repository root URL '%s'"
@@ -2786,9 +2747,7 @@ msgstr "不支持ra_local RA加载器版
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)"
+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
@@ -2814,9 +2773,9 @@ msgstr "文件“%s”已存在"
msgid "Could not write svndiff to temp file"
msgstr "无法将 svndiff 写入临时文件"
-#, fuzzy, c-format
+#, c-format
msgid "No lock on path '%s' (Status %d on PUT Request)"
-msgstr "路径“%s”没有被锁定，其文件系统是“%s”"
+msgstr "路径“%s”没有被锁定 (PUT 请求的状态码是 %d)"
msgid "Could not save the URL of the version resource"
msgstr "无法储存版本资源的URL"
@@ -2841,9 +2800,7 @@ 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"
+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
@@ -2968,13 +2925,13 @@ msgstr "加锁请求失败: %d %s"
msgid "'%s' is not locked in the repository"
msgstr "版本库中的“%s”没有被锁定"
-#, fuzzy, c-format
+#, c-format
msgid "Unlock failed on '%s' (%d Forbidden)"
-msgstr "禁止访问 '%s'"
+msgstr "对 '%s' 解锁失败 (%d 禁止)"
-#, fuzzy, c-format
+#, c-format
msgid "No lock on path '%s' (%d Bad Request)"
-msgstr "路径“%s”没有被锁定，其文件系统是“%s”"
+msgstr "路径“%s”没有被锁定 (%d 错误的请求)"
msgid "Failed to fetch lock information"
msgstr "获取锁信息失败"
@@ -2987,24 +2944,16 @@ msgid "Server does not support custom re
msgstr "服务器不支持通过日志自定义 revprops"
#, c-format
-msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
+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"
+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 响应并未返回所有我们请求的属性 (这些是完成提交所"
-"需要的)"
+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 响应并未返回所有我们请求的属性 (这些是完成提交所需要的)"
#, c-format
msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
@@ -3013,12 +2962,8 @@ msgstr "“%s”的 MERGE 响应并不�
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。"
+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。"
#, c-format
msgid "Don't know how to handle '%s' for capability '%s'"
@@ -3041,7 +2986,7 @@ msgid "Neon was unable to parse URL '%s'
msgstr "Neon 不能解析URL“%s”"
msgid "The path was not part of a repository"
-msgstr "路径不是版本库的一部份"
+msgstr "路径不是版本库的一部分"
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
@@ -3056,9 +3001,9 @@ msgstr "资源没有 relative-path 属�
msgid "The OPTIONS response did not include the youngest revision"
msgstr "OPTIONS 响应中没有包含最新的版本"
-#, fuzzy, c-format
+#, c-format
msgid "Url '%s' is not in repository '%s'"
-msgstr "“%s”与“%s”并不在同一个版本库中"
+msgstr "URL '%s' 不在版本库 '%s' 中"
msgid "'DAV:baseline-collection' was not present on the baseline resource"
msgstr "基线资源没有“DAV:baseline-collection”"
@@ -3067,15 +3012,15 @@ msgstr "基线资源没有“DAV:baselin
msgid "'%s' was not present on the baseline resource"
msgstr "“%s” 不在基线资源中"
-#, fuzzy, c-format
+#, c-format
msgid "No lock on path '%s'; repository is unchanged"
-msgstr "至少有一个属性变更失败；版本库未改变"
+msgstr "路径 '%s' 上没有锁；版本库未改变"
msgid "At least one property change failed; repository is unchanged"
msgstr "至少有一个属性变更失败；版本库未改变"
msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr "元素apply-textdelta之前没有add-file或者open-file元素"
+msgstr "元素 apply-textdelta 之前没有 add-file 或者 open-file 元素"
msgid "Got close-file element without preceding add-file or open-file"
msgstr "元素close-file之前没有add-file或者open-file元素"
@@ -3101,8 +3046,7 @@ msgstr "无效URL: 代理端口中有非
msgid "Invalid URL: negative proxy port number"
msgstr "无效URL: 负的代理端口"
-msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgid "Invalid URL: proxy port number greater than maximum TCP port number 65535"
msgstr "无效URL: 代理端口大于TCP通信端口最大值65535"
msgid "Invalid config: illegal character in timeout value"
@@ -3173,8 +3117,7 @@ msgid "Repository moved temporarily to '
msgstr "版本库临时移到‘%s’；请重新定位。"
#, c-format
-msgid ""
-"Server sent unexpected return value (%d %s) in response to %s request for '%s'"
+msgid "Server sent unexpected return value (%d %s) in response to %s request for '%s'"
msgstr "服务器发送了意外的返回值(%d %s)，在响应 “%s” 的请求 “%s” 中"
#, c-format
@@ -3238,12 +3181,10 @@ msgstr "更新文件失败"
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"
+msgid "The OPTIONS response did not include the requested activity-collection-set value"
msgstr "OPTIONS 响应中没有包含请求的 activity-collection-set 值。"
-#, fuzzy, c-format
+#, c-format
msgid "Adding directory failed: %s on %s (%d %s)"
msgstr "增加目录失败: “%s” 于 “%s”(%d %s)"
@@ -3258,8 +3199,11 @@ msgstr "版本库的 URL 非法"
msgid "Unlock request failed: %d %s"
msgstr "解锁请求失败: %d %s"
-msgid ""
-"The PROPFIND response did not include the requested baseline-collection value"
+#, 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"
@@ -3306,9 +3250,7 @@ msgid "Unsupported RA loader version (%d
msgstr "不支持的 ra_serf RA 加载器版本(%d)"
#, c-format
-msgid ""
-"ra_serf was compiled for serf %d.%d.%d but loaded an incompatible %d.%d.%d "
-"library"
+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"
#, c-format
@@ -3316,6 +3258,10 @@ msgid "GET request failed: %d %s"
msgstr "GET 请求失败: %d %s"
#, c-format
+msgid "Unknown tag '%s' while at state %d"
+msgstr "未知标签“%s”，上下文状态 %d"
+
+#, c-format
msgid "Error retrieving REPORT (%d)"
msgstr "获取报告出错(%d)"
@@ -3327,9 +3273,9 @@ msgstr "执行上下文错误"
msgid "Malformed DAV:status CDATA '%s'"
msgstr "非法 DAV:status CDATA '%s'"
-#, fuzzy, c-format
+#, c-format
msgid "XML parsing failed"
-msgstr "XML 解析失败: (%d %s)"
+msgstr "XML 解析失败"
#, c-format
msgid "XML parsing failed: (%d %s)"
@@ -3350,12 +3296,10 @@ msgid "Premature EOF seen from server (h
msgstr "从服务器发现 EOF 太早 (http status=%d)"
#, c-format
-msgid "Unspecified error message: %d %s"
-msgstr "未指明的错误信息: %d %s"
+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"
+msgid "The PROPFIND response did not include the requested version-controlled-configuration value"
msgstr "PROPFIND 响应中没有包含请求的 version-controlled-configuration 值。"
#, c-format
@@ -3393,12 +3337,8 @@ msgstr "子进程错误: %s"
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'。"
+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 。"
#, c-format
msgid "Illegal svn repository URL '%s'"
@@ -3429,12 +3369,11 @@ msgstr "使用 svn 网络协议访问版
msgid "Server did not send repository root"
msgstr "服务器没有返回版本库根路径"
-msgid ""
-"Server doesn't support setting arbitrary revision properties during commit"
+msgid "Server doesn't support setting arbitrary revision properties during commit"
msgstr "在提交时，服务器不支持设置任意版本属性"
msgid "Non-string as part of file contents"
-msgstr "部份文件内容不是字符串"
+msgstr "部分文件内容不是字符串"
msgid "Dirlist element not a list"
msgstr "目录列表元素不是列表"
@@ -3529,8 +3468,16 @@ msgid "Unexpected server response to aut
msgstr "服务器意外响应认证请求"
#, c-format
-msgid "Could not initialize the SASL library"
-msgstr "不能初始化 SASL 库"
+msgid "SASL authentication error: %s%s"
+msgstr "SASL 认证错误: %s%s"
+
+#, c-format
+msgid "Could not initialized the SASL library: %s%s"
+msgstr "不能初始化 SASL 库: %s%s"
+
+#, c-format
+msgid "Could not create SASL context: %s%s"
+msgstr "不能创建 SASL 上下文: %s%s"
#, c-format
msgid "Authentication error from server: %s"
@@ -3656,9 +3603,7 @@ msgstr "无效目标路径"
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"
+msgid "Invalid editor anchoring; at least one of the input paths is not a directory and there was no source entry"
msgstr "无效编辑器定位；至少一个输入路径不是目录，并且没有源入口"
#, c-format
@@ -3720,23 +3665,13 @@ msgstr "正在从 '%s' 删除 '\\r' ..."
msgid "E%06d: While validating fspath '%s': %s"
msgstr "E%06d: 当验证文件系统路径“%s”时出错：%s"
-#, fuzzy, c-format
-msgid ""
-"Referencing data in revision %ld, which is older than the oldest dumped "
-"revision (%ld). Loading this dump into an empty repository will fail."
-msgstr ""
-"警告: 版本 %ld 的参考数据比最旧的转存数据版本 (%ld)还旧。\n"
-"警告: 装载这个转存到空的版本库会失败。\n"
-"\n"
+#, 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) 还旧。加载这个转存到空的版本库会失败。"
-#, fuzzy, c-format
-msgid ""
-"Mergeinfo referencing revision(s) prior to the oldest dumped revision (%ld). "
-"Loading this dump may result in invalid mergeinfo."
-msgstr ""
-"警告: 合并信息引用的版本早于最早的转存版本 (%ld)。\n"
-"警告: 加载此转储到可能导致无效的合并信息。\n"
-"\n"
+#, 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) 还旧。加载这个转存可能导致非法的合并信息。"
#, c-format
msgid "Start revision %ld is greater than end revision %ld"
@@ -3746,21 +3681,11 @@ msgstr "起始版本 %ld 大于结束版
msgid "End revision %ld is invalid (youngest revision is %ld)"
msgstr "结束版本 %ld 无效 (最新版本是 %ld)"
-#, fuzzy
-msgid ""
-"The range of revisions dumped contained references to copy sources outside "
-"that range."
-msgstr ""
-"警告: 导出的版本范围引用了\n"
-"警告: 外部复制源。\n"
+msgid "The range of revisions dumped contained references to copy sources outside that range."
+msgstr "导出的版本范围包含的引用超出导出范围。"
-#, fuzzy
-msgid ""
-"The range of revisions dumped contained mergeinfo which reference revisions "
-"outside that range."
-msgstr ""
-"警告: 导出的版本范围包含了\n"
-"警告: 引用外部版本的合并信息。\n"
+msgid "The range of revisions dumped contained mergeinfo which reference revisions outside that range."
+msgstr "导出的版本范围包含的合并信息，其引用的版本超出导出范围。"
#, c-format
msgid "Unexpected node kind %d for '%s'"
@@ -3770,9 +3695,7 @@ msgid "Commit succeeded, but post-commit
msgstr "提交成功，但是后置提交钩子(post-commit)失败"
#, 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”，它说明您的客户端有漏洞"
#, c-format
@@ -3784,9 +3707,7 @@ msgid "Cannot accept non-LF line endings
msgstr "不能接受属性 “%s” 的非 LF 行结束符"
#, 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' 上的合并信息包含意外的字符串终结符，提交被拒绝"
#, c-format
@@ -3815,9 +3736,7 @@ msgid "[Error output could not be read.]
msgstr "[没有可用的错误输出。]"
#, 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)。"
msgid "Commit"
@@ -4062,28 +3981,12 @@ msgstr "没有提供程序为 '%s' 凭�
msgid "Invalid config: unknown password store '%s'"
msgstr "无效配置: 未知的密码存储 “%s”"
-#, c-format
-msgid "Can't lock cache mutex"
-msgstr "不能锁定缓存互斥体"
-
-#, c-format
-msgid "Can't unlock cache mutex"
-msgstr "不能解锁缓存互斥体"
-
-#, 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 不支持 线程"
-
msgid "Can't iterate a membuffer-based cache"
msgstr "不能迭代基于内存的缓存"
@@ -4223,18 +4126,6 @@ msgstr "本地URL“%s”只有主机名
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 互斥体"
-
msgid "Can't recode error string from APR"
msgstr "无法重新编码 APR 的错误信息"
@@ -4250,6 +4141,32 @@ msgstr "文件 “%s”，行 %d：断�
msgid "In file '%s' line %d: internal malfunction"
msgstr "文件 “%s” 行 %d：内部故障"
+msgid "stream error"
+msgstr "流写入错误"
+
+msgid "out of memory"
+msgstr ""
+
+msgid "buffer error"
+msgstr "缓冲区写入错误"
+
+msgid "version error"
+msgstr "版本错误"
+
+msgid "corrupt data"
+msgstr "损坏的数据"
+
+msgid "unknown error"
+msgstr "未知错误"
+
+#, c-format
+msgid "Password for '%s': "
+msgstr "“%s”的密码: "
+
+#, c-format
+msgid "Enter your Subversion password for %s"
+msgstr ""
+
msgid "Serialized hash missing terminator"
msgstr "序列化哈希值没有终结符"
@@ -4257,10 +4174,6 @@ msgid "Serialized hash malformed"
msgstr "畸形的序列化哈希值"
#, c-format
-msgid "Error converting entry in directory '%s' to UTF-8"
-msgstr "目录 “%s” 中的条目从本地编码转换到 UTF8 失败"
-
-#, c-format
msgid "Can't check path '%s'"
msgstr "无法检查路径 “%s”"
@@ -4304,26 +4217,10 @@ 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” 不是目录"
-
-#, 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” 出错"
-
-#, c-format
msgid "Can't make directory '%s'"
msgstr "无法创建目录 “%s”"
@@ -4403,6 +4300,10 @@ msgid "Can't set process '%s' child errf
msgstr "无法设置“%s”的子进程错误输出文件"
#, c-format
+msgid "Can't set process '%s' stdio pipes"
+msgstr "无法设置进程“%s”的标准 IO 管道"
+
+#, c-format
msgid "Can't set process '%s' child errfile for error handler"
msgstr "无法为错误处理函数设置“%s”的子进程错误输出文件"
@@ -4543,9 +4444,9 @@ msgstr "无法删除目录 “%s”"
msgid "Can't read directory"
msgstr "无法读取目录"
-#, fuzzy, c-format
+#, c-format
msgid "Error closing directory"
-msgstr "关闭目录 “%s” 出错"
+msgstr "关闭目录失败"
#, c-format
msgid "Can't read directory entry in '%s'"
@@ -4575,14 +4476,6 @@ msgstr "不能撤销“%s”"
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” 时发现负的版本号"
-
msgid "Pathname not terminated by ':'"
msgstr "路径名称没有以 “:” 结束"
@@ -4590,10 +4483,6 @@ msgid "No pathname preceding ':'"
msgstr "没有路径名称前缀 “:”"
#, c-format
-msgid "Mergeinfo for '%s' maps to an empty revision range"
-msgstr "“%s” 的合并信息映射到空的版本范围"
-
-#, c-format
msgid "Invalid character '%c' found in revision list"
msgstr "在版本列表中发现无效字符 “%c”"
@@ -4606,8 +4495,7 @@ msgid "Unable to parse reversed revision
msgstr "不能解析反向的版本范围 “%ld - %ld”"
#, 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”"
#, c-format
@@ -4618,13 +4506,15 @@ msgid "Range list parsing ended before h
msgstr "在遇到新行之前范围列表分析结束"
#, c-format
+msgid "Mergeinfo for '%s' maps to an empty revision range"
+msgstr "“%s” 的合并信息映射到空的版本范围"
+
+#, c-format
msgid "Could not find end of line in range list line in '%s'"
msgstr "在“%s”的范围列表行中没有找到行结束符"
#, c-format
-msgid ""
-"Unable to parse overlapping revision ranges '%s' and '%s' with different "
-"inheritance types"
+msgid "Unable to parse overlapping revision ranges '%s' and '%s' with different inheritance types"
msgstr "不支持解析重叠且继承类型不同的版本范围 “%s” 和 “%s”"
#, c-format
@@ -4664,13 +4554,13 @@ msgstr ""
"\n"
"全局选项: \n"
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error parsing peg revision '%s'; did you mean '%s@'?"
-msgstr "解析版本“%s”时发生语法错误"
+msgstr "解析铆钉版本 '%s' 时发生语法错误；你是不是想执行 '%s@'?"
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error parsing peg revision '%s'"
-msgstr "解析版本“%s”时发生语法错误"
+msgstr "解析铆钉版本 '%s' 时发生语法错误"
msgid "Revision property pair is empty"
msgstr "版本属性对为空"
@@ -4681,7 +4571,7 @@ msgstr "“%s”不是有效的 Subversi
#, c-format
msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
-msgstr "“%s” 是 peg 版本。或许你应该使用 “%s@” ?"
+msgstr "“%s” 是铆钉版本。或许你应该使用 “%s@” ?"
#, c-format
msgid "URL '%s' contains a '..' element"
@@ -4701,16 +4591,15 @@ msgstr ""
" 编译于 %s，%s\n"
"\n"
-#, fuzzy
msgid ""
-"Copyright (C) 2011 The Apache Software Foundation.\n"
+"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"
"\n"
msgstr ""
-"版权所有 (C) 2011 Apache 软件基金会。\n"
-"此软件包含了许多人的贡献；请查看文件 NOTICE 以获得更多信息。\n"
+"版权所有 (C) 2012 Apache 软件基金会。\n"
+"此软件包含了许多人的贡献，请查看文件 NOTICE 以获得更多信息。\n"
"Subversion 是开放源代码软件，请参阅 http://subversion.apache.org/ 站点。\n"
"\n"
@@ -4734,10 +4623,6 @@ msgid "Username: "
msgstr "用户名: "
#, c-format
-msgid "Password for '%s': "
-msgstr "“%s”的密码: "
-
-#, c-format
msgid "Error validating server certificate for '%s':\n"
msgstr "验证“%s”的服务器证书时出错: \n"
@@ -4874,9 +4759,9 @@ msgstr "GNOME keyring [%s] 的密码: "
msgid "Config error: invalid value '%s' for option '%s'"
msgstr "配置错误: 无效取值 “%s”，对于选项 “%s”"
-#, fuzzy, c-format
+#, c-format
msgid "%s, executing statement '%s'"
-msgstr "'%s' 阻止创建 '%s' 的父亲"
+msgstr "%s, 执行语句 '%s'"
msgid "Expected database row missing"
msgstr "丢失了期待的数据库行"
@@ -4885,10 +4770,6 @@ msgid "Extra database row found"
msgstr "发现了额外的数据库行"
#, c-format
-msgid "Schema format %d not recognized"
-msgstr "不能识别方案格式 %d"
-
-#, c-format
msgid "SQLite compiled for %s, but running with %s"
msgstr "SQLite 编译为 %s，但是运行于 %s"
@@ -4901,9 +4782,6 @@ msgstr "不能配置 SQLite"
msgid "Could not initialize SQLite"
msgstr "不能初始化 SQLite"
-msgid "Could not initialize SQLite shared cache"
-msgstr "不能初始化 SQLite 共享缓存"
-
#, c-format
msgid "SQLite hotcopy failed for %s"
msgstr "SQLite 由于 %s 导致热复制失败"
@@ -4913,9 +4791,29 @@ msgid "File '%s' has inconsistent newlin
msgstr "文件 “%s” 内的换行符不一致"
#, c-format
+msgid "Can't create mutex"
+msgstr "无法创建互斥体"
+
+#, c-format
+msgid "Can't lock mutex"
+msgstr "不能锁定互斥体"
+
+#, c-format
+msgid "Can't unlock mutex"
+msgstr "不能解锁互斥体"
+
+#, c-format
msgid "Could not convert '%s' into a number"
msgstr "无法转换 '%s' 到数字"
+#, c-format
+msgid "Invalid revision number found parsing '%s'"
+msgstr "解析 “%s” 时发现无效的版本号"
+
+#, c-format
+msgid "Negative revision number found parsing '%s'"
+msgstr "解析 “%s” 时发现负的版本号"
+
#. Human explanatory part, generated by apr_strftime as "Sat, 01 Jan 2000"
msgid " (%a, %d %b %Y)"
msgstr " (%a, %Y-%m-%d)"
@@ -4924,12 +4822,6 @@ msgstr " (%a, %Y-%m-%d)"
msgid "Token '%s' is unrecognized"
msgstr "无法识别令牌 “%s”"
-msgid "Can't lock charset translation mutex"
-msgstr "不能锁定字符转换互斥体"
-
-msgid "Can't unlock charset translation mutex"
-msgstr "不能解锁字符转换互斥体"
-
#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "不能创建从本地编码到“%s”的字符转换器"
@@ -4955,14 +4847,11 @@ msgid "Can't convert string from '%s' to
msgstr "不能把字符串从“%s”编码转换为“%s”编码。"
#, 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"
#, 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"
#, c-format
@@ -4986,8 +4875,12 @@ msgid "MIME type '%s' does not contain '
msgstr "MIME 类型 “%s” 没有包含 “/”"
#, c-format
-msgid "MIME type '%s' contains invalid character '%c'"
-msgstr "MIME 类型“%s”包含非法字符“%c”"
+msgid "MIME type '%s' contains invalid character '%c' in media type"
+msgstr "MIME 类型“%s”的媒体类型中包含非法字符“%c”"
+
+#, c-format
+msgid "MIME type '%s' contains invalid character '0x%02x' in postfix"
+msgstr "MIME 类型“%s”中包含非法字符“0x%02x”"
#, c-format
msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
@@ -5008,9 +4901,9 @@ msgstr "节点 '%s' 不能恢复。"
msgid "Error aborting report"
msgstr "取消报告出错"
-#, fuzzy, c-format
+#, c-format
msgid "Pristine checksum for file '%s' is missing"
-msgstr "“%s”的管理目录丢失"
+msgstr "文件“%s”的原始内容校验和丢失"
#, c-format
msgid "Checksum mismatch for text base of '%s'"
@@ -5029,14 +4922,11 @@ msgid "Can only get the pristine content
msgstr "只能取得文件的原始内容；“%s”不是文件"
#, 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”的原始内容，因为其删除操作已经提交"
#, 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”的原始内容，因为其状态未知"
#, c-format
@@ -5047,18 +4937,17 @@ msgstr "节点 '%s' 没有原始内容"
msgid "Revision %ld doesn't match existing revision %ld in '%s'"
msgstr "版本 %ld 不匹配现有版本 %ld 于 “%s”"
-#, fuzzy, c-format
-msgid ""
-"URL '%s' (uuid: '%s') doesn't match existing URL '%s' (uuid: '%s') in '%s'"
-msgstr "URL “%s” 不匹配现有 URL “%s” 于 “%s”"
+#, c-format
+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' 不能被删除"
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is the root of a working copy and cannot be deleted"
-msgstr "不能删除根目录"
+msgstr "不能删除工作副本根目录 '%s'"
#, c-format
msgid "Can't find parent directory's node while trying to add '%s'"
@@ -5081,12 +4970,8 @@ msgid "The URL '%s' has a different repo
msgstr "URL “%s” 与其父目录的版本库根目录不相同"
#, 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') 的工作副本下增加。"
#, c-format
msgid "Can't add '%s' with URL '%s', but with the data from '%s'"
@@ -5107,8 +4992,7 @@ msgid "Invalid 'conflict_result' argumen
msgstr "无效的 “conflict_result” 参数"
#, c-format
-msgid ""
-"Tree conflicts can only be resolved to 'working' state; '%s' not resolved"
+msgid "Tree conflicts can only be resolved to 'working' state; '%s' not resolved"
msgstr "树冲突只能解决为 “working” 状态；“%s” 还没有解决"
#, c-format
@@ -5120,10 +5004,22 @@ msgid "cannot handle node kind for '%s'"
msgstr "不能为 '%s'“处理节点类型"
#, c-format
+msgid "Cannot handle status of '%s'"
+msgstr "不能处理“%s”的状态"
+
+#, c-format
msgid "Cannot copy '%s' excluded by server"
msgstr "不能复制被服务器排除的 '%s'"
#, c-format
+msgid "Deleted node '%s' can't be copied."
+msgstr "已经删除的节点“%s”不能被复制。"
+
+#, c-format
+msgid "The node '%s' was not found."
+msgstr "找不到节点 '%s'。"
+
+#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
msgstr "无法复制到“%s”，因为它不在版本库“%s”中；它来自“%s”"
@@ -5152,18 +5048,11 @@ msgid "Cannot exclude '%s': it is a swit
msgstr "不能排除 '%s':它是已切换的路径"
#, c-format
-msgid "The node '%s' was not found."
-msgstr "找不到节点 '%s'。"
-
-#, 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': 它将要增加到版本库中。请先提交"
#, 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': 它将要从版本库中删除。请先提交"
msgid "Can only crop a working copy with a restrictive depth"
@@ -5173,14 +5062,11 @@ msgid "Can only crop directories"
msgstr "只能修剪目录"
#, 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”: 它将要从版本库中删除；请先提交"
#, 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': 它将要增加到版本库中。请先提交"
#, c-format
@@ -5200,10 +5086,18 @@ msgid "'%s' is not of the right kind"
msgstr "“%s” 的类型错误"
#, c-format
+msgid "The file '%s' has no checksum"
+msgstr "文件 '%s' 没有校验和。"
+
+#, c-format
msgid "No copyfrom URL for '%s'"
msgstr "'%s' 没有 copyfrom URL"
#, c-format
+msgid "Bad base MD5 checksum for '%s'; expected: '%s'; found '%s'; "
+msgstr "'%s' 的基础的 MD5 校验和错误; 期望 '%s'; 发现 '%s'; "
+
+#, c-format
msgid "No default entry in directory '%s'"
msgstr "在目录“%s”中没有默认入口"
@@ -5224,32 +5118,44 @@ msgid "Can't split line into components:
msgstr "不能分割行到组件：“%s”"
#, 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 必须检出到本地路径"
#, 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\" 作为目标目录"
#, 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” 包含 “..” 或是绝对路径"
#, c-format
msgid "This editor can only update '%s'"
msgstr "此编辑器只能更新“%s”"
-#, fuzzy, c-format
+#, c-format
msgid "Node '%s' is no existing file external"
-msgstr "节点 '%s' 没有原始内容"
+msgstr "节点 '%s' 的外部链接不是现存文件"
+
+#, c-format
+msgid "URL '%s' does not begin with a scheme"
+msgstr "URL “%s” 没有以方案开始"
+
+#, c-format
+msgid "Illegal parent directory URL '%s'"
+msgstr "非法父目录 URL “%s”"
+
+#, c-format
+msgid "Illegal repository root URL '%s'"
+msgstr "非法版本库根 URL “%s”"
+
+#, c-format
+msgid "The external relative URL '%s' cannot have backpaths, i.e. '..'"
+msgstr "外部相对 URL “%s” 不能包含后退路径，例如 “..”"
+
+#, c-format
+msgid "Unrecognized format for the relative external URL '%s'"
+msgstr "外部相对 URL “%s” 的格式无法识别"
#, c-format
msgid "Path '%s' ends in '%s', which is unsupported for this operation"
@@ -5293,9 +5199,9 @@ msgstr "冲突的回调函数违反 API�
msgid "Conflict callback violated API: returned no merged file"
msgstr "冲突的回调函数违反 API：没有返回合并文件。"
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not the root of the working copy '%s'"
-msgstr "“%s” 不是版本库的根"
+msgstr "“%s”不是工作副本“%s”的根"
msgid "Invalid escape sequence"
msgstr "无效的转义序列"
@@ -5369,101 +5275,79 @@ msgstr "无效的条目终止符"
msgid "Error at entry %d in entries file for '%s':"
msgstr "条目文件中的条目 %d 出错于 “%s”"
-#, fuzzy, c-format
+#, c-format
msgid "The node '%s' does not have properties in this state."
-msgstr "节点 '%s' 不能恢复。"
+msgstr "节点 '%s' 没有属性。"
#, c-format
msgid "The property '%s' may not be merged into '%s'."
msgstr "属性 “%s” 不能合并到 “%s”。"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to add new property '%s'\n"
"but the property already exists.\n"
-msgstr ""
-"试图增加新属性 “%s”，值为 “%s”，\n"
-"但是属性已经存在，值为 “%s”。"
+msgstr "试图增加新属性 “%s”，但是它已经存在。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to add new property '%s'\n"
"but the property has been locally deleted.\n"
-msgstr ""
-"试图把属性 “%s” 的值从 “%s” 改为 “%s”，\n"
-"但是它已经在本地被删除。"
+msgstr "试图增加新属性 “%s”，但是它已经在本地被删除。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s'\n"
"but the property has been locally added.\n"
-msgstr ""
-"试图删除属性 '%s'，取值为 '%s'，\n"
-"但是已经本地增加此属性，取值为 “%s”。"
+msgstr "试图删除属性 “%s”，但是它已经在本地被增加。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s'\n"
"but the property has been locally modified.\n"
-msgstr ""
-"试图删除属性 '%s'，取值为 '%s'，\n"
-"但是已经本地增加此属性，取值为 “%s”。"
+msgstr "试图删除属性 “%s”，但是它已经在本地被修改。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s'\n"
"but the property has been locally deleted and had a different value.\n"
-msgstr ""
-"试图删除属性 '%s'，取值为 '%s'，\n"
-"但是已经本地增加此属性，取值为 “%s”。"
+msgstr "试图删除属性 “%s”，但是它已经在本地被修改，并且具有不同的取值。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s'\n"
"but the local property value is different.\n"
-msgstr ""
-"试图删除属性 '%s'，取值为 '%s'，\n"
-"但是本地取值为 “%s”。"
+msgstr "试图删除属性 “%s”，但是它的本地取值不同。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to change property '%s'\n"
"but the local property value conflicts with the incoming change.\n"
-msgstr ""
-"试图把属性“%s”的值从“%s”改为“%s”，\n"
-"但是属性的值已经是“%s”了。"
+msgstr "试图修改属性 “%s”，但是它的本地取值不同。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to change property '%s'\n"
"but the property has already been locally changed to a different value.\n"
-msgstr ""
-"试图把属性 “%s” 的值从 “%s” 改为 “%s”，\n"
-"但是其本地取值已经从 “%s” 改为 “%s”。"
+msgstr "试图修改属性 “%s”，但是它的本地取值已经改变。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to change property '%s'\n"
"but the property has been locally deleted.\n"
-msgstr ""
-"试图把属性 “%s” 的值从 “%s” 改为 “%s”，\n"
-"但是它已经在本地被删除。"
+msgstr "试图修改属性 “%s”，但是它已经在本地被删除。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to change property '%s'\n"
"but the property has been locally added with a different value.\n"
-msgstr ""
-"试图把属性 “%s” 的值从 “%s” 改为 “%s”，\n"
-"但是已经本地增加此属性，取值为 “%s”。"
+msgstr "试图修改属性 “%s”，但是它已经在本地被增加，并且取值不同。\n"
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to change property '%s'\n"
"but the property does not exist locally.\n"
-msgstr ""
-"试图把属性 “%s” 的值从 “%s” 改为 “%s”，\n"
-"但是属性并不存在。"
+msgstr "试图修改属性 “%s”，但是它并不存在。\n"
msgid "<<<<<<< (local property value)"
msgstr "<<<<<<< (本地属性值)"
@@ -5471,17 +5355,14 @@ msgstr "<<<<<<< (本地属性值)"
msgid ">>>>>>> (incoming property value)"
msgstr ">>>>>>> (服务器端属性值)"
-#, fuzzy
msgid "Local property value:\n"
-msgstr "属性名称错误"
+msgstr "本地属性取值:\n"
-#, fuzzy
msgid "Cannot display: property value is binary data\n"
-msgstr "无法显示: 文件标记为二进制类型。%s"
+msgstr "无法显示: 属性取值为二进制数据\n"
-#, fuzzy
msgid "Incoming property value:\n"
-msgstr "错误或不期望的属性值"
+msgstr "外部属性取值:\n"
msgid "Conflict callback violated API: returned no results."
msgstr "冲突的回调函数违反 API：没有返回结果。"
@@ -5532,9 +5413,7 @@ msgid "Cannot relocate '%s' as it is not
msgstr "不能重新定位 '%s'，因为它不是工作副本根目录"
#, 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'"
msgid "Cannot relocate a single file"
@@ -5558,9 +5437,9 @@ msgstr "树冲突描述中有未知的�
msgid "Invalid version info in tree conflict description"
msgstr "树冲突描述中有非法的版本信息"
-#, fuzzy, c-format
+#, c-format
msgid "Invalid conflict info '%s' in tree conflict description"
-msgstr "树冲突描述中有非法的冲突信息"
+msgstr "树冲突描述中有非法的冲突信息 '%s'"
msgid "Empty 'victim' field in tree conflict description"
msgstr "树冲突描述中的 “victim” 域为空"
@@ -5587,24 +5466,18 @@ msgid "Path '%s' is not in the working c
msgstr "路径 “%s” 不在工作副本中"
#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
+msgid "Failed to add directory '%s': object of the same name as the administrative directory"
msgstr "无法增加目录“%s”: 对象与管理目录同名"
msgid "Couldn't do property merge"
msgstr "无法进行属性合并"
#, 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”标记为不存在: 同名项目已加入增加调度"
#, 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”: 对象与管理目录同名"
#, c-format
@@ -5630,15 +5503,11 @@ msgid "Missing end of line in wcprops fi
msgstr "wcprops文件“%s”丢失了行结束符"
#, 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”不能被升级"
#, 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”不能被升级"
#, c-format
@@ -5649,29 +5518,18 @@ msgid "Error parsing tree conflict skel"
msgstr "解析树冲突骨架出错"
#, 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 的客户端比较/还原后，再使用此客户端"
-#, fuzzy, 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' 的工作副本是有 WORKING 节点的格式 22；请先使用支持格式 22 的客户端比"
-"较/还原后，再使用此客户端"
+#, 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 ""
-"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 "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."
+msgstr "此工作副本损坏，不能升级。请重新检出。"
msgid "(unreleased development version)"
msgstr "(未发布的开发版本)"
@@ -5681,42 +5539,36 @@ msgid "Working copy '%s' is too old (for
msgstr "工作副本 '%s' 格式太旧 (格式 %d, Subversion %s 创建)"
#, 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' 升级，最后使用当前客户端"
-#, fuzzy, c-format
+#, c-format
msgid "Can't upgrade '%s' as it is not a pre-1.7 working copy directory"
-msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本根目录"
+msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本目录"
-#, fuzzy, 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 之前的工作副本根目录"
+#, 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'"
#, c-format
msgid "No REPOSITORY table entry for id '%ld'"
msgstr "对于标识 '%ld' 没有 REPOSITORY 表入口"
#, c-format
-msgid "The node '%s' is not in a workingcopy."
-msgstr "节点 “%s” 不在工作副本中"
+msgid "The file '%s' has no checksum."
+msgstr "文件 '%s' 没有校验和。"
+
+#, c-format
+msgid "The node '%s' is not in a working copy."
+msgstr "节点 “%s” 不在工作副本中。"
#, c-format
msgid "The node '%s' has a corrupt checksum value."
msgstr "节点 '%s' 的校验和损坏。"
-#, fuzzy, c-format
-msgid "The node '%s' is not an external."
-msgstr "节点 “%s” 不在工作副本中"
-
#, c-format
-msgid "Cannot handle status of '%s'"
-msgstr "不能处理“%s”的状态"
+msgid "The node '%s' is not an external."
+msgstr "节点 “%s” 不是外部对象"
#, c-format
msgid "Can't store properties for '%s' in '%s'."
@@ -5734,21 +5586,29 @@ msgstr "不能恢复 '%s'，而不恢复
msgid "Unsupported depth for revert of '%s'"
msgstr "对于恢复 '%s'，其深度不受支持"
-#, fuzzy, c-format
+#, c-format
msgid "Cannot delete '%s' as '%s' is excluded by server"
-msgstr "不能复制被服务器排除的 '%s'"
+msgstr "不能删除 '%s'，因为 '%s' 被服务器排除"
+
+#, c-format
+msgid "Cannot move '%s' to '%s' because they are not in the same working copy"
+msgstr "不能将 '%s' 移到 '%s'，因为它们不在同一工作副本中"
#, c-format
msgid "Corrupt data for '%s'"
msgstr "'%s' 的数据损坏"
-#, fuzzy, c-format
+#, 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 以获得详细信息"
+
+#, c-format
msgid "The node '%s' is not in working copy '%s'"
-msgstr "节点 “%s” 不在工作副本中"
+msgstr "节点“%s”不在工作副本“%s”中"
-#, fuzzy, c-format
+#, c-format
msgid "The node '%s' is not installable"
-msgstr "找不到节点 '%s'。"
+msgstr "节点 '%s' 不可安装"
#, c-format
msgid "Expected node '%s' to be added."
@@ -5759,9 +5619,7 @@ msgid "Expected node '%s' to be deleted.
msgstr "期望节点“%s”被删除。"
#, c-format
-msgid ""
-"The properties of '%s' are in an indeterminate state and cannot be upgraded. "
-"See issue #2530."
+msgid "The properties of '%s' are in an indeterminate state and cannot be upgraded. See issue #2530."
msgstr "'%s' 的属性处于不确定的状态，不能更新。详情参见问题 #2530。"
#, c-format
@@ -5792,13 +5650,13 @@ msgstr "工作副本 '%s' 未被锁定�
msgid "Modification of '%s' already exists"
msgstr "“%s” 的修改已存在"
-#, fuzzy, c-format
+#, c-format
msgid "Invalid conflict file '%s' for '%s'"
-msgstr "无法找到标签 “%s” 于 URL “%s”"
+msgstr "非法的冲突文件“%s”于“%s”"
-#, fuzzy, c-format
+#, c-format
msgid "Invalid property reject file '%s' for '%s'"
-msgstr "属性 “%s” 于 “%s” 被设为新值\n"
+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.
@@ -5815,6 +5673,10 @@ msgid "Pristine text '%s' not present"
msgstr "原始内容 “%s” 不存在"
#, c-format
+msgid "Can't read '%s' from pristine store because no checksum supplied"
+msgstr "没有提供校验和，因此不能从原始内容仓库中读取 '%s'"
+
+#, c-format
msgid "New pristine text '%s' has different size: %ld versus %ld"
msgstr "新原始内容 '%s' 有不同的大小: %ld 与 %ld"
@@ -5835,9 +5697,7 @@ msgid "Missing a row in WCROOT."
msgstr "WCROOT 中丢失了一行。"
#, c-format
-msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
+msgid "Working copy format of '%s' is too old (%d); please check out your working copy again"
msgstr "“%s”的工作副本格式太旧(%d)；请重新取出工作副本"
#, c-format
[... 2163 lines stripped ...]