You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/01/20 18:52:21 UTC
svn commit: r1653314 [17/20] - in /subversion/branches/move-tracking-2: ./
notes/ subversion/ subversion/bindings/swig/
subversion/bindings/swig/include/ subversion/bindings/swig/perl/native/
subversion/bindings/swig/perl/native/t/ subversion/bindings/...
Modified: subversion/branches/move-tracking-2/subversion/po/zh_CN.po
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/po/zh_CN.po?rev=1653314&r1=1653313&r2=1653314&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/po/zh_CN.po [UTF-8] (original)
+++ subversion/branches/move-tracking-2/subversion/po/zh_CN.po [UTF-8] Tue Jan 20 17:52:18 2015
@@ -55,7 +55,7 @@ msgid ""
msgstr ""
"Project-Id-Version: subversion 1.9\n"
"Report-Msgid-Bugs-To: dev@subversion.apache.org\n"
-"POT-Creation-Date: 2014-04-26 15:32+0800\n"
+"POT-Creation-Date: 2014-11-29 01:59+0800\n"
"PO-Revision-Date: 2014-04-26 16:08+0800\n"
"Last-Translator: \n"
"Language-Team: Simplified Chinese <de...@subversion.apache.org>\n"
@@ -183,7 +183,7 @@ msgstr "路径不是指定目录的直�
msgid "Bogus UUID"
msgstr "非法 UUID"
-#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:1014
+#: ../include/svn_error_codes.h:207 ../include/svn_error_codes.h:1024
msgid "Invalid configuration value"
msgstr "无效的配置取值"
@@ -263,9 +263,10 @@ msgstr "管道协议中帧错误"
msgid "Read error in pipe"
msgstr "管道读取错误"
+#. is errno on POSIX
#: ../include/svn_error_codes.h:299 ../libsvn_subr/cmdline.c:417
#: ../libsvn_subr/cmdline.c:448 ../libsvn_subr/cmdline.c:471 ../svn/util.c:564
-#: ../svnlook/svnlook.c:2011
+#: ../svnlook/svnlook.c:2025
#, c-format
msgid "Write error"
msgstr "写入错误"
@@ -638,7 +639,7 @@ msgstr "没有用户与文件系统关�
msgid "Path is already locked"
msgstr "已经锁定路径"
-#: ../include/svn_error_codes.h:724 ../include/svn_error_codes.h:951
+#: ../include/svn_error_codes.h:724 ../include/svn_error_codes.h:961
msgid "Path is not locked"
msgstr "路径没有加锁"
@@ -662,7 +663,7 @@ msgstr "文件系统没有此锁"
msgid "Lock has expired"
msgstr "锁过期"
-#: ../include/svn_error_codes.h:754 ../include/svn_error_codes.h:938
+#: ../include/svn_error_codes.h:754 ../include/svn_error_codes.h:948
msgid "Item is out of date"
msgstr "条目过时"
@@ -731,640 +732,652 @@ msgid "Index files are inconsistent."
msgstr "索引文件不一致。"
#: ../include/svn_error_codes.h:847
-msgid "Ambiguous move"
-msgstr "不明确的移动"
+msgid "Lock operation failed"
+msgstr "锁操作失败"
#: ../include/svn_error_codes.h:852
-msgid "Move without a suitable deletion"
-msgstr "没有适当删除的移动"
+msgid "Unsupported FS type"
+msgstr "不支持的文件系统类型"
#: ../include/svn_error_codes.h:857
-msgid "Lock operation failed"
-msgstr "锁操作失败"
+msgid "Container capacity exceeded."
+msgstr ""
+
+#: ../include/svn_error_codes.h:862
+msgid "Malformed node revision ID string."
+msgstr "畸形的节点版本 ID 字符串。"
-#: ../include/svn_error_codes.h:863
+#: ../include/svn_error_codes.h:867 ../libsvn_fs_x/revprops.c:291
+msgid "Invalid generation number data."
+msgstr "无效的生成编号数据。"
+
+#: ../include/svn_error_codes.h:873
msgid "The repository is locked, perhaps for db recovery"
msgstr "版本库被锁，可能正在恢复"
-#: ../include/svn_error_codes.h:867
+#: ../include/svn_error_codes.h:877
msgid "A repository hook failed"
msgstr "版本库钩子错误"
-#: ../include/svn_error_codes.h:871
+#: ../include/svn_error_codes.h:881
msgid "Incorrect arguments supplied"
msgstr "提供了不正确的参数"
-#: ../include/svn_error_codes.h:875
+#: ../include/svn_error_codes.h:885
msgid "A report cannot be generated because no data was supplied"
msgstr "没有数据，无法产生报告"
-#: ../include/svn_error_codes.h:879
+#: ../include/svn_error_codes.h:889
msgid "Bogus revision report"
msgstr "版本报告非法"
-#: ../include/svn_error_codes.h:888
+#: ../include/svn_error_codes.h:898
msgid "Unsupported repository version"
msgstr "不支持此版本库版本"
-#: ../include/svn_error_codes.h:892
+#: ../include/svn_error_codes.h:902
msgid "Disabled repository feature"
msgstr "关闭版本库特性"
-#: ../include/svn_error_codes.h:896
+#: ../include/svn_error_codes.h:906
msgid "Error running post-commit hook"
msgstr "执行 post-commit 钩子错误"
-#: ../include/svn_error_codes.h:901
+#: ../include/svn_error_codes.h:911
msgid "Error running post-lock hook"
msgstr "执行 post-lock 钩子错误"
-#: ../include/svn_error_codes.h:906
+#: ../include/svn_error_codes.h:916
msgid "Error running post-unlock hook"
msgstr "执行 post-unlock 钩子错误"
-#: ../include/svn_error_codes.h:911
+#: ../include/svn_error_codes.h:921
msgid "Repository upgrade is not supported"
msgstr "不支持版本库升级"
-#: ../include/svn_error_codes.h:916
+#: ../include/svn_error_codes.h:926
msgid "Repository is corrupt"
msgstr "版本库已损坏"
-#: ../include/svn_error_codes.h:922
+#: ../include/svn_error_codes.h:932
msgid "Bad URL passed to RA layer"
msgstr "传递至 RA 层的 URL 错误"
-#: ../include/svn_error_codes.h:926
+#: ../include/svn_error_codes.h:936
msgid "Authorization failed"
msgstr "认证失败"
-#: ../include/svn_error_codes.h:930
+#: ../include/svn_error_codes.h:940
msgid "Unknown authorization method"
msgstr "未知认证"
-#: ../include/svn_error_codes.h:934
+#: ../include/svn_error_codes.h:944
msgid "Repository access method not implemented"
msgstr "版本库未实现存取方法"
-#: ../include/svn_error_codes.h:942
+#: ../include/svn_error_codes.h:952
msgid "Repository has no UUID"
msgstr "版本库没有 UUID"
-#: ../include/svn_error_codes.h:946
+#: ../include/svn_error_codes.h:956
msgid "Unsupported RA plugin ABI version"
msgstr "不支持此 RA 插件的 ABI 版本"
-#: ../include/svn_error_codes.h:956
+#: ../include/svn_error_codes.h:966
msgid "Server can only replay from the root of a repository"
msgstr "服务器只能从版本库的根重放"
-#: ../include/svn_error_codes.h:961
+#: ../include/svn_error_codes.h:971
msgid "Repository UUID does not match expected UUID"
msgstr "版本库的 UUID 与期望的 UUID 不匹配"
-#: ../include/svn_error_codes.h:966
+#: ../include/svn_error_codes.h:976
msgid "Repository root URL does not match expected root URL"
msgstr "版本库根 URL 与期望的根 URL 不匹配"
-#: ../include/svn_error_codes.h:971
+#: ../include/svn_error_codes.h:981
msgid "Session URL does not match expected session URL"
msgstr "会话 URL 与期望的会话 URL 不匹配"
-#: ../include/svn_error_codes.h:976 ../libsvn_ra_svn/client.c:496
+#: ../include/svn_error_codes.h:986 ../libsvn_ra_svn/client.c:503
#, c-format
msgid "Can't create tunnel"
msgstr "无法创建隧道"
-#: ../include/svn_error_codes.h:981
+#: ../include/svn_error_codes.h:991
msgid "Can't create session"
msgstr "无法创建回话"
-#: ../include/svn_error_codes.h:987
+#: ../include/svn_error_codes.h:997
msgid "RA layer failed to init socket layer"
msgstr "RA 层无法初始化 socket 层"
-#: ../include/svn_error_codes.h:991
+#: ../include/svn_error_codes.h:1001
msgid "RA layer failed to create HTTP request"
msgstr "RA 层创建 HTTP 请求失败"
-#: ../include/svn_error_codes.h:995
+#: ../include/svn_error_codes.h:1005
msgid "RA layer request failed"
msgstr "RA 层请求失败"
-#: ../include/svn_error_codes.h:999
+#: ../include/svn_error_codes.h:1009
msgid "RA layer didn't receive requested OPTIONS info"
msgstr "RA 层无法取得请求的 OPTIONS 信息"
-#: ../include/svn_error_codes.h:1003
+#: ../include/svn_error_codes.h:1013
msgid "RA layer failed to fetch properties"
msgstr "RA 层无法取得属性"
-#: ../include/svn_error_codes.h:1007
+#: ../include/svn_error_codes.h:1017
msgid "RA layer file already exists"
msgstr "RA 层文件已经存在"
-#: ../include/svn_error_codes.h:1021
+#: ../include/svn_error_codes.h:1031
msgid "HTTP Path Not Found"
msgstr "找不到 HTTP 路径"
-#: ../include/svn_error_codes.h:1025
+#: ../include/svn_error_codes.h:1035
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "执行 WebDAV PROPPATCH 失败"
#. If condition COND is not met, return a "malformed network data" error.
#.
-#: ../include/svn_error_codes.h:1030 ../include/svn_error_codes.h:1498
-#: ../libsvn_ra_svn/marshal.c:1125 ../libsvn_ra_svn/marshal.c:1377
-#: ../libsvn_ra_svn/marshal.c:1407 ../libsvn_ra_svn/marshal.c:2491
+#: ../include/svn_error_codes.h:1040 ../include/svn_error_codes.h:1513
+#: ../libsvn_ra_svn/marshal.c:1129 ../libsvn_ra_svn/marshal.c:1381
+#: ../libsvn_ra_svn/marshal.c:1411 ../libsvn_ra_svn/marshal.c:2495
msgid "Malformed network data"
msgstr "非法网络数据"
-#: ../include/svn_error_codes.h:1035
+#: ../include/svn_error_codes.h:1045
msgid "Unable to extract data from response header"
msgstr "不能从响应的头信息中获取数据"
-#: ../include/svn_error_codes.h:1040
+#: ../include/svn_error_codes.h:1050
msgid "Repository has been moved"
msgstr "版本库已经移动"
-#: ../include/svn_error_codes.h:1045 ../libsvn_ra_serf/util.c:882
+#: ../include/svn_error_codes.h:1055 ../libsvn_ra_serf/util.c:886
msgid "Connection timed out"
msgstr "连接超时"
-#: ../include/svn_error_codes.h:1050
+#: ../include/svn_error_codes.h:1060
msgid "URL access forbidden for unknown reason"
msgstr "因为未知的理由，禁止访问 URL"
-#: ../include/svn_error_codes.h:1055
+#: ../include/svn_error_codes.h:1065
msgid "The server state conflicts with the requested preconditions"
msgstr "服务器状态与请求的前置条件冲突。"
-#: ../include/svn_error_codes.h:1061 ../include/svn_error_codes.h:1502
+#: ../include/svn_error_codes.h:1071 ../include/svn_error_codes.h:1517
msgid "Couldn't find a repository"
msgstr "无法找到版本库"
-#: ../include/svn_error_codes.h:1065
+#: ../include/svn_error_codes.h:1075
msgid "Couldn't open a repository"
msgstr "无法打开版本库"
-#: ../include/svn_error_codes.h:1071
+#: ../include/svn_error_codes.h:1081
msgid "Svndiff data has invalid header"
msgstr "svndiff 数据包含无效头"
-#: ../include/svn_error_codes.h:1075
+#: ../include/svn_error_codes.h:1085
msgid "Svndiff data contains corrupt window"
msgstr "Svndiff 数据包含损坏窗口"
-#: ../include/svn_error_codes.h:1079
+#: ../include/svn_error_codes.h:1089
msgid "Svndiff data contains backward-sliding source view"
msgstr "Svndiff 数据包含向后变化的资源视图"
-#: ../include/svn_error_codes.h:1083
+#: ../include/svn_error_codes.h:1093
msgid "Svndiff data contains invalid instruction"
msgstr "svndiff 数据包含无效指令"
-#: ../include/svn_error_codes.h:1087
+#: ../include/svn_error_codes.h:1097
msgid "Svndiff data ends unexpectedly"
msgstr "svndiff 数据意外结束"
-#: ../include/svn_error_codes.h:1091
+#: ../include/svn_error_codes.h:1101
msgid "Svndiff compressed data is invalid"
msgstr "非法 svndiff 压缩数据"
-#: ../include/svn_error_codes.h:1097
+#: ../include/svn_error_codes.h:1107
msgid "Apache has no path to an SVN filesystem"
msgstr "Apache 没有指向 SVN 文件系统的路径"
-#: ../include/svn_error_codes.h:1101
+#: ../include/svn_error_codes.h:1111
msgid "Apache got a malformed URI"
msgstr "Apache 得到非法 URI"
-#: ../include/svn_error_codes.h:1105
+#: ../include/svn_error_codes.h:1115
msgid "Activity not found"
msgstr "没有找到活动项"
-#: ../include/svn_error_codes.h:1109
+#: ../include/svn_error_codes.h:1119
msgid "Baseline incorrect"
msgstr "基线错误"
-#: ../include/svn_error_codes.h:1113
+#: ../include/svn_error_codes.h:1123
msgid "Input/output error"
msgstr "输出/输出错误"
-#: ../include/svn_error_codes.h:1119
+#: ../include/svn_error_codes.h:1129
msgid "A path under version control is needed for this operation"
msgstr "只能对纳入版本控制的路径执行此操作"
-#: ../include/svn_error_codes.h:1123
+#: ../include/svn_error_codes.h:1133
msgid "Repository access is needed for this operation"
msgstr "此操作需要存取版本库"
-#: ../include/svn_error_codes.h:1127
+#: ../include/svn_error_codes.h:1137
msgid "Bogus revision information given"
msgstr "给出的版本信息非法"
-#: ../include/svn_error_codes.h:1131
+#: ../include/svn_error_codes.h:1141
msgid "Attempting to commit to a URL more than once"
msgstr "试图对 URL 进行多次提交"
-#: ../include/svn_error_codes.h:1135
+#: ../include/svn_error_codes.h:1145
msgid "Operation does not apply to binary file"
msgstr "不能对二进制文件执行此操作"
-#: ../include/svn_error_codes.h:1141
+#: ../include/svn_error_codes.h:1151
msgid "Format of an svn:externals property was invalid"
msgstr "svn:externals 属性格式非法"
-#: ../include/svn_error_codes.h:1145
+#: ../include/svn_error_codes.h:1155
msgid "Attempting restricted operation for modified resource"
msgstr "试图对已修改的资源进行受限操作"
-#: ../include/svn_error_codes.h:1149
+#: ../include/svn_error_codes.h:1159
msgid "Operation does not apply to directory"
msgstr "不能对目录执行此操作"
-#: ../include/svn_error_codes.h:1153
+#: ../include/svn_error_codes.h:1163
msgid "Revision range is not allowed"
msgstr "不允许的版本范围"
-#: ../include/svn_error_codes.h:1157
+#: ../include/svn_error_codes.h:1167
msgid "Inter-repository relocation not allowed"
msgstr "不支持版本库之间的重新定位"
-#: ../include/svn_error_codes.h:1161
+#: ../include/svn_error_codes.h:1171
msgid "Author name cannot contain a newline"
msgstr "作者名称不能换行"
-#: ../include/svn_error_codes.h:1165
+#: ../include/svn_error_codes.h:1175
msgid "Bad property name"
msgstr "属性名称错误"
-#: ../include/svn_error_codes.h:1170
+#: ../include/svn_error_codes.h:1180
msgid "Two versioned resources are unrelated"
msgstr "两个纳入版本控制的资源不相关"
-#: ../include/svn_error_codes.h:1175
+#: ../include/svn_error_codes.h:1185
msgid "Path has no lock token"
msgstr "路径没有锁定令牌"
-#: ../include/svn_error_codes.h:1180
+#: ../include/svn_error_codes.h:1190
msgid "Operation does not support multiple sources"
msgstr "此操作不支持多个源对象"
-#: ../include/svn_error_codes.h:1185
+#: ../include/svn_error_codes.h:1195
msgid "No versioned parent directories"
msgstr "没有受版本控制的父目录"
-#: ../include/svn_error_codes.h:1190 ../include/svn_error_codes.h:1210
+#: ../include/svn_error_codes.h:1200 ../include/svn_error_codes.h:1220
msgid "Working copy and merge source not ready for reintegration"
msgstr "工作副本与合并来源没有准备好复兴"
-#: ../include/svn_error_codes.h:1195
+#: ../include/svn_error_codes.h:1205
msgid "A file external cannot overwrite an existing versioned item"
msgstr "外部引用的文件不能覆写已存的版本控制的条目"
-#: ../include/svn_error_codes.h:1200
+#: ../include/svn_error_codes.h:1210
msgid "Invalid path component strip count specified"
msgstr "指定了无效的路径组件修剪计数"
-#: ../include/svn_error_codes.h:1205
+#: ../include/svn_error_codes.h:1215
msgid "Detected a cycle while processing the operation"
msgstr "当处理此操作是，检测到死循环"
-#: ../include/svn_error_codes.h:1215
+#: ../include/svn_error_codes.h:1225
msgid "Invalid mergeinfo detected in merge target"
msgstr "在合并目标检测到了合并信息"
-#: ../include/svn_error_codes.h:1220
+#: ../include/svn_error_codes.h:1230
msgid "Can't perform this operation without a valid lock token"
msgstr "不能在没有合法的锁令牌时执行此操作"
-#: ../include/svn_error_codes.h:1225
+#: ../include/svn_error_codes.h:1235
msgid "The operation is forbidden by the server"
msgstr "操作被服务器禁止"
-#: ../include/svn_error_codes.h:1231
+#: ../include/svn_error_codes.h:1241
msgid "A problem occurred; see other errors for details"
msgstr "发生问题；请参阅其它错误信息"
-#: ../include/svn_error_codes.h:1235
+#: ../include/svn_error_codes.h:1245
msgid "Failure loading plugin"
msgstr "加载插件失败"
-#: ../include/svn_error_codes.h:1239
+#: ../include/svn_error_codes.h:1249
msgid "Malformed file"
msgstr "文件格式错误"
-#: ../include/svn_error_codes.h:1243
+#: ../include/svn_error_codes.h:1253
msgid "Incomplete data"
msgstr "数据不完整"
-#: ../include/svn_error_codes.h:1247
+#: ../include/svn_error_codes.h:1257
msgid "Incorrect parameters given"
msgstr "参数不正确"
-#: ../include/svn_error_codes.h:1251
+#: ../include/svn_error_codes.h:1261
msgid "Tried a versioning operation on an unversioned resource"
msgstr "试图对未纳入版本控制的资源进行版本操作"
-#: ../include/svn_error_codes.h:1255
+#: ../include/svn_error_codes.h:1265
msgid "Test failed"
msgstr "测试失败"
-#: ../include/svn_error_codes.h:1259
+#: ../include/svn_error_codes.h:1269
msgid "Trying to use an unsupported feature"
msgstr "试图使用不支持的特性"
-#: ../include/svn_error_codes.h:1263
+#: ../include/svn_error_codes.h:1273
msgid "Unexpected or unknown property kind"
msgstr "意外或未知的属性类型"
-#: ../include/svn_error_codes.h:1267
+#: ../include/svn_error_codes.h:1277
msgid "Illegal target for the requested operation"
msgstr "此请求操作的目标非法"
-#: ../include/svn_error_codes.h:1271
+#: ../include/svn_error_codes.h:1281
msgid "MD5 checksum is missing"
msgstr "没有 MD5 校验和"
-#: ../include/svn_error_codes.h:1275
+#: ../include/svn_error_codes.h:1285
msgid "Directory needs to be empty but is not"
msgstr "必须为空的目录有内容"
-#: ../include/svn_error_codes.h:1279
+#: ../include/svn_error_codes.h:1289
msgid "Error calling external program"
msgstr "调用外部程序错误"
-#: ../include/svn_error_codes.h:1283
+#: ../include/svn_error_codes.h:1293
msgid "Python exception has been set with the error"
msgstr "Python 异常被设为错误"
-#: ../include/svn_error_codes.h:1287
+#: ../include/svn_error_codes.h:1297
msgid "A checksum mismatch occurred"
msgstr "校验和错误"
-#: ../include/svn_error_codes.h:1291
+#: ../include/svn_error_codes.h:1301
msgid "The operation was interrupted"
msgstr "操作被中断"
-#: ../include/svn_error_codes.h:1295
+#: ../include/svn_error_codes.h:1305
msgid "The specified diff option is not supported"
msgstr "不支持指定的 diff 选项"
-#: ../include/svn_error_codes.h:1299
+#: ../include/svn_error_codes.h:1309
msgid "Property not found"
msgstr "找不到属性"
-#: ../include/svn_error_codes.h:1303
+#: ../include/svn_error_codes.h:1313
msgid "No auth file path available"
msgstr "未提供 auth 文件路径"
-#: ../include/svn_error_codes.h:1308
+#: ../include/svn_error_codes.h:1318
msgid "Incompatible library version"
msgstr "不兼容的库版本"
-#: ../include/svn_error_codes.h:1313
+#: ../include/svn_error_codes.h:1323
msgid "Mergeinfo parse error"
msgstr "分析合并信息出错"
-#: ../include/svn_error_codes.h:1318
+#: ../include/svn_error_codes.h:1328
msgid "Cease invocation of this API"
msgstr "停止调用此 API"
-#: ../include/svn_error_codes.h:1323
+#: ../include/svn_error_codes.h:1333
msgid "Error parsing revision number"
msgstr "解析版本号出错"
-#: ../include/svn_error_codes.h:1328
+#: ../include/svn_error_codes.h:1338
msgid "Iteration terminated before completion"
msgstr "迭代在完成前终止"
-#: ../include/svn_error_codes.h:1333
+#: ../include/svn_error_codes.h:1343
msgid "Unknown changelist"
msgstr "未知修改列表"
-#: ../include/svn_error_codes.h:1338
+#: ../include/svn_error_codes.h:1348
msgid "Reserved directory name in command line arguments"
msgstr "在命令行参数中包含保留的目录名称"
-#: ../include/svn_error_codes.h:1343
+#: ../include/svn_error_codes.h:1353
msgid "Inquiry about unknown capability"
msgstr "查询未知特性"
-#: ../include/svn_error_codes.h:1348
+#: ../include/svn_error_codes.h:1358
msgid "Test skipped"
msgstr "跳过测试"
-#: ../include/svn_error_codes.h:1353
+#: ../include/svn_error_codes.h:1363
msgid "APR memcache library not available"
msgstr "APR memcache 库不可用"
-#: ../include/svn_error_codes.h:1358
+#: ../include/svn_error_codes.h:1368
msgid "Couldn't perform atomic initialization"
msgstr "不能完成原子的初始化"
-#: ../include/svn_error_codes.h:1363
+#: ../include/svn_error_codes.h:1373
msgid "SQLite error"
msgstr "SQLite 错误"
-#: ../include/svn_error_codes.h:1368
+#: ../include/svn_error_codes.h:1378
msgid "Attempted to write to readonly SQLite db"
msgstr "试图写至只读 SQLite 数据库"
-#: ../include/svn_error_codes.h:1375
+#: ../include/svn_error_codes.h:1385
msgid "Unsupported schema found in SQLite db"
msgstr "不支持 SQLite 数据库中的方案"
-#: ../include/svn_error_codes.h:1380
+#: ../include/svn_error_codes.h:1390
msgid "The SQLite db is busy"
msgstr "SQLite 数据库繁忙"
-#: ../include/svn_error_codes.h:1385
+#: ../include/svn_error_codes.h:1395
msgid "SQLite busy at transaction rollback; resetting all busy SQLite statements to allow rollback"
msgstr "SQLite 忙于回滚事务; 请重置所有繁忙的 SQLite 语句，以便允许回滚"
-#: ../include/svn_error_codes.h:1391
+#: ../include/svn_error_codes.h:1401
msgid "Constraint error in SQLite db"
msgstr "在 SQLite 数据库中的约束出错"
-#: ../include/svn_error_codes.h:1396
+#: ../include/svn_error_codes.h:1406
msgid "Too many memcached servers configured"
msgstr "配置了太多的 memcached 服务器"
-#: ../include/svn_error_codes.h:1401
+#: ../include/svn_error_codes.h:1411
msgid "Failed to parse version number string"
msgstr "解析版本号字符串失败"
-#: ../include/svn_error_codes.h:1406
+#: ../include/svn_error_codes.h:1416
msgid "Atomic data storage is corrupt"
msgstr "原子数据存储损坏"
-#: ../include/svn_error_codes.h:1411
+#: ../include/svn_error_codes.h:1421
msgid "utf8proc library error"
msgstr "UTF8 处理库错误"
-#: ../include/svn_error_codes.h:1416
+#: ../include/svn_error_codes.h:1426
msgid "Bad arguments to SQL operators GLOB or LIKE"
msgstr "传递给 SQL 操作符 GBLOB 或 LIKE 的参数错误"
-#: ../include/svn_error_codes.h:1421
+#: ../include/svn_error_codes.h:1431
msgid "Packed data stream is corrupt"
msgstr "打包数据流损坏"
-#: ../include/svn_error_codes.h:1426
+#: ../include/svn_error_codes.h:1436
msgid "Additional errors:"
msgstr "额外错误:"
-#: ../include/svn_error_codes.h:1432
+#: ../include/svn_error_codes.h:1441
+msgid "Parser error: invalid input"
+msgstr "解析错误: 非法输入"
+
+#: ../include/svn_error_codes.h:1447
msgid "Error parsing arguments"
msgstr "解析参数出错"
-#: ../include/svn_error_codes.h:1436
+#: ../include/svn_error_codes.h:1451
msgid "Not enough arguments provided"
msgstr "没有提供足够的参数"
-#: ../include/svn_error_codes.h:1440
+#: ../include/svn_error_codes.h:1455
msgid "Mutually exclusive arguments specified"
msgstr "参数冲突"
-#: ../include/svn_error_codes.h:1444
+#: ../include/svn_error_codes.h:1459
msgid "Attempted command in administrative dir"
msgstr "试图在管理目录中执行命令"
-#: ../include/svn_error_codes.h:1448
+#: ../include/svn_error_codes.h:1463
msgid "The log message file is under version control"
msgstr "日志信息文件被纳入版本控制"
-#: ../include/svn_error_codes.h:1452
+#: ../include/svn_error_codes.h:1467
msgid "The log message is a pathname"
msgstr "日志信息是路径名"
-#: ../include/svn_error_codes.h:1456
+#: ../include/svn_error_codes.h:1471
msgid "Committing in directory scheduled for addition"
msgstr "在调度增加的目录中进行提交"
-#: ../include/svn_error_codes.h:1460
+#: ../include/svn_error_codes.h:1475
msgid "No external editor available"
msgstr "没有外部编辑器可用"
-#: ../include/svn_error_codes.h:1464
+#: ../include/svn_error_codes.h:1479
msgid "Something is wrong with the log message's contents"
msgstr "日志信息内容不妥"
-#: ../include/svn_error_codes.h:1468
+#: ../include/svn_error_codes.h:1483
msgid "A log message was given where none was necessary"
msgstr "在不需要时给出日志信息"
-#: ../include/svn_error_codes.h:1472
+#: ../include/svn_error_codes.h:1487
msgid "No external merge tool available"
msgstr "没有外部合并工具可用"
-#: ../include/svn_error_codes.h:1476
+#: ../include/svn_error_codes.h:1491
msgid "Failed processing one or more externals definitions"
msgstr "处理一个或更多的外部定义失败"
-#: ../include/svn_error_codes.h:1482
+#: ../include/svn_error_codes.h:1497
msgid "Special code for wrapping server errors to report to client"
msgstr "用专用代码封装服务器错误以便报告客户端"
-#: ../include/svn_error_codes.h:1486
+#: ../include/svn_error_codes.h:1501
msgid "Unknown svn protocol command"
msgstr "未知的 svn 协议命令"
-#: ../include/svn_error_codes.h:1490
+#: ../include/svn_error_codes.h:1505
msgid "Network connection closed unexpectedly"
msgstr "网络连接意外关闭"
-#: ../include/svn_error_codes.h:1494
+#: ../include/svn_error_codes.h:1509
msgid "Network read/write error"
msgstr "网络读写错误"
-#: ../include/svn_error_codes.h:1506
+#: ../include/svn_error_codes.h:1521
msgid "Client/server version mismatch"
msgstr "客户端/服务器版本不匹配"
-#: ../include/svn_error_codes.h:1511
+#: ../include/svn_error_codes.h:1526
msgid "Cannot negotiate authentication mechanism"
msgstr "无法协商认证机制"
-#: ../include/svn_error_codes.h:1516
+#: ../include/svn_error_codes.h:1531
msgid "Editor drive was aborted"
msgstr "编辑器中止"
-#: ../include/svn_error_codes.h:1524
+#: ../include/svn_error_codes.h:1539
msgid "Credential data unavailable"
msgstr "无法取得凭证数据"
-#: ../include/svn_error_codes.h:1528
+#: ../include/svn_error_codes.h:1543
msgid "No authentication provider available"
msgstr "没有可用的认证提供者"
-#: ../include/svn_error_codes.h:1532
+#: ../include/svn_error_codes.h:1547
msgid "All authentication providers exhausted"
msgstr "所有的认证提供者都不可用"
-#: ../include/svn_error_codes.h:1536
+#: ../include/svn_error_codes.h:1551
msgid "Credentials not saved"
msgstr "没有保存凭证数据"
-#: ../include/svn_error_codes.h:1541
+#: ../include/svn_error_codes.h:1556 ../libsvn_subr/gpg_agent.c:416
msgid "Authentication failed"
msgstr "认证失败"
-#: ../include/svn_error_codes.h:1547
+#: ../include/svn_error_codes.h:1562
msgid "Read access denied for root of edit"
msgstr "编辑根目录时拒绝读取"
-#: ../include/svn_error_codes.h:1552
+#: ../include/svn_error_codes.h:1567
msgid "Item is not readable"
msgstr "条目不可读"
-#: ../include/svn_error_codes.h:1557
+#: ../include/svn_error_codes.h:1572
msgid "Item is partially readable"
msgstr "条目部分可读"
-#: ../include/svn_error_codes.h:1561
+#: ../include/svn_error_codes.h:1576
msgid "Invalid authz configuration"
msgstr "认证配置无效"
-#: ../include/svn_error_codes.h:1566
+#: ../include/svn_error_codes.h:1581
msgid "Item is not writable"
msgstr "条目不能写"
-#: ../include/svn_error_codes.h:1573
+#: ../include/svn_error_codes.h:1588
msgid "Diff data source modified unexpectedly"
msgstr "svndiff 数据被意外修改"
-#: ../include/svn_error_codes.h:1579
+#: ../include/svn_error_codes.h:1594
msgid "Initialization of SSPI library failed"
msgstr "初始化 SSPI 库失败"
-#: ../include/svn_error_codes.h:1583
+#: ../include/svn_error_codes.h:1598
msgid "Server SSL certificate untrusted"
msgstr "服务器的 SSL 证书不被信任"
-#: ../include/svn_error_codes.h:1588
+#: ../include/svn_error_codes.h:1603
msgid "Initialization of the GSSAPI context failed"
msgstr "初始化 GSSAPI 失败"
-#: ../include/svn_error_codes.h:1593
+#: ../include/svn_error_codes.h:1608
msgid "While handling serf response:"
msgstr "当处理 serf 的响应时:"
-#: ../include/svn_error_codes.h:1599
+#: ../include/svn_error_codes.h:1614
msgid "Assertion failure"
msgstr "断言失败"
-#: ../include/svn_error_codes.h:1603
+#: ../include/svn_error_codes.h:1618
msgid "No non-tracing links found in the error chain"
msgstr "没有发现错误链中的非跟踪链接"
-#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:274
+#: ../libsvn_auth_gnome_keyring/gnome_keyring.c:152
msgid "GNOME Keyring is locked and we are non-interactive"
msgstr "GNOME Keyring 被锁定，并且我们处于非交互方式"
-#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:356
-#: ../libsvn_subr/opt.c:930
+#: ../libsvn_client/add.c:609 ../libsvn_client/cmdline.c:365
+#: ../libsvn_subr/opt.c:932
#, c-format
msgid "'%s' ends in a reserved name"
msgstr "“%s”以保留名称结束"
@@ -1374,37 +1387,37 @@ msgstr "“%s”以保留名称结束"
msgid "'%s' prevents creating parent of '%s'"
msgstr "'%s' 阻止创建 '%s' 的父亲"
-#: ../libsvn_client/add.c:915 ../libsvn_wc/adm_ops.c:735
+#: ../libsvn_client/add.c:915 ../libsvn_wc/adm_ops.c:445
#, c-format
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:922 ../libsvn_wc/adm_ops.c:690
+#: ../libsvn_client/add.c:922 ../libsvn_wc/adm_ops.c:400
#: ../libsvn_wc/workqueue.c:874 ../libsvn_wc/workqueue.c:968
#, c-format
msgid "'%s' not found"
msgstr "找不到 “%s”"
-#: ../libsvn_client/add.c:928 ../libsvn_wc/adm_ops.c:695
+#: ../libsvn_client/add.c:928 ../libsvn_wc/adm_ops.c:405
#: ../libsvn_wc/delete.c:98
#, c-format
msgid "Unsupported node kind for path '%s'"
msgstr "路径 “%s” 有不支持的节点种类"
#: ../libsvn_client/add.c:961 ../libsvn_client/changelist.c:65
-#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3076
-#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:821
-#: ../libsvn_client/patch.c:3015 ../libsvn_client/relocate.c:232
+#: ../libsvn_client/changelist.c:104 ../libsvn_client/deprecated.c:3055
+#: ../libsvn_client/export.c:1394 ../libsvn_client/import.c:831
+#: ../libsvn_client/patch.c:3124 ../libsvn_client/relocate.c:153
#: ../libsvn_client/resolved.c:119 ../libsvn_client/revert.c:139
#: ../libsvn_client/status.c:368 ../libsvn_client/switch.c:471
-#: ../libsvn_client/update.c:685 ../libsvn_client/upgrade.c:105
-#: ../svn/util.c:979
+#: ../libsvn_client/update.c:701 ../libsvn_client/upgrade.c:109
+#: ../svn-bench/util.c:76 ../svn/util.c:979
#, c-format
msgid "'%s' is not a local path"
msgstr "“%s”不是本地路径"
#: ../libsvn_client/add.c:1002 ../libsvn_client/copy_foreign.c:491
-#: ../libsvn_wc/adm_ops.c:769 ../libsvn_wc/copy.c:722
+#: ../libsvn_wc/adm_ops.c:479 ../libsvn_wc/copy.c:784
#, c-format
msgid "'%s' is already under version control"
msgstr "“%s”已纳入版本控制"
@@ -1420,12 +1433,12 @@ msgid "Cannot calculate blame informatio
msgstr "无法为二进制文件 “%s” 计算追溯信息"
#: ../libsvn_client/cat.c:77 ../libsvn_client/commit_util.c:613
-#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:829
-#: ../libsvn_client/prop_commands.c:1409 ../libsvn_client/revisions.c:105
-#: ../libsvn_wc/adm_ops.c:1202 ../libsvn_wc/adm_ops.c:1251
-#: ../libsvn_wc/copy.c:564 ../libsvn_wc/copy.c:625 ../libsvn_wc/entries.c:1301
+#: ../libsvn_client/delete.c:81 ../libsvn_client/prop_commands.c:837
+#: ../libsvn_client/prop_commands.c:1417 ../libsvn_client/revisions.c:105
+#: ../libsvn_wc/adm_ops.c:912 ../libsvn_wc/adm_ops.c:966
+#: ../libsvn_wc/copy.c:626 ../libsvn_wc/copy.c:687 ../libsvn_wc/entries.c:1301
#: ../libsvn_wc/entries.c:2681 ../libsvn_wc/entries.c:2712
-#: ../svn/notify.c:1111
+#: ../svn-bench/notify.c:968 ../svn/notify.c:1026
#, c-format
msgid "'%s' is not under version control"
msgstr "“%s” 尚未纳入版本控制"
@@ -1444,7 +1457,7 @@ msgstr "在提交之前，“%s”没有
msgid "(local)"
msgstr "(本地)"
-#: ../libsvn_client/cat.c:258
+#: ../libsvn_client/cat.c:255
#, c-format
msgid "URL '%s' refers to a directory"
msgstr "URL “%s” 指向目录"
@@ -1453,22 +1466,23 @@ msgstr "URL “%s” 指向目录"
msgid "Target changelist name must not be empty"
msgstr "目标修改列表的名称不能为空"
-#: ../libsvn_client/checkout.c:113 ../libsvn_client/export.c:1447
+#: ../libsvn_client/checkout.c:131 ../libsvn_client/export.c:1447
+#: ../svn-bench/null-export-cmd.c:275
#, c-format
msgid "URL '%s' doesn't exist"
msgstr "URL “%s” 不存在"
-#: ../libsvn_client/checkout.c:117
+#: ../libsvn_client/checkout.c:135
#, c-format
msgid "URL '%s' refers to a file, not a directory"
msgstr "URL “%s” 指向一个文件，不是目录"
-#: ../libsvn_client/checkout.c:151
+#: ../libsvn_client/checkout.c:173
#, c-format
msgid "'%s' is already a working copy for a different URL"
msgstr "“%s” 已经是指向不同 URL 的工作副本"
-#: ../libsvn_client/checkout.c:159
+#: ../libsvn_client/checkout.c:181
#, c-format
msgid "'%s' already exists and is not a directory"
msgstr "“%s” 已经存在并且不是目录"
@@ -1478,11 +1492,16 @@ msgstr "“%s” 已经存在并且不�
msgid "All non-relative targets must have the same root URL"
msgstr "所有非相对目标必须有相同的根 URL"
-#: ../libsvn_client/cmdline.c:312
+#: ../libsvn_client/cmdline.c:207
+#, c-format
+msgid "'%s' is just a peg revision. Maybe try '%s@' instead?"
+msgstr "“%s” 是铆钉版本。或许你应该使用 “%s@” ?"
+
+#: ../libsvn_client/cmdline.c:321
msgid "Resolving '^/': no repository root found in the target arguments or in the current directory"
msgstr "解析“^/”: 在目标参数或当前目录中找不到版本库的根"
-#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:1529
+#: ../libsvn_client/commit.c:157 ../libsvn_client/copy.c:1541
msgid "Commit failed (details follow):"
msgstr "提交失败(细节如下): "
@@ -1498,12 +1517,12 @@ msgstr "解除锁定目录出错(细节�
msgid "Error bumping revisions post-commit (details follow):"
msgstr "执行 post-commit 出错 (细节如下): "
-#: ../libsvn_client/commit.c:544
+#: ../libsvn_client/commit.c:551
#, c-format
msgid "'%s' is a URL, but URLs cannot be commit targets"
msgstr "“%s” 是 URL，但是 URL 不可作为提交目标"
-#: ../libsvn_client/commit.c:646
+#: ../libsvn_client/commit.c:653
msgid ""
"Commit can only commit to a single repository at a time.\n"
"Are all targets part of the same working copy?"
@@ -1511,12 +1530,12 @@ msgstr ""
"每次提交只能针对一个版本库。\n"
"是否所有目标都属于同一工作副本？"
-#: ../libsvn_client/commit.c:762
+#: ../libsvn_client/commit.c:769
#, 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 "不能提交 '%s'，因为它是自 '%s' 移入的，并且不是此提交的一部分；它们必须同时提交"
-#: ../libsvn_client/commit.c:806
+#: ../libsvn_client/commit.c:813
#, 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 "不能提交 '%s'，因为已经移到 '%s'，并且不是此提交的一部分；它们必须同时提交"
@@ -1571,27 +1590,27 @@ msgstr "节点 “%s” 的类型意外�
msgid "'%s' is scheduled for addition, but is missing"
msgstr "丢失了预定增加的“%s”"
-#: ../libsvn_client/commit_util.c:1281
+#: ../libsvn_client/commit_util.c:1280
#, 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” 是提交的一部分"
-#: ../libsvn_client/commit_util.c:1420
+#: ../libsvn_client/commit_util.c:1419
#, 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:1575
+#: ../libsvn_client/commit_util.c:1574
#, c-format
msgid "Commit item '%s' has copy flag but no copyfrom URL"
msgstr "提交项目 “%s” 有复制标记，但是没有源地址(copyfrom URL)"
-#: ../libsvn_client/commit_util.c:1580
+#: ../libsvn_client/commit_util.c:1579
#, c-format
msgid "Commit item '%s' has copy flag but an invalid revision"
msgstr "提交项目 “%s” 有复制标志，但是版本无效"
-#: ../libsvn_client/commit_util.c:2046
+#: ../libsvn_client/commit_util.c:2054
msgid "Standard properties can't be set explicitly as revision properties"
msgstr "标准属性不能设置为版本属性"
@@ -1601,9 +1620,9 @@ msgid "Path '%s' exists, but is excluded
msgstr "路径 “%s” 存在，但被排除"
#: ../libsvn_client/copy.c:445 ../libsvn_client/copy.c:1062
-#: ../libsvn_client/copy.c:1328 ../libsvn_client/copy.c:1903
-#: ../libsvn_client/import.c:869 ../libsvn_client/mtcc.c:456
-#: ../libsvn_client/mtcc.c:473 ../libsvn_ra_serf/util.c:1815
+#: ../libsvn_client/copy.c:1340 ../libsvn_client/copy.c:1914
+#: ../libsvn_client/import.c:879 ../libsvn_client/mtcc.c:454
+#: ../libsvn_client/mtcc.c:471 ../libsvn_ra_serf/util.c:1819
#, c-format
msgid "Path '%s' already exists"
msgstr "路径 “%s” 已经存在"
@@ -1614,13 +1633,13 @@ msgid "Path '%s' already exists as unver
msgstr "路径 “%s” 已经作为非版本控制节点存在"
#: ../libsvn_client/copy.c:522 ../libsvn_client/copy.c:532
-#: ../libsvn_client/copy.c:1919
+#: ../libsvn_client/copy.c:1930
#, c-format
msgid "Path '%s' is not a directory"
msgstr "路径 “%s” 不是目录"
-#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10140
-#: ../svnlook/svnlook.c:1426
+#: ../libsvn_client/copy.c:571 ../libsvn_client/merge.c:10189
+#: ../svnlook/svnlook.c:1435
#, c-format
msgid "Path '%s' does not exist"
msgstr "路径 “%s” 不存在"
@@ -1639,61 +1658,61 @@ msgstr "来源与目标 URL 似乎不在
msgid "Path '%s' does not exist in revision %ld"
msgstr "路径 “%s” 不在版本 %ld 中"
-#: ../libsvn_client/copy.c:1887 ../libsvn_client/mtcc.c:550
+#: ../libsvn_client/copy.c:1898 ../libsvn_client/mtcc.c:548
#, c-format
msgid "Path '%s' not found in revision %ld"
msgstr "路径 “%s” 不在版本 %ld 中"
-#: ../libsvn_client/copy.c:1892
+#: ../libsvn_client/copy.c:1903
#, c-format
msgid "Path '%s' not found in head revision"
msgstr "HEAD 版本中找不到路径 “%s”"
-#: ../libsvn_client/copy.c:2023
+#: ../libsvn_client/copy.c:2034
msgid "Cannot mix repository and working copy sources"
msgstr "不能在源中混合版本库和工作副本"
-#: ../libsvn_client/copy.c:2075
+#: ../libsvn_client/copy.c:2086
#, c-format
msgid "Cannot copy path '%s' into its own child '%s'"
msgstr "无法复制路径 “%s” 到其子目录 “%s” 中"
-#: ../libsvn_client/copy.c:2111
+#: ../libsvn_client/copy.c:2122
#, c-format
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:2126
+#: ../libsvn_client/copy.c:2137
msgid "Moves between the working copy and the repository are not supported"
msgstr "不支持在工作副本和版本库之间移动"
-#: ../libsvn_client/copy.c:2141
+#: ../libsvn_client/copy.c:2152
#, c-format
msgid "Cannot move URL '%s' into itself"
msgstr "无法移动 URL “%s” 到本身"
-#: ../libsvn_client/copy.c:2142
+#: ../libsvn_client/copy.c:2153
#, c-format
msgid "Cannot move path '%s' into itself"
msgstr "无法移动路径 “%s” 到本身"
-#: ../libsvn_client/copy.c:2209
+#: ../libsvn_client/copy.c:2220
#, 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:283
-#: ../libsvn_client/externals.c:904 ../libsvn_client/externals.c:1103
-#: ../libsvn_wc/update_editor.c:1104
+#: ../libsvn_client/externals.c:960 ../libsvn_client/externals.c:1171
+#: ../libsvn_wc/update_editor.c:1103
#, c-format
msgid "Path '%s' is not in the working copy"
msgstr "路径 “%s” 不在工作副本中"
#: ../libsvn_client/copy_foreign.c:373 ../libsvn_client/export.c:814
-#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1065
-#: ../libsvn_fs_x/dag.c:1066 ../libsvn_ra_svn/client.c:1343
-#: ../libsvn_wc/diff_editor.c:1967 ../libsvn_wc/diff_editor.c:2046
-#: ../libsvn_wc/externals.c:652 ../libsvn_wc/update_editor.c:4281
+#: ../libsvn_client/repos_diff.c:998 ../libsvn_fs_fs/dag.c:1068
+#: ../libsvn_fs_x/dag.c:1067 ../libsvn_ra_svn/client.c:1327
+#: ../libsvn_wc/diff_editor.c:1983 ../libsvn_wc/diff_editor.c:2069
+#: ../libsvn_wc/externals.c:650 ../libsvn_wc/update_editor.c:4294
#, c-format
msgid "Checksum mismatch for '%s'"
msgstr "'%s' 的校验和不匹配"
@@ -1723,12 +1742,12 @@ msgstr "“%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/delete.c:349
+#: ../libsvn_client/delete.c:358
#, c-format
msgid "URL '%s' not within a repository"
msgstr "URL '%s' 不在版本库中"
-#: ../libsvn_client/delete.c:356
+#: ../libsvn_client/delete.c:365
#, c-format
msgid "URL '%s' does not exist"
msgstr "URL “%s” 不存在"
@@ -1737,11 +1756,11 @@ msgstr "URL “%s” 不存在"
msgid "Cannot specify revisions (except HEAD) with move operations"
msgstr "移动操作不能指定版本"
-#: ../libsvn_client/deprecated.c:1646
+#: ../libsvn_client/deprecated.c:1625
msgid "No commits in repository"
msgstr "版本库中没有提交"
-#: ../libsvn_client/deprecated.c:3030 ../libsvn_wc/deprecated.c:4152
+#: ../libsvn_client/deprecated.c:3009 ../libsvn_wc/deprecated.c:4171
msgid "Non-recursive relocation not supported"
msgstr "不支持非递归的重新定位"
@@ -1766,58 +1785,58 @@ msgstr "%s\t(不存在的)"
msgid "%s\t(working copy)"
msgstr "%s\t(工作副本)"
-#: ../libsvn_client/diff.c:499 ../svnlook/svnlook.c:795
+#: ../libsvn_client/diff.c:501 ../svnlook/svnlook.c:802
#, c-format
msgid "%sProperty changes on: %s%s"
msgstr "%s 属性改变: %s%s"
-#: ../libsvn_client/diff.c:711
+#: ../libsvn_client/diff.c:756
#, c-format
msgid "Cannot display: file marked as a binary type.%s"
msgstr "无法显示: 文件标记为二进制类型。%s"
-#: ../libsvn_client/diff.c:1237 ../libsvn_client/merge.c:7190
-#: ../libsvn_client/merge.c:10542
+#: ../libsvn_client/diff.c:1287 ../libsvn_client/merge.c:7239
+#: ../libsvn_client/merge.c:10591
msgid "Not all required revisions are specified"
msgstr "没有全部提供需要的版本"
-#: ../libsvn_client/diff.c:1251
+#: ../libsvn_client/diff.c:1301
msgid "At least one revision must be something other than BASE or WORKING when diffing a URL"
msgstr "要比较 URL 的时候，必须有一个版本，既不是基础版本，又不是工作版本"
-#: ../libsvn_client/diff.c:1288
+#: ../libsvn_client/diff.c:1338
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld'"
msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 中"
-#: ../libsvn_client/diff.c:1293
+#: ../libsvn_client/diff.c:1343
#, c-format
msgid "Diff target '%s' was not found in the repository at revision '%ld' or '%ld'"
msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 或 '%ld' 中"
-#: ../libsvn_client/diff.c:1469
+#: ../libsvn_client/diff.c:1519
#, c-format
msgid "Diff target '%s' was not found in the repository at revisions '%ld' and '%ld'"
msgstr "差异目标 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
-#: ../libsvn_client/diff.c:1474
+#: ../libsvn_client/diff.c:1524
#, c-format
msgid "Diff targets '%s' and '%s' were not found in the repository at revisions '%ld' and '%ld'"
msgstr "差异目标 '%s' 与 '%s' 不在版本库的版本 '%ld' 和 '%ld' 中"
-#: ../libsvn_client/diff.c:1573
+#: ../libsvn_client/diff.c:1623
msgid "Sorry, svn_client_diff6 was called in a way that is not yet supported"
msgstr "抱歉，svn_client_diff6 尚不支持这种调用方式"
-#: ../libsvn_client/diff.c:1613
+#: ../libsvn_client/diff.c:1663
msgid "Only diffs between a path's text-base and its working files are supported at this time"
msgstr "当前只支持纯文本类型的参考文件与其工作文件比较比较差异"
-#: ../libsvn_client/diff.c:2308 ../libsvn_client/diff.c:2394
+#: ../libsvn_client/diff.c:2369 ../libsvn_client/diff.c:2455
msgid "Cannot ignore properties and show only properties at the same time"
msgstr "不能在忽略属性的同时，只显示属性"
-#: ../libsvn_client/diff_local.c:720 ../libsvn_wc/props.c:1568
+#: ../libsvn_client/diff_local.c:792 ../libsvn_wc/props.c:1673
#, c-format
msgid "'%s' is not a file or directory"
msgstr "“%s”不是文件或目录"
@@ -1832,23 +1851,23 @@ msgid "Destination directory exists, and
msgstr "目的目录已存在，除非强迫为之，否则不会覆盖"
#: ../libsvn_client/export.c:265 ../libsvn_client/export.c:1527
-#: ../libsvn_wc/adm_crawler.c:1205 ../libsvn_wc/conflicts.c:1293
-#: ../libsvn_wc/copy.c:587 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
-#: ../libsvn_wc/info.c:409 ../libsvn_wc/node.c:665 ../libsvn_wc/props.c:227
-#: ../libsvn_wc/status.c:2713 ../libsvn_wc/wc_db.c:2129
-#: ../libsvn_wc/wc_db.c:2570 ../libsvn_wc/wc_db.c:2799
-#: ../libsvn_wc/wc_db.c:2823 ../libsvn_wc/wc_db.c:2981
-#: ../libsvn_wc/wc_db.c:3979 ../libsvn_wc/wc_db.c:6042
+#: ../libsvn_wc/adm_crawler.c:1216 ../libsvn_wc/conflicts.c:1173
+#: ../libsvn_wc/copy.c:649 ../libsvn_wc/crop.c:236 ../libsvn_wc/crop.c:327
+#: ../libsvn_wc/info.c:403 ../libsvn_wc/node.c:667 ../libsvn_wc/props.c:202
+#: ../libsvn_wc/status.c:2713 ../libsvn_wc/wc_db.c:2133
+#: ../libsvn_wc/wc_db.c:2574 ../libsvn_wc/wc_db.c:2803
+#: ../libsvn_wc/wc_db.c:2827 ../libsvn_wc/wc_db.c:2985
+#: ../libsvn_wc/wc_db.c:3983 ../libsvn_wc/wc_db.c:6042
#: ../libsvn_wc/wc_db.c:6362 ../libsvn_wc/wc_db.c:6531
#: ../libsvn_wc/wc_db.c:6697 ../libsvn_wc/wc_db.c:7748
#: ../libsvn_wc/wc_db.c:8707 ../libsvn_wc/wc_db.c:9400
#: ../libsvn_wc/wc_db.c:10031 ../libsvn_wc/wc_db.c:10178
#: ../libsvn_wc/wc_db.c:10318 ../libsvn_wc/wc_db.c:10668
-#: ../libsvn_wc/wc_db.c:12132 ../libsvn_wc/wc_db.c:12200
-#: ../libsvn_wc/wc_db.c:12526 ../libsvn_wc/wc_db.c:13618
-#: ../libsvn_wc/wc_db.c:13678 ../libsvn_wc/wc_db.c:13816
-#: ../libsvn_wc/wc_db.c:13975 ../libsvn_wc/wc_db.c:14416
-#: ../libsvn_wc/wc_db.c:15197
+#: ../libsvn_wc/wc_db.c:12136 ../libsvn_wc/wc_db.c:12204
+#: ../libsvn_wc/wc_db.c:12530 ../libsvn_wc/wc_db.c:13623
+#: ../libsvn_wc/wc_db.c:13683 ../libsvn_wc/wc_db.c:13821
+#: ../libsvn_wc/wc_db.c:13980 ../libsvn_wc/wc_db.c:14421
+#: ../libsvn_wc/wc_db.c:15202
#, c-format
msgid "The node '%s' was not found."
msgstr "找不到节点 '%s'。"
@@ -1877,68 +1896,69 @@ msgstr "“%s” 已存在且不是目�
msgid "'%s' already exists"
msgstr "“%s” 已存在"
-#: ../libsvn_client/externals.c:406
+#: ../libsvn_client/externals.c:440
#, c-format
msgid "Cannot insert a file external defined on '%s' into the working copy '%s'."
msgstr "不能将在“%s”定义的文件外部引用插入到工作副本“%s”。"
-#: ../libsvn_client/externals.c:431
+#: ../libsvn_client/externals.c:465
#, c-format
msgid "The file external from '%s' cannot overwrite the existing versioned item at '%s'"
msgstr "来源于 “%s” 的外部引用的文件不能覆写位于 “%s” 的已存版本控制条目"
-#: ../libsvn_client/externals.c:444
+#: ../libsvn_client/externals.c:479
#, c-format
msgid "The file external '%s' can not be created because the node exists."
msgstr "不能创建文件外部引用 '%s'，节点已经存在。"
-#: ../libsvn_client/externals.c:703
+#: ../libsvn_client/externals.c:757
#, c-format
msgid "URL '%s' at revision %ld doesn't exist"
msgstr "URL “%s” 在版本 %ld 中不存在"
-#: ../libsvn_client/externals.c:708
+#: ../libsvn_client/externals.c:762
#, c-format
msgid "URL '%s' at revision %ld is not a file or a directory"
msgstr "URL “%s” 在版本 %ld 中不是文件或目录"
-#: ../libsvn_client/externals.c:786
+#: ../libsvn_client/externals.c:840
#, c-format
msgid "Unsupported external: URL of file external '%s' is not in repository '%s'"
msgstr "不支持的外部对象：文件外部对象“%s”的 URL 不在版本库“%s”中"
-#: ../libsvn_client/externals.c:979
+#: ../libsvn_client/externals.c:1036
#, c-format
msgid "Traversal of '%s' found no ambient depth"
msgstr "在 “%s” 中找不到深度"
-#: ../libsvn_client/import.c:160
+#: ../libsvn_client/import.c:149
#, c-format
msgid "%s property on '%s' contains unrecognized EOL-style '%s'"
msgstr "属性 %s (对象 '%s') 包含不可识别的行结束符号 '%s'"
-#: ../libsvn_client/import.c:490
+#: ../libsvn_client/import.c:479
#, c-format
msgid "Unknown or unversionable type for '%s'"
msgstr "“%s” 是未知类型或不可纳入版本控制"
-#: ../libsvn_client/import.c:710
+#: ../libsvn_client/import.c:706
msgid "New entry name required when importing a file"
msgstr "导入文件时，需要一个新的条目名称"
-#: ../libsvn_client/import.c:761 ../libsvn_client/patch.c:3022
-#: ../libsvn_client/patch.c:3034 ../libsvn_wc/delete.c:93
+#: ../libsvn_client/import.c:757 ../libsvn_client/patch.c:3131
+#: ../libsvn_client/patch.c:3143 ../libsvn_wc/delete.c:93
#: ../libsvn_wc/lock.c:121 ../libsvn_wc/wc_db_wcroot.c:77
#, c-format
msgid "'%s' does not exist"
msgstr "“%s” 不存在"
-#: ../libsvn_client/import.c:897
+#: ../libsvn_client/import.c:907
#, c-format
msgid "'%s' is a reserved name and cannot be imported"
msgstr "“%s” 是保留名称，无法被导入"
-#: ../libsvn_client/info.c:399 ../libsvn_client/list.c:272
+#: ../libsvn_client/info.c:398 ../libsvn_client/list.c:272
+#: ../svn-bench/null-info-cmd.c:148
#, c-format
msgid "URL '%s' non-existent in revision %ld"
msgstr "URL “%s” 不在版本 %ld 中"
@@ -1947,27 +1967,27 @@ msgstr "URL “%s” 不在版本 %ld �
msgid "No common parent found, unable to operate on disjoint arguments"
msgstr "没有找到公共父节点，不能在分离的参数上操作"
-#: ../libsvn_client/locking_commands.c:383
+#: ../libsvn_client/locking_commands.c:382
#, c-format
msgid "The node '%s' is not a file"
msgstr "节点 '%s' 不是文件"
-#: ../libsvn_client/locking_commands.c:403
+#: ../libsvn_client/locking_commands.c:402
msgid "Unable to lock/unlock across multiple repositories"
msgstr "不能跨越多个版本库进行锁定/解锁"
-#: ../libsvn_client/locking_commands.c:444
+#: ../libsvn_client/locking_commands.c:443
#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "“%s” 没有在工作副本中锁定"
-#: ../libsvn_client/locking_commands.c:497
+#: ../libsvn_client/locking_commands.c:496
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” 没有被锁定"
-#: ../libsvn_client/locking_commands.c:531 ../libsvn_fs/fs-loader.c:1619
-#: ../libsvn_ra/ra_loader.c:1216
+#: ../libsvn_client/locking_commands.c:530 ../libsvn_fs/fs-loader.c:1596
+#: ../libsvn_ra/ra_loader.c:1219
msgid "Lock comment contains illegal characters"
msgstr "锁定注释包含非法字符"
@@ -1994,7 +2014,7 @@ msgstr "当指定工作副本路径时�
msgid "PREV, BASE, or COMMITTED revision keywords are invalid for URL"
msgstr "对于 URL，版本关键字 PREV，BASE，或 COMMITTED 非法"
-#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:871
+#: ../libsvn_client/log.c:561 ../libsvn_client/log.c:868
msgid "Missing required revision specification"
msgstr "未提供请求的版本"
@@ -2011,26 +2031,26 @@ 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:2049
+#: ../libsvn_client/merge.c:2081
#, c-format
msgid ".working%s%s"
msgstr ".working%s%s"
-#: ../libsvn_client/merge.c:2052
+#: ../libsvn_client/merge.c:2084
#, c-format
msgid ".merge-left.r%ld%s%s"
msgstr ".merge-left.r%ld%s%s"
-#: ../libsvn_client/merge.c:2056
+#: ../libsvn_client/merge.c:2088
#, c-format
msgid ".merge-right.r%ld%s%s"
msgstr ".merge-right.r%ld%s%s"
-#: ../libsvn_client/merge.c:4693
+#: ../libsvn_client/merge.c:4743
msgid "Cannot reverse-merge a range from a path's own future history; try updating first"
msgstr "不能从路径的未来历史中反向合并范围；请先更新"
-#: ../libsvn_client/merge.c:5428
+#: ../libsvn_client/merge.c:5478
#, c-format
msgid ""
"One or more conflicts were produced while merging r%ld:%ld into\n"
@@ -2041,79 +2061,79 @@ msgstr ""
"当合并 r%ld:%ld 到 “%s” 时出现了一个或更多的冲突\n"
"请解决所有冲突后，再次运行合并，处理剩余的未合并版本"
-#: ../libsvn_client/merge.c:6243
+#: ../libsvn_client/merge.c:6293
#, c-format
msgid "Invalid mergeinfo detected on '%s', merge tracking not possible"
msgstr "在“%s”发现了非法的合并信息；合并跟踪是不可能的"
-#: ../libsvn_client/merge.c:6392
+#: ../libsvn_client/merge.c:6442
msgid "Merge tracking not allowed with missing subtrees; try restoring these items first:\n"
msgstr "合并跟踪不允许丢失子树; 请先恢复这些项目:\n"
-#: ../libsvn_client/merge.c:7394
+#: ../libsvn_client/merge.c:7443
#, c-format
msgid "Invalid mergeinfo detected on merge target '%s', merge tracking not possible"
msgstr "在合并目标“%s”发现了非法的合并信息；合并跟踪是不可能的"
-#: ../libsvn_client/merge.c:9712
+#: ../libsvn_client/merge.c:9761
msgid "Use of two URLs is not compatible with mergeinfo modification"
msgstr "使用两个 URL 与合并信息修改不兼容"
-#: ../libsvn_client/merge.c:9719 ../libsvn_client/merge.c:10054
+#: ../libsvn_client/merge.c:9768 ../libsvn_client/merge.c:10103
msgid "Merge from foreign repository is not compatible with mergeinfo modification"
msgstr "从外部版本库合并与合并信息修改不兼容"
-#: ../libsvn_client/merge.c:10147 ../libsvn_client/merge.c:10290
+#: ../libsvn_client/merge.c:10196 ../libsvn_client/merge.c:10339
#, c-format
msgid "Merge target '%s' does not exist in the working copy"
msgstr "合并目标 “%s” 不在工作副本中"
-#: ../libsvn_client/merge.c:10170
+#: ../libsvn_client/merge.c:10219
msgid "Cannot determine revision of working copy"
msgstr "不能确定工作副本的版本"
-#: ../libsvn_client/merge.c:10176
+#: ../libsvn_client/merge.c:10225
#, c-format
msgid "Cannot merge into mixed-revision working copy [%ld:%ld]; try updating first"
msgstr "不能合并到有混合版本的工作副本 [%ld:%ld] 中；请先更新"
-#: ../libsvn_client/merge.c:10191
+#: ../libsvn_client/merge.c:10240
msgid "Cannot merge into a working copy with a switched subtree"
msgstr "不能合并到已经切换子目录的工作副本中"
-#: ../libsvn_client/merge.c:10207
+#: ../libsvn_client/merge.c:10256
msgid "Cannot merge into a working copy that has local modifications"
msgstr "不能合并到有本地修改的工作副本中"
-#: ../libsvn_client/merge.c:10227 ../svn/merge-cmd.c:60
+#: ../libsvn_client/merge.c:10276 ../svn/merge-cmd.c:56
#, c-format
msgid "Invalid merge source '%s'; a working copy path can only be used with a repository revision (a number, a date, or head)"
msgstr ""
-#: ../libsvn_client/merge.c:10545 ../svn/merge-cmd.c:127
+#: ../libsvn_client/merge.c:10594 ../svn/merge-cmd.c:123
msgid "Merge sources must both be either paths or URLs"
msgstr "合并源必须同时是路径或 URL"
-#: ../libsvn_client/merge.c:11306 ../libsvn_client/merge.c:11468
-#: ../libsvn_client/merge.c:12364
+#: ../libsvn_client/merge.c:11355 ../libsvn_client/merge.c:11517
+#: ../libsvn_client/merge.c:12413
#, c-format
msgid "'%s@%ld' must be ancestrally related to '%s@%ld'"
msgstr "“%s@%ld”必须与“%s@%ld”有祖先关系"
-#: ../libsvn_client/merge.c:11418
+#: ../libsvn_client/merge.c:11467
#, c-format
msgid "Neither the reintegrate source nor target can be the root of the repository"
msgstr "复兴源或目标都不能是版本库的根。"
-#: ../libsvn_client/merge.c:11428
+#: ../libsvn_client/merge.c:11477
msgid "Reintegrate merge not possible"
msgstr "复兴合并是不可能的"
-#: ../libsvn_client/merge.c:11498
+#: ../libsvn_client/merge.c:11547
msgid " Missing ranges: "
msgstr " 丢失的范围: "
-#: ../libsvn_client/merge.c:11501
+#: ../libsvn_client/merge.c:11550
#, 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"
@@ -2122,165 +2142,163 @@ msgstr ""
"复兴只能用于版本 %ld 到 %ld 以前曾经从 %s 合并到复兴源的情况，但是现在不是这种情况：\n"
"%s"
-#: ../libsvn_client/merge.c:11563
+#: ../libsvn_client/merge.c:11612
#, 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:11831
+#: ../libsvn_client/merge.c:11880
msgid "Cannot merge automatically while ignoring mergeinfo"
msgstr ""
-#: ../libsvn_client/merge.c:12586
+#: ../libsvn_client/merge.c:12635
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:12592
+#: ../libsvn_client/merge.c:12641
msgid "The required merge is reintegrate-like, and the depth option cannot be used with this kind of merge"
msgstr ""
-#: ../libsvn_client/merge.c:12598
+#: ../libsvn_client/merge.c:12647
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:1720
+#: ../libsvn_client/mergeinfo.c:1715
msgid "Only depths 'infinity' and 'empty' are currently supported"
msgstr "当前仅支持深度 'infinity' 和 'empty'"
-#: ../libsvn_client/mtcc.c:167
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:166
+#, c-format
msgid "Can't operate on '%s' because '%s' is not a directory"
-msgstr "源 “%s” 不是目录"
+msgstr "不能针对“%s”操作，因为“%s”不是目录"
-#: ../libsvn_client/mtcc.c:320
+#: ../libsvn_client/mtcc.c:319
#, c-format
msgid "No origin found for node at '%s'"
msgstr ""
-#: ../libsvn_client/mtcc.c:358
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:357
+#, c-format
msgid "No such revision %ld (HEAD is %ld)"
-msgstr "没有版本 %ld"
+msgstr "没有版本 %ld (HEAD 是 %ld)"
-#: ../libsvn_client/mtcc.c:406
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:405
+#, c-format
msgid "'%s' is not an ancestor of '%s'"
-msgstr "“%s”与“%s”没有共同的祖先"
+msgstr "“%s”不是“%s”的祖先"
-#: ../libsvn_client/mtcc.c:506
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:504
+#, c-format
msgid "Can't add file at '%s'"
-msgstr "不能读取文件“%s”"
+msgstr "不能在“%s”增加文件"
-#: ../libsvn_client/mtcc.c:538 ../libsvn_client/ra.c:705
-#: ../libsvn_fs_fs/fs_fs.c:1254 ../libsvn_fs_fs/rev_file.c:93
-#: ../libsvn_fs_fs/rev_file.c:104 ../libsvn_fs_x/fs_x.c:558
-#: ../libsvn_fs_x/fs_x.c:597 ../libsvn_repos/log.c:2494
-#: ../libsvn_repos/log.c:2498
+#: ../libsvn_client/mtcc.c:536 ../libsvn_client/ra.c:705
+#: ../libsvn_fs_fs/fs_fs.c:1365 ../libsvn_fs_fs/rev_file.c:177
+#: ../libsvn_fs_fs/rev_file.c:189 ../libsvn_fs_x/fs_x.c:667
+#: ../libsvn_fs_x/rev_file.c:190 ../libsvn_repos/log.c:2343
+#: ../libsvn_repos/log.c:2347
#, c-format
msgid "No such revision %ld"
msgstr "没有版本 %ld"
-#: ../libsvn_client/mtcc.c:560
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:558
+#, c-format
msgid "Can't add node at '%s'"
-msgstr "无法读取目录 “%s”"
+msgstr "不能在“%s”增加节点"
-#: ../libsvn_client/mtcc.c:587
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:585
+#, c-format
msgid "Can't delete node at '%s' as it does not exist"
-msgstr "目标路径 “%s” 不存在"
+msgstr "不能在“%s”删除节点，因为它并不存在"
-#: ../libsvn_client/mtcc.c:604
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:602
+#, c-format
msgid "Can't delete node at '%s'"
-msgstr "不能撤销“%s”"
+msgstr "不能在“%s”删除节点"
-#: ../libsvn_client/mtcc.c:641
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:639
+#, c-format
msgid "Can't create directory at '%s'"
-msgstr "无法创建目录 “%s”"
+msgstr "不能在“%s”创建目录"
-#: ../libsvn_client/mtcc.c:780 ../libsvn_client/prop_commands.c:273
-#: ../libsvn_client/prop_commands.c:468
+#: ../libsvn_client/mtcc.c:778 ../libsvn_client/prop_commands.c:281
+#: ../libsvn_client/prop_commands.c:476
#, c-format
msgid "Bad property name: '%s'"
msgstr "属性名称错误: “%s”"
-#: ../libsvn_client/mtcc.c:784 ../libsvn_client/prop_commands.c:266
+#: ../libsvn_client/mtcc.c:782 ../libsvn_client/prop_commands.c:274
#, c-format
msgid "Revision property '%s' not allowed in this context"
msgstr "此上下文中不允许版本属性 “%s”"
-#: ../libsvn_client/mtcc.c:789 ../libsvn_client/prop_commands.c:60
+#: ../libsvn_client/mtcc.c:787 ../libsvn_client/prop_commands.c:60
#, c-format
msgid "'%s' is a wcprop, thus not accessible to clients"
msgstr "“%s” 是一个工作副本属性，应此不能被客户端存取"
-#: ../libsvn_client/mtcc.c:799
-#, fuzzy
+#: ../libsvn_client/mtcc.c:797
msgid "Error normalizing property value"
-msgstr "外部属性取值:\n"
+msgstr "规格化属性值出错"
-#: ../libsvn_client/mtcc.c:834 ../libsvn_client/mtcc.c:857
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:832 ../libsvn_client/mtcc.c:855
+#, c-format
msgid "Can't set properties at not existing '%s'"
-msgstr "不能在 “%s” 设置权限"
+msgstr "不能在不存在的“%s”上设置属性"
-#: ../libsvn_client/mtcc.c:905
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:903
+#, c-format
msgid "Can't update '%s' because it is not a file"
-msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本目录"
+msgstr "不能更新 '%s'，因为它不是文件"
-#: ../libsvn_client/mtcc.c:916
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:914
+#, c-format
msgid "Can't update file at '%s'"
-msgstr "不能截断文件 “%s”"
+msgstr "不能在“%s”更新文件"
-#: ../libsvn_client/mtcc.c:981
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:979
+#, c-format
msgid "Can't perform directory operation on '%s' as it is not a directory"
-msgstr "不能升级 '%s'，因为它不是 1.7 之前的工作副本目录"
+msgstr "不能对“%s”执行目录操作，因为它不是目录"
-#: ../libsvn_client/mtcc.c:991
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:989
+#, c-format
msgid "Can't perform file operation on '%s' as it is not a file"
-msgstr "不能在没有合法的锁令牌时执行此操作"
+msgstr "不能对“%s”执行文件操作，因为它不是文件"
-#: ../libsvn_client/mtcc.c:998
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:996
+#, c-format
msgid "Can't open '%s' as it does not exist"
-msgstr "路径 “%s” 不存在"
+msgstr "不能打开“%s”，因为它不存在"
-#: ../libsvn_client/mtcc.c:1389
-#, fuzzy, c-format
+#: ../libsvn_client/mtcc.c:1388
+#, c-format
msgid "Can't commit to '%s' because it is not a directory"
-msgstr "不能切换“%s”，因为还不在版本库中"
+msgstr "不能提交到“%s”，因为不是目录"
-#: ../libsvn_client/patch.c:279
+#: ../libsvn_client/patch.c:283
#, c-format
msgid "Cannot strip %u components from '%s'"
msgstr "不能修剪 %u 个组件于“%s”"
-#: ../libsvn_client/patch.c:910
-#, fuzzy
+#: ../libsvn_client/patch.c:914
msgid "Invalid link representation"
-msgstr "正在读取修订版"
+msgstr "非法链接表示"
-#: ../libsvn_client/patch.c:3011
+#: ../libsvn_client/patch.c:3120
msgid "strip count must be positive"
msgstr "修剪计数取值必须为正"
-#: ../libsvn_client/patch.c:3027 ../libsvn_fs_base/tree.c:4093
-#: ../libsvn_fs_base/tree.c:4098 ../libsvn_fs_fs/tree.c:3376
-#: ../libsvn_fs_fs/tree.c:3381 ../libsvn_fs_x/tree.c:3289
-#: ../libsvn_fs_x/tree.c:3294 ../libsvn_ra/compat.c:679
-#: ../libsvn_ra_local/ra_plugin.c:1198
+#: ../libsvn_client/patch.c:3136 ../libsvn_fs_base/tree.c:4081
+#: ../libsvn_fs_base/tree.c:4086 ../libsvn_fs_fs/tree.c:3176
+#: ../libsvn_fs_fs/tree.c:3181 ../libsvn_fs_x/tree.c:3105
+#: ../libsvn_fs_x/tree.c:3110 ../libsvn_ra/compat.c:677
+#: ../libsvn_ra_local/ra_plugin.c:1196
#, c-format
msgid "'%s' is not a file"
msgstr "“%s”不是一个文件"
-#: ../libsvn_client/patch.c:3039 ../libsvn_wc/util.c:59
+#: ../libsvn_client/patch.c:3148 ../libsvn_wc/util.c:59
#, c-format
msgid "'%s' is not a directory"
msgstr "“%s”不是目录"
@@ -2290,55 +2308,55 @@ msgstr "“%s”不是目录"
msgid "Property '%s' is not a regular property"
msgstr "属性 “%s” 不是常规属性"
-#: ../libsvn_client/prop_commands.c:301
+#: ../libsvn_client/prop_commands.c:309
msgid "Targets must be working copy paths"
msgstr "目标必须是工作副本路径"
-#: ../libsvn_client/prop_commands.c:362
+#: ../libsvn_client/prop_commands.c:370
msgid "Targets must be URLs"
msgstr "目标必须是 URL"
-#: ../libsvn_client/prop_commands.c:372
+#: ../libsvn_client/prop_commands.c:380
msgid "Setting property on non-local targets needs a base revision"
msgstr "设定非本地目标的属性需要版本参数"
-#: ../libsvn_client/prop_commands.c:387
+#: ../libsvn_client/prop_commands.c:395
#, c-format
msgid "Setting property '%s' on non-local targets is not supported"
msgstr "不支持对非本地目标设置属性“%s”"
-#: ../libsvn_client/prop_commands.c:415
+#: ../libsvn_client/prop_commands.c:423
#, c-format
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
+#: ../libsvn_client/prop_commands.c:432
#, c-format
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
+#: ../libsvn_client/prop_commands.c:440
#, c-format
msgid "revprop '%s' in r%ld is unexpectedly present in repository (maybe someone else set it?)"
msgstr "revprop “%s” 于版本 r%ld 出乎意料地在版本库中(可能某人设置了？)"
-#: ../libsvn_client/prop_commands.c:463
+#: ../libsvn_client/prop_commands.c:471
msgid "Author name should not contain a newline; value will not be set unless forced"
msgstr "作者名称不能包含换行；除非强迫为之，否则其值不会被设定"
-#: ../libsvn_client/prop_commands.c:577
+#: ../libsvn_client/prop_commands.c:585
#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "没有路径 “%s” 在版本 %ld 中"
-#: ../libsvn_client/prop_commands.c:583 ../libsvn_client/prop_commands.c:1092
+#: ../libsvn_client/prop_commands.c:591 ../libsvn_client/prop_commands.c:1100
#: ../libsvn_wc/crop.c:168
#, c-format
msgid "Unknown node kind for '%s'"
msgstr "“%s” 是未知的节点类型"
#: ../libsvn_client/ra.c:164
-#, fuzzy, c-format
+#, c-format
msgid "Attempt to set wcprop '%s' on '%s' in a non-commit operation"
msgstr "试图在非提交操作中，设定工作副本属性 “%s” 于 “%s”"
@@ -2347,7 +2365,7 @@ msgstr "试图在非提交操作中，�
msgid "Redirect cycle detected for URL '%s'"
msgstr "z在 URL '%s' 检测到循环重定向"
-#: ../libsvn_client/ra.c:731 ../libsvn_ra/compat.c:398
+#: ../libsvn_client/ra.c:731 ../libsvn_ra/compat.c:397
#, c-format
msgid "Unable to find repository location for '%s' in revision %ld"
msgstr "“%s” 的版本库位置不在版本 %ld 中"
@@ -2367,7 +2385,7 @@ msgstr "“%s” 不是版本库的根"
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
+#: ../libsvn_client/repos_diff.c:931 ../libsvn_wc/externals.c:568
#, c-format
msgid "Base checksum mismatch for '%s'"
msgstr "“%s”的校验和错误"
@@ -2384,7 +2402,7 @@ msgstr "“%s” 的请求版本类型�
#: ../libsvn_client/status.c:422 ../libsvn_client/status.c:601
#: ../libsvn_wc/lock.c:564 ../libsvn_wc/lock.c:856 ../libsvn_wc/lock.c:1542
-#: ../libsvn_wc/wc_db.c:13230 ../libsvn_wc/wc_db_wcroot.c:628
+#: ../libsvn_wc/wc_db.c:13235 ../libsvn_wc/wc_db_wcroot.c:638
#, c-format
msgid "'%s' is not a working copy"
msgstr "“%s”不是工作副本"
@@ -2410,7 +2428,7 @@ 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:4875
+#: ../libsvn_ra_local/ra_plugin.c:325 ../libsvn_wc/update_editor.c:4983
#, c-format
msgid ""
"'%s'\n"
@@ -2427,11 +2445,11 @@ msgstr ""
msgid "'%s' shares no common ancestry with '%s'"
msgstr "“%s”与“%s”没有共同的祖先"
-#: ../libsvn_client/update.c:747
+#: ../libsvn_client/update.c:762
msgid "None of the targets are working copies"
msgstr ""
-#: ../libsvn_client/util.c:337
+#: ../libsvn_client/util.c:341
#, c-format
msgid "Cannot mix repository and working copy targets"
msgstr "不能混合版本库和工作副本目标"
@@ -2474,28 +2492,28 @@ msgstr "Delta 没有填充目标窗口"
msgid "Delta does not contain enough new data"
msgstr "Delta 没有包含足够新数据"
-#: ../libsvn_delta/svndiff.c:604
+#: ../libsvn_delta/svndiff.c:608
msgid "Svndiff has invalid header"
msgstr "Svndiff 数据包含无效头"
-#: ../libsvn_delta/svndiff.c:660 ../libsvn_delta/svndiff.c:849
+#: ../libsvn_delta/svndiff.c:664 ../libsvn_delta/svndiff.c:853
msgid "Svndiff contains a too-large window"
msgstr "Svndiff 数据包含太大的窗口"
-#: ../libsvn_delta/svndiff.c:667 ../libsvn_delta/svndiff.c:856
+#: ../libsvn_delta/svndiff.c:671 ../libsvn_delta/svndiff.c:860
msgid "Svndiff contains corrupt window header"
msgstr "Svndiff 数据包含无效窗口"
-#: ../libsvn_delta/svndiff.c:676
+#: ../libsvn_delta/svndiff.c:680
msgid "Svndiff has backwards-sliding source views"
msgstr "Svndiff 数据包含向后变化的资源视图"
-#: ../libsvn_delta/svndiff.c:733 ../libsvn_delta/svndiff.c:790
-#: ../libsvn_delta/svndiff.c:878
+#: ../libsvn_delta/svndiff.c:737 ../libsvn_delta/svndiff.c:794
+#: ../libsvn_delta/svndiff.c:882
msgid "Unexpected end of svndiff input"
msgstr "svndiff 输入意料结束"
-#: ../libsvn_diff/diff_file.c:184
+#: ../libsvn_diff/diff_file.c:186
#, c-format
msgid "File '%s' is too large to be read in to memory"
msgstr ""
@@ -2505,61 +2523,61 @@ msgstr ""
msgid "The file '%s' changed unexpectedly during diff"
msgstr "文件“%s”在比较期间意外改变"
-#: ../libsvn_diff/diff_file.c:1276
+#: ../libsvn_diff/diff_file.c:1280
msgid "Error in options to internal diff"
msgstr "内部比较的选项错误"
-#: ../libsvn_diff/diff_file.c:1302
+#: ../libsvn_diff/diff_file.c:1309
#, c-format
msgid "Invalid argument '%s' in diff options"
msgstr "diff 选项中参数'%s'无效"
#. Order of date components can be different in different languages
-#: ../libsvn_diff/diff_file.c:1799
+#: ../libsvn_diff/diff_file.c:1808
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%a %b %e %H:%M:%S %Y"
-#: ../libsvn_diff/diff_file.c:1877 ../libsvn_diff/diff_file.c:1893
-#, fuzzy, c-format
+#: ../libsvn_diff/diff_file.c:1889 ../libsvn_diff/diff_file.c:1905
+#, c-format
msgid "Path '%s' must be inside the directory '%s'"
-msgstr "路径 “%s” 必须是目录 “%s” 的直接子孙"
+msgstr "路径“%s”必须在目录“%s”中"
-#: ../libsvn_diff/diff_file.c:2415
+#: ../libsvn_diff/diff_file.c:2451
#, c-format
msgid "Failed to delete mmap '%s'"
msgstr "删除 mmap“%s”失败"
-#: ../libsvn_diff/util.c:469
+#: ../libsvn_diff/util.c:477
#, c-format
msgid " Reverse-merged %s:r%s%s"
msgstr " 已经撤销合并 %s:r%s%s"
-#: ../libsvn_diff/util.c:486
+#: ../libsvn_diff/util.c:494
#, c-format
msgid " Merged %s:r%s%s"
msgstr " 已经合并 %s:r%s%s"
-#: ../libsvn_fs/editor.c:219
+#: ../libsvn_fs/editor.c:217
#, c-format
msgid "Revision for modifying '%s' is required"
msgstr ""
-#: ../libsvn_fs/editor.c:228
+#: ../libsvn_fs/editor.c:226
#, c-format
msgid "'%s' is out of date; try updating"
msgstr "“%s” 已经过时；请先更新"
-#: ../libsvn_fs/editor.c:260
+#: ../libsvn_fs/editor.c:258
#, c-format
msgid "'%s' has been modified since the commit began (restart the commit)"
msgstr "自提交开始，“%s” 已有本地修改 (重新提交)"
-#: ../libsvn_fs/editor.c:318
+#: ../libsvn_fs/editor.c:316
#, c-format
msgid "'%s' already exists, so may be out of date; try updating"
msgstr "“%s” 已经存在，因此可能过时；请先更新"
-#: ../libsvn_fs/editor.c:451
+#: ../libsvn_fs/editor.c:449
msgid "The filesystem does not support 'absent' nodes"
msgstr "此文件系统不支持 'absent' 节点"
@@ -2584,60 +2602,60 @@ msgstr "加载 “%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:294
+#: ../libsvn_fs/fs-loader.c:301
#, c-format
msgid "Unknown FS type '%s'"
msgstr "未知的文件系统类型 “%s”"
-#: ../libsvn_fs/fs-loader.c:436
+#: ../libsvn_fs/fs-loader.c:443
#, c-format
msgid "Path '%s' is not in UTF-8"
msgstr "路径 “%s” 不是 UTF-8 编码"
-#: ../libsvn_fs/fs-loader.c:444
+#: ../libsvn_fs/fs-loader.c:451
#, c-format
msgid "Path '%s' contains '.' or '..' element"
msgstr "路径 “%s” 包含 “.” 或 “..” 元素"
-#: ../libsvn_fs/fs-loader.c:624 ../libsvn_repos/repos.c:2115
+#: ../libsvn_fs/fs-loader.c:636 ../libsvn_repos/repos.c:2175
msgid "Hotcopy source and destination are equal"
msgstr ""
-#: ../libsvn_fs/fs-loader.c:634
+#: ../libsvn_fs/fs-loader.c:646
#, c-format
msgid "'%s' already exists and is a file"
msgstr "“%s”已存在，它是文件"
-#: ../libsvn_fs/fs-loader.c:639
+#: ../libsvn_fs/fs-loader.c:651
#, c-format
msgid "'%s' already exists and has an unknown node kind"
msgstr "“%s”已存在，具有未知的节点类型"
-#: ../libsvn_fs/fs-loader.c:657
+#: ../libsvn_fs/fs-loader.c:669
#, c-format
msgid "The filesystem type of the hotcopy source ('%s') does not match the filesystem type of the hotcopy destination ('%s')"
msgstr ""
-#: ../libsvn_fs/fs-loader.c:1594
+#: ../libsvn_fs/fs-loader.c:1571
#, c-format
msgid "Malformed UUID '%s'"
msgstr "非法 UUID “%s”"
-#: ../libsvn_fs/fs-loader.c:1623
+#: ../libsvn_fs/fs-loader.c:1600
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "传递到 svn_fs_lock 的有效期非法"
-#: ../libsvn_fs/fs-loader.c:1638
+#: ../libsvn_fs/fs-loader.c:1615
#, c-format
msgid "Lock token URI '%s' has bad scheme; expected '%s'"
msgstr "锁令牌 URI '%s' 的方案错误；期望是 '%s'"
-#: ../libsvn_fs/fs-loader.c:1647
-#, fuzzy, c-format
+#: ../libsvn_fs/fs-loader.c:1624
+#, c-format
msgid "Lock token '%s' is not ASCII or is a control character at byte %u"
-msgstr "锁令牌 '%s' 在字节 %u 处不是 ASCII 字符"
+msgstr "锁令牌 '%s' 在字节 %u 处，不是 ASCII 字符或者是一个控制字符"
-#: ../libsvn_fs/fs-loader.c:1655
+#: ../libsvn_fs/fs-loader.c:1632
#, c-format
msgid "Lock token URI '%s' is not XML-safe"
msgstr "锁令牌 URI '%s' 不是 XML 安全的"
@@ -2655,44 +2673,44 @@ msgstr "正在创建修改"
msgid "deleting changes"
msgstr "正在删除修改"
-#: ../libsvn_fs_base/bdb/changes-table.c:150 ../libsvn_fs_fs/transaction.c:695
-#: ../libsvn_fs_x/transaction.c:683
+#: ../libsvn_fs_base/bdb/changes-table.c:170 ../libsvn_fs_fs/transaction.c:665
+#: ../libsvn_fs_x/transaction.c:902
msgid "Missing required node revision ID"
msgstr "缺少必须的节点版本 ID"
-#: ../libsvn_fs_base/bdb/changes-table.c:161 ../libsvn_fs_fs/transaction.c:705
-#: ../libsvn_fs_x/transaction.c:693
+#: ../libsvn_fs_base/bdb/changes-table.c:181 ../libsvn_fs_fs/transaction.c:675
+#: ../libsvn_fs_x/transaction.c:912
msgid "Invalid change ordering: new node revision ID without delete"
msgstr "无效的改变顺序: 没有删除新节点版本 ID"
-#: ../libsvn_fs_base/bdb/changes-table.c:171 ../libsvn_fs_fs/transaction.c:718
-#: ../libsvn_fs_x/transaction.c:706
+#: ../libsvn_fs_base/bdb/changes-table.c:191 ../libsvn_fs_fs/transaction.c:686
+#: ../libsvn_fs_x/transaction.c:923
msgid "Invalid change ordering: non-add change on deleted path"
msgstr "无效的改变顺序: 在已经删除的路径执行非增加修改"
-#: ../libsvn_fs_base/bdb/changes-table.c:180 ../libsvn_fs_fs/transaction.c:728
-#: ../libsvn_fs_x/transaction.c:715
+#: ../libsvn_fs_base/bdb/changes-table.c:200 ../libsvn_fs_fs/transaction.c:695
+#: ../libsvn_fs_x/transaction.c:932
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
+#: ../libsvn_fs_base/bdb/changes-table.c:296
+#: ../libsvn_fs_base/bdb/changes-table.c:420
msgid "creating cursor for reading changes"
msgstr "正在为读取修改创建指针"
-#: ../libsvn_fs_base/bdb/changes-table.c:297
-#: ../libsvn_fs_base/bdb/changes-table.c:416
+#: ../libsvn_fs_base/bdb/changes-table.c:321
+#: ../libsvn_fs_base/bdb/changes-table.c:441
#, 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
+#: ../libsvn_fs_base/bdb/changes-table.c:381
+#: ../libsvn_fs_base/bdb/changes-table.c:464
msgid "fetching changes"
msgstr "正在获取修改"
-#: ../libsvn_fs_base/bdb/changes-table.c:369
-#: ../libsvn_fs_base/bdb/changes-table.c:452
+#: ../libsvn_fs_base/bdb/changes-table.c:394
+#: ../libsvn_fs_base/bdb/changes-table.c:477
msgid "closing changes cursor"
msgstr "正在关闭修改指针"
@@ -3016,19 +3034,19 @@ msgstr "损坏的数据库: 初始的版
msgid "Attempted to get entries of a non-directory node"
msgstr "试图从非目录节点中获取条目"
-#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:374
-#: ../libsvn_fs_x/dag.c:374
+#: ../libsvn_fs_base/dag.c:461 ../libsvn_fs_fs/dag.c:377
+#: ../libsvn_fs_x/dag.c:377
#, 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:380
-#: ../libsvn_fs_x/dag.c:380
+#: ../libsvn_fs_base/dag.c:467 ../libsvn_fs_fs/dag.c:383
+#: ../libsvn_fs_x/dag.c:383
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:386 ../libsvn_fs_x/dag.c:386
+#: ../libsvn_fs_fs/dag.c:389 ../libsvn_fs_x/dag.c:389
#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "试图克隆非可变节点的子节点"
@@ -3038,13 +3056,13 @@ msgstr "试图克隆非可变节点的�
msgid "Attempted to create entry that already exists"
msgstr "试图创建已经存在的条目"
-#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:465
-#: ../libsvn_fs_x/dag.c:465
+#: ../libsvn_fs_base/dag.c:529 ../libsvn_fs_fs/dag.c:468
+#: ../libsvn_fs_x/dag.c:468
msgid "Attempted to set entry in non-directory node"
msgstr "试图在非目录节点中设置条目"
-#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:471
-#: ../libsvn_fs_x/dag.c:471
+#: ../libsvn_fs_base/dag.c:535 ../libsvn_fs_fs/dag.c:474
+#: ../libsvn_fs_x/dag.c:474
msgid "Attempted to set entry in immutable node"
msgstr "试图在不变节点设置条目"
@@ -3143,8 +3161,8 @@ msgstr "节点合并信息计数的值�
msgid "Corrupt filesystem revision %ld in filesystem '%s'"
msgstr "文件系统版本 %ld 损坏，其文件系统是 “%s”"
-#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:274
-#: ../libsvn_fs_x/cached_data.c:259
+#: ../libsvn_fs_base/err.c:57 ../libsvn_fs_fs/cached_data.c:276
+#: ../libsvn_fs_x/cached_data.c:261
#, c-format
msgid "Reference to non-existent node '%s' in filesystem '%s'"
msgstr "引用不存在的节点 “%s”，其文件系统是 “%s”"
@@ -3343,12 +3361,12 @@ msgstr "“%s”特性需要文件系统
msgid "Expected FS format '%d'; found format '%d'"
msgstr "期望文件系统格式“%d”；发现格式“%d”"
-#: ../libsvn_fs_base/fs.c:1307
+#: ../libsvn_fs_base/fs.c:1309
#, c-format
msgid "BDB repositories do not support incremental hotcopy"
msgstr ""
-#: ../libsvn_fs_base/fs.c:1411
+#: ../libsvn_fs_base/fs.c:1413
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature\n"
"may be interfering with the hotcopy algorithm. If\n"
@@ -3358,7 +3376,7 @@ msgstr ""
"复制日志文件出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直存在，请\n"
"尝试在 DB_CONFIG 中禁用此特性。"
-#: ../libsvn_fs_base/fs.c:1430
+#: ../libsvn_fs_base/fs.c:1432
msgid ""
"Error running catastrophic recovery on hotcopy; the\n"
"DB_LOG_AUTOREMOVE feature may be interfering with the\n"
@@ -3368,37 +3386,37 @@ msgstr ""
"热复制时执行灾难恢复出错；DB_LOG_AUTOREMOVE 特性可能妨碍热复制。如果问题一直\n"
"存在，请尝试在 DB_CONFIG 中禁用此特性。"
-#: ../libsvn_fs_base/fs.c:1475
+#: ../libsvn_fs_base/fs.c:1477
msgid "Module for working with a Berkeley DB repository."
msgstr "模块只能操作BDB版本库。"
-#: ../libsvn_fs_base/fs.c:1523
+#: ../libsvn_fs_base/fs.c:1526
#, c-format
msgid "Unsupported FS loader version (%d) for bdb"
msgstr "不支持的BDB之FS加载器版本 (%d)"
#: ../libsvn_fs_base/lock.c:121 ../libsvn_fs_base/lock.c:126
-#: ../libsvn_fs_fs/lock.c:757 ../libsvn_fs_fs/lock.c:762
-#: ../libsvn_fs_fs/lock.c:783 ../libsvn_fs_x/lock.c:757
-#: ../libsvn_fs_x/lock.c:762 ../libsvn_fs_x/lock.c:783
+#: ../libsvn_fs_fs/lock.c:758 ../libsvn_fs_fs/lock.c:763
+#: ../libsvn_fs_fs/lock.c:784 ../libsvn_fs_x/lock.c:758
+#: ../libsvn_fs_x/lock.c:763 ../libsvn_fs_x/lock.c:784
#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
msgstr "HEAD中没有路径“%s”"
-#: ../libsvn_fs_base/lock.c:598 ../libsvn_fs_fs/lock.c:660
-#: ../libsvn_fs_x/lock.c:660
+#: ../libsvn_fs_base/lock.c:598 ../libsvn_fs_fs/lock.c:661
+#: ../libsvn_fs_x/lock.c:661
#, c-format
msgid "Cannot verify lock on path '%s'; no username available"
msgstr "不能校验路径“%s”上的锁；没有用户名"
-#: ../libsvn_fs_base/lock.c:604 ../libsvn_fs_fs/lock.c:666
-#: ../libsvn_fs_x/lock.c:666
+#: ../libsvn_fs_base/lock.c:604 ../libsvn_fs_fs/lock.c:667
+#: ../libsvn_fs_x/lock.c:667
#, 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:610 ../libsvn_fs_fs/lock.c:672
-#: ../libsvn_fs_x/lock.c:672
+#: ../libsvn_fs_base/lock.c:610 ../libsvn_fs_fs/lock.c:673
+#: ../libsvn_fs_x/lock.c:673
#, c-format
msgid "Cannot verify lock on path '%s'; no matching lock-token available"
msgstr "不能校验路径“%s”的锁；没有匹配的可用锁令牌"
@@ -3486,8 +3504,8 @@ msgstr "事务未结束: “%s”"
msgid "Transaction is dead: '%s'"
msgstr "事务已结束: “%s”"
-#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:1882
-#: ../libsvn_fs_x/fs_x.c:1162
+#: ../libsvn_fs_base/revs-txns.c:272 ../libsvn_fs_fs/fs_fs.c:2079
+#: ../libsvn_fs_x/fs_x.c:1141
#, c-format
msgid "revprop '%s' has unexpected value in filesystem"
msgstr "revprop“%s”在文件系统中有不期望的值"
@@ -3508,14 +3526,14 @@ msgstr ""
msgid "committing Berkeley DB transaction"
msgstr ""
-#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:1113
-#: ../libsvn_fs_x/tree.c:1088
+#: ../libsvn_fs_base/tree.c:773 ../libsvn_fs_fs/tree.c:1104
+#: ../libsvn_fs_x/tree.c:1083
#, c-format
msgid "Failure opening '%s'"
msgstr "打开“%s”失败"
-#: ../libsvn_fs_base/tree.c:1445 ../libsvn_fs_fs/tree.c:1632
-#: ../libsvn_fs_x/tree.c:1602
+#: ../libsvn_fs_base/tree.c:1445 ../libsvn_fs_fs/tree.c:1623
+#: ../libsvn_fs_x/tree.c:1601
msgid "Cannot compare property value between two different filesystems"
msgstr "不能在两个不同的文件系统之间比较属性值"
@@ -3528,20 +3546,20 @@ msgstr "损坏的数据库: 先前的数
msgid "Unexpected immutable node at '%s'"
msgstr "“%s”有意外的不变节点"
-#: ../libsvn_fs_base/tree.c:2057 ../libsvn_fs_fs/tree.c:1662
-#: ../libsvn_fs_x/tree.c:1632 ../libsvn_repos/commit.c:1241
+#: ../libsvn_fs_base/tree.c:2057 ../libsvn_fs_fs/tree.c:1653
+#: ../libsvn_fs_x/tree.c:1631 ../libsvn_repos/commit.c:1241
#, c-format
msgid "Conflict at '%s'"
msgstr "在“%s”冲突"
#: ../libsvn_fs_base/tree.c:2110 ../libsvn_fs_base/tree.c:2862
-#: ../libsvn_fs_fs/tree.c:1760 ../libsvn_fs_fs/tree.c:2306
-#: ../libsvn_fs_x/tree.c:1732 ../libsvn_fs_x/tree.c:2267
+#: ../libsvn_fs_fs/tree.c:1751 ../libsvn_fs_fs/tree.c:2305
+#: ../libsvn_fs_x/tree.c:1721 ../libsvn_fs_x/tree.c:2260
msgid "Bad merge; ancestor, source, and target not all in same fs"
msgstr "错误的合并；初始，原始，目标不在同一个文件系统"
-#: ../libsvn_fs_base/tree.c:2126 ../libsvn_fs_fs/tree.c:1776
-#: ../libsvn_fs_x/tree.c:1748
+#: ../libsvn_fs_base/tree.c:2126 ../libsvn_fs_fs/tree.c:1767
+#: ../libsvn_fs_x/tree.c:1737
#, c-format
msgid "Bad merge; target '%s' has id '%s', same as ancestor"
msgstr "错误的合并: 目标“%s”拥有标识“%s”，与初始相同"
@@ -3556,272 +3574,405 @@ msgstr "事务 “%s” 过时，对于�
msgid "Cannot deltify revisions prior to r%ld"
msgstr "不能在 r%ld 之前计算增量变化"
-#: ../libsvn_fs_base/tree.c:3064 ../libsvn_fs_fs/tree.c:2489
-#: ../libsvn_fs_x/tree.c:2417
+#: ../libsvn_fs_base/tree.c:3064 ../libsvn_fs_fs/tree.c:2485
+#: ../libsvn_fs_x/tree.c:2423
msgid "The root directory cannot be deleted"
msgstr "不能删除根目录"
-#: ../libsvn_fs_base/tree.c:3277 ../libsvn_fs_fs/tree.c:2633
-#: ../libsvn_fs_x/tree.c:2560
+#: ../libsvn_fs_base/tree.c:3277 ../libsvn_fs_fs/tree.c:2555
+#: ../libsvn_fs_x/tree.c:2492
#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
msgstr "不能在两个不同的文件系统(“%s”和“%s”)之间复制"
-#: ../libsvn_fs_base/tree.c:3286 ../libsvn_fs_fs/tree.c:2640
-#: ../libsvn_fs_x/tree.c:2567
+#: ../libsvn_fs_base/tree.c:3286 ../libsvn_fs_fs/tree.c:2562
+#: ../libsvn_fs_x/tree.c:2499
msgid "Copy from mutable tree not currently supported"
msgstr "当前不支持从可变的树复制"
-#: ../libsvn_fs_base/tree.c:3808 ../libsvn_fs_fs/tree.c:3151
-#: ../libsvn_fs_x/tree.c:3064
+#: ../libsvn_fs_base/tree.c:3796 ../libsvn_fs_fs/tree.c:2957
+#: ../libsvn_fs_x/tree.c:2886
#, c-format
msgid "Base checksum mismatch on '%s'"
msgstr "'%s' 的校验和错误"
-#: ../libsvn_fs_base/tree.c:4084 ../libsvn_fs_fs/tree.c:3367
-#: ../libsvn_fs_x/tree.c:3280
+#: ../libsvn_fs_base/tree.c:4072 ../libsvn_fs_fs/tree.c:3167
+#: ../libsvn_fs_x/tree.c:3096
msgid "Cannot compare file contents between two different filesystems"
msgstr "不能在两个不同的文件系统间比较文件内容"
-#: ../libsvn_fs_base/tree.c:5128 ../libsvn_fs_base/tree.c:5303
+#: ../libsvn_fs_base/tree.c:5121 ../libsvn_fs_base/tree.c:5296
#, c-format
msgid "Node-revision '%s' claims to have mergeinfo but doesn't"
msgstr "节点版本“%s”声称自己有合并信息，实际上却没有"
-#: ../libsvn_fs_base/tree.c:5164
+#: ../libsvn_fs_base/tree.c:5157
#, c-format
msgid "Node-revision '%s' claims to sit atop a tree containing mergeinfo but is not a directory"
msgstr "节点版本“%s”声称自己是包含合并信息的树顶，实际上却不是目录"
-#: ../libsvn_fs_fs/cached_data.c:696 ../libsvn_fs_x/cached_data.c:1208
+#: ../libsvn_fs_fs/cached_data.c:709 ../libsvn_fs_x/cached_data.c:584
msgid "Malformed svndiff data in representation"
msgstr "修订版的 svndiff 数据非法"
-#: ../libsvn_fs_fs/cached_data.c:914
-msgid "No representation found at offset %s for item %"
-msgstr ""
+#: ../libsvn_fs_fs/cached_data.c:956 ../libsvn_fs_x/cached_data.c:844
+#, c-format
+msgid "No representation found at offset %s for item %s in revision %ld"
+msgstr "在偏移 %s 发现非展现数据，项目 %s，版本 %ld"
-#: ../libsvn_fs_fs/cached_data.c:1446 ../libsvn_fs_fs/cached_data.c:1458
[... 11750 lines stripped ...]