David Glasser wrote:
> On 8/22/06, Max Bowsher <maxb1@ukf.net> wrote:
>> Hmm, the previous format is rather long-winded. Here's a tabular form.
>>
>> Translation status report for revision 21204 (branches/1.4.x/)
>
> Note that a fair number of these are better on trunk (though the ones
> in need of the most work, de and zh_CN, are not yet).
>
> --dave
>
Sorry for finishing it so late, last weekend I prepared to start
translation, but I found I hadn't merged zh_CN.po with latest
subversion.pot and I couldn't connect to internet at home :-(
Yesterday I sent the nearly finised translation to some boards at
a BBS here, and I got very little feedback, it seems very few people
are interested in translation (indeed, it's not so interesting...).
I will send the po files to svn-users mail list, but I'm afraid they
can't be reviewed enough before 1.4.0 released, so I hope they can
be committed to repos first and then wait somebody to maintain them.
(If nobody stands out, I would like to do this job)
Note I have not reviewed all the old translated items, I think they
need be reviewed again.
I have run "make locale", it's ok.
Any suggestions or comments are welcomed.
BTW: Noritada, thank you again for your guide, I find Emacs with po mode
is really wonderful:-)
Best regards,
Liu Yubao
[[[
* subversion/po/zh_CN.po: finish all untranslated and fuzzy items,
remove all obsolete items.
]]]
diff -u msgmerged\zh_CN.po translated\zh_CN.po
--- msgmerged\zh_CN.po Wed Aug 23 10:59:56 2006
+++ translated\zh_CN.po Wed Aug 23 11:00:09 2006
@@ -1,13 +1,76 @@
# Simplified Chinese translation for subversion package
-# Copyright (C) 2004 CollabNet.
+# Copyright (C) 2006 CollabNet.
# This file is distributed under the same license as the subversion package.
#
+#
+# 翻译工具:
+# Emacs + po-mode,åŽè€…在GNU gettext包ä¸ï¼Œä½¿ç”¨æ–‡æ¡£å‚考gettext手册,windows版本下载地å€ï¼š
+# http://ntemacs.sourceforge.net (推�Emacs 23)
+# http://gettext.sourceforge.net
+# http://unxutils.sourceforge.net (�是必须)
+#
+# �考http://svn.collab.net/repos/svn/trunk/TRANSLATING%e4%bb%a5%e8%8e%b7%e5%be%97subversion.pot,
+# 与zh_CN.poåˆå¹¶åŽå†è¿›è¡Œç¿»è¯‘。
+#
+# -----------------------> .emacs (Emacs 23 for windows)
+# ;; from GNU gettext manual
+# (setq auto-mode-alist
+# (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist))
+# (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+# (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\."
+# 'po-find-file-coding-system)
+# (autoload 'po-find-file-coding-system "po-mode")
+#
+# (setq w32-charset-info-alist
+# (cons '("gbk" w32-charset-gb2312 . 936) w32-charset-info-alist))
+#
+#
+# ;; from brep at newsmth.net
+# (setq default-frame-alist
+# (append
+# '((font . "fontset-gbk")) default-frame-alist))
+#
+# (create-fontset-from-fontset-spec
+# "-outline-Courier New-normal-r-normal-normal-13-97-96-96-c-*-fontset-gbk")
+# (set-fontset-font
+# "fontset-default" nil
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'kana
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'han
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'cjk-misc
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'symbol
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-default-font "fontset-gbk")
+#
+# -------------------------------
+#
+# 翻译术è¯è¡¨ï¼š
+# attribute 属性
+# 指XML文件ä¸ä¸€ä¸ªæ ‡è®°èŠ‚ç‚¹çš„å±žæ€§
+# element å…ƒç´
+# 指XML文件ä¸çš„ä¸€ä¸ªæ ‡è®°èŠ‚ç‚¹
+# parse è§£æž
+# representation 修订版
+# 简写作rep,指æ¯ä¸€ä¸ªä¿®è®¢ç‰ˆåœ¨æ–‡ä»¶ç³»ç»Ÿä¸çš„具体å˜å‚¨å½¢å¼ï¼Œç¿»è¯‘æˆâ€œå˜å‚¨è¡¨ç¤ºâ€
+# 并䏿¸…楚,便æ„译为“修订版â€
+# repository 档案库
+# revision 修订版
+# scheme 方案
+# 指URLä¸çš„svn://, http://%e8%bf%99%e6%a0%b7%e7%9a%84%e9%83%a8%e5%88%86
+#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.2.0\n"
+"Project-Id-Version: subversion trunk\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
"POT-Creation-Date: 2006-08-21 06:57-0400\n"
-"PO-Revision-Date: 2004-09-12 22:05+0800\n"
+"PO-Revision-Date: 2006-08-23 00:03+0800\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -230,14 +293,12 @@
msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
#: include/svn_error_codes.h:387
-#, fuzzy
msgid "Invalid relocation"
-msgstr "æ— æ•ˆçš„é”定"
+msgstr "æ— æ•ˆçš„é‡å®šä½"
#: include/svn_error_codes.h:392
-#, fuzzy
msgid "Invalid switch"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+msgstr "æ— æ•ˆçš„åˆ‡æ¢"
#: include/svn_error_codes.h:398
msgid "General filesystem error"
@@ -277,7 +338,7 @@
#: include/svn_error_codes.h:434
msgid "Filesystem has no such representation"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
+msgstr "æ–‡ä»¶ç³»ç»Ÿä¸æ²¡æœ‰è¿™ä¸ªä¿®è®¢ç‰ˆ"
#: include/svn_error_codes.h:438
msgid "Filesystem has no such string"
@@ -342,11 +403,11 @@
# as-is
#: include/svn_error_codes.h:498
msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改å˜"
+msgstr "åœ¨è¯»å–æ—¶ä¸€ä¸ªä¿®è®¢ç‰ˆæ¶ˆå¤±æˆ–被改å˜"
#: include/svn_error_codes.h:502
msgid "Tried to change an immutable representation"
-msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
+msgstr "å°è¯•更改一个ä¸å¯å˜çš„修订版"
#: include/svn_error_codes.h:506
msgid "Malformed skeleton data"
@@ -377,26 +438,22 @@
msgstr "未知的 FS 类别"
#: include/svn_error_codes.h:536
-#, fuzzy
msgid "No user associated with filesystem"
msgstr "没有用户与文件系统关è”"
#: include/svn_error_codes.h:541
-#, fuzzy
msgid "Path is already locked"
-msgstr "路径“%sâ€å·²ç»è¢«é”定"
+msgstr "路径已ç»è¢«é”定"
#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
-#, fuzzy
msgid "Path is not locked"
msgstr "路径没有被é”定"
#: include/svn_error_codes.h:551
msgid "Lock token is incorrect"
-msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
+msgstr "é”å®šæ ‡è®°ä¸æ£ç¡®"
#: include/svn_error_codes.h:556
-#, fuzzy
msgid "No lock token provided"
msgstr "没有æä¾›é”å®šæ ‡è®°"
@@ -405,7 +462,6 @@
msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
#: include/svn_error_codes.h:566
-#, fuzzy
msgid "Filesystem has no such lock"
msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
@@ -414,14 +470,12 @@
msgstr "é”过期"
#: include/svn_error_codes.h:576
-#, fuzzy
msgid "Item is out of date"
-msgstr "æ¡ç›®å·²è¿‡æ—¶"
+msgstr "æ¡ç›®å·²è¿‡æœŸ"
#: include/svn_error_codes.h:588
-#, fuzzy
msgid "Unsupported FS format"
-msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
+msgstr "䏿”¯æŒçš„æ–‡ä»¶ç³»ç»Ÿæ ¼å¼"
#: include/svn_error_codes.h:594
msgid "The repository is locked, perhaps for db recovery"
@@ -456,12 +510,10 @@
msgstr "执行 post-commit 外挂时å‘生错误"
#: include/svn_error_codes.h:632
-#, fuzzy
msgid "Error running post-lock hook"
msgstr "执行 post-lock 外挂时å‘生错误"
#: include/svn_error_codes.h:637
-#, fuzzy
msgid "Error running post-unlock hook"
msgstr "执行 post-unlock 外挂时å‘生错误"
@@ -526,7 +578,6 @@
msgstr "找ä¸åˆ° HTTP 路径"
#: include/svn_error_codes.h:712
-#, fuzzy
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "执行 WebDAV PROPPATCH 失败"
@@ -586,24 +637,20 @@
msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
#: include/svn_error_codes.h:792
-#, fuzzy
msgid "Item is not readable"
-msgstr "项目ä¸èƒ½è¯»ã€‚"
+msgstr "æ¡ç›®ä¸å¯è¯»"
#: include/svn_error_codes.h:797
-#, fuzzy
msgid "Item is partially readable"
-msgstr "项目部分å¯è¯»ã€‚"
+msgstr "æ¡ç›®éƒ¨åˆ†å¯è¯»"
#: include/svn_error_codes.h:801
-#, fuzzy
msgid "Invalid authz configuration"
-msgstr "æ— æ•ˆçš„é…置值"
+msgstr "æ— æ•ˆçš„authzé…ç½®"
#: include/svn_error_codes.h:806
-#, fuzzy
msgid "Item is not writable"
-msgstr "项目ä¸èƒ½å†™ã€‚"
+msgstr "æ¡ç›®ä¸å¯å†™"
#: include/svn_error_codes.h:812
msgid "Svndiff data has invalid header"
@@ -628,14 +675,12 @@
msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
#: include/svn_error_codes.h:832
-#, fuzzy
msgid "Svndiff compressed data is invalid"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+msgstr "Svndiff åŽ‹ç¼©æ•°æ®æ— 效"
#: include/svn_error_codes.h:838
-#, fuzzy
msgid "Diff data source modified unexpectedly"
-msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+msgstr "Diffæ•°æ®æºè¢«æ„外修改"
#: include/svn_error_codes.h:844
msgid "Apache has no path to an SVN filesystem"
@@ -800,7 +845,7 @@
#: include/svn_error_codes.h:1015
msgid "Not enough arguments provided; try 'svn help' for more info"
-msgstr ""
+msgstr "傿•°ä¸å¤Ÿï¼Œè¯·ç”¨â€œsvn helpâ€èŽ·å–帮助"
#: include/svn_error_codes.h:1019
msgid "Mutually exclusive arguments specified"
@@ -851,7 +896,7 @@
#: libsvn_client/blame.c:522
msgid "blame of the WORKING revision is not supported"
-msgstr ""
+msgstr "blame䏿”¯æŒå·¥ä½œä¿®è®¢ç‰ˆ"
#: libsvn_client/blame.c:535
msgid "Start revision must precede end revision"
@@ -868,12 +913,12 @@
msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not under version control or doesn't exist"
msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
#: libsvn_client/cat.c:79
-#, fuzzy, c-format
+#, c-format
msgid "'%s' refers to a directory"
msgstr "“%sâ€å¼•用一个目录"
@@ -898,14 +943,13 @@
msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
#: libsvn_client/checkout.c:171
-#, fuzzy
msgid "; run 'svn update' to complete it"
msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
#: libsvn_client/checkout.c:181
-#, fuzzy, c-format
+#, c-format
msgid "'%s' already exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+msgstr "“%sâ€å·²å˜åœ¨ä¸”䏿˜¯ç›®å½•"
#: libsvn_client/commit.c:198
#, c-format
@@ -964,7 +1008,7 @@
#: libsvn_client/commit.c:1407
msgid "Are all the targets part of the same working copy?"
-msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部分?"
#: libsvn_client/commit.c:1422
msgid "Cannot non-recursively commit a directory deletion"
@@ -1043,7 +1087,7 @@
"'%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â€æ˜¯æäº¤çš„一部份"
+"“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œä¹Ÿä¸æ˜¯æäº¤çš„一部分,但是它的å路径“%sâ€æ˜¯æäº¤çš„一部分"
#: libsvn_client/commit_util.c:885
#, c-format
@@ -1056,13 +1100,13 @@
msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
#: libsvn_client/copy.c:95 libsvn_client/copy.c:768
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is not a directory"
-msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
+msgstr "路径“%sâ€ä¸æ˜¯ç›®å½•"
#: libsvn_client/copy.c:138
msgid "Move will not be attempted unless forced"
-msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
+msgstr "除éžå¼ºåˆ¶æ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
#: libsvn_client/copy.c:334
#, c-format
@@ -1147,23 +1191,19 @@
msgstr "åå—:%s%s"
#: libsvn_client/diff.c:203
-#, fuzzy, c-format
+#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"sâ€ä¸Žâ€œ%sâ€)"
+msgstr "地å�€(URL)䏿²¡æœ‰æ–¹æ¡ˆå��(指svn://, http://, file://ç‰ï¼‰ï¼ˆâ€œ%sâ€�与“%sâ€�)"
#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, fuzzy, c-format
+#, c-format
msgid "URL has no scheme: '%s'"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"sâ€"
+msgstr "地å�€(URL)䏿²¡æœ‰æ–¹æ¡ˆå��(指svn://, http://, file://ç‰ï¼‰ï¼ˆâ€œ%sâ€�)"
#: libsvn_client/diff.c:222
-#, fuzzy, c-format
+#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
+msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–方案 (“%sâ€ä¸Žâ€œ%sâ€)"
# as-is
#: libsvn_client/diff.c:287
@@ -1216,9 +1256,8 @@
msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
#: libsvn_client/diff.c:1960
-#, fuzzy
msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
+msgstr "抱æ‰ï¼Œsvn_client_diff3 å°šä¸æ”¯æŒè¿™ç§è°ƒç”¨æ–¹å¼"
#: libsvn_client/diff.c:1999
msgid ""
@@ -1233,7 +1272,7 @@
#: libsvn_client/diff.c:2351
msgid "Summarizing diff can only compare repository to repository"
-msgstr ""
+msgstr "åªèƒ½åœ¨æ¡£æ¡ˆåº“ä¹‹é—´åšæ‘˜è¦æ¯”较"
#: libsvn_client/diff.c:2708 libsvn_client/diff.c:2714
#: libsvn_client/diff.c:2847 libsvn_client/locking_commands.c:263
@@ -1268,14 +1307,14 @@
msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
#: libsvn_client/info.c:244
-#, fuzzy, c-format
+#, c-format
msgid "Cannot read entry for '%s'"
msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
-#, fuzzy, c-format
+#, c-format
msgid "URL '%s' non-existent in revision %ld"
-msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
+msgstr "地å€(URL)“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
#: libsvn_client/list.c:225
#, c-format
@@ -1291,12 +1330,12 @@
msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
#: libsvn_client/locking_commands.c:328
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
#: libsvn_client/locking_commands.c:376
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked"
msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
@@ -1310,9 +1349,8 @@
msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
#: libsvn_client/log.c:86
-#, fuzzy
msgid "Revision type requires a working copy path, not a URL"
-msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+msgstr "修订版类型需è¦å·¥ä½œæ‹·è´è·¯å¾„ï¼Œä¸æ˜¯URL"
#: libsvn_client/log.c:139 libsvn_client/status.c:261
#: libsvn_client/update.c:87
@@ -1321,7 +1359,6 @@
msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
#: libsvn_client/log.c:370
-#, fuzzy
msgid "No commits in repository"
msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
@@ -1336,7 +1373,7 @@
msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
#: libsvn_client/prop_commands.c:166
-#, fuzzy, c-format
+#, c-format
msgid "Setting property on non-local target '%s' is not supported"
msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
@@ -1350,7 +1387,7 @@
msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
#: libsvn_client/prop_commands.c:466
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not exist in revision %ld"
msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
@@ -1398,9 +1435,9 @@
"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
#: libsvn_client/relocate.c:101
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not the root of the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+msgstr "“%sâ€ä¸æ˜¯æ¡£æ¡ˆåº“çš„æ ¹ç›®å½•"
#: libsvn_client/relocate.c:108
#, c-format
@@ -1408,9 +1445,9 @@
msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
#: libsvn_client/revisions.c:99
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' has no committed revision"
-msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
+msgstr "路径“%sâ€ä¸Šæ²¡æœ‰æäº¤çš„修订版"
#: libsvn_client/revisions.c:109
#, c-format
@@ -1419,15 +1456,15 @@
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
-msgstr ""
+msgstr "svndiffæ•°æ®åŽ‹ç¼©å¤±è´¥"
#: libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
-msgstr ""
+msgstr "svndiffæ•°æ®è§£åŽ‹ç¼©å¤±è´¥"
#: libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
-msgstr ""
+msgstr "è§£åŽ‹ç¼©åŽæ•°æ®é•¿åº¦ä¸ŽåŽŸå§‹é•¿åº¦ä¸ä¸€è‡´"
#: libsvn_delta/svndiff.c:484
#, c-format
@@ -1490,17 +1527,17 @@
#: libsvn_diff/diff_file.c:593
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
-msgstr ""
+msgstr "文件“%sâ€åœ¨æ¯”较期间被修改"
#: libsvn_diff/diff_file.c:714
-#, fuzzy, c-format
+#, c-format
msgid "Error parsing diff options"
-msgstr "分解“%sâ€æ—¶å‘生错误"
+msgstr "è§£æždiff选项出错"
#: libsvn_diff/diff_file.c:737
#, c-format
msgid "Invalid argument '%s' in diff options"
-msgstr ""
+msgstr "diff选项ä¸çš„“%sâ€å‚æ•°æ— æ•ˆ"
#: libsvn_diff/diff_file.c:1019
#, c-format
@@ -1519,9 +1556,9 @@
msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
+#, c-format
msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%sâ€æ¨¡å—失败"
+msgstr "装载“%sâ€æ–‡ä»¶ç³»ç»Ÿç±»åž‹çš„æ¨¡å—失败"
#: libsvn_fs/fs-loader.c:138
#, c-format
@@ -1535,26 +1572,26 @@
msgstr "未知的文件系统(FS)类别“%sâ€"
#: libsvn_fs/fs-loader.c:253
-#, fuzzy, c-format
+#, c-format
msgid "Can't allocate FS mutex"
-msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
+msgstr "ä¸èƒ½åˆ†é…文件系统互斥体"
#: libsvn_fs/fs-loader.c:289
-#, fuzzy, c-format
+#, c-format
msgid "Can't grab FS mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿäº’斥体"
#: libsvn_fs/fs-loader.c:295
#, c-format
msgid "Can't ungrab FS mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿäº’斥体"
#: libsvn_fs/fs-loader.c:901
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
#: libsvn_fs_base/bdb/bdb-err.c:101
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while %s:\n"
msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
@@ -1585,7 +1622,7 @@
#: libsvn_fs_base/bdb/changes-table.c:282
#: libsvn_fs_base/bdb/changes-table.c:401
-#, fuzzy, c-format
+#, c-format
msgid "Error reading changes for key '%s'"
msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
@@ -1600,7 +1637,6 @@
msgstr "æ£åœ¨å…³é—更改指针"
#: libsvn_fs_base/bdb/copies-table.c:85
-#, fuzzy
msgid "storing copy record"
msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
@@ -1618,7 +1654,6 @@
# as-is
#: libsvn_fs_base/bdb/copies-table.c:195
-#, fuzzy
msgid "reading copy"
msgstr "æ£åœ¨è¯»å–æ‹·è´"
@@ -1631,7 +1666,7 @@
msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
#: libsvn_fs_base/bdb/nodes-table.c:152
-#, fuzzy, c-format
+#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
@@ -1641,88 +1676,77 @@
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/nodes-table.c:218
-#, fuzzy
msgid "reading node revision"
msgstr "æ£åœ¨è¯»å–节点修订版"
#: libsvn_fs_base/bdb/nodes-table.c:250
-#, fuzzy
msgid "storing node revision"
msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
-#, fuzzy, c-format
+#, c-format
msgid "No such representation '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
+msgstr "没有修订版“%sâ€"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/reps-table.c:96
-#, fuzzy
msgid "reading representation"
-msgstr "æ£åœ¨è¯»å–请求"
+msgstr "æ£åœ¨è¯»å–修订版"
#: libsvn_fs_base/bdb/reps-table.c:124
-#, fuzzy
msgid "storing representation"
-msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
+msgstr "æ£åœ¨å˜å‚¨ä¿®è®¢ç‰ˆ"
#: libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
-msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
+msgstr "æ£åœ¨åˆ†é…新修订版(æ£åœ¨èŽ·å– next-key)"
#: libsvn_fs_base/bdb/reps-table.c:175
-#, fuzzy
msgid "bumping next representation key"
-msgstr "æ£åœ¨æå–下一个请求关键å—"
+msgstr "æ£åœ¨æå–下一个修订版关键å—"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/reps-table.c:203
-#, fuzzy
msgid "deleting representation"
-msgstr "æ£åœ¨åˆ 除请求"
+msgstr "æ£åœ¨åˆ 除修订版"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/rev-table.c:87
-#, fuzzy
msgid "reading filesystem revision"
-msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
+msgstr "æ£åœ¨è¯»å–文件系统修订版"
#: libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
#: libsvn_fs_base/bdb/txn-table.c:92
-#, fuzzy
msgid "storing transaction record"
msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
#: libsvn_fs_base/bdb/uuids-table.c:114
-#, fuzzy
msgid "get repository uuid"
-msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+msgstr "èŽ·å–æ¡£æ¡ˆåº“UUID"
#: libsvn_fs_base/bdb/uuids-table.c:142
-#, fuzzy
msgid "set repository uuid"
-msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+msgstr "设置档案库UUID"
#: libsvn_fs_base/dag.c:217
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:225
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„æ‹·è´ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:234
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:317
-#, fuzzy
msgid "Attempted to create entry in non-directory parent"
msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
@@ -1732,22 +1756,20 @@
msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:323
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
#: libsvn_fs_base/dag.c:471
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to create entry that already exists"
msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:385
-#, fuzzy
msgid "Attempted to set entry in non-directory node"
msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:391
-#, fuzzy
msgid "Attempted to set entry in immutable node"
msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
@@ -1762,12 +1784,12 @@
msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
#: libsvn_fs_base/dag.c:830
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
#: libsvn_fs_base/dag.c:836
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
@@ -1777,12 +1799,12 @@
msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
-#, fuzzy, c-format
+#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
#: libsvn_fs_base/dag.c:940
-#, fuzzy, c-format
+#, c-format
msgid "Attempted removal of immutable node"
msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
@@ -1802,25 +1824,25 @@
msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to set textual contents of an immutable node"
-msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
#: libsvn_fs_base/dag.c:1235
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"æ ¡éªŒå’Œä¸åŒ¹é…,修订版“%sâ€ï¼š\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_base/dag.c:1290
#, c-format
@@ -1887,32 +1909,32 @@
msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„一个文件"
#: libsvn_fs_base/err.c:171
-#, fuzzy, c-format
+#, c-format
msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
#: libsvn_fs_base/err.c:181
-#, fuzzy, c-format
+#, c-format
msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
+msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ²¡æœ‰æ ‡è¯†"
#: libsvn_fs_base/err.c:190
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'locks' è¡¨é‡Œé”æŸå"
#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
-#, fuzzy, c-format
+#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
-#, fuzzy, c-format
+#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
@@ -1922,12 +1944,12 @@
msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
-#, fuzzy, c-format
+#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
+msgstr "用户“%1$sâ€å°è¯•使用文件系统“%3$sâ€ä¸å±žäºŽâ€œ%2$sâ€çš„é”"
#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
@@ -1942,24 +1964,23 @@
msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
-#, fuzzy
msgid "Filesystem object already open"
msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
#: libsvn_fs_base/fs.c:189
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当关é—环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:539
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当创建环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:545
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当打开环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:281
#, c-format
@@ -1967,32 +1988,28 @@
msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
#: libsvn_fs_base/fs.c:1094
-#, fuzzy
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
"the problem persists, try deactivating this feature \n"
"in DB_CONFIG"
msgstr ""
-"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
-"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
-"在 DB_CONFIG ä¸å–消这个功能。"
+"å¤åˆ¶logfileæ—¶å‘生错误;DB_LOG_AUTOREMOVE 特性å¯èƒ½å¹²æ‰°çƒæ‹·è´ç®—法。\n"
+"如果问题æŒç»å˜åœ¨ï¼Œè¯·å°è¯•在 DB_CONFIG ä¸å–消这个特性。"
#: libsvn_fs_base/fs.c:1113
-#, fuzzy
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
"hotcopy algorithm. If the problem persists, try deactivating \n"
"this feature in DB_CONFIG"
msgstr ""
-"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
-"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
-"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
+"å¯¹çƒæ‹·è´æ‰§è¡Œç¾åŽæ¢å¤æ—¶å‡ºé”™ï¼›DB_LOG_AUTOREMOVE 特性å¯èƒ½å¹²æ‰°çƒæ‹·è´ç®—法。\n"
+"如果问题æŒç»å˜åœ¨ï¼Œè¯·å°è¯•在 DB_CONFIG ä¸å–消这个特性。"
#: libsvn_fs_base/fs.c:1222
msgid "Module for working with a Berkeley DB repository."
-msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
+msgstr "æ“作伯克利数æ®åº“(Berkeley DB)档案库的模å—。"
#: libsvn_fs_base/fs.c:1255
#, c-format
@@ -2017,49 +2034,48 @@
#. Helper macro that evaluates to an error message indicating that
#. the representation referred to by X has an unknown node kind.
#: libsvn_fs_base/reps-strings.c:57
-#, fuzzy, c-format
+#, c-format
msgid "Unknown node kind for representation '%s'"
-msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
+msgstr "修订版“%sâ€çš„节点类型未知"
#: libsvn_fs_base/reps-strings.c:108
-#, fuzzy
msgid "Representation is not of type 'delta'"
-msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
+msgstr "ä¿®è®¢ç‰ˆä¸æ˜¯ “delta†类型"
#: libsvn_fs_base/reps-strings.c:379
msgid "Svndiff source length inconsistency"
-msgstr ""
+msgstr "Svndiffæºé•¿åº¦ä¸ä¸€è‡´"
#: libsvn_fs_base/reps-strings.c:506
#, c-format
msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
+msgstr "在“%sâ€ä¿®è®¢ç‰ˆä¸ diff 的版本ä¸ä¸€è‡´"
#: libsvn_fs_base/reps-strings.c:532
#, c-format
msgid ""
"Corruption detected whilst reading delta chain from representation '%s' to '%"
"s'"
-msgstr ""
+msgstr "从修订版“%sâ€åˆ°â€œ%sâ€è¯»å–差异链时检测到æŸå"
#: libsvn_fs_base/reps-strings.c:780
#, c-format
msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
+msgstr "修订版内容太大: %s,最大åªèƒ½ %s"
#: libsvn_fs_base/reps-strings.c:796
-#, fuzzy, c-format
+#, c-format
msgid "Failure reading rep '%s'"
-msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
+msgstr "读å–修订版“%sâ€å¤±è´¥"
#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch on rep '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+"修订版“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
" 预期: %s\n"
" 实际: %s\n"
@@ -2068,14 +2084,14 @@
msgstr "空的报告,å移已ç»è¶…过零值"
#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
-#, fuzzy, c-format
+#, c-format
msgid "Rep '%s' is not mutable"
-msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
+msgstr "修订版“%sâ€æ˜¯ä¸å¯å˜çš„"
#: libsvn_fs_base/reps-strings.c:1040
#, c-format
msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
+msgstr "修订版“%s†å¯å˜ä¸”éžçº¯æ–‡æœ¬"
#: libsvn_fs_base/reps-strings.c:1340
msgid "Failed to get new string key"
@@ -2087,22 +2103,21 @@
msgstr "ä¼å›¾ deltify “%s†自身"
#: libsvn_fs_base/reps-strings.c:1487
-#, fuzzy, c-format
+#, c-format
msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%sâ€çš„MD5指纹失败"
+msgstr "计算“%sâ€çš„MD5摘è¦å¤±è´¥"
#: libsvn_fs_base/revs-txns.c:65
-#, fuzzy, c-format
+#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "事务未结æŸï¼šâ€œ%sâ€"
#: libsvn_fs_base/revs-txns.c:68
-#, fuzzy, c-format
+#, c-format
msgid "Transaction is dead: '%s'"
msgstr "事务已结æŸï¼šâ€œ%sâ€"
#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
msgid "Transaction aborted, but cleanup failed"
msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
@@ -2110,7 +2125,7 @@
#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
#. for PATH in ROOT.
#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
+#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
@@ -2121,7 +2136,7 @@
#. Build a detailed `file already exists' message for PATH in ROOT.
#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
+#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
@@ -2131,32 +2146,30 @@
msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
-#, fuzzy
msgid "Root object must be a transaction root"
-msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
+msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªæ ¹äº‹åŠ¡"
#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
+#, c-format
msgid "Failure opening '%s'"
msgstr "打开“%sâ€å¤±è´¥"
#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
-#, fuzzy
msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
#: libsvn_fs_base/tree.c:1735
msgid "Corrupt DB: faulty predecessor count"
msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected immutable node at '%s'"
-msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
+msgstr "在“%sâ€ä¸åº”有ä¸å¯æ”¹å˜èŠ‚ç‚¹"
# as-is
#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
+#, c-format
msgid "Conflict at '%s'"
msgstr "在“%sâ€å†²çª"
@@ -2171,67 +2184,64 @@
msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
#: libsvn_fs_base/tree.c:2373
-#, fuzzy, c-format
+#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
+msgstr "关于修订版本“%2$sâ€çš„事务“%1$sâ€å·²ç»è¿‡æœŸ"
#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
-#, fuzzy
msgid "The root directory cannot be deleted"
msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
-#, fuzzy, c-format
+#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿï¼ˆâ€œ%sâ€å’Œâ€œ%sâ€ï¼‰ä¹‹é—´æ¯”较属性值"
#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
msgid "Copy from mutable tree not currently supported"
msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
-#, fuzzy, c-format
+#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"åŸºæ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
-#, fuzzy
msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿé—´æ¯”较文件内容"
#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
#: libsvn_repos/rev_hunt.c:605
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a file"
msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
#: libsvn_fs_fs/dag.c:367
-#, fuzzy
msgid "Can't get entries of non-directory"
msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
#: libsvn_fs_fs/dag.c:914
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_fs/err.c:107
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
+msgstr "文件系统“%2$sâ€ä¸è·¯å¾„“%1$sâ€çš„锿–‡ä»¶æŸå"
#: libsvn_fs_fs/fs.c:97
#, c-format
@@ -2239,7 +2249,7 @@
msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
#: libsvn_fs_fs/fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid "Can't create FSFS mutex"
msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
@@ -2264,7 +2274,7 @@
#: libsvn_fs_fs/fs_fs.c:591 libsvn_fs_fs/fs_fs.c:605 libsvn_fs_fs/fs_fs.c:612
#: libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627 libsvn_fs_fs/fs_fs.c:635
msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
+msgstr "node-rev 䏿œ‰ç•¸å½¢çš„æ–‡æœ¬è¡¨ç¤ºå移行"
#: libsvn_fs_fs/fs_fs.c:704
msgid "Missing kind field in node-rev"
@@ -2288,7 +2298,7 @@
#: libsvn_fs_fs/fs_fs.c:975
msgid "Malformed representation header"
-msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
+msgstr "畸形的修订版文件头"
#: libsvn_fs_fs/fs_fs.c:999
msgid "Missing node-id in node-rev"
@@ -2320,12 +2330,12 @@
#: libsvn_fs_fs/fs_fs.c:1224
msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
+msgstr "修订版的svndiff æ•°æ®ç•¸å½¢"
# as-is
#: libsvn_fs_fs/fs_fs.c:1367 libsvn_fs_fs/fs_fs.c:1380
msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
+msgstr "读å–一个svndiffçª—å£æ—¶è¶…出了修订版的结尾"
#: libsvn_fs_fs/fs_fs.c:1516
msgid "svndiff data requested non-existent source"
@@ -2340,13 +2350,13 @@
msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
#: libsvn_fs_fs/fs_fs.c:1610
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+"读å–ä¿®è®¢ç‰ˆæ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
" 预期: %s\n"
" 实际: %s\n"
@@ -2378,16 +2388,15 @@
msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
#: libsvn_fs_fs/fs_fs.c:2503
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
+msgstr "æ— æ³•åœ¨â€œ%sâ€ä¸ä¸ºä¿®è®¢ç‰ˆ %ld 创建事务目录"
#: libsvn_fs_fs/fs_fs.c:2680 libsvn_fs_fs/fs_fs.c:2687
msgid "next-id file corrupt"
msgstr "next-id 文件æŸå"
#: libsvn_fs_fs/fs_fs.c:2772
-#, fuzzy
msgid "Transaction cleanup failed"
msgstr "事务清除失败"
@@ -2435,19 +2444,19 @@
msgstr "æ— æ¤äº‹åŠ¡"
#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
+#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
+msgstr "æ— æ³•å†™å…¥é”-æ¡ç›®çš„哈希文件“%sâ€"
#: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
+#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
+msgstr "ä¸èƒ½è§£æžé”-æ¡ç›®çš„哈希文件“%s“"
#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽHEAD修订版ä¸"
#: libsvn_fs_fs/lock.c:741
#, c-format
@@ -2455,31 +2464,25 @@
msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
#: libsvn_ra/ra_loader.c:213
-#, fuzzy, c-format
+#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
+msgstr "“%sâ€çš„ RA 版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
#: libsvn_ra/ra_loader.c:285
-#, fuzzy, c-format
+#, c-format
msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+msgstr "æ— æ³•è¯†åˆ«â€œ%sâ€ä¸çš„URL方案"
#: libsvn_ra/ra_loader.c:336
-#, fuzzy, c-format
+#, c-format
msgid "'%s' isn't in the same repository as '%s'"
-msgstr ""
-"“%sâ€\n"
-"与\n"
-"“%sâ€\n"
-"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
+msgstr "“%sâ€ä¸Žâ€œ%sâ€å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
# as-is
#: libsvn_ra/ra_loader.c:707
-#, fuzzy, c-format
+#, c-format
msgid " - handles '%s' scheme\n"
-msgstr " - 处ç†â€œ%sâ€è§„则\n"
+msgstr " - 处ç†â€œ%sâ€æ–¹æ¡ˆ\n"
#: libsvn_ra/ra_loader.c:793
#, c-format
@@ -2500,22 +2503,22 @@
msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
#: libsvn_ra_dav/commit.c:487
-#, fuzzy, c-format
+#, c-format
msgid "Could not create a CHECKOUT request (%s)"
msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
#: libsvn_ra_serf/commit.c:436
-#, fuzzy, c-format
+#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
+msgstr "您的文件或目录“%sâ€å¾ˆå¯èƒ½å·²ç»è¿‡æœŸ"
#: libsvn_ra_dav/commit.c:582
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
#: libsvn_ra_dav/commit.c:881
-#, fuzzy, c-format
+#, c-format
msgid "Could not create a DELETE request (%s)"
msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
@@ -2544,9 +2547,9 @@
msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
#: libsvn_ra_dav/fetch.c:406
-#, fuzzy, c-format
+#, c-format
msgid "Could not get content-type from response"
-msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
+msgstr "ä¸èƒ½ä»Žå“应ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
#: libsvn_ra_dav/fetch.c:451
#, c-format
@@ -2575,7 +2578,7 @@
#: libsvn_ra_dav/fetch.c:1151
msgid "Server response missing the expected deadprop-count property"
-msgstr ""
+msgstr "æœåŠ¡ç«¯å“应丢失了deadprop-count属性"
#: libsvn_ra_dav/fetch.c:1324
msgid "Server does not support date-based operations"
@@ -2587,21 +2590,18 @@
# as-is
#: libsvn_ra_dav/fetch.c:1470
-#, fuzzy
msgid "'get-locations' REPORT not implemented"
msgstr "get-locations REPORT 未实现"
#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
#: libsvn_ra_dav/session.c:1474
-#, fuzzy
msgid "Incomplete lock data returned"
msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
-#, fuzzy
msgid "Server does not support locking features"
-msgstr "æœåС噍䏿”¯æŒé”定特性"
+msgstr "æœåС噍䏿”¯æŒåŠ é”"
#: libsvn_ra_dav/fetch.c:1908
msgid ""
@@ -2628,7 +2628,6 @@
# as-is
#: libsvn_ra_dav/file_revs.c:363
-#, fuzzy
msgid "'get-file-revs' REPORT not implemented"
msgstr "get-file-revs REPORT 未实现"
@@ -2694,12 +2693,12 @@
#: libsvn_ra_dav/props.c:685
msgid "The path was not part of a repository"
-msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
+msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部分"
#: libsvn_ra_dav/props.c:696
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
+msgstr "路径“%sâ€çš„任何一部分在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
msgid "The VCC property was not found on the resource"
@@ -2722,55 +2721,52 @@
msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
-#, fuzzy
msgid "Missing revision attr in target-revision element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "target-revisionå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
-#, fuzzy
msgid "Missing revision attr in open-root element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-rootå…ƒç´ ä¸¢å¤±äº†revisioin属性"
#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
msgid "Missing name attr in delete-entry element"
-msgstr ""
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_dav/replay.c:176
msgid "Missing rev attr in delete-entry element"
-msgstr ""
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†rev属性"
#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
-#, fuzzy
msgid "Missing name attr in open-directory element"
-msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "open-directoryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
#: libsvn_ra_serf/replay.c:371
-#, fuzzy, c-format
+#, c-format
msgid "Missing name attr in %s element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "“%sâ€å…ƒç´ 丢失了name属性"
#: libsvn_ra_dav/replay.c:288
msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr ""
+msgstr "apply-textdeltaå…ƒç´ ä¹‹å‰æ²¡æœ‰add-file或者open-fileå…ƒç´ "
#: libsvn_ra_dav/replay.c:314
msgid "Got close-file element without preceding add-file or open-file"
-msgstr ""
+msgstr "close-fileå…ƒç´ ä¹‹å‰æ²¡æœ‰add-file或者open-fileå…ƒç´ "
#: libsvn_ra_dav/replay.c:329
msgid "Got close-directory element without ever opening a directory"
-msgstr ""
+msgstr "close-directoryå…ƒç´ ä¹‹å‰æ²¡æœ‰æ‰“开过目录"
#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
-#, fuzzy, c-format
+#, c-format
msgid "Error writing stream: unexpected EOF"
-msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
+msgstr "å†™å…¥æµæ—¶å‘生错误:æå‰åˆ°è¾¾æ–‡ä»¶æœ«å°¾"
#: libsvn_ra_dav/replay.c:463
#, c-format
msgid "Got cdata content for a prop delete"
-msgstr ""
+msgstr "åˆ é™¤å±žæ€§æ—¶ç¢°åˆ°cdata内容"
#: libsvn_ra_dav/session.c:444
msgid "Invalid URL: illegal character in proxy port number"
@@ -2829,34 +2825,30 @@
msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
-#, fuzzy
msgid "Failed to parse URI"
-msgstr "分æžåœ°å€(URI)失败"
+msgstr "è§£æžURI失败"
#: libsvn_ra_dav/session.c:1183
-#, fuzzy
msgid "Lock request failed"
msgstr "é”请求失败"
#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked in the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+msgstr "档案库ä¸çš„“%sâ€æ²¡æœ‰è¢«é”定"
#: libsvn_ra_dav/session.c:1349
-#, fuzzy
msgid "Unlock request failed"
-msgstr "解除é”请求失败"
+msgstr "è§£é”请求失败"
#: libsvn_ra_dav/session.c:1560
-#, fuzzy
msgid "Failed to fetch lock information"
msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
#: libsvn_ra_dav/session.c:1633
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_dav RAåŠ è½½å™¨"
#: libsvn_ra_dav/util.c:275
msgid "authorization failed"
@@ -2933,9 +2925,9 @@
# as-is
#: libsvn_ra_local/ra_plugin.c:1340
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
+msgstr "䏿”¯æŒ%d版本的ra_local RA 载入器"
#: libsvn_ra_local/split_url.c:44
#, c-format
@@ -2959,84 +2951,76 @@
#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
#: libsvn_repos/commit.c:393
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' not present"
msgstr "路径“%sâ€ä¸å˜åœ¨"
#: libsvn_ra_serf/commit.c:910
#, c-format
msgid "Failed writing updated file"
-msgstr ""
+msgstr "写更新文件失败"
#: libsvn_ra_serf/getlocations.c:289
-#, fuzzy
msgid "File doesn't exist on HEAD"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽHEAD修订版ä¸"
#: libsvn_ra_serf/locks.c:354
-#, fuzzy, c-format
+#, c-format
msgid "Lock request failed: %d %s"
-msgstr "é”请求失败"
+msgstr "é”请求失败:%d %s"
#: libsvn_ra_serf/locks.c:703
-#, fuzzy, c-format
+#, c-format
msgid "Unlock request failed: %d %s"
-msgstr "解除é”请求失败"
+msgstr "è§£é”请求失败:%d %s"
#: libsvn_ra_serf/replay.c:204
-#, fuzzy
msgid "Missing revision attr in delete-entry element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:230
-#, fuzzy
msgid "Missing revision attr in open-directory element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-directoryå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:250
-#, fuzzy
msgid "Missing name attr in add-directory element"
-msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "add-directoryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_serf/replay.c:285
-#, fuzzy
msgid "Missing name attr in open-file element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "open-fileå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_serf/replay.c:291
-#, fuzzy
msgid "Missing revision attr in open-file element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-fileå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:311
-#, fuzzy
msgid "Missing name attr in add-file element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "add-fileå…ƒç´ ä¸¢å¤±äº†name属性"
-# as-is
+# serf是一个WebDAV库
#: libsvn_ra_serf/serf.c:52
-#, fuzzy
msgid "Access repository via WebDAV protocol through serf."
-msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
+msgstr "使用serf库通过WebDAVå议访问档案库。"
#: libsvn_ra_serf/serf.c:155
#, c-format
msgid "Could not lookup hostname: %s://%s"
-msgstr ""
+msgstr "找�到主机:%s://%s"
#: libsvn_ra_serf/serf.c:741
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_serf RAåŠ è½½å™¨"
#: libsvn_ra_serf/update.c:2114
#, c-format
msgid "Error retrieving REPORT (%d)"
-msgstr ""
+msgstr "èŽ·å–æŠ¥å‘Šæ—¶å‡ºé”™ï¼ˆ%d)"
#: libsvn_ra_serf/util.c:743
msgid "Premature EOF seen from server"
-msgstr ""
+msgstr "æœåŠ¡ç«¯å‘é€çš„æ•°æ®æµæå‰ç»ˆæ¢"
#: libsvn_ra_svn/client.c:115
#, c-format
@@ -3119,7 +3103,7 @@
#: libsvn_ra_svn/client.c:880
msgid "Non-string as part of file contents"
-msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨åˆ†ä¸æ˜¯å—串"
# as-is
#: libsvn_ra_svn/client.c:979
@@ -3138,13 +3122,11 @@
# as-is
#: libsvn_ra_svn/client.c:1225
-#, fuzzy
msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+msgstr "stat未实现"
# as-is
#: libsvn_ra_svn/client.c:1282
-#, fuzzy
msgid "'get-locations' not implemented"
msgstr "get-locations 未实现"
@@ -3155,7 +3137,6 @@
# as-is
#: libsvn_ra_svn/client.c:1344
-#, fuzzy
msgid "'get-file-revs' not implemented"
msgstr "get-file-revs 未实现"
@@ -3173,65 +3154,56 @@
msgstr "get-file-revs 命令没有返回任何修订版"
#: libsvn_ra_svn/client.c:1455
-#, fuzzy
msgid "Server doesn't support the lock command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+msgstr "æœåС噍䏿”¯æŒåŠ é”命令"
#: libsvn_ra_svn/client.c:1519
-#, fuzzy
msgid "Server doesn't support the unlock command"
-msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
+msgstr "æœåС噍䏿”¯æŒè§£é”命令"
# as-is
#: libsvn_ra_svn/client.c:1616
-#, fuzzy
msgid "Lock response not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "åŠ é”å“åº”ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1630
-#, fuzzy
msgid "Unknown status for lock command"
-msgstr "未知的 svn 通讯å定命令"
+msgstr "åŠ é”å‘½ä»¤çš„çŠ¶æ€æœªçŸ¥"
#: libsvn_ra_svn/client.c:1652
msgid "Didn't receive end marker for lock responses"
-msgstr ""
+msgstr "åŠ é”å“åº”ä¸¢å¤±äº†ç»“å°¾æ ‡è®°"
# as-is
#: libsvn_ra_svn/client.c:1739
-#, fuzzy
msgid "Unlock response not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "è§£é”å“åº”ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1753
-#, fuzzy
msgid "Unknown status for unlock command"
-msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
+msgstr "è§£é”å‘½ä»¤çš„çŠ¶æ€æœªçŸ¥"
#: libsvn_ra_svn/client.c:1774
msgid "Didn't receive end marker for unlock responses"
-msgstr ""
+msgstr "è§£é”å“åº”ä¸¢å¤±äº†ç»“æŸæ ‡è®°"
#: libsvn_ra_svn/client.c:1798 libsvn_ra_svn/client.c:1826
-#, fuzzy
msgid "Server doesn't support the get-lock command"
-msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
+msgstr "æœåС噍䏿”¯æŒå‘½ä»¤get-lock"
# as-is
#: libsvn_ra_svn/client.c:1839
-#, fuzzy
msgid "Lock element not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "Lockå…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1862
-#, fuzzy
msgid "Server doesn't support the replay command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+msgstr "æœåС噍䏿”¯æŒreplay命令"
#: libsvn_ra_svn/client.c:1926
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_svn RAåŠ è½½å™¨"
#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
#: libsvn_ra_svn/sasl_auth.c:302 libsvn_ra_svn/sasl_auth.c:357
@@ -3246,12 +3218,12 @@
#: libsvn_ra_svn/editor.c:621
msgid "Non-string as part of text delta"
-msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨åˆ†ä¸æ˜¯å—串"
#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
-msgstr ""
+msgstr "finish-replay命令åªåœ¨é‡æ”¾æ—¶æœ‰æ•ˆ"
# as-is
#: libsvn_ra_svn/editorp.c:129
@@ -3319,7 +3291,7 @@
#: libsvn_ra_svn/sasl_auth.c:155
msgid "Could not initialize the SASL library"
-msgstr ""
+msgstr "åˆå§‹åŒ–SASL库失败"
#: libsvn_ra_svn/sasl_auth.c:215 libsvn_ra_svn/simple_auth.c:58
#: libsvn_ra_svn/simple_auth.c:110
@@ -3329,7 +3301,7 @@
#: libsvn_ra_svn/sasl_auth.c:232
msgid "Unhandled SASL interaction"
-msgstr ""
+msgstr "未处ç†çš„SASL交互"
#: libsvn_ra_svn/simple_auth.c:97 libsvn_subr/prompt.c:156
#, c-format
@@ -3405,15 +3377,15 @@
# as-is
#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
+#, c-format
msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+msgstr "* 已导出修订版 %ld。\n"
# as-is
#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
+#, c-format
msgid "* Verified revision %ld.\n"
-msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
+msgstr "* å·²æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1211
msgid "Commit succeeded, but post-commit hook failed"
@@ -3427,9 +3399,9 @@
msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
+#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
+msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒè¯»å–所有修订版 %ld。"
#: libsvn_repos/fs-wrap.c:484
#, c-format
@@ -3437,9 +3409,8 @@
msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
+msgstr "è§£é”æˆåŠŸï¼Œä½†æ˜¯post-unlock外挂失败"
#: libsvn_repos/hooks.c:71
#, c-format
@@ -3447,14 +3418,14 @@
msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
#: libsvn_repos/hooks.c:83
-#, fuzzy, c-format
+#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€å¤–挂创建éžç»§æ‰¿çš„管é“è¯»å¥æŸ„"
#: libsvn_repos/hooks.c:89
-#, fuzzy, c-format
+#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€å¤–挂创建éžç»§æ‰¿çš„管é“写奿Ÿ„"
#: libsvn_repos/hooks.c:98
#, c-format
@@ -3467,7 +3438,7 @@
msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
#: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
+#, c-format
msgid "Failed to start '%s' hook"
msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
@@ -3481,7 +3452,7 @@
"%s"
#: libsvn_repos/hooks.c:144
-#, fuzzy, c-format
+#, c-format
msgid "'%s' hook failed; no error output available"
msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
@@ -3518,12 +3489,12 @@
#: libsvn_repos/load.c:173
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr ""
+msgstr "导出æµåœ¨â€œ%.20sâ€åŒ…å«é”™è¯¯å¤´éƒ¨ï¼ˆæ²¡æœ‰â€œ:â€ï¼‰"
#: libsvn_repos/load.c:186
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr ""
+msgstr "导出æµåœ¨â€œ%.20sâ€åŒ…å«é”™è¯¯å¤´éƒ¨ï¼ˆæ²¡æœ‰å€¼ï¼‰"
#: libsvn_repos/load.c:273
msgid "Incomplete or unterminated property block"
@@ -3591,7 +3562,6 @@
msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
#: libsvn_repos/load.c:1158
-#, fuzzy
msgid " done.\n"
msgstr "完æˆã€‚\n"
@@ -3639,9 +3609,8 @@
msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
#: libsvn_repos/reporter.c:842
-#, fuzzy
msgid "Target path does not exist"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+msgstr "ç›®æ ‡è·¯å¾„ä¸å˜åœ¨"
#: libsvn_repos/reporter.c:849
msgid "Cannot replace a directory from within"
@@ -3709,9 +3678,8 @@
msgstr "æ£åœ¨åˆ›å»º passwd 文件"
#: libsvn_repos/repos.c:1527
-#, fuzzy
msgid "Creating authz file"
-msgstr "æ£åœ¨åˆ›å»º passwd 文件"
+msgstr "æ£åœ¨åˆ›å»º authz 文件"
#: libsvn_repos/repos.c:1560
msgid "Could not create top-level directory"
@@ -3730,7 +3698,7 @@
msgstr "档案库创建失败"
#: libsvn_repos/repos.c:1756
-#, fuzzy, c-format
+#, c-format
msgid "Expected format '%d' of repository; found format '%d'"
msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
@@ -3750,14 +3718,13 @@
msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
#: libsvn_repos/rev_hunt.c:315
-#, fuzzy
msgid "Unreadable path encountered; access denied"
-msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
+msgstr "é‡åˆ°ä¸å¯è¯»çš„路径;访问被拒ç»"
#: libsvn_subr/cmdline.c:481
#, c-format
msgid "Error initializing command line arguments"
-msgstr ""
+msgstr "åˆå§‹åŒ–å‘½ä»¤è¡Œå‚æ•°å‡ºé”™"
#: libsvn_subr/config.c:630
#, c-format
@@ -3807,14 +3774,14 @@
msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
#: libsvn_subr/dso.c:70
-#, fuzzy, c-format
+#, c-format
msgid "Can't grab DSO mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•èŽ·å–动æ€å…±äº«å¯¹è±¡ï¼ˆDSO)互斥体"
#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
-#, fuzzy, c-format
+#, c-format
msgid "Can't ungrab DSO mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•é‡Šæ”¾åŠ¨æ€å…±äº«å¯¹è±¡ï¼ˆDSO)互斥体"
#: libsvn_subr/error.c:326
msgid "Can't recode error string from APR"
@@ -3915,19 +3882,19 @@
# as-is
#: libsvn_subr/io.c:1192
-#, fuzzy, c-format
+#, c-format
msgid "Can't open file at '%s'"
msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
#: libsvn_subr/io.c:1196
-#, fuzzy, c-format
+#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+msgstr "ä¸èƒ½èŽ·å–“%sâ€æ–‡ä»¶çš„æƒé™(文件 stat 错误)"
#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
-#, fuzzy, c-format
+#, c-format
msgid "Can't change perms of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
+msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€çš„æƒé™"
#: libsvn_subr/io.c:1370
#, c-format
@@ -3998,7 +3965,7 @@
#: libsvn_subr/io.c:1811
#, c-format
msgid "Can't rewind directory '%s'"
-msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
+msgstr "æ— æ³•å›žç»•ç›®å½•â€œ%sâ€"
#: libsvn_subr/io.c:2003
#, c-format
@@ -4013,32 +3980,32 @@
#: libsvn_subr/io.c:2021
#, c-format
msgid "Can't set process '%s' directory"
-msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
+msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€çš„目录"
#: libsvn_subr/io.c:2034
#, c-format
msgid "Can't set process '%s' child input"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å输入"
#: libsvn_subr/io.c:2041
#, c-format
msgid "Can't set process '%s' child outfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å输出文件"
#: libsvn_subr/io.c:2048
#, c-format
msgid "Can't set process '%s' child errfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å错误文件"
#: libsvn_subr/io.c:2055
-#, fuzzy, c-format
+#, c-format
msgid "Can't set process '%s' child errfile for error handler"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å错误输出文件"
#: libsvn_subr/io.c:2061
-#, fuzzy, c-format
+#, c-format
msgid "Can't set process '%s' error handler"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„错误处ç†å‡½æ•°"
# as-is
#: libsvn_subr/io.c:2084
@@ -4145,12 +4112,11 @@
# as-is
#: libsvn_subr/io.c:2639
-#, fuzzy, c-format
+#, c-format
msgid "Can't read length line in file '%s'"
msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
#: libsvn_subr/io.c:2643
-#, fuzzy
msgid "Can't read length line in stream"
msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
@@ -4210,12 +4176,11 @@
msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
#: libsvn_subr/nls.c:86
-#, fuzzy
msgid "Can't get module file name"
msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
@@ -4278,7 +4243,6 @@
# as-is
#: libsvn_subr/opt.c:957
-#, fuzzy
msgid ""
"Copyright (C) 2000-2006 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4286,8 +4250,8 @@
"Net/).\n"
"\n"
msgstr ""
-"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
+"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2006 CollabNet.\n"
+"Subversion 是开放æº�代ç �软件,请å�‚考 http://subversion.tigris.org/\n"
"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
"\n"
@@ -4312,9 +4276,9 @@
msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
#: libsvn_subr/path.c:1253
-#, fuzzy, c-format
+#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
+msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符“0x%1$02xâ€"
#: libsvn_subr/prompt.c:97 svnserve/main.c:490
#, c-format
@@ -4402,9 +4366,9 @@
msgstr "“%sâ€çš„密ç :"
#: libsvn_subr/subst.c:1559
-#, fuzzy, c-format
+#, c-format
msgid "'%s' has unsupported special file type '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgstr "“%sâ€å˜åœ¨ä¸æ”¯æŒçš„特殊文件类型“%sâ€"
#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
#, c-format
@@ -4420,51 +4384,51 @@
msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
#: libsvn_subr/utf.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:275
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:279
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:285
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%iâ€åˆ°â€œ%iâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:513
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from native encoding to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€œ%sâ€ç¼–ç :"
#: libsvn_subr/utf.c:517
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from '%s' to native encoding:"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从“%sâ€ç¼–ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç :"
#: libsvn_subr/utf.c:521
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from '%s' to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从“%sâ€ç¼–ç 转æ¢ä¸ºâ€œ%sâ€ç¼–ç :"
#: libsvn_subr/utf.c:527
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从CCSID“%iâ€è½¬æ¢ä¸ºCCSID“%iâ€ï¼š"
#: libsvn_subr/utf.c:572
-#, fuzzy, c-format
+#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
"UTF-8"
-msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
+msgstr "安全数æ®â€œ%sâ€æ˜¯å޿ޥéžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/自 UTF-8"
#: libsvn_subr/utf.c:580
#, c-format
@@ -4524,9 +4488,9 @@
msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
#: libsvn_wc/adm_files.c:100
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid administrative directory name"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„管ç†ç›®å½•å"
# plz leave this as-is
#: libsvn_wc/adm_files.c:260
@@ -4594,11 +4558,11 @@
msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
#: libsvn_wc/adm_ops.c:1128
-#, fuzzy, c-format
+#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
"committed and the parent updated before adding '%s'"
-msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
+msgstr "æ— æ³•ä»¥ä¸åŒç±»åž‹èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼›åœ¨æ–°å¢žâ€œ%sâ€å‰å¿…é¡»æäº¤åˆ 除æ“作并更新父目录"
#: libsvn_wc/adm_ops.c:1145
#, c-format
@@ -4611,14 +4575,14 @@
msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
#: libsvn_wc/adm_ops.c:1166
-#, fuzzy, c-format
+#, c-format
msgid "The URL '%s' has a different repository root than its parent"
-msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
+msgstr "地å€(URL)“%sâ€ä¸Žå…¶å‰ä¸€ä¿®è®¢ç‰ˆçš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸åŒ"
#: libsvn_wc/adm_ops.c:1495
#, c-format
msgid "Error restoring text for '%s'"
-msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
+msgstr "还原“%sâ€æ–‡æœ¬æ—¶å‡ºé”™"
#: libsvn_wc/adm_ops.c:1626
#, c-format
@@ -4681,9 +4645,9 @@
msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
#: libsvn_wc/copy.c:578
-#, fuzzy, c-format
+#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
+msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€ï¼Œå› ä¸ºå®ƒä¸æ˜¯æ¥è‡ªäºŽæ¡£æ¡ˆåº““%sâ€è€Œæ˜¯â€œ%sâ€"
#: libsvn_wc/copy.c:585
#, c-format
@@ -4697,25 +4661,22 @@
msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
#: libsvn_wc/entries.c:111
-#, fuzzy
msgid "Invalid escape sequence"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+msgstr "æ— æ•ˆçš„è½¬ä¹‰åºåˆ—"
#: libsvn_wc/entries.c:118
-#, fuzzy
msgid "Invalid escaped character"
-msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
+msgstr "æ— æ•ˆçš„è½¬ä¹‰å—符"
#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
#: libsvn_wc/entries.c:203
-#, fuzzy
msgid "Unexpected end of entry"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+msgstr "æ¡ç›®æå‰ç»ˆæ¢"
#: libsvn_wc/entries.c:225
#, c-format
msgid "Invalid value for field '%s'"
-msgstr ""
+msgstr "“%sâ€åŸŸçš„å€¼æ— æ•ˆ"
#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:537
#, c-format
@@ -4723,9 +4684,9 @@
msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:514
-#, fuzzy, c-format
+#, c-format
msgid "Entry for '%s' has invalid repository root"
-msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
+msgstr "“%sâ€æ¡ç›®çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
#: libsvn_wc/entries.c:944
#, c-format
@@ -4745,24 +4706,22 @@
msgstr "默认项目没有地å€(URL)"
#: libsvn_wc/entries.c:1089
-#, fuzzy, c-format
+#, c-format
msgid "Invalid version line in entries file of '%s'"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+msgstr "“%sâ€æ¡ç›®æ–‡ä»¶ä¸çš„ç‰ˆæœ¬è¡Œæ— æ•ˆ"
#: libsvn_wc/entries.c:1106
-#, fuzzy
msgid "Missing entry terminator"
-msgstr "丢失默认项目"
+msgstr "æ¡ç›®ç»ˆç»“符丢失"
#: libsvn_wc/entries.c:1109
-#, fuzzy
msgid "Invalid entry terminator"
-msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+msgstr "æ— æ•ˆçš„æ¡ç›®ç»ˆæ¢ç¬¦"
#: libsvn_wc/entries.c:1113
-#, fuzzy, c-format
+#, c-format
msgid "Error at entry %d in entries file for '%s':"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+msgstr "“%2$sâ€æ¡ç›®æ–‡ä»¶ä¸çš„%1$dæ¡ç›®å‡ºé”™"
#: libsvn_wc/entries.c:1209
#, c-format
@@ -4877,39 +4836,39 @@
msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
-#, fuzzy, c-format
+#, c-format
msgid "Unable to check path existence for '%s'"
-msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
+msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€æ˜¯å¦å˜åœ¨"
#: libsvn_wc/lock.c:937
#, c-format
msgid "Expected '%s' to be a directory but found a file"
-msgstr ""
+msgstr "期望“%sâ€æ˜¯ä¸€ä¸ªç›®å½•,但它是一个文件"
#: libsvn_wc/lock.c:944
-#, fuzzy, c-format
+#, c-format
msgid "Expected '%s' to be a file but found a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+msgstr "期望“%sâ€æ˜¯ä¸€ä¸ªæ–‡ä»¶ï¼Œä½†å®ƒæ˜¯ä¸€ä¸ªç›®å½•"
#: libsvn_wc/lock.c:963
-#, fuzzy, c-format
+#, c-format
msgid "Directory '%s' is missing"
-msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgstr "目录“%sâ€ä¸¢å¤±"
#: libsvn_wc/lock.c:968
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
-msgstr ""
+msgstr "包å«å·¥ä½œæ‹·è´ç®¡ç†åŒºçš„目录“%sâ€ä¸¢å¤±äº†"
#: libsvn_wc/lock.c:973
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock '%s'"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+msgstr "æ— æ³•é”定“%sâ€"
#: libsvn_wc/lock.c:978
-#, fuzzy, c-format
+#, c-format
msgid "Working copy '%s' is not locked"
-msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
+msgstr "工作拷è´â€œ%sâ€æœªè¢«é”定"
#: libsvn_wc/lock.c:1371
#, c-format
@@ -4966,14 +4925,14 @@
msgstr "修改“%sâ€çš„项目时å‘生错误"
#: libsvn_wc/log.c:857
-#, fuzzy, c-format
+#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
#: libsvn_wc/log.c:880
-#, fuzzy, c-format
+#, c-format
msgid "Error removing changelist from entry '%s'"
-msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
+msgstr "åˆ åŽ»â€œ%sâ€æ¡ç›®ä¸Šçš„æ›´æ”¹åˆ—表时å‘生错误"
#: libsvn_wc/log.c:1010
#, c-format
@@ -5016,9 +4975,8 @@
msgstr "修改“%sâ€çš„项目时å‘生错误"
#: libsvn_wc/log.c:1514
-#, fuzzy
msgid "Invalid 'format' attribute"
-msgstr "æ— æ•ˆçš„é…置值"
+msgstr "æ— æ•ˆçš„format属性"
#: libsvn_wc/log.c:1549
#, c-format
@@ -5088,12 +5046,10 @@
"但是属性并ä¸å˜åœ¨ã€‚"
#: libsvn_wc/props.c:679
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
-msgstr ""
-"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
-"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
+msgstr "å°è¯•åˆ é™¤å±žæ€§â€œ%sâ€ï¼Œä½†æ˜¯å…¶å€¼å·²ä»Žâ€œ%sâ€ä¿®æ”¹ä¸ºâ€œ%sâ€ã€‚"
#: libsvn_wc/props.c:697
#, c-format
@@ -5105,9 +5061,9 @@
"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
#: libsvn_wc/props.c:880
-#, fuzzy, c-format
+#, c-format
msgid "Missing end of line in wcprops file for '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "wcprops文件“%sâ€ä¸¢å¤±äº†è¡Œç»ˆæ¢ç¬¦"
#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
#: libsvn_wc/props.c:1626
@@ -5183,7 +5139,7 @@
#: libsvn_wc/relocate.c:69
msgid "Relocate can only change the repository part of an URL"
-msgstr ""
+msgstr "Relocateåªèƒ½æ”¹å˜URLä¸çš„æ¡£æ¡ˆåº“部分"
#: libsvn_wc/update_editor.c:390
#, c-format
@@ -5201,18 +5157,18 @@
msgstr "写入“%sâ€çš„æ—¥å¿—文件时å‘生错误"
#: libsvn_wc/update_editor.c:1078
-#, fuzzy, c-format
+#, c-format
msgid ""
"Failed to add directory '%s': a non-directory object of the same name "
"already exists"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šæ¡£æ¡ˆåº“ä¸å·²å˜åœ¨åŒåéžç›®å½•对象"
#: libsvn_wc/update_editor.c:1108
-#, fuzzy, c-format
+#, c-format
msgid ""
"Failed to forcibly add directory '%s': a versioned directory of the same "
"name already exists"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+msgstr "æ— æ³•å¼ºåˆ¶æ–°å¢žç›®å½•â€œ%sâ€ï¼šæ¡£æ¡ˆåº“ä¸å·²å˜åœ¨åŒå的目录"
#: libsvn_wc/update_editor.c:1121
#, c-format
@@ -5250,10 +5206,10 @@
msgstr "æ— æ³•å°†â€œ%sâ€æ ‡è®°ä¸ºä¸å˜åœ¨ï¼šåŒåé¡¹ç›®å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
#: libsvn_wc/update_editor.c:1534
-#, fuzzy, c-format
+#, c-format
msgid ""
"Failed to add file '%s': a non-file object of the same name already exists"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šæ¡£æ¡ˆåº“ä¸å·²å˜åœ¨åŒåéžæ–‡ä»¶å¯¹è±¡"
#: libsvn_wc/update_editor.c:1545
#, c-format
@@ -5283,7 +5239,7 @@
msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
#: libsvn_wc/update_editor.c:3014
-#, fuzzy, c-format
+#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
@@ -5325,9 +5281,8 @@
msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
#: svn/diff-cmd.c:184
-#, fuzzy
msgid "'--new' option only valid with '--old' option"
-msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
+msgstr "--newé€‰é¡¹åªæœ‰å’Œ--old选项一åŒä½¿ç”¨æ—¶æ‰æœ‰æ•ˆ"
#: svn/diff-cmd.c:214
#, c-format
@@ -5341,7 +5296,7 @@
msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
#: svn/help-cmd.c:45
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
"Subversion command-line client, version %s.\n"
@@ -5357,10 +5312,12 @@
msgstr ""
"用法:svn <subcommand> [options] [args]\n"
"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
-"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
-"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
-"行递归å˜å–。\n"
+"使用“svn help <subcommand>â€æ˜¾ç¤ºç‰¹å®šå命令帮助。\n"
+"使用“svn --versionâ€æŸ¥çœ‹ç¨‹åºä»¥åŠRA模å—的版本å·ï¼Œæˆ–者\n"
+"使用“svn --version --quietâ€ä»…查看程åºç‰ˆæœ¬å·ã€‚\n"
+"\n"
+"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递归处ç†ï¼Œå¦‚æ²¡æœ‰æŒ‡å®šå‚æ•°ï¼Œåˆ™é»˜è®¤\n"
+"对当å‰ç›®å½•(包å«å½“å‰ç›®å½•)递归处ç†ã€‚\n"
"\n"
"å¯ç”¨çš„å命令:\n"
@@ -5394,9 +5351,9 @@
msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
#: svn/info-cmd.c:111
-#, fuzzy, c-format
+#, c-format
msgid "'%s' has invalid revision"
-msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
+msgstr "“%sâ€æœ‰æ— 效的修订版"
#: svn/info-cmd.c:267 svnadmin/main.c:1046
#, c-format
@@ -5415,7 +5372,7 @@
msgstr "地å€(URL):%s\n"
#: svn/info-cmd.c:280
-#, fuzzy, c-format
+#, c-format
msgid "Repository Root: %s\n"
msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
@@ -5563,14 +5520,14 @@
"%s\n"
#: svn/info-cmd.c:425
-#, fuzzy, c-format
+#, c-format
msgid "Changelist: %s\n"
-msgstr "æ ¡éªŒå’Œï¼š%s\n"
+msgstr "更改列表: %s\n"
#: svn/info-cmd.c:477 svn/revert-cmd.c:59
-#, fuzzy, c-format
+#, c-format
msgid "no such changelist '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
+msgstr "没有“%sâ€è¿™æ ·çš„æ›´æ”¹åˆ—表"
#: svn/info-cmd.c:539
#, c-format
@@ -5582,7 +5539,7 @@
"\n"
#: svn/info-cmd.c:548
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s: (Not a valid URL)\n"
"\n"
@@ -5591,9 +5548,8 @@
"\n"
#: svn/lock-cmd.c:52
-#, fuzzy
msgid "Lock comment contains a zero byte"
-msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
+msgstr "åŠ é”æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
#: svn/log-cmd.c:162
msgid "(no author)"
@@ -5636,9 +5592,8 @@
msgstr "显示å命令帮助"
#: svn/main.c:65
-#, fuzzy
msgid "specify log message ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+msgstr "指定日志消æ¯ARG"
#: svn/main.c:66
msgid "print as little as possible"
@@ -5657,9 +5612,10 @@
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
msgstr ""
+"在ARGä¿®è®¢ç‰ˆï¼ˆå¦‚åŒ -r ARG-1:ARG)作的修改\n"
+" 如果ARG为负数则ç‰ä»·äºŽ -r ARG:ARG-1"
#: svn/main.c:74
-#, fuzzy
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -5671,19 +5627,18 @@
" 'COMMITTED' last commit at or before BASE\n"
" 'PREV' revision just before COMMITTED"
msgstr ""
-"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
+"ARG (一些命令也接å—ARG1:ARG2范围)\n"
" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
-" æ•°å— ä¿®è®¢ç‰ˆå·\n"
-" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
-" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
-" \"PREV\" 修订版æäº¤ä¹‹å‰"
+" NUMBER 修订版å·\n"
+" '{' DATE '}' 在指定时间以åŽçš„修订版\n"
+" 'HEAD' 档案库ä¸çš„æœ€æ–°ä¿®è®¢ç‰ˆ\n"
+" 'BASE' 工作拷è´çš„基线版本\n"
+" 'COMMITTED' 最åŽä¸€æ¬¡æäº¤çš„修订版\n"
+" 'PREV' COMMITTEDçš„å‰ä¸€ä¿®è®¢ç‰ˆ"
#: svn/main.c:84
-#, fuzzy
msgid "read log message from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件ARGè¯»å–æ—¥å¿—消æ¯"
#: svn/main.c:86
msgid "give output suitable for concatenation"
@@ -5696,9 +5651,8 @@
#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
#: svnversion/main.c:125
-#, fuzzy
msgid "show program version information"
-msgstr "显示版本信æ¯"
+msgstr "显示程åºç‰ˆæœ¬ä¿¡æ¯"
#: svn/main.c:93
msgid "print extra information"
@@ -5737,6 +5691,17 @@
" --ignore-eol-style:\n"
" Ignore changes in EOL style"
msgstr ""
+"缺çœï¼šâ€œ-uâ€ã€‚当Subversion调用一个外部diffç¨‹åºæ—¶ï¼Œ\n"
+" ARGç›´æŽ¥ä¼ ç»™è¿™ä¸ªç¨‹åºã€‚但是当Subversion使用缺çœçš„\n"
+" 内部diffå®žçŽ°æˆ–è€…æ£æ˜¾ç¤ºblame评注时,ARGå¯ä»¥æ˜¯ï¼š\n"
+" -u (--unified):\n"
+" 输出三行统一上下文。\n"
+" -b (--ignore-space-change):\n"
+" 忽略空白数é‡çš„æ›´æ”¹ã€‚\n"
+" -w (--ignore-all-space):\n"
+" 忽略所有的空白。\n"
+" --ignore-eol-style:\n"
+" 忽略EOLæ ·å¼çš„æ›´æ”¹ã€‚"
#: svn/main.c:130
msgid "pass contents of file ARG as additional args"
@@ -5772,7 +5737,7 @@
#: svn/main.c:144 svnlook/main.c:111
msgid "do not print differences for deleted files"
-msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
+msgstr "ä¸è¦è¾“å‡ºåˆ é™¤æ–‡ä»¶é€ æˆçš„差异"
#: svn/main.c:146
msgid "notice ancestry when calculating differences"
@@ -5827,16 +5792,14 @@
msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
#: svn/main.c:174
-#, fuzzy
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
" property set to 'native'.\n"
" ARG may be one of 'LF', 'CR', 'CRLF'"
msgstr ""
-"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
-" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属性为 'native'。\n"
-" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
+"设置svn:eol-style为“nativeâ€ä»¥åœ¨æ–‡ä»¶ä¸ä½¿ç”¨éžç³»ç»Ÿé»˜è®¤çš„è¡Œç»“æŸæ ‡è®°ã€‚\n"
+" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ï¼š'LF','CR','CRLF'"
#: svn/main.c:182
msgid "maximum number of log entries"
@@ -5848,19 +5811,19 @@
#: svn/main.c:186
msgid "show a summary of the results"
-msgstr ""
+msgstr "显示结果的摘è¦"
#: svn/main.c:188
msgid "remove changelist association"
-msgstr ""
+msgstr "åˆ é™¤æ›´æ”¹åˆ—è¡¨å…³è”"
#: svn/main.c:190
msgid "operate only on members of changelist ARG"
-msgstr ""
+msgstr "仅用于更改列表ARGçš„æˆå‘˜"
#: svn/main.c:192
msgid "don't delete changelist after commit"
-msgstr ""
+msgstr "ä¸è¦åœ¨æäº¤åŽåˆ 除更改列表"
#: svn/main.c:231
msgid ""
@@ -5908,6 +5871,9 @@
"usage: 1. changelist CLNAME TARGET...\n"
" 2. changelist --clear TARGET...\n"
msgstr ""
+"在本地路径和更改列表CLNAME之间建立关è”ï¼ˆæˆ–è€…å–æ¶ˆå…³è”)。\n"
+"用法:1. changelist CLNAME ç›®æ ‡...\n"
+" 2. changelist --clear ç›®æ ‡...\n"
#: svn/main.c:263
msgid ""
@@ -5933,6 +5899,18 @@
" to the working copy. All properties from the repository are applied\n"
" to the obstructing path.\n"
msgstr ""
+"从档案库ç¾å‡ºä¸€ä»½å·¥ä½œæ‹·è´ã€‚\n"
+"用法:checkout URL[@修订版]... [路径]\n"
+"\n"
+" å¦‚æžœæŒ‡å®šä¿®è®¢ç‰ˆå‚æ•°ï¼Œåˆ™ä»Žè¿™ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾URL。\n"
+"\n"
+" å¦‚æžœå¿½ç•¥è·¯å¾„å‚æ•°ï¼Œåˆ™URL最末尾的目录åä½œä¸ºç›®æ ‡ç›®å½•å。如果指定多个URLï¼Œåˆ™ä¾æ¬¡å°†\n"
+" å…¶ç¾å‡ºåˆ°è·¯å¾„傿•°æŒ‡å®šçš„目录的å目录ä¸ï¼Œå目录åå—就是URL最末尾的目录å。\n"
+"\n"
+" 如果使用了--forceé€‰é¡¹ï¼Œé‚£ä¹ˆç›®æ ‡ç›®å½•ä¸çš„æœªå—版本管ç†çš„åŒå路径ä¸ä¼šè‡ªåŠ¨ä½¿ç¾å‡ºå¤±è´¥ã€‚\n"
+" 如果这个路径的类型(文件或者目录)与档案库ä¸å¯¹åº”è·¯å¾„ä¸€æ ·ï¼Œåˆ™è¿™ä¸ªè·¯å¾„è¢«çº³å…¥ç‰ˆæœ¬ç®¡ç†ï¼Œ\n"
+" 并且ä¸ä¿®æ”¹å…¶åŽŸæœ‰å†…å®¹ï¼Œå¦‚æžœå®ƒè·Ÿæ¡£æ¡ˆåº“ä¸ç›¸åº”文件内容ä¸ä¸€è‡´ï¼Œåˆ™çœ‹ä½œæ˜¯æœ¬åœ°ä¿®æ”¹ã€‚档案库\n"
+" 䏿¤è·¯å¾„拥有的属性会全部应用到这个åŒå路径上。\n"
#: svn/main.c:288
msgid ""
@@ -5940,12 +5918,11 @@
"unfinished operations, etc.\n"
"usage: cleanup [PATH...]\n"
msgstr ""
-"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
+"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œç»§ç»æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
"\n"
"用法:cleanup [路径...]\n"
#: svn/main.c:295
-#, fuzzy
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -5955,16 +5932,14 @@
" If any targets are (or contain) locked items, those will be\n"
" unlocked after a successful commit.\n"
msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"把更改从工作拷è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
"用法:commit [路径...]\n"
"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+" å¿…é¡»æä¾›æ—¥å¿—消æ¯ï¼Œä½†å®ƒå¯ä»¥æ˜¯ç©ºçš„。如果没有指定 --message 或 --file 选项,\n"
+" 则会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚å¦‚æžœä»»ä½•ç›®æ ‡æ˜¯é”定的或者包å«é”定æ¡ç›®ï¼Œåˆ™åœ¨æˆåŠŸæäº¤åŽå®ƒ\n"
+" 们都会被解é”。\n"
#: svn/main.c:303
-#, fuzzy
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -5975,13 +5950,12 @@
" (or contain) locked items, those will be unlocked after a\n"
" successful commit.\n"
msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"把更改从工作拷è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
"用法:commit [路径...]\n"
"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+" å¿…é¡»æä¾›æ—¥å¿—消æ¯ï¼Œä½†å®ƒå¯ä»¥æ˜¯ç©ºçš„。OS400䏿”¯æŒå¯åŠ¨ç¼–è¾‘å™¨ï¼Œå› æ¤å¿…须指定--message\n"
+" 或 --file é€‰é¡¹ã€‚å¦‚æžœä»»ä½•ç›®æ ‡æ˜¯é”定的或者包å«é”定æ¡ç›®ï¼Œåˆ™åœ¨æˆåŠŸæäº¤åŽå®ƒä»¬éƒ½ä¼šè¢«\n"
+" è§£é”。\n"
#: svn/main.c:318
msgid ""
@@ -6032,7 +6006,6 @@
" \n"
#: svn/main.c:346
-#, fuzzy
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -6060,31 +6033,29 @@
"\n"
" Use just 'svn diff' to display local modifications in a working copy.\n"
msgstr ""
-"显示两个路径ä¸çš„差异。\n"
+"显示两个路径或者两个修订版的差异。\n"
"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
-" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
+" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
+" [路径...]\n"
+" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
"\n"
-" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
-" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
+" 1ã€æ˜¾ç¤ºä¿®è®¢ç‰ˆREVä¸â€œç›®æ ‡â€åœ¨ä¸¤ä¸ªä¸åŒçš„修订版Nã€Mä¹‹é—´çš„å·®å¼‚ã€‚â€œç›®æ ‡â€è¦ä¹ˆå…¨æ˜¯å·¥ä½œæ‹·è´\n"
+" 路径,è¦ä¹ˆå…¨æ˜¯åœ°å€(URL)。\n"
"\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
-" HEAD。\n"
-"\n"
-" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
-" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
-" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
-" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
-" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
-" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
-"法。\n"
+" å¦‚æžœâ€œç›®æ ‡â€æ˜¯å·¥ä½œæ‹·è´è·¯å¾„,N 默认为 BASE,M 指工作拷è´ï¼›\n"
+" å¦‚æžœâ€œç›®æ ‡â€æ˜¯URL,N 必须指定, M 默认是HEAD。\n"
+" \n"
+" “-c Mâ€ç‰ä»·ä¸Žâ€œ-r M-1:Mâ€ï¼Œâ€œ-c -Mâ€ç‰ä»·ä¸Žâ€œ-r M:M-1â€ã€‚\n"
+"\n"
+" 2ã€æ˜¾ç¤ºæ–°æ—§ä¿®è®¢ç‰ˆä¸å¯¹åº”ç›®æ ‡çš„å·®å¼‚ã€‚â€œè·¯å¾„â€æ˜¯ç›¸å¯¹äºŽæ–°æ—§ç›®æ ‡çš„相对路径,它é™åˆ¶åªè¾“出这些\n"
+" è·¯å¾„ä¸Šçš„å·®å¼‚ã€‚æ–°æ—§ç›®æ ‡å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€URL[@REV]ã€‚æ–°ç›®æ ‡é»˜è®¤ä¸Žæ—§ç›®æ ‡ç›¸åŒï¼Œ\n"
+" OLDREV 默认为 N,NEWREV 默认为 M。\n"
"\n"
-" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
+" 3ã€â€œsvn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]â€çš„简写。\n"
+"\n"
+" ä¸åР傿•°ä½¿ç”¨â€œsvn diffâ€æ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
#: svn/main.c:376
-#, fuzzy
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6106,20 +6077,19 @@
" looked up.\n"
msgstr ""
"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
-"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
+"用法: 1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
"\n"
-" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
-" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
-" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-"\n"
-" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
-" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
-" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
-" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
+" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。REV缺çœä¸ºHEAD。如果çœç•¥PATH,\n"
+" 地å€(URL)的最åŽéƒ¨åˆ†ä¼šè¢«å½“æˆç›®æ ‡ç›®å½•å。\n"
+"\n"
+" 2ã€ä»ŽPATH1指定的工作拷è´å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2,REV缺çœä¸ºå·¥ä½œç‰ˆæœ¬ã€‚\n"
+" 如果çœç•¥PATH2,PATH1 的最åŽéƒ¨åˆ†ä¼šè¢«ç”¨æ¥å½“æˆç›®æ ‡ç›®å½•å。如果çœç•¥REV,\n"
+" 所有的本地修改都会被导出。没有纳入版本控制的文件ä¸ä¼šè¢«æ‹·è´ã€‚\n"
+" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入版本控制\n"
+" 的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+" 如果指定了PEGREV ,则从æ¤ä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
"\n"
#: svn/main.c:399
@@ -6131,7 +6101,6 @@
"用法:help [å命令...]\n"
#: svn/main.c:405
-#, fuzzy
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6142,14 +6111,14 @@
" If PATH is a directory, the contents of the directory are added\n"
" directly under URL.\n"
msgstr ""
-"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
+"å°†æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘å¯¼å…¥æ¡£æ¡ˆåº“ã€‚\n"
"用法:import [PATH] URL\n"
"\n"
-" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
-" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
+" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL),PATH默认为 '.'。\n"
+" 父目录会ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。如果 PATHæ˜¯ä¸€ä¸ªç›®å½•ï¼Œåˆ™å…¶ä¸‹çš„å†…å®¹ç›´æŽ¥åŠ å…¥åˆ°\n"
+" URL指定的ä½ç½®ä¸‹ã€‚\n"
#: svn/main.c:418
-#, fuzzy
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6161,11 +6130,11 @@
"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
"用法:info [TARGET...]\n"
"\n"
-" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
-" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
+" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认是'.')。\n"
+" TARGET å¯ä»¥æ˜¯å·¥ä½œæ‹·è´ä¸çš„路径或档案库ä¸çš„地å€(URL)。REV指定在哪一个\n"
+" ä¿®è®¢ç‰ˆä¸æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
#: svn/main.c:428
-#, fuzzy
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6186,25 +6155,23 @@
" Size (in bytes)\n"
" Date and time of the last commit\n"
msgstr ""
-"列出档案库ä¸çš„目录项目。\n"
+"列出档案库ä¸çš„目录内容。\n"
"用法:list [TARGET[@REV]...]\n"
"\n"
-" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸æ–‡ä»¶å’Œå目录列表。如果 TARGET 是工作拷è´è·¯å¾„,那么æ“作对应的档案库地å€\n"
+" (URL)上的TARGET。REV指定从在哪个修订版查找TARGET。\n"
"\n"
-" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
+" TARGET默认是'.',表示当å‰å·¥ä½œç›®å½•对应的档案库地å€(URL)。\n"
"\n"
-" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
+" åŠ ä¸Š --verbose çš„è¯ï¼Œæ¯ä¸ªæ¡ç›®ä¼šæ˜¾ç¤ºä»¥ä¸‹é¢å¤–ä¿¡æ¯ï¼š\n"
"\n"
-" 剿¬¡æäº¤çš„修订版å·ç \n"
-" 剿¬¡æäº¤çš„作者\n"
+" 最åŽä¸€æ¬¡æäº¤çš„修订版å·ç \n"
+" 最åŽä¸€æ¬¡æäº¤çš„作者\n"
" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
" å¤§å° (以å—节为å•ä½)\n"
-" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
+" 最åŽä¸€æ¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
#: svn/main.c:450
-#, fuzzy
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6212,24 +6179,20 @@
"\n"
" Use --force to steal the lock from another user or working copy.\n"
msgstr ""
-"在档案库ä¸é”定工作目录或地å€(URL),\n"
-"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
+"é”定档案库ä¸ä¸çš„路径,使得其他用户ä¸èƒ½å‘å…¶æäº¤ä¿®æ”¹ã€‚\n"
"用法:lock TARGET...\n"
"\n"
-" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
+" 使用 --force 选项å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
#: svn/main.c:458
-#, fuzzy
msgid "read lock comment from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件 ARG 读å–åŠ é”æ³¨é‡Š"
#: svn/main.c:459
-#, fuzzy
msgid "specify lock comment ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+msgstr "æŒ‡å®šåŠ é”æ³¨é‡ŠARG"
#: svn/main.c:462
-#, fuzzy
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6259,20 +6222,19 @@
msgstr ""
"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
"用法:1ã€log [PATH]\n"
-" 2ã€log URL [PATH...]\n"
+" 2ã€log URL[@REV] [PATH...]\n"
"\n"
" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
" BASE:1。\n"
"\n"
-" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" HEAD:1。\n"
+" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚REV指定从哪一个修订版开始查找\n"
+" URL。默认的修订版范围为 HEAD:1。\n"
"\n"
-" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
+" 使用 -v 时,在日志信æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径å。\n"
" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
"\n"
-" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
-" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
-" 个功能,这在找出分支点的很方便。\n"
+" æ¯ä¸€æ¡æ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡ï¼Œå³ä½¿æŒ‡å®šæŸä¸€ä¸ªæ›´æ”¹ä¸æ¶‰åŠåˆ°çš„多个文件。默认logä¿¡æ¯ä¼š\n"
+" 追溯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™ç§è¡Œä¸ºï¼Œè¿™ä¾¿äºŽæ‰¾å‡ºåˆ†æ”¯ç‚¹ã€‚\n"
"\n"
" 范例:\n"
" svn log\n"
@@ -6281,7 +6243,6 @@
" svn log http://www.example.com/repo/project foo.c bar.c\n"
#: svn/main.c:492
-#, fuzzy
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6311,22 +6272,17 @@
"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
+" 3ã€merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
"\n"
-" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
-" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
+" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæº URL 的修订版 N 与 Mä½œä¸ºæ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版,默认为 HEAD。\n"
"\n"
-" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
-" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
+" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œä¸¤ä¸ªæºå·¥ä½œæ‹·è´è·¯å¾„对应的档案库ä¸çš„URLä½œä¸ºæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
"\n"
-" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
-" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
-"作\n"
-" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
-"\n"
-" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
-" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´ä¸çš„路径,åŽè€…会使用档案库ä¸å¯¹åº”的地å€(URL)。\n"
+" 比较æºå°±æ˜¯REV修订版ä¸çš„地å€(URL) 在修订版 N å’Œ M时的状æ€ã€‚REV默认为HEAD。\n"
+"\n"
+" WCPATH 是接收更改的工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º'.'ï¼Œé™¤éžæ¥æºä¸æœ‰ä¸Žå½“å‰ç›®å½•\n"
+" ä¸åŒå的文件,这时更改会直接应用至该文件去。\n"
#: svn/main.c:521
msgid ""
@@ -6358,7 +6314,6 @@
" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
#: svn/main.c:538
-#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC DST\n"
@@ -6370,17 +6325,17 @@
" WC -> WC: move and schedule for addition (with history)\n"
" URL -> URL: complete server-side rename.\n"
msgstr ""
-"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
+"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的文件或目录。\n"
"用法:move SRC DST\n"
"\n"
-" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
+" 注æ„:本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
+" 注æ„:æ¤å‘½ä»¤ä¸èƒ½ä½¿ç”¨--revision选项。\n"
"\n"
" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
#: svn/main.c:551
-#, fuzzy
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6390,15 +6345,15 @@
" 2. Removes unversioned remote prop on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"移除目录,文件,或修订版的属性。\n"
+"ç§»é™¤ç›®å½•ã€æ–‡ä»¶æˆ–修订版的属性。\n"
"用法:1ã€propdel PROPNAME [PATH...]\n"
" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
+" 1ã€ç§»é™¤å·¥ä½œæ‹·è´ä¸çº³å…¥ç‰ˆæœ¬ç®¡ç†çš„æ–‡ä»¶æˆ–目录上的属性。\n"
+" 2ã€ç§»é™¤æ¡£æ¡ˆåº“ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:563
-#, fuzzy
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME PATH...\n"
@@ -6408,15 +6363,15 @@
" 2. Edits unversioned remote prop on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
-"用法:1ã€propedit PROPNAME PATH...\n"
+"å¯åŠ¨å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘å±žæ€§ã€‚\n"
+"用法:1ã€propedit PROPNAME [PATH...]\n"
" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+" 1ã€ç¼–辑工作拷è´ä¸çº³å…¥ç‰ˆæœ¬ç®¡ç†çš„æ–‡ä»¶æˆ–目录上的属性。\n"
+" 2ã€ç¼–辑档案库ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:576
-#, fuzzy
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6434,21 +6389,19 @@
" the --strict option to disable these beautifications (useful,\n"
" for example, when redirecting binary property values to a file).\n"
msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
+"æ˜¾ç¤ºç›®å½•ã€æ–‡ä»¶æˆ–修订版的一个属性。\n"
"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
-" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
-" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
-" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
+" 1ã€æ˜¾ç¤ºç›®æ ‡ä¸Šçš„属性。REVæŒ‡å®šä»Žå“ªä¸€ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
+" 2ã€æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
+"\n"
+" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶\n"
+" 处ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåœ¨å¼€å¤´æ·»åŠ ä¸Šå®ƒæ‰€å¯¹åº”çš„è·¯å¾„ã€‚ä½¿ç”¨ --strict 选项\n"
+" 以关é—这项美化行为 (è¿™æ ·åšåˆ©äºŽå°†äºŒè¿›åˆ¶å±žæ€§å†…容é‡å®šå‘至一个文件时)。\n"
#: svn/main.c:595
-#, fuzzy
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6459,16 +6412,15 @@
" 2. Lists unversioned remote props on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
+"åˆ—å‡ºç›®å½•ã€æ–‡ä»¶æˆ–修订版上的所有属性。\n"
"用法:1ã€proplist [TARGET[@REV]...]\n"
-" 2ã€proplist --revprop -r REV [URL]\n"
+" 2ã€proplist --revprop -r REV [TARGET]\n"
"\n"
-" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚REVæŒ‡å®šä»Žå“ªä¸€ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
+" 2ã€åˆ—出档案库ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:607
-#, fuzzy
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6512,43 +6464,44 @@
" attempt will fail, and a recursive attempt will set the property\n"
" only on the file children of the directory.\n"
msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
-" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
-"\n"
-" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
-" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
-" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
-" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
-" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
-" LastChangedRevision\n"
-" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
-" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
-" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
-" 下的文件å项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
-" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
-" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
-" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
+"è®¾å®šç›®å½•ã€æ–‡ä»¶æˆ–修订版的属性。\n"
+"用法:1ã€propset PROPNAME PROPVAL PATH...\n"
+" 2ã€propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸åˆ›å»ºæˆ–者修改一个属性。\n"
+" 2ã€åœ¨æ¡£æ¡ˆåº“ä¸REV修订版上创建或者修改一个属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
+"\n"
+" 如果没有PROPVAL傿•°ï¼Œåˆ™å¿…é¡»æä¾›--file选项。\n"
+"\n"
+" 注æ„:svn 除了能å˜å‚¨ä»»æ„属性外,还识别以下特殊版本控制属性:\n"
+" svn:ignore - 以æ¢è¡Œç¬¦éš”开的忽略文件模å¼åˆ—表。\n"
+" svn:keywords - 将被展开的关键å—。有效的关键å—为。\n"
+" URL, HeadURL - æ¤å¯¹è±¡HEAD版本的地å€(URL)。\n"
+" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„人。\n"
+" Date, LastChangedDate - æ¤å¯¹è±¡æœ€è¿‘一次更改的日期。\n"
+" Rev, Revision, - æ¤å¯¹è±¡æœ€åŽä¸€æ¬¡æ›´æ”¹çš„修订版。\n"
+" LastChangedRevision\n"
+" Id - å‰å››ä¸ªå…³é”®å—的紧凑摘è¦ã€‚\n"
+" svn:executable - 如果å˜åœ¨æ¤å±žæ€§åˆ™è®¾ç½®æ–‡ä»¶ä¸ºå¯æ‰§è¡Œçš„。\n"
+" svn:eol-style - 'native','LF','CR','CRLF'之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
+" 以åŠApache如何处ç†å®ƒã€‚mime类别以 'text/' (或是没有指定 mime 类别)\n"
+" 开头的文件会被视为纯文本文件,å¦åˆ™å°±æ˜¯äºŒè¿›åˆ¶æ•°æ®ã€‚\n"
+" svn:externals - 以æ¢è¡Œç¬¦éš”开的模å—说明列表,æ¯ä¸€æ¡è¯´æ˜Žéƒ½ç”±ä¸€ä¸ªç›¸å¯¹è·¯å¾„ã€\n"
+" å¯é€‰çš„ä¿®è®¢ç‰ˆæ ‡å¿—ã€ä¸€ä¸ªURL组æˆã€‚例如:\n"
" foo http://example.com/repos/zig\n"
" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
-"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
-"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
-"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
+" svn:needs-lock - 如果å˜åœ¨æ¤å±žæ€§åˆ™è¡¨æ˜Žæ¤æ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”è¢«åŠ é”ï¼Œå¦‚æžœæ²¡æœ‰è¢«åŠ é”\n"
+" åˆ™æ¤æ–‡ä»¶åœ¨å·¥ä½œæ‹·è´ä¸åº”被设为åªè¯»ã€‚\n"
+"\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以åŠ\n"
+" svn:needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。ä¸èƒ½åœ¨è®¾ç½®è¿™äº›å±žæ€§æ—¶ä½¿ç”¨éžé€’归选项\n"
+" (-N),递归æ“作时åªä¼šä½œç”¨äºŽæŒ‡å®šç›®å½•下的文件上。\n"
#: svn/main.c:649
-#, fuzzy
msgid "read property value from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件 ARG 读å–属性值"
#: svn/main.c:652
msgid ""
@@ -6573,14 +6526,13 @@
" Note: this subcommand does not require network access, and resolves\n"
" any conflicted states. However, it does not restore removed directories.\n"
msgstr ""
-"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
+"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨åˆ†çš„æœ¬åœ°ä¿®æ”¹)。\n"
"用法:revert PATH...\n"
"\n"
" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
" è¢«åˆ é™¤çš„ç›®å½•\n"
#: svn/main.c:670
-#, fuzzy
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6654,15 +6606,15 @@
" 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
msgstr ""
-"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
+"显示工作拷è´ä¸ç›®å½•与文件的状æ€ã€‚\n"
"用法:status [PATH...]\n"
"\n"
-" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
-" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
-" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
+" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œåªæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„æ¡ç›® (没有网络的å˜å–æ“作)。\n"
+" 使用 -u æ—¶ï¼ŒåŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸Žé’ˆå¯¹æœåŠ¡å™¨ä¸Šç‰ˆæœ¬æ˜¯å¦è¿‡æœŸçš„ä¿¡æ¯ã€‚\n"
+" 使用 -v 时,显示æ¯ä¸€ä¸ªæ¡ç›®çš„完整修订版信æ¯ã€‚\n"
"\n"
-" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
-" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
+" 输出的å‰å…æ å„å 一个å—符宽度:\n"
+" 第一æ :表示一个项目是新增ã€åˆ 除,还是修改的\n"
" ' ' æ— ä¿®æ”¹\n"
" 'A' 新增\n"
" 'C' 冲çª\n"
@@ -6672,40 +6624,41 @@
" 'M' 改å˜\n"
" 'R' 替æ¢\n"
" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
+" '?' 未纳入版本控制\n"
" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
-" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
+" '~' 版本控制下的项目与其它类型的项目é‡å\n"
" 第二æ :显示目录或文件的属性状æ€\n"
" ' ' æ— ä¿®æ”¹\n"
" 'C' 冲çª\n"
" 'M' 改å˜\n"
-" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
+" 第三æ :工作拷è´ç›®å½•是å¦è¢«é”定\n"
" ' ' 未é”定\n"
" 'L' é”定\n"
-" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
-" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
-" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
-" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
+" 第四æ :已调度的æäº¤æ˜¯å¦åŒ…嫿‹·è´åކå²ï¼ˆåŒºåˆ†æ˜¯svn add还是svn copy引起的add)\n"
+" ' ' ä¸åŒ…å«\n"
+" '+' 包å«\n"
+" 第五æ :该æ¡ç›®ç›¸å¯¹å…¶çˆ¶ç›®å½•是å¦å·²åˆ‡æ¢ï¼ˆæœ‰æ— svn switchæ“作)\n"
" ' ' æ£å¸¸\n"
-" 'S' 被切æ¢\n"
-" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
+" 'S' 已切æ¢\n"
+" ç¬¬å…æ :档案库é”å®šæ ‡è®°\n"
+" (没有 -u时)\n"
" ' ' 没有é”å®šæ ‡è®°\n"
" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
-" (有 -u)\n"
+" (有 -u时)\n"
" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
"\n"
-" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
+" 是å¦è¿‡æœŸçš„ä¿¡æ¯å‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
"\n"
" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
+" å·¥ä½œä¿®è®¢ç‰ˆå· (与 -u 或 -v 并用时)\n"
" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
-" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
+" 工作拷è´è·¯å¾„总是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
"\n"
" 范例输出:\n"
" svn status wc\n"
@@ -6726,7 +6679,6 @@
" Status against revision: 981\n"
#: svn/main.c:746
-#, fuzzy
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -6756,15 +6708,20 @@
"用法:1ã€switch URL [PATH]\n"
" 2ã€switch --relocate FROM TO [PATH...]\n"
"\n"
-" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
-" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
-"\n"
-" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
-" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
-" 档案库的åŒä¸€ç›®å½•时用之。\n"
+" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL),其行为跟“svn updateâ€å¾ˆåƒï¼Œä¹Ÿä¼šå°†\n"
+" æœåŠ¡å™¨ä¸Šæ–‡ä»¶ä¸Žæœ¬åœ°æ–‡ä»¶åˆå¹¶ã€‚这是将工作拷è´å¯¹åº”到åŒä¸€æ¡£æ¡ˆåº“䏿Ÿä¸ªåˆ†æ”¯æˆ–è€…æ ‡è®°çš„\n"
+" 方法。\n"
+"\n"
+" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„URL元数æ®ï¼Œä»¥åæ˜ å•纯的URL上的改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹åœ°å€(URL)å˜åЍ \n"
+" (æ¯”å¦‚æ–¹æ¡ˆåæˆ–是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€æ¡£æ¡ˆåº“çš„åŒä¸€ç›®å½•时使用\n"
+" 这个命令更新工作拷è´ä¸Žæ¡£æ¡ˆåº“的对应关系。\n"
+"\n"
+" 如果使用了--forceé€‰é¡¹ï¼Œé‚£ä¹ˆç›®æ ‡ç›®å½•ä¸çš„æœªå—版本管ç†çš„åŒå路径ä¸ä¼šè‡ªåŠ¨ä½¿åˆ‡æ¢å¤±è´¥ã€‚\n"
+" 如果这个路径的类型(文件或者目录)与档案库ä¸å¯¹åº”è·¯å¾„ä¸€æ ·ï¼Œåˆ™è¿™ä¸ªè·¯å¾„è¢«çº³å…¥ç‰ˆæœ¬ç®¡ç†ï¼Œ\n"
+" 并且ä¸ä¿®æ”¹å…¶åŽŸæœ‰å†…å®¹ï¼Œå¦‚æžœå®ƒè·Ÿæ¡£æ¡ˆåº“ä¸ç›¸åº”文件内容ä¸ä¸€è‡´ï¼Œåˆ™çœ‹ä½œæ˜¯æœ¬åœ°ä¿®æ”¹ã€‚档案库\n"
+" 䏿¤è·¯å¾„拥有的属性会全部应用到这个åŒå路径上。 \n"
#: svn/main.c:773
-#, fuzzy
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -6774,10 +6731,9 @@
"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
"用法:unlock TARGET...\n"
"\n"
-" 使用 -force 䏿¢é”定。\n"
+" 使用 --force 䏿¢é”定。\n"
#: svn/main.c:781
-#, fuzzy
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -6812,24 +6768,28 @@
" are applied to the obstructing path. Obstructing paths are reported\n"
" in the first column with code 'E'.\n"
msgstr ""
-"将档案库的改å˜å应至工作拷è´ã€‚\n"
+"将档案库的更改åˆå¹¶åˆ°å·¥ä½œæ‹·è´ä¸ã€‚\n"
"用法:update [PATH...]\n"
"\n"
-" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
-" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
+" å¦‚æžœæ²¡æœ‰æŒ‡å®šä¿®è®¢ç‰ˆï¼Œåˆ™å°†å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。å¦åˆ™åŒæ¥è‡³ -r 选项所指定的修订版。\n"
"\n"
-" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
-" 这些å—符代表如下:\n"
+" æ¯æ›´æ–°ä¸€ä¸ªæ¡ç›®å°±è¾“出一行信æ¯ï¼Œè¿™è¡Œçš„第一个å—符表示所采å–的动作,这些å—符å«ä¹‰å¦‚下:\n"
"\n"
-" A 新增\n"
-" D åˆ é™¤\n"
-" U æ›´æ–°\n"
-" C 冲çª\n"
-" G åˆå¹¶\n"
-"\n"
-" 第一æ çš„å—符表示实际文件的更新,\n"
-" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
-" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
+" A å·²æ·»åŠ \n"
+" D å·²åˆ é™¤\n"
+" U 已更新\n"
+" C 有冲çª\n"
+" G åˆå¹¶æˆåŠŸ\n"
+" E å·²å˜åœ¨\n"
+"\n"
+" 第一æ çš„å—符表示实际文件上的更新,第二æ çš„å—符表示文件上属性的更新,第三æ ä¸Šçš„å—æ¯\n"
+" “Bâ€è¡¨ç¤ºæ¤æ–‡ä»¶ä¸Šçš„é”è¢«ä¸æ¢æˆ–窃å–。\n"
+"\n"
+" 如果使用了--forceé€‰é¡¹ï¼Œé‚£ä¹ˆç›®æ ‡ç›®å½•ä¸çš„æœªå—版本管ç†çš„åŒå路径ä¸ä¼šè‡ªåŠ¨ä½¿æ›´æ–°å¤±è´¥ã€‚\n"
+" 如果这个路径的类型(文件或者目录)与档案库ä¸å¯¹åº”è·¯å¾„ä¸€æ ·ï¼Œåˆ™è¿™ä¸ªè·¯å¾„è¢«çº³å…¥ç‰ˆæœ¬ç®¡ç†ï¼Œ\n"
+" 并且ä¸ä¿®æ”¹å…¶åŽŸæœ‰å†…å®¹ï¼Œå¦‚æžœå®ƒè·Ÿæ¡£æ¡ˆåº“ä¸ç›¸åº”文件内容ä¸ä¸€è‡´ï¼Œåˆ™çœ‹ä½œæ˜¯æœ¬åœ°ä¿®æ”¹ã€‚档案库\n"
+" 䏿¤è·¯å¾„拥有的属性会全部应用到这个åŒå路径上。输出信æ¯ç¬¬ä¸€æ ä¸çš„“Eâ€è¡¨ç¤ºå‘现åŒå\n"
+" 路径已å˜åœ¨ã€‚\n"
#: svn/main.c:857 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
msgid "Caught signal"
@@ -6841,35 +6801,31 @@
#: svn/main.c:975
msgid "Argument to --limit must be positive"
-msgstr ""
+msgstr "--limité€‰é¡¹çš„å‚æ•°å¿…é¡»æ˜¯æ£æ•°"
#: svn/main.c:995
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚æ•°ï¼›ä¸èƒ½æŒ‡å®š -c ä¸¤æ¬¡æˆ–è€…åŒæ—¶ä½¿ç”¨ -c å’Œ -r"
#: svn/main.c:1003 svn/main.c:1194
msgid "Can't specify -c with --old"
-msgstr ""
+msgstr "ä¸èƒ½åŒæ—¶æŒ‡å®š-cå’Œ--old"
#: svn/main.c:1010
-#, fuzzy
msgid "Non-numeric change argument given to -c"
-msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
+msgstr "-cé€‰é¡¹çš„å‚æ•°ä¸æ˜¯æ•°å—"
#: svn/main.c:1016
-#, fuzzy
msgid "There is no change 0"
-msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
+msgstr "没有 0 修订版"
#: svn/main.c:1043
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚æ•°ï¼›ä¸èƒ½åŒæ—¶æŒ‡å®š -r å’Œ -c,请使用“-r N:Mâ€è€Œéžâ€œ-r N -r Mâ€"
#: svn/main.c:1056 svnadmin/main.c:1244
#, c-format
@@ -6910,24 +6866,20 @@
msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
#: svn/main.c:1405
-#, fuzzy
msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+msgstr "锿³¨é‡Šæ–‡ä»¶æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制覆盖"
#: svn/main.c:1426
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
-msgstr ""
-"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
+msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (本是想用 -F 选项的å—?);请使用 '--force-log' 以强制覆盖"
#: svn/main.c:1433
-#, fuzzy
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
-msgstr ""
-"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
+msgstr "锿³¨é‡Šæ˜¯ä¸€ä¸ªè·¯å¾„åç§° (本是想用-F 选项的å—?);请使用 '--force-log' 强制覆盖"
#: svn/main.c:1558
msgid ""
@@ -6941,9 +6893,8 @@
msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
-#, fuzzy
msgid "Too many arguments given"
-msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
+msgstr "傿•°è¿‡å¤š"
#: svn/merge-cmd.c:117
msgid "A working copy merge source needs an explicit revision"
@@ -7137,9 +7088,9 @@
msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除。\n"
#: svn/propedit-cmd.c:60
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid Subversion property name"
-msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆSubversion属性å"
#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:229 svn/propset-cmd.c:85
msgid "Bad encoding option: prop value not stored as UTF8"
@@ -7190,19 +7141,17 @@
msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
#: svn/proplist-cmd.c:119
-#, fuzzy, c-format
+#, c-format
msgid "Properties on '%s':\n"
-msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
+msgstr "“%sâ€ä¸Šçš„属性:\n"
#: svn/props.c:51
-#, fuzzy
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
-msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
+msgstr "æ“作修订版属性时,必须指定数å—ã€æ—¥æœŸå½¢å¼çš„ä¿®è®¢ç‰ˆå·æˆ–“HEADâ€"
#: svn/props.c:58
-#, fuzzy
msgid "Wrong number of targets specified"
msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
@@ -7236,16 +7185,15 @@
msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
#: svn/revert-cmd.c:86
-#, fuzzy
msgid "Try 'svn revert --recursive' instead?"
-msgstr "å°è¯•用 “svn revert -recursive†代替?"
+msgstr "用“svn revert --recursiveâ€çœ‹çœ‹ï¼Ÿ"
#: svn/status-cmd.c:317
#, c-format
msgid ""
"\n"
"--- Changelist '%s':\n"
-msgstr ""
+msgstr "\n--- 更改列表“%sâ€ï¼š\n"
#: svn/status.c:263
#, c-format
@@ -7267,11 +7215,11 @@
"æäº¤åŽçš„修订版为 %ld。\n"
#: svn/util.c:68
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"Warning: %s\n"
-msgstr "%sè¦å‘Šï¼š%s\n"
+msgstr "\nè¦å‘Šï¼š%s\n"
#: svn/util.c:136
msgid ""
@@ -7320,13 +7268,12 @@
msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
#: svn/util.c:510
-#, fuzzy
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
msgstr ""
-"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
-"message (-m) 或 --file (-F) 选项"
+"OS400ä¸Šä¸æ”¯æŒé€šè¿‡å¤–部外部编辑器获得日志信æ¯ï¼›è¯·ä½¿ç”¨ --message (-m) 或\n"
+"--file (-F) 选项"
#: svn/util.c:592
msgid "Cannot invoke editor to get log message when non-interactive"
@@ -7398,7 +7345,6 @@
msgstr "如果有的è¯ï¼Œä»¥æµä¸çš„æ•°å€¼æ¥è®¾å®šæ¡£æ¡ˆåº“çš„ UUID"
#: svnadmin/main.c:257
-#, fuzzy
msgid "type of repository: 'fsfs' (default) or 'bdb'"
msgstr "档案库类型:“fsfsâ€(默认)或“bdbâ€"
@@ -7415,11 +7361,10 @@
msgstr "关闿—¥å¿—文件自动移除 [Berkeley DB]"
#: svnadmin/main.c:272
-#, fuzzy
msgid ""
"remove redundant Berkeley DB log files\n"
" from source repository [Berkeley DB]"
-msgstr "è‡ªæ¥æºæ¡£æ¡ˆåº“移除多余的日志文件"
+msgstr "åˆ é™¤æºæ¡£æ¡ˆåº“ä¸å¤šä½™çš„Berkely DB日志文件"
#: svnadmin/main.c:276
msgid "call pre-commit hook before committing revisions"
@@ -7441,7 +7386,7 @@
msgid ""
"disallow use of SVNDIFF1 in on-disk storage,\n"
" for backwards compatibility"
-msgstr ""
+msgstr "ä¸å…è®¸å› å‘åŽå…¼å®¹è€Œåœ¨ç£ç›˜å˜å‚¨é‡Œä½¿ç”¨SVNDIFF1"
#: svnadmin/main.c:299
msgid ""
@@ -7450,6 +7395,10 @@
"Open the repository at REPOS_PATH, then abort, thus simulating\n"
"a process that crashes while holding an open repository handle.\n"
msgstr ""
+"用法:svnadmin crashtest REPOS_PATH\n"
+"\n"
+"打开REPOS_PATH上的档案库,然åŽä¸æ–ï¼Œä»Žè€Œæ¨¡æ‹Ÿä¸€ä¸ªè¿›ç¨‹åœ¨æŒæœ‰æ‰“å¼€çš„æ¡£æ¡ˆåº“å¥æŸ„æ—¶\n"
+"崩溃的情形。\n"
#: svnadmin/main.c:305
msgid ""
@@ -7559,7 +7508,6 @@
"进度报告会é€è‡³æ ‡å‡†è¾“出。\n"
#: svnadmin/main.c:362
-#, fuzzy
msgid ""
"usage: svnadmin lslocks REPOS_PATH\n"
"\n"
@@ -7567,7 +7515,7 @@
msgstr ""
"用法:svnadmin lslocks REPOS_PATH\n"
"\n"
-"显示所有é”的相信信æ¯ã€‚\n"
+"显示所有é”çš„æè¿°ã€‚\n"
#: svnadmin/main.c:367
msgid ""
@@ -7653,14 +7601,13 @@
"æ ¡éªŒå‚¨å˜äºŽæ¡£æ¡ˆåº“的数æ®ã€‚\n"
#: svnadmin/main.c:456
-#, fuzzy
msgid "Invalid revision specifier"
-msgstr "æŒ‡å®šäº†æ— æ•ˆçš„ä¿®è®¢ç‰ˆæœ¬"
+msgstr "æ— æ•ˆçš„ä¿®è®¢ç‰ˆæè¿°"
#: svnadmin/main.c:461
-#, fuzzy, c-format
+#, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
-msgstr "修订版必须ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
+msgstr "修订版å·ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
#: svnadmin/main.c:534 svnadmin/main.c:629
msgid "First revision cannot be higher than second"
@@ -7677,7 +7624,6 @@
msgstr "完æˆã€‚\n"
#: svnadmin/main.c:654
-#, fuzzy
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -7686,18 +7632,16 @@
"Available subcommands:\n"
msgstr ""
"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnadmin --versionâ€å·²æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬å·ä»¥åŠå¯ç”¨çš„æ–‡ä»¶ç³»ç»Ÿæ¨¡å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
-#, fuzzy
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
-msgstr ""
-"以下的档案库åŽå°(FS) 模å—å¯ç”¨ï¼š\n"
-"\n"
+msgstr "以下的档案库åŽç«¯(FS) 模å—å¯ç”¨ï¼š\n\n"
#: svnadmin/main.c:738
#, c-format
@@ -7762,12 +7706,12 @@
# this points to filename according to sunny256
#: svnadmin/main.c:1048 svnlook/main.c:1729
-#, fuzzy, c-format
+#, c-format
msgid "Owner: %s\n"
msgstr "所有者:%s\n"
#: svnadmin/main.c:1049 svnlook/main.c:1730
-#, fuzzy, c-format
+#, c-format
msgid "Created: %s\n"
msgstr "创建于:%s\n"
@@ -7799,20 +7743,19 @@
"\n"
#: svnadmin/main.c:1110
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "路径“%sâ€æ²¡æœ‰è¢«é”定。\n"
#: svnadmin/main.c:1122
-#, fuzzy, c-format
+#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "åˆ é™¤â€œ%sâ€ä¸Šçš„é”。\n"
#: svnadmin/main.c:1230
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请使用“-r N:Mâ€è€Œéžâ€œ-r M -r Nâ€"
#: svnadmin/main.c:1349
#, c-format
@@ -7851,7 +7794,7 @@
#: svndumpfilter/main.c:558
#, c-format
msgid "No valid copyfrom revision in filtered stream"
-msgstr ""
+msgstr "在被过滤的æµä¸æ²¡æœ‰æœ‰æ•ˆçš„copyfrom修订版"
#: svndumpfilter/main.c:663
msgid "Delta property block detected - not supported by svndumpfilter"
@@ -7898,7 +7841,6 @@
"用法:svndumpfilter help [SUBCOMMAND...]\n"
#: svndumpfilter/main.c:888
-#, fuzzy
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -7907,7 +7849,8 @@
"Available subcommands:\n"
msgstr ""
"一般用法:svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
-"请使用 “svndumpfilter help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svndumpfilter help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svndumpfilter --versionâ€ä»¥æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬å·ã€‚\n"
"\n"
"å¯ç”¨çš„å命令:\n"
@@ -7964,7 +7907,7 @@
"错误:没有æä¾›å‰ç½®å—首,\n"
#: svndumpfilter/main.c:1289
-#, fuzzy, c-format
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svndumpfilter help %s' for usage.\n"
@@ -7989,18 +7932,16 @@
msgstr "为æ¯ä¸ªè·¯å¾„显示节点修订版编å·"
#: svnlook/main.c:114
-#, fuzzy
msgid "do not print differences for added files"
-msgstr "ä¸è¦æ‰“å°å·²æ–°åŠ æ–‡ä»¶çš„ä¸åŒå¤„"
+msgstr "ä¸è¦è¾“å‡ºæ–°åŠ æ–‡ä»¶é€ æˆçš„差异"
#: svnlook/main.c:117
msgid "print differences against the copy source"
msgstr "显示差异并对照原始内容"
#: svnlook/main.c:120
-#, fuzzy
msgid "operate on a revision property (use with -r or -t)"
-msgstr "在修订版属性上作æ“作(使用-r傿•°)"
+msgstr "æ“作修订版上的属性(使用-r或-t选项)"
#: svnlook/main.c:123
msgid "show full paths instead of indenting them"
@@ -8008,7 +7949,7 @@
#: svnlook/main.c:126
msgid "show details for copies"
-msgstr ""
+msgstr "显示å„个拷è´çš„详细信æ¯"
#: svnlook/main.c:138
msgid ""
@@ -8103,7 +8044,6 @@
"显示作者,日期戳,日志信æ¯å¤§å°ï¼Œä»¥åŠæ—¥å¿—ä¿¡æ¯ã€‚\n"
#: svnlook/main.c:186
-#, fuzzy
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8111,7 +8051,7 @@
msgstr ""
"用法:svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
-"如果档案库路径已ç»å˜åœ¨é”,æè¿°å®ƒã€‚\n"
+"如果档案库指定路径上å˜åœ¨é”,则æè¿°å®ƒã€‚\n"
#: svnlook/main.c:191
msgid ""
@@ -8124,7 +8064,6 @@
"显示日志信æ¯ã€‚\n"
#: svnlook/main.c:196
-#, fuzzy
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8133,11 +8072,10 @@
msgstr ""
"用法:svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
-"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性的原始内容。\n"
-"åŠ ä¸Š --revprop, 显示修订版属性的原始值。\n"
+"æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸æŸä¸ªè·¯å¾„上属性的原始值。\n"
+"用--revprop选项显示修订版上属性的原始值。\n"
#: svnlook/main.c:202
-#, fuzzy
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8147,9 +8085,9 @@
msgstr ""
"用法:svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
-"列出档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性。\n"
-"åŠ ä¸Š --revprop 选项, 修订版属性。\n"
-"åŠ ä¸Š -v çš„è¯ï¼Œä¸€å¹¶æ˜¾ç¤ºå±žæ€§å†…容。\n"
+"åˆ—å‡ºæ¡£æ¡ˆåº“ä¸æŸä¸ªè·¯å¾„的属性。\n"
+"使用 --revprop 选项列出修订版的属性。\n"
+"使用 -v 选项一并显示属性的内容。\n"
#: svnlook/main.c:209
msgid ""
@@ -8243,18 +8181,18 @@
"REVISION PATH\n"
"-------- ----\n"
msgstr ""
-"修 订 版 路径\n"
+"修 订 版 路径\n"
"-------- ----\n"
#: svnlook/main.c:1419
-#, fuzzy, c-format
+#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "属性“%sâ€åœ¨ä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
#: svnlook/main.c:1423
-#, fuzzy, c-format
+#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
-msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸æ‰¾ä¸åˆ°"
+msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸Šæ‰¾ä¸åˆ°"
#: svnlook/main.c:1592 svnlook/main.c:1807
#, c-format
@@ -8262,7 +8200,6 @@
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
#: svnlook/main.c:1653
-#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8275,15 +8212,15 @@
msgstr ""
"一般用法:svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"注æ„ï¼šä»»ä½•æŽ¥å— â€œ--revisionâ€ä¸Ž “--transactionâ€é€‰é¡¹çš„å命令,在没有\n"
-" 指定两者其一的情况下使用,会直接作用在档案库最新的修订版。\n"
-"请使用 “svnlook help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+" 指定两者其一的情况下会直接作用在档案库最新的修订版上。\n"
+"请使用“svnlook help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnlook --versionâ€ä»¥æŸ¥çœ‹ç¨‹åºçš„版本以åŠå¯ç”¨çš„æ–‡ä»¶ç³»ç»Ÿæ¨¡å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnlook/main.c:1709
-#, fuzzy
msgid "Missing path argument"
-msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "ä¸¢å¤±è·¯å¾„å‚æ•°"
#: svnlook/main.c:1734
#, c-format
@@ -8304,9 +8241,9 @@
"%s\n"
#: svnlook/main.c:1781
-#, fuzzy, c-format
+#, c-format
msgid "Missing propname argument"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "丢失属性å傿•°"
#: svnlook/main.c:1782
#, c-format
@@ -8327,9 +8264,9 @@
msgstr "'--transaction' (-t) 与 '--revision' (-r) 傿•°ä¸èƒ½åŒæ—¶å˜åœ¨"
#: svnlook/main.c:2089
-#, fuzzy, c-format
+#, c-format
msgid "Repository argument required\n"
-msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
+msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
#: svnlook/main.c:2098
#, c-format
@@ -8337,12 +8274,12 @@
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径\n"
#: svnlook/main.c:2149
-#, fuzzy, c-format
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnlook help %s' for usage.\n"
msgstr ""
-"å命令“%sâ€å¹¶ä¸æŽ¥å—选项“%sâ€\n"
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svnlook help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
#: svnserve/main.c:140
@@ -8374,9 +8311,8 @@
msgstr "æœåŠ¡æ ¹ç›®å½•"
#: svnserve/main.c:153
-#, fuzzy
msgid "force read only, overriding repository config file"
-msgstr "ä¸èµžæˆï¼›ä½¿ç”¨æ¡£æ¡ˆåº“é…置文件"
+msgstr "强制åªè¯»æˆï¼›ä¼˜å…ˆäºŽæ¡£æ¡ˆåº“é…置文件"
#: svnserve/main.c:154
msgid "tunnel mode"
@@ -8396,30 +8332,28 @@
#: svnserve/main.c:162
msgid "write server process ID to file arg"
-msgstr ""
+msgstr "å°†æœåŠ¡è¿›ç¨‹çš„ID写入文件ARGä¸"
#: svnserve/main.c:165
msgid "run as a windows service (SCM only)"
-msgstr ""
+msgstr "以WindowsæœåŠ¡æ–¹å¼è¿è¡Œï¼ˆä»…对æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨æœ‰æ•ˆï¼‰"
#: svnserve/main.c:177
#, c-format
msgid "Type '%s --help' for usage.\n"
-msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
+msgstr "请使用“%s --helpâ€ä»¥å¾—到用法和帮助。\n"
#: svnserve/main.c:186
-#, fuzzy
msgid ""
"usage: svnserve [options]\n"
"\n"
"Valid options:\n"
msgstr ""
-"用户:svnserve [选项]\n"
+"用法:svnserve [选项]\n"
"\n"
"有效选项:\n"
#: svnserve/main.c:468
-#, fuzzy
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "您必须指定 -d, -i, -t 或 -X ä¸çš„一个。\n"
@@ -8433,65 +8367,65 @@
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
-msgstr ""
+msgstr "svnserve: åªæœ‰è¢«æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨å¯åŠ¨æ—¶--serviceé€‰é¡¹æ‰æœ‰æ•ˆ\n"
#: svnserve/main.c:583
-#, fuzzy, c-format
+#, c-format
msgid "Can't get address info"
-msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯"
#: svnserve/main.c:599
-#, fuzzy, c-format
+#, c-format
msgid "Can't create server socket"
-msgstr "æ— æ³•åˆ›å»ºæœåŠ¡å™¨å¥—æŽ¥å—:%s\n"
+msgstr "æ— æ³•åˆ›å»ºæœåŠ¡ç«¯å¥—æŽ¥å—"
#: svnserve/main.c:612
-#, fuzzy, c-format
+#, c-format
msgid "Can't bind server socket"
-msgstr "ä¸èƒ½ç»‘定æœåŠ¡å™¨å¥—æŽ¥å—:“%sâ€\n"
+msgstr "ä¸èƒ½ç»‘定æœåŠ¡ç«¯å¥—æŽ¥å—"
#: svnserve/main.c:680
-#, fuzzy, c-format
+#, c-format
msgid "Can't accept client connection"
-msgstr "æ— æ³•æŽ¥å—客户连接:%s\n"
+msgstr "æ— æ³•æŽ¥å—客户端连接"
#: svnserve/main.c:734
-#, fuzzy, c-format
+#, c-format
msgid "Can't create threadattr"
-msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§ï¼šâ€œ%sâ€\n"
+msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§"
# as-is
#: svnserve/main.c:742
-#, fuzzy, c-format
+#, c-format
msgid "Can't set detached state"
-msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çš„状æ€ï¼šâ€œ%sâ€\n"
+msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çжæ€"
#: svnserve/main.c:755
-#, fuzzy, c-format
+#, c-format
msgid "Can't create thread"
-msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s\n"
+msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹"
#: svnserve/winservice.c:341
#, c-format
msgid "Failed to create winservice_start_event"
-msgstr ""
+msgstr "创建windowsæœåŠ¡å¯åŠ¨äº‹ä»¶å¤±è´¥"
#: svnserve/winservice.c:352
#, c-format
msgid "The service failed to start"
-msgstr ""
+msgstr "æœåŠ¡å¯åŠ¨å¤±è´¥"
#: svnserve/winservice.c:400
#, c-format
msgid "Failed to connect to Service Control Manager"
-msgstr ""
+msgstr "连接æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨å¤±è´¥"
#: svnserve/winservice.c:411
#, c-format
msgid ""
"The service failed to start; an internal error occurred while starting the "
"service"
-msgstr ""
+msgstr "å‘生内部错误,æœåŠ¡å¯åŠ¨å¤±è´¥"
#: svnsync/main.c:56
msgid ""
@@ -8509,6 +8443,15 @@
"In other words, the destination repository should be a read-only\n"
"mirror of the source repository.\n"
msgstr ""
+"用法:svnsync initialize ç›®æ ‡URL æºURL\n"
+"\n"
+"åˆå§‹åŒ–ä¸€ä¸ªç›®æ ‡æ¡£æ¡ˆåº“ä»¥ä»Žå¦ä¸€ä¸ªæ¡£æ¡ˆåº“åŒæ¥ã€‚\n"
+"\n"
+"ç›®æ ‡URL必须指å‘ä¸€ä¸ªæ¡£æ¡ˆåº“çš„æ ¹ç›®å½•ï¼Œè¿™ä¸ªæ¡£æ¡ˆåº“å¿…é¡»æ²¡æœ‰æäº¤è¿‡çš„修订版并且å…许\n"
+"更改修订版属性。\n"
+"\n"
+"除了svnsyncå¤–ï¼Œä½ ä¸åº”è¯¥åœ¨ç›®æ ‡æ¡£æ¡ˆåº“ä¸æäº¤æˆ–è€…æ›´æ”¹ä¿®è®¢ç‰ˆå±žæ€§ã€‚ä¹Ÿå°±æ˜¯è¯´ï¼Œç›®æ ‡\n"
+"æ¡£æ¡ˆåº“åº”è¯¥æ˜¯æºæ¡£æ¡ˆåº“çš„åªè¯»é•œåƒã€‚\n"
#: svnsync/main.c:71
msgid ""
@@ -8516,6 +8459,9 @@
"\n"
"Transfer all pending revisions from source to destination.\n"
msgstr ""
+"用法: svnsync synchronize ç›®æ ‡URL\n"
+"\n"
+"ä»Žæºæ¡£æ¡ˆåº“ä¼ é€ä¿®è®¢ç‰ˆåˆ°ç›®æ ‡æ¡£æ¡ˆåº“。\n"
#: svnsync/main.c:76
msgid ""
@@ -8524,73 +8470,73 @@
"Copy all revision properties for revision REV from source to\n"
"destination.\n"
msgstr ""
+"用法:svnsync copy-revprops ç›®æ ‡URL 修订版\n"
+"\n"
+"ä»Žæºæ¡£æ¡ˆåº“æ‹·è´æ‰€æœ‰æŒ‡å®šä¿®è®¢ç‰ˆä¸Šçš„å±žæ€§åˆ°ç›®æ ‡æ¡£æ¡ˆåº“ã€‚\n"
#: svnsync/main.c:82
-#, fuzzy
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
"Describe the usage of this program or its subcommands.\n"
msgstr ""
-"用法:svnadmin help [SUBCOMMAND...]\n"
+"用法:svnsync help [SUBCOMMAND...]\n"
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
#: svnsync/main.c:184
-#, fuzzy, c-format
+#, c-format
msgid "Can't get local hostname"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+msgstr "æ— æ³•èŽ·å–æœ¬åœ°ä¸»æœºå"
#: svnsync/main.c:206
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
-msgstr ""
+msgstr "å¯¹ç›®æ ‡æ¡£æ¡ˆåº“åŠ é”失败,当å‰è¢«â€œ%sâ€é”定ä¸\n"
#: svnsync/main.c:301
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
-msgstr ""
+msgstr "会è¯çš„æ ¹ç›®å½•在“%sâ€ä½†æ¡£æ¡ˆåº“çš„æ ¹ç›®å½•æ˜¯â€œ%sâ€"
#: svnsync/main.c:341
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
-msgstr ""
+msgstr "修订版%ld的属性拷è´å®Œæ¯•(%s* 属性被跳过)\n"
#: svnsync/main.c:346
-#, fuzzy, c-format
+#, c-format
msgid "Copied properties for revision %ld.\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgstr "æ‹·è´äº†ä¿®è®¢ç‰ˆ%ld上的属性。\n"
#: svnsync/main.c:387
msgid "Cannot initialize a repository with content in it"
-msgstr ""
+msgstr "档案库éžç©ºï¼Œåˆå§‹åŒ–失败"
#: svnsync/main.c:398
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
-msgstr ""
+msgstr "ç›®æ ‡æ¡£æ¡ˆåº“å·²ç»åœ¨ä¸Žâ€œ%sâ€åŒæ¥"
#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
#: svnsync/main.c:1200
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is not a URL"
-msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
+msgstr "路径“%sâ€ä¸æ˜¯URL"
#: svnsync/main.c:838
-#, fuzzy, c-format
+#, c-format
msgid "Committed revision %ld.\n"
-msgstr ""
-"\n"
-"æäº¤åŽçš„修订版为 %ld。\n"
+msgstr "æäº¤åŽçš„修订版为 %ld。\n"
#: svnsync/main.c:877
msgid "Destination repository has not been initialized"
-msgstr ""
+msgstr "ç›®æ ‡æ¡£æ¡ˆåº“å°šæœªè¢«åˆå§‹åŒ–"
#: svnsync/main.c:892
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
-msgstr ""
+msgstr "æºæ¡£æ¡ˆåº“(%s)的UUID与期望的UUID(%s)ä¸åŒ¹é…"
#: svnsync/main.c:954
#, c-format
@@ -8599,6 +8545,8 @@
"destination HEAD (%ld) are inconsistent; have you committed to the "
"destination without using svnsync?"
msgstr ""
+"当剿£è¢«æ‹·è´çš„修订版(%ldï¼‰ã€æœ€åŽåˆå¹¶çš„修订版(%ld)以åŠç›®æ ‡æ¡£æ¡ˆåº“çš„HEAD(%ld)\n"
+"ä¸ä¸€è‡´ï¼›ä½ 是å¦ç”¨svnsync之外的办法å‘ç›®æ ‡æ¡£æ¡ˆåº“æäº¤è¿‡ï¼Ÿ"
#: svnsync/main.c:992
#, c-format
@@ -8606,23 +8554,23 @@
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
"committed to the destination without using svnsync?"
msgstr ""
+"ç›®æ ‡æ¡£æ¡ˆåº“çš„HEAD(%ldï¼‰ä¸æ˜¯æœ€åŽåˆå¹¶çš„修订版(%ldï¼‰ï¼›ä½ æ˜¯å¦ç”¨svnsync之外的办法å‘ç›®æ ‡\n"
+"档案库æäº¤è¿‡ï¼Ÿ"
#: svnsync/main.c:1069
#, c-format
msgid "Commit created rev %ld but should have created %ld"
-msgstr ""
+msgstr "æäº¤åˆ›å»ºäº†ä¿®è®¢ç‰ˆ%ld 但本应创建%ld"
#: svnsync/main.c:1171
msgid "Cannot copy revprops for a revision that has not been synchronized yet"
-msgstr ""
+msgstr "ä¸èƒ½æ‹·è´å°šæœªåŒæ¥çš„修订版的修订属性"
#: svnsync/main.c:1203
-#, fuzzy
msgid "Invalid revision number"
-msgstr "æä¾›äº†æ— 效的版本å·ç "
+msgstr "æ— æ•ˆçš„ä¿®è®¢ç‰ˆå·"
#: svnsync/main.c:1239
-#, fuzzy
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8630,31 +8578,32 @@
"\n"
"Available subcommands:\n"
msgstr ""
-"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"一般用法:svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"请使用“svnsync help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnsync --versionâ€æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬ä»¥åŠå¯ç”¨çš„RA模å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnsync/main.c:1429
-#, fuzzy, c-format
+#, c-format
msgid ""
"subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
-"请输入“svn help %sâ€ä»¥å–得用法。\n"
+"请输入“svnsync help %sâ€ä»¥å–得用法。\n"
#: svnsync/main.c:1490
msgid "Not enough arguments provided; try 'svnsync help' for more info"
-msgstr ""
+msgstr "傿•°ä¸å¤Ÿï¼›è¯·ç”¨â€œsvnsync helpâ€èŽ·å–æ›´å¤šå¸®åŠ©"
#: svnversion/main.c:39
-#, fuzzy, c-format
+#, c-format
msgid "Type 'svnversion --help' for usage.\n"
-msgstr "请使用“svnversion --helpâ€ä»¥å¾—到用法和帮助。\n"
+msgstr "请使用“svnversion --helpâ€ä»¥å¾—到帮助。\n"
#: svnversion/main.c:50
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
@@ -8686,25 +8635,26 @@
msgstr ""
"用法:svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
-" 为工作拷è´è·¯å¾„ WC_PATH 产生简æ´çš„ “版本å·ç â€ã€‚ TRAIL_URL 是\n"
-" URL 的结尾部份,用以决定 WC_PATH 是å¦å·²è¢«åˆ‡æ¢ (WC_PATH 内的切æ¢\n"
-" 侦测并ä¸å€šèµ– TRAIL_URL)。版本å·ç ä¼šå†™è‡³æ ‡å‡†è¾“å‡ºã€‚ä¸¾ä¾‹è¯´æ˜Žï¼š\n"
+" 为工作拷è´è·¯å¾„ WC_PATH 产生紧凑的 “版本å·â€ã€‚ TRAIL_URL 是\n"
+" URL çš„ç»“å°¾éƒ¨åˆ†ï¼Œç”¨ä»¥åˆ¤æ– WC_PATH 是å¦å·²åˆ‡æ¢è¿‡ (探测WC_PATH\n"
+" 内的切æ¢å¹¶ä¸ä¾é TRAIL_URL)。版本å·ç ä¼šå†™è‡³æ ‡å‡†è¾“å‡ºã€‚ä¸¾ä¾‹è¯´æ˜Žï¼š\n"
"\n"
" $ svnversion . /repos/svn/trunk \n"
" 4168\n"
"\n"
-" å¦‚æžœå·¥ä½œæ‹·è´æ˜¯å•一版本,未ç»ä¿®æ”¹ï¼Œæœªè¢«åˆ‡æ¢ï¼Œè€Œä¸”其地å€(URL)符åˆ\n"
-" TRAIL_URL 傿•°ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç 将会是å•一å·ç 。如果工作拷è´å†…ä¸\n"
-" 太å•纯的è¯ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç å°±ä¼šå¤æ‚地多:\n"
+" å¦‚æžœå·¥ä½œæ‹·è´æ˜¯å•一版本,未ç»ä¿®æ”¹ï¼Œæœªç»åˆ‡æ¢ï¼Œè€Œä¸”其地å€(URL)符åˆ\n"
+" TRAIL_URL 傿•°ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç 将会是å•一数å—。如果工作拷è´ä¸æ™®é€šï¼Œ\n"
+" 那么版本å·å°±ä¼šå¤æ‚得多:\n"
"\n"
" 4123:4168 æ··åˆä¿®è®¢ç‰ˆçš„工作拷è´\n"
" 4168M 有修改的工作拷è´\n"
" 4123S 切æ¢äº†çš„工作拷è´\n"
-" 4123:4168MS æ··åˆä¿®è®¢ç‰ˆï¼Œæœ‰ä¿®æ”¹ï¼Œåˆ‡æ¢äº†çš„工作拷è´\n"
+" 4123:4168MS æ··åˆä¿®è®¢ç‰ˆï¼Œæœ‰ä¿®æ”¹ï¼Œå·¥ä½œæ‹·è´åˆ‡æ¢è¿‡\n"
+"\n"
+" 如果使用在éžå·¥ä½œæ‹·è´çš„目录上,例如导出的目录,那么它会输出“已导出â€ã€‚\n"
+"\n"
+" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•°åˆ™WC_PATH默认为当å‰ç›®å½•。\n"
"\n"
-" 如果在éžå·¥ä½œæ‹·è´çš„目录ä¸ï¼Œä¾‹å¦‚导出的目录执行的è¯ï¼Œé‚£ä¹ˆ\n"
-" 这个程åºä¼šè¾“出“已导出â€ã€‚\n"
-" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•° WC_PATH 会使用当å‰ç›®å½•。\n"
"有效选项:\n"
#: svnversion/main.c:121
@@ -8725,236 +8675,3 @@
msgid "'%s' not versioned, and not exported\n"
msgstr "“%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œå¹¶æœªå¯¼å‡º\n"
-#~ msgid "Finished"
-#~ msgstr "完æˆ"
-
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
-
-#, fuzzy
-#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
-
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
-
-#~ msgid "No URL target available"
-#~ msgstr "没有æä¾› URL ç›®æ ‡"
-
-#~ msgid "repository argument required\n"
-#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
-
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%sâ€\n"
-
-#~ msgid "Can't recode string"
-#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
-
-#~ msgid "native"
-#~ msgstr "本地"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
-#~ msgstr "䏿”¯æŒra_davçš„ RA æ’ä»¶ ABI 版本 (%d)"
-
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
-
-#~ msgid "Working copy not locked"
-#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
-
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信æ¯\n"
-
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
-
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
-
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
-
-#~ msgid "print client version info"
-#~ msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
-
-#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
-#~ msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
-
-#, fuzzy
-#~ msgid ""
-#~ "Check out a working copy from a repository.\n"
-#~ "usage: checkout URL[@REV]... [PATH]\n"
-#~ "\n"
-#~ " If specified, REV determines in which revision the URL is first\n"
-#~ " looked up.\n"
-#~ "\n"
-#~ " If PATH is omitted, the basename of the URL will be used as\n"
-#~ " the destination. If multiple URLs are given each will be checked\n"
-#~ " out into a sub-directory of PATH, with the name of the sub-directory\n"
-#~ " being the basename of the URL.\n"
-#~ msgstr ""
-#~ "从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
-#~ "用法:checkout 地å€[@版本]... [路径]\n"
-#~ "\n"
-#~ " 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
-#~ " 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
-#~ " 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
-#~ "\n"
-
-#~ msgid "Wrong number of paths given"
-#~ msgstr "指定了错误数目的路径"
-
-#~ msgid "Not enough args provided"
-#~ msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
-
-# as-is
-#~ msgid "Can't seek in '%s'"
-#~ msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
-
-#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-#~ msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
-
-#~ msgid "Unrecognized node kind of '%s'"
-#~ msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-
-#~ msgid "'%s' is in the way"
-#~ msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
-
-#~ msgid "'%s' is not supported"
-#~ msgstr "“%sâ€ä¸æ”¯æŒ"
-
-#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
-
-#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-#~ msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
-
-#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-#~ msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-
-#~ msgid "Search for malformed path '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for reading"
-#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for writing"
-#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
-
-#, fuzzy
-#~ msgid "Error reading file '%s'"
-#~ msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
-
-#, fuzzy
-#~ msgid "Error writing file '%s'"
-#~ msgstr "写入文件“%sâ€æ—¶å‘生错误"
-
-#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
-
-#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-#~ msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
-
-#~ msgid "Found malformed header block in dumpfile stream"
-#~ msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
-
-# as-is
-#~ msgid "Creating readme file"
-#~ msgstr "æ£åœ¨åˆ›å»º readme 文件"
-
-# as-is
-#~ msgid "Can't open config file '%s'"
-#~ msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
-
-# as-is
-#~ msgid "Can't find config file '%s'"
-#~ msgstr "找ä¸åˆ°é…置文件“%sâ€"
-
-#~ msgid "Can't change executability of file '%s'"
-#~ msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
-
-#~ msgid "Can't stat new directory '%s'"
-#~ msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
-
-#~ msgid "Too few arguments"
-#~ msgstr "傿•°å¤ªå°‘"
-
-#~ msgid ""
-#~ "The entry '%s' is no longer a directory; remove the entry before updating"
-#~ msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-
-#~ msgid "Error restoring props for '%s'"
-#~ msgstr "还原“%sâ€çš„属性时å‘生错误"
-
-#~ msgid "Error removing props for '%s'"
-#~ msgstr "移除“%sâ€çš„属性时å‘生错误"
-
-#~ msgid ""
-#~ "'%s' is scheduled for deletion; it must be committed before being "
-#~ "overwritten"
-#~ msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
-
-#, fuzzy
-#~ msgid "Working copy '%s' is missing or not locked"
-#~ msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
-
-#~ msgid "Error checking path '%s'"
-#~ msgstr "检查路径“%sâ€æ—¶å‘生错误"
-
-#~ msgid "Unable to delete temporary file"
-#~ msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
-
-#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
-
-#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
-
-#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
-
-#~ msgid "Unknown node kind: '%s'"
-#~ msgstr "未知的节点类型:“%sâ€"
-
-#~ msgid "'%s' has unknown value for svn:eol-style property"
-#~ msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
-
-#~ msgid "Move failed"
-#~ msgstr "移动失败"
-
-#~ msgid "Node with dropped parent sneaked in"
-#~ msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
-
-#, fuzzy
-#~ msgid "Error creating dir '%s' (path exists)"
-#~ msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
-
-#~ msgid "Can't create temporary directory"
-#~ msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
-
-#~ msgid ""
-#~ "Warning: -R is deprecated.\n"
-#~ "Anonymous access is now read-only by default.\n"
-#~ "To change, use conf/svnserve.conf in repos:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (default read)\n"
-#~ " auth-access = read|write|none (default write)\n"
-#~ "Forcing all access to read-only for now\n"
-#~ msgstr ""
-#~ "è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
-#~ "匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
-#~ "修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (默认 read)\n"
-#~ " auth-access = read|write|none (默认 write)\n"
-#~ "强制所有访问为åªè¯»\n"
[[[
* subversion/po/zh_CN.po: finish all untranslated and fuzzy items,
remove all obsolete items.
]]]
diff -u msgmerged\zh_CN.po translated\zh_CN.po
--- msgmerged\zh_CN.po Wed Aug 23 11:00:59 2006
+++ translated\zh_CN.po Wed Aug 23 11:01:19 2006
@@ -1,13 +1,76 @@
# Simplified Chinese translation for subversion package
-# Copyright (C) 2004 CollabNet.
+# Copyright (C) 2006 CollabNet.
# This file is distributed under the same license as the subversion package.
#
+#
+# 翻译工具:
+# Emacs + po-mode,åŽè€…在GNU gettext包ä¸ï¼Œä½¿ç”¨æ–‡æ¡£å‚考gettext手册,windows版本下载地å€ï¼š
+# http://ntemacs.sourceforge.net (推�Emacs 23)
+# http://gettext.sourceforge.net
+# http://unxutils.sourceforge.net (�是必须)
+#
+# �考http://svn.collab.net/repos/svn/trunk/TRANSLATING%e4%bb%a5%e8%8e%b7%e5%be%97subversion.pot,
+# 与zh_CN.poåˆå¹¶åŽå†è¿›è¡Œç¿»è¯‘。
+#
+# -----------------------> .emacs (Emacs 23 for windows)
+# ;; from GNU gettext manual
+# (setq auto-mode-alist
+# (cons '("\\.po\\'\\|\\.po\\." . po-mode) auto-mode-alist))
+# (autoload 'po-mode "po-mode" "Major mode for translators to edit PO files" t)
+# (modify-coding-system-alist 'file "\\.po\\'\\|\\.po\\."
+# 'po-find-file-coding-system)
+# (autoload 'po-find-file-coding-system "po-mode")
+#
+# (setq w32-charset-info-alist
+# (cons '("gbk" w32-charset-gb2312 . 936) w32-charset-info-alist))
+#
+#
+# ;; from brep at newsmth.net
+# (setq default-frame-alist
+# (append
+# '((font . "fontset-gbk")) default-frame-alist))
+#
+# (create-fontset-from-fontset-spec
+# "-outline-Courier New-normal-r-normal-normal-13-97-96-96-c-*-fontset-gbk")
+# (set-fontset-font
+# "fontset-default" nil
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'kana
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'han
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'cjk-misc
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-fontset-font
+# "fontset-gbk" 'symbol
+# "-outline-新宋体-normal-r-normal-*-14-*-96-96-c-*-iso10646-1" nil 'prepend)
+# (set-default-font "fontset-gbk")
+#
+# -------------------------------
+#
+# 翻译术è¯è¡¨ï¼š
+# attribute 属性
+# 指XML文件ä¸ä¸€ä¸ªæ ‡è®°èŠ‚ç‚¹çš„å±žæ€§
+# element å…ƒç´
+# 指XML文件ä¸çš„ä¸€ä¸ªæ ‡è®°èŠ‚ç‚¹
+# parse è§£æž
+# representation 修订版
+# 简写作rep,指æ¯ä¸€ä¸ªä¿®è®¢ç‰ˆåœ¨æ–‡ä»¶ç³»ç»Ÿä¸çš„具体å˜å‚¨å½¢å¼ï¼Œç¿»è¯‘æˆâ€œå˜å‚¨è¡¨ç¤ºâ€
+# 并䏿¸…楚,便æ„译为“修订版â€
+# repository 档案库
+# revision 修订版
+# scheme 方案
+# 指URLä¸çš„svn://, http://%e8%bf%99%e6%a0%b7%e7%9a%84%e9%83%a8%e5%88%86
+#
msgid ""
msgstr ""
-"Project-Id-Version: subversion 1.2.0\n"
+"Project-Id-Version: subversion 1.4.x\n"
"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
"POT-Creation-Date: 2006-08-21 10:21-0400\n"
-"PO-Revision-Date: 2004-09-12 22:05+0800\n"
+"PO-Revision-Date: 2006-08-23 10:53+0800\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
@@ -230,14 +293,12 @@
msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
#: include/svn_error_codes.h:387
-#, fuzzy
msgid "Invalid relocation"
-msgstr "æ— æ•ˆçš„é”定"
+msgstr "æ— æ•ˆçš„é‡å®šä½"
#: include/svn_error_codes.h:392
-#, fuzzy
msgid "Invalid switch"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+msgstr "æ— æ•ˆçš„åˆ‡æ¢"
#: include/svn_error_codes.h:398
msgid "General filesystem error"
@@ -277,7 +338,7 @@
#: include/svn_error_codes.h:434
msgid "Filesystem has no such representation"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
+msgstr "æ–‡ä»¶ç³»ç»Ÿä¸æ²¡æœ‰è¿™ä¸ªä¿®è®¢ç‰ˆ"
#: include/svn_error_codes.h:438
msgid "Filesystem has no such string"
@@ -342,11 +403,11 @@
# as-is
#: include/svn_error_codes.h:498
msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改å˜"
+msgstr "åœ¨è¯»å–æ—¶ä¸€ä¸ªä¿®è®¢ç‰ˆæ¶ˆå¤±æˆ–被改å˜"
#: include/svn_error_codes.h:502
msgid "Tried to change an immutable representation"
-msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
+msgstr "å°è¯•更改一个ä¸å¯å˜çš„修订版"
#: include/svn_error_codes.h:506
msgid "Malformed skeleton data"
@@ -377,26 +438,22 @@
msgstr "未知的 FS 类别"
#: include/svn_error_codes.h:536
-#, fuzzy
msgid "No user associated with filesystem"
msgstr "没有用户与文件系统关è”"
#: include/svn_error_codes.h:541
-#, fuzzy
msgid "Path is already locked"
-msgstr "路径“%sâ€å·²ç»è¢«é”定"
+msgstr "路径已ç»è¢«é”定"
#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
-#, fuzzy
msgid "Path is not locked"
msgstr "路径没有被é”定"
#: include/svn_error_codes.h:551
msgid "Lock token is incorrect"
-msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
+msgstr "é”å®šæ ‡è®°ä¸æ£ç¡®"
#: include/svn_error_codes.h:556
-#, fuzzy
msgid "No lock token provided"
msgstr "没有æä¾›é”å®šæ ‡è®°"
@@ -405,7 +462,6 @@
msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
#: include/svn_error_codes.h:566
-#, fuzzy
msgid "Filesystem has no such lock"
msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
@@ -414,14 +470,12 @@
msgstr "é”过期"
#: include/svn_error_codes.h:576
-#, fuzzy
msgid "Item is out of date"
-msgstr "æ¡ç›®å·²è¿‡æ—¶"
+msgstr "æ¡ç›®å·²è¿‡æœŸ"
#: include/svn_error_codes.h:588
-#, fuzzy
msgid "Unsupported FS format"
-msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
+msgstr "䏿”¯æŒçš„æ–‡ä»¶ç³»ç»Ÿæ ¼å¼"
#: include/svn_error_codes.h:594
msgid "The repository is locked, perhaps for db recovery"
@@ -456,12 +510,10 @@
msgstr "执行 post-commit 外挂时å‘生错误"
#: include/svn_error_codes.h:632
-#, fuzzy
msgid "Error running post-lock hook"
msgstr "执行 post-lock 外挂时å‘生错误"
#: include/svn_error_codes.h:637
-#, fuzzy
msgid "Error running post-unlock hook"
msgstr "执行 post-unlock 外挂时å‘生错误"
@@ -526,7 +578,6 @@
msgstr "找ä¸åˆ° HTTP 路径"
#: include/svn_error_codes.h:712
-#, fuzzy
msgid "Failed to execute WebDAV PROPPATCH"
msgstr "执行 WebDAV PROPPATCH 失败"
@@ -586,24 +637,20 @@
msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
#: include/svn_error_codes.h:792
-#, fuzzy
msgid "Item is not readable"
-msgstr "项目ä¸èƒ½è¯»ã€‚"
+msgstr "æ¡ç›®ä¸å¯è¯»"
#: include/svn_error_codes.h:797
-#, fuzzy
msgid "Item is partially readable"
-msgstr "项目部分å¯è¯»ã€‚"
+msgstr "æ¡ç›®éƒ¨åˆ†å¯è¯»"
#: include/svn_error_codes.h:801
-#, fuzzy
msgid "Invalid authz configuration"
-msgstr "æ— æ•ˆçš„é…置值"
+msgstr "æ— æ•ˆçš„authzé…ç½®"
#: include/svn_error_codes.h:806
-#, fuzzy
msgid "Item is not writable"
-msgstr "项目ä¸èƒ½å†™ã€‚"
+msgstr "æ¡ç›®ä¸å¯å†™"
#: include/svn_error_codes.h:812
msgid "Svndiff data has invalid header"
@@ -628,14 +675,12 @@
msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
#: include/svn_error_codes.h:832
-#, fuzzy
msgid "Svndiff compressed data is invalid"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+msgstr "Svndiff åŽ‹ç¼©æ•°æ®æ— 效"
#: include/svn_error_codes.h:838
-#, fuzzy
msgid "Diff data source modified unexpectedly"
-msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+msgstr "Diffæ•°æ®æºè¢«æ„外修改"
#: include/svn_error_codes.h:844
msgid "Apache has no path to an SVN filesystem"
@@ -800,7 +845,7 @@
#: include/svn_error_codes.h:1015
msgid "Not enough arguments provided; try 'svn help' for more info"
-msgstr ""
+msgstr "傿•°ä¸å¤Ÿï¼Œè¯·ç”¨â€œsvn helpâ€èŽ·å–帮助"
#: include/svn_error_codes.h:1019
msgid "Mutually exclusive arguments specified"
@@ -851,7 +896,7 @@
#: libsvn_client/blame.c:522
msgid "blame of the WORKING revision is not supported"
-msgstr ""
+msgstr "blame䏿”¯æŒå·¥ä½œä¿®è®¢ç‰ˆ"
#: libsvn_client/blame.c:535
msgid "Start revision must precede end revision"
@@ -868,12 +913,12 @@
msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not under version control or doesn't exist"
msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
#: libsvn_client/cat.c:79
-#, fuzzy, c-format
+#, c-format
msgid "'%s' refers to a directory"
msgstr "“%sâ€å¼•用一个目录"
@@ -898,14 +943,13 @@
msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
#: libsvn_client/checkout.c:167
-#, fuzzy
msgid "; run 'svn update' to complete it"
msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
#: libsvn_client/checkout.c:177
-#, fuzzy, c-format
+#, c-format
msgid "'%s' already exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+msgstr "“%sâ€å·²å˜åœ¨ä¸”䏿˜¯ç›®å½•"
#: libsvn_client/commit.c:198
#, c-format
@@ -964,7 +1008,7 @@
#: libsvn_client/commit.c:1404
msgid "Are all the targets part of the same working copy?"
-msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部分?"
#: libsvn_client/commit.c:1419
msgid "Cannot non-recursively commit a directory deletion"
@@ -1042,7 +1086,7 @@
"'%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â€æ˜¯æäº¤çš„一部份"
+"“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œä¹Ÿä¸æ˜¯æäº¤çš„一部分,但是它的å路径“%sâ€æ˜¯æäº¤çš„一部分"
#: libsvn_client/commit_util.c:865
#, c-format
@@ -1055,13 +1099,13 @@
msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
#: libsvn_client/copy.c:95 libsvn_client/copy.c:769
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is not a directory"
-msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
+msgstr "路径“%sâ€ä¸æ˜¯ç›®å½•"
#: libsvn_client/copy.c:138
msgid "Move will not be attempted unless forced"
-msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
+msgstr "除éžå¼ºåˆ¶æ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
#: libsvn_client/copy.c:334
#, c-format
@@ -1146,23 +1190,19 @@
msgstr "åå—:%s%s"
#: libsvn_client/diff.c:203
-#, fuzzy, c-format
+#, c-format
msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"sâ€ä¸Žâ€œ%sâ€)"
+msgstr "地å�€(URL)䏿²¡æœ‰æ–¹æ¡ˆå��(指svn://, http://, file://ç‰ï¼‰ï¼ˆâ€œ%sâ€�与“%sâ€�)"
#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
-#, fuzzy, c-format
+#, c-format
msgid "URL has no scheme: '%s'"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"sâ€"
+msgstr "地å�€(URL)䏿²¡æœ‰æ–¹æ¡ˆå��(指svn://, http://, file://ç‰ï¼‰ï¼ˆâ€œ%sâ€�)"
#: libsvn_client/diff.c:222
-#, fuzzy, c-format
+#, c-format
msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
+msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–方案 (“%sâ€ä¸Žâ€œ%sâ€)"
# as-is
#: libsvn_client/diff.c:287
@@ -1214,9 +1254,8 @@
msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
#: libsvn_client/diff.c:1961
-#, fuzzy
msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
+msgstr "抱æ‰ï¼Œsvn_client_diff3 å°šä¸æ”¯æŒè¿™ç§è°ƒç”¨æ–¹å¼"
#: libsvn_client/diff.c:2000
msgid ""
@@ -1231,7 +1270,7 @@
#: libsvn_client/diff.c:2352
msgid "Summarizing diff can only compare repository to repository"
-msgstr ""
+msgstr "åªèƒ½åœ¨æ¡£æ¡ˆåº“ä¹‹é—´åšæ‘˜è¦æ¯”较"
#: libsvn_client/diff.c:2709 libsvn_client/diff.c:2715
#: libsvn_client/diff.c:2850 libsvn_client/locking_commands.c:263
@@ -1266,12 +1305,12 @@
msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
#: libsvn_client/info.c:243
-#, fuzzy, c-format
+#, c-format
msgid "Cannot read entry for '%s'"
msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
#: libsvn_client/info.c:379 libsvn_client/info.c:404 libsvn_client/info.c:414
-#, fuzzy, c-format
+#, c-format
msgid "URL '%s' non-existent in revision '%ld'"
msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
@@ -1289,12 +1328,12 @@
msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
#: libsvn_client/locking_commands.c:328
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked in this working copy"
msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
#: libsvn_client/locking_commands.c:376
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked"
msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
@@ -1308,9 +1347,8 @@
msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
#: libsvn_client/log.c:86
-#, fuzzy
msgid "Revision type requires a working copy path, not a URL"
-msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+msgstr "修订版类型需è¦å·¥ä½œæ‹·è´è·¯å¾„ï¼Œä¸æ˜¯URL"
#: libsvn_client/log.c:139 libsvn_client/status.c:261
#: libsvn_client/update.c:86
@@ -1319,7 +1357,6 @@
msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
#: libsvn_client/log.c:370
-#, fuzzy
msgid "No commits in repository"
msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
@@ -1334,7 +1371,7 @@
msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
#: libsvn_client/prop_commands.c:199
-#, fuzzy, c-format
+#, c-format
msgid "Setting property on non-local target '%s' is not supported"
msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
@@ -1348,9 +1385,9 @@
msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
#: libsvn_client/prop_commands.c:499
-#, fuzzy, c-format
+#, c-format
msgid "'%s' does not exist in revision '%ld'"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
+msgstr "“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ%ldä¸"
#: libsvn_client/prop_commands.c:506 libsvn_client/prop_commands.c:765
#, c-format
@@ -1396,9 +1433,9 @@
"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
#: libsvn_client/relocate.c:101
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not the root of the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+msgstr "“%sâ€ä¸æ˜¯æ¡£æ¡ˆåº“çš„æ ¹ç›®å½•"
#: libsvn_client/relocate.c:108
#, c-format
@@ -1406,9 +1443,9 @@
msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
#: libsvn_client/revisions.c:99
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' has no committed revision"
-msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
+msgstr "路径“%sâ€ä¸Šæ²¡æœ‰æäº¤çš„修订版"
#: libsvn_client/revisions.c:109
#, c-format
@@ -1417,15 +1454,15 @@
#: libsvn_delta/svndiff.c:144
msgid "Compression of svndiff data failed"
-msgstr ""
+msgstr "svndiffæ•°æ®åŽ‹ç¼©å¤±è´¥"
#: libsvn_delta/svndiff.c:407
msgid "Decompression of svndiff data failed"
-msgstr ""
+msgstr "svndiffæ•°æ®è§£åŽ‹ç¼©å¤±è´¥"
#: libsvn_delta/svndiff.c:414
msgid "Size of uncompressed data does not match stored original length"
-msgstr ""
+msgstr "è§£åŽ‹ç¼©åŽæ•°æ®é•¿åº¦ä¸ŽåŽŸå§‹é•¿åº¦ä¸ä¸€è‡´"
#: libsvn_delta/svndiff.c:484
#, c-format
@@ -1488,17 +1525,17 @@
#: libsvn_diff/diff_file.c:593
#, c-format
msgid "The file '%s' changed unexpectedly during diff"
-msgstr ""
+msgstr "文件“%sâ€åœ¨æ¯”较期间被修改"
#: libsvn_diff/diff_file.c:714
-#, fuzzy, c-format
+#, c-format
msgid "Error parsing diff options"
-msgstr "分解“%sâ€æ—¶å‘生错误"
+msgstr "è§£æždiff选项出错"
#: libsvn_diff/diff_file.c:737
#, c-format
msgid "Invalid argument '%s' in diff options"
-msgstr ""
+msgstr "diff选项ä¸çš„“%sâ€å‚æ•°æ— æ•ˆ"
#: libsvn_diff/diff_file.c:1019
#, c-format
@@ -1517,9 +1554,9 @@
msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
+#, c-format
msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%sâ€æ¨¡å—失败"
+msgstr "装载“%sâ€æ–‡ä»¶ç³»ç»Ÿç±»åž‹çš„æ¨¡å—失败"
#: libsvn_fs/fs-loader.c:138
#, c-format
@@ -1533,26 +1570,26 @@
msgstr "未知的文件系统(FS)类别“%sâ€"
#: libsvn_fs/fs-loader.c:253
-#, fuzzy, c-format
+#, c-format
msgid "Can't allocate FS mutex"
-msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
+msgstr "ä¸èƒ½åˆ†é…文件系统互斥体"
#: libsvn_fs/fs-loader.c:289
-#, fuzzy, c-format
+#, c-format
msgid "Can't grab FS mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿäº’斥体"
#: libsvn_fs/fs-loader.c:295
#, c-format
msgid "Can't ungrab FS mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿäº’斥体"
#: libsvn_fs/fs-loader.c:901
msgid "Negative expiration date passed to svn_fs_lock"
msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
#: libsvn_fs_base/bdb/bdb-err.c:101
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while %s:\n"
msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
@@ -1583,7 +1620,7 @@
#: libsvn_fs_base/bdb/changes-table.c:282
#: libsvn_fs_base/bdb/changes-table.c:401
-#, fuzzy, c-format
+#, c-format
msgid "Error reading changes for key '%s'"
msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
@@ -1598,7 +1635,6 @@
msgstr "æ£åœ¨å…³é—更改指针"
#: libsvn_fs_base/bdb/copies-table.c:85
-#, fuzzy
msgid "storing copy record"
msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
@@ -1616,7 +1652,6 @@
# as-is
#: libsvn_fs_base/bdb/copies-table.c:195
-#, fuzzy
msgid "reading copy"
msgstr "æ£åœ¨è¯»å–æ‹·è´"
@@ -1629,7 +1664,7 @@
msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
#: libsvn_fs_base/bdb/nodes-table.c:152
-#, fuzzy, c-format
+#, c-format
msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
@@ -1639,88 +1674,77 @@
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/nodes-table.c:218
-#, fuzzy
msgid "reading node revision"
msgstr "æ£åœ¨è¯»å–节点修订版"
#: libsvn_fs_base/bdb/nodes-table.c:250
-#, fuzzy
msgid "storing node revision"
msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
-#, fuzzy, c-format
+#, c-format
msgid "No such representation '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
+msgstr "没有修订版“%sâ€"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/reps-table.c:96
-#, fuzzy
msgid "reading representation"
-msgstr "æ£åœ¨è¯»å–请求"
+msgstr "æ£åœ¨è¯»å–修订版"
#: libsvn_fs_base/bdb/reps-table.c:124
-#, fuzzy
msgid "storing representation"
-msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
+msgstr "æ£åœ¨å˜å‚¨ä¿®è®¢ç‰ˆ"
#: libsvn_fs_base/bdb/reps-table.c:154
msgid "allocating new representation (getting next-key)"
-msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
+msgstr "æ£åœ¨åˆ†é…新修订版(æ£åœ¨èŽ·å– next-key)"
#: libsvn_fs_base/bdb/reps-table.c:175
-#, fuzzy
msgid "bumping next representation key"
-msgstr "æ£åœ¨æå–下一个请求关键å—"
+msgstr "æ£åœ¨æå–下一个修订版关键å—"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/reps-table.c:203
-#, fuzzy
msgid "deleting representation"
-msgstr "æ£åœ¨åˆ 除请求"
+msgstr "æ£åœ¨åˆ 除修订版"
#. Handle any other error conditions.
#: libsvn_fs_base/bdb/rev-table.c:87
-#, fuzzy
msgid "reading filesystem revision"
-msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
+msgstr "æ£åœ¨è¯»å–文件系统修订版"
#: libsvn_fs_base/bdb/strings-table.c:89
msgid "creating cursor for reading a string"
msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
#: libsvn_fs_base/bdb/txn-table.c:92
-#, fuzzy
msgid "storing transaction record"
msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
#: libsvn_fs_base/bdb/uuids-table.c:114
-#, fuzzy
msgid "get repository uuid"
-msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+msgstr "èŽ·å–æ¡£æ¡ˆåº“UUID"
#: libsvn_fs_base/bdb/uuids-table.c:142
-#, fuzzy
msgid "set repository uuid"
-msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+msgstr "设置档案库UUID"
#: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:247
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„æ‹·è´ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:256
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:317
-#, fuzzy
msgid "Attempted to create entry in non-directory parent"
msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
@@ -1730,22 +1754,20 @@
msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:323
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to clone child of non-mutable node"
msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
#: libsvn_fs_base/dag.c:494
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to create entry that already exists"
msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:385
-#, fuzzy
msgid "Attempted to set entry in non-directory node"
msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:391
-#, fuzzy
msgid "Attempted to set entry in immutable node"
msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
@@ -1760,12 +1782,12 @@
msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
#: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to delete entry '%s' from *non*-directory node"
msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
#: libsvn_fs_base/dag.c:858
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to delete entry '%s' from immutable directory node"
msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
@@ -1775,12 +1797,12 @@
msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
-#, fuzzy, c-format
+#, c-format
msgid "Delete failed: directory has no entry '%s'"
msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
#: libsvn_fs_base/dag.c:962
-#, fuzzy, c-format
+#, c-format
msgid "Attempted removal of immutable node"
msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
@@ -1800,25 +1822,25 @@
msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
-#, fuzzy, c-format
+#, c-format
msgid "Attempted to set textual contents of an immutable node"
-msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
#: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch, rep '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"æ ¡éªŒå’Œä¸åŒ¹é…,修订版“%sâ€ï¼š\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_base/dag.c:1312
#, c-format
@@ -1885,32 +1907,32 @@
msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„一个文件"
#: libsvn_fs_base/err.c:171
-#, fuzzy, c-format
+#, c-format
msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
#: libsvn_fs_base/err.c:181
-#, fuzzy, c-format
+#, c-format
msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
+msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ²¡æœ‰æ ‡è¯†"
#: libsvn_fs_base/err.c:190
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'locks' è¡¨é‡Œé”æŸå"
#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
-#, fuzzy, c-format
+#, c-format
msgid "No lock on path '%s' in filesystem '%s'"
msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
-#, fuzzy, c-format
+#, c-format
msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
@@ -1920,12 +1942,12 @@
msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
-#, fuzzy, c-format
+#, c-format
msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
+msgstr "用户“%1$sâ€å°è¯•使用文件系统“%3$sâ€ä¸å±žäºŽâ€œ%2$sâ€çš„é”"
#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
@@ -1940,24 +1962,23 @@
msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
-#, fuzzy
msgid "Filesystem object already open"
msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
#: libsvn_fs_base/fs.c:189
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当关é—环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:539
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当创建环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:545
-#, fuzzy, c-format
+#, c-format
msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+msgstr "当打开环境时文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)出错:\n"
#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:277
#, c-format
@@ -1965,32 +1986,28 @@
msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
#: libsvn_fs_base/fs.c:1094
-#, fuzzy
msgid ""
"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
"may be interfering with the hotcopy algorithm. If \n"
"the problem persists, try deactivating this feature \n"
"in DB_CONFIG"
msgstr ""
-"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
-"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
-"在 DB_CONFIG ä¸å–消这个功能。"
+"å¤åˆ¶logfileæ—¶å‘生错误;DB_LOG_AUTOREMOVE 特性å¯èƒ½å¹²æ‰°çƒæ‹·è´ç®—法。\n"
+"如果问题æŒç»å˜åœ¨ï¼Œè¯·å°è¯•在 DB_CONFIG ä¸å–消这个特性。"
#: libsvn_fs_base/fs.c:1113
-#, fuzzy
msgid ""
"Error running catastrophic recovery on hotcopy; the \n"
"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
"hotcopy algorithm. If the problem persists, try deactivating \n"
"this feature in DB_CONFIG"
msgstr ""
-"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
-"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
-"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
+"å¯¹çƒæ‹·è´æ‰§è¡Œç¾åŽæ¢å¤æ—¶å‡ºé”™ï¼›DB_LOG_AUTOREMOVE 特性å¯èƒ½å¹²æ‰°çƒæ‹·è´ç®—法。\n"
+"如果问题æŒç»å˜åœ¨ï¼Œè¯·å°è¯•在 DB_CONFIG ä¸å–消这个特性。"
#: libsvn_fs_base/fs.c:1222
msgid "Module for working with a Berkeley DB repository."
-msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
+msgstr "æ“作伯克利数æ®åº“(Berkeley DB)档案库的模å—。"
#: libsvn_fs_base/fs.c:1255
#, c-format
@@ -2015,49 +2032,48 @@
#. Helper macro that evaluates to an error message indicating that
#. the representation referred to by X has an unknown node kind.
#: libsvn_fs_base/reps-strings.c:57
-#, fuzzy, c-format
+#, c-format
msgid "Unknown node kind for representation '%s'"
-msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
+msgstr "修订版“%sâ€çš„节点类型未知"
#: libsvn_fs_base/reps-strings.c:108
-#, fuzzy
msgid "Representation is not of type 'delta'"
-msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
+msgstr "ä¿®è®¢ç‰ˆä¸æ˜¯ “delta†类型"
#: libsvn_fs_base/reps-strings.c:379
msgid "Svndiff source length inconsistency"
-msgstr ""
+msgstr "Svndiffæºé•¿åº¦ä¸ä¸€è‡´"
#: libsvn_fs_base/reps-strings.c:506
#, c-format
msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
+msgstr "在“%sâ€ä¿®è®¢ç‰ˆä¸ diff 的版本ä¸ä¸€è‡´"
#: libsvn_fs_base/reps-strings.c:532
#, c-format
msgid ""
"Corruption detected whilst reading delta chain from representation '%s' to '%"
"s'"
-msgstr ""
+msgstr "从修订版“%sâ€åˆ°â€œ%sâ€è¯»å–差异链时检测到æŸå"
#: libsvn_fs_base/reps-strings.c:780
#, c-format
msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
+msgstr "修订版内容太大: %s,最大åªèƒ½ %s"
#: libsvn_fs_base/reps-strings.c:796
-#, fuzzy, c-format
+#, c-format
msgid "Failure reading rep '%s'"
-msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
+msgstr "读å–修订版“%sâ€å¤±è´¥"
#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch on rep '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+"修订版“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
" 预期: %s\n"
" 实际: %s\n"
@@ -2066,14 +2082,14 @@
msgstr "空的报告,å移已ç»è¶…过零值"
#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
-#, fuzzy, c-format
+#, c-format
msgid "Rep '%s' is not mutable"
-msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
+msgstr "修订版“%sâ€æ˜¯ä¸å¯å˜çš„"
#: libsvn_fs_base/reps-strings.c:1040
#, c-format
msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
+msgstr "修订版“%s†å¯å˜ä¸”éžçº¯æ–‡æœ¬"
#: libsvn_fs_base/reps-strings.c:1340
msgid "Failed to get new string key"
@@ -2085,22 +2101,21 @@
msgstr "ä¼å›¾ deltify “%s†自身"
#: libsvn_fs_base/reps-strings.c:1487
-#, fuzzy, c-format
+#, c-format
msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%sâ€çš„MD5指纹失败"
+msgstr "计算“%sâ€çš„MD5摘è¦å¤±è´¥"
#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
+#, c-format
msgid "Transaction is not dead: '%s'"
msgstr "事务未结æŸï¼šâ€œ%sâ€"
#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
-#, fuzzy, c-format
+#, c-format
msgid "Transaction is dead: '%s'"
msgstr "事务已结æŸï¼šâ€œ%sâ€"
#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
msgid "Transaction aborted, but cleanup failed"
msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
@@ -2108,7 +2123,7 @@
#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
#. for PATH in ROOT.
#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
+#, c-format
msgid "File not found: transaction '%s', path '%s'"
msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
@@ -2119,7 +2134,7 @@
#. Build a detailed `file already exists' message for PATH in ROOT.
#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
+#, c-format
msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
@@ -2129,32 +2144,30 @@
msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
-#, fuzzy
msgid "Root object must be a transaction root"
-msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
+msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªæ ¹äº‹åŠ¡"
#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
+#, c-format
msgid "Failure opening '%s'"
msgstr "打开“%sâ€å¤±è´¥"
#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
-#, fuzzy
msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
#: libsvn_fs_base/tree.c:1735
msgid "Corrupt DB: faulty predecessor count"
msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
+#, c-format
msgid "Unexpected immutable node at '%s'"
-msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
+msgstr "在“%sâ€ä¸åº”有ä¸å¯æ”¹å˜èŠ‚ç‚¹"
# as-is
#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
+#, c-format
msgid "Conflict at '%s'"
msgstr "在“%sâ€å†²çª"
@@ -2169,67 +2182,64 @@
msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
#: libsvn_fs_base/tree.c:2373
-#, fuzzy, c-format
+#, c-format
msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
+msgstr "关于修订版本“%2$sâ€çš„事务“%1$sâ€å·²ç»è¿‡æœŸ"
#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
-#, fuzzy
msgid "The root directory cannot be deleted"
msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
-#, fuzzy, c-format
+#, c-format
msgid "Cannot copy between two different filesystems ('%s' and '%s')"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿï¼ˆâ€œ%sâ€å’Œâ€œ%sâ€ï¼‰ä¹‹é—´æ¯”较属性值"
#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
msgid "Copy from mutable tree not currently supported"
msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
-#, fuzzy, c-format
+#, c-format
msgid ""
"Base checksum mismatch on '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"åŸºæ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
-#, fuzzy
msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
+msgstr "ä¸èƒ½åœ¨ä¸¤ä¸ªä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿé—´æ¯”较文件内容"
#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
#: libsvn_repos/rev_hunt.c:605
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a file"
msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
#: libsvn_fs_fs/dag.c:367
-#, fuzzy
msgid "Can't get entries of non-directory"
msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
#: libsvn_fs_fs/dag.c:914
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch, file '%s':\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+" 预期:%s\n"
+" 实际:%s\n"
#: libsvn_fs_fs/err.c:107
-#, fuzzy, c-format
+#, c-format
msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
+msgstr "文件系统“%2$sâ€ä¸è·¯å¾„“%1$sâ€çš„锿–‡ä»¶æŸå"
#: libsvn_fs_fs/fs.c:97
#, c-format
@@ -2237,7 +2247,7 @@
msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
#: libsvn_fs_fs/fs.c:104
-#, fuzzy, c-format
+#, c-format
msgid "Can't create FSFS mutex"
msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
@@ -2262,7 +2272,7 @@
#: libsvn_fs_fs/fs_fs.c:583 libsvn_fs_fs/fs_fs.c:597 libsvn_fs_fs/fs_fs.c:604
#: libsvn_fs_fs/fs_fs.c:611 libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627
msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
+msgstr "node-rev 䏿œ‰ç•¸å½¢çš„æ–‡æœ¬è¡¨ç¤ºå移行"
#: libsvn_fs_fs/fs_fs.c:696
msgid "Missing kind field in node-rev"
@@ -2286,7 +2296,7 @@
#: libsvn_fs_fs/fs_fs.c:967
msgid "Malformed representation header"
-msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
+msgstr "畸形的修订版文件头"
#: libsvn_fs_fs/fs_fs.c:991
msgid "Missing node-id in node-rev"
@@ -2318,12 +2328,12 @@
#: libsvn_fs_fs/fs_fs.c:1216
msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
+msgstr "修订版的svndiff æ•°æ®ç•¸å½¢"
# as-is
#: libsvn_fs_fs/fs_fs.c:1359 libsvn_fs_fs/fs_fs.c:1372
msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
+msgstr "读å–一个svndiffçª—å£æ—¶è¶…出了修订版的结尾"
#: libsvn_fs_fs/fs_fs.c:1508
msgid "svndiff data requested non-existent source"
@@ -2338,13 +2348,13 @@
msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
#: libsvn_fs_fs/fs_fs.c:1602
-#, fuzzy, c-format
+#, c-format
msgid ""
"Checksum mismatch while reading representation:\n"
" expected: %s\n"
" actual: %s\n"
msgstr ""
-"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+"读å–ä¿®è®¢ç‰ˆæ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
" 预期: %s\n"
" 实际: %s\n"
@@ -2376,16 +2386,15 @@
msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
#: libsvn_fs_fs/fs_fs.c:2492
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
+msgstr "æ— æ³•åœ¨â€œ%sâ€ä¸ä¸ºä¿®è®¢ç‰ˆ %ld 创建事务目录"
#: libsvn_fs_fs/fs_fs.c:2671 libsvn_fs_fs/fs_fs.c:2678
msgid "next-id file corrupt"
msgstr "next-id 文件æŸå"
#: libsvn_fs_fs/fs_fs.c:2763
-#, fuzzy
msgid "Transaction cleanup failed"
msgstr "事务清除失败"
@@ -2433,19 +2442,19 @@
msgstr "æ— æ¤äº‹åŠ¡"
#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
+#, c-format
msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
+msgstr "æ— æ³•å†™å…¥é”-æ¡ç›®çš„哈希文件“%sâ€"
#: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
+#, c-format
msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
+msgstr "ä¸èƒ½è§£æžé”-æ¡ç›®çš„哈希文件“%s“"
#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽHEAD修订版ä¸"
#: libsvn_fs_fs/lock.c:741
#, c-format
@@ -2453,31 +2462,25 @@
msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
#: libsvn_ra/ra_loader.c:213
-#, fuzzy, c-format
+#, c-format
msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
+msgstr "“%sâ€çš„ RA 版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
#: libsvn_ra/ra_loader.c:285
-#, fuzzy, c-format
+#, c-format
msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+msgstr "æ— æ³•è¯†åˆ«â€œ%sâ€ä¸çš„URL方案"
#: libsvn_ra/ra_loader.c:336
-#, fuzzy, c-format
+#, c-format
msgid "'%s' isn't in the same repository as '%s'"
-msgstr ""
-"“%sâ€\n"
-"与\n"
-"“%sâ€\n"
-"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
+msgstr "“%sâ€ä¸Žâ€œ%sâ€å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
# as-is
#: libsvn_ra/ra_loader.c:707
-#, fuzzy, c-format
+#, c-format
msgid " - handles '%s' scheme\n"
-msgstr " - 处ç†â€œ%sâ€è§„则\n"
+msgstr " - 处ç†â€œ%sâ€æ–¹æ¡ˆ\n"
#: libsvn_ra/ra_loader.c:793
#, c-format
@@ -2498,22 +2501,22 @@
msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
#: libsvn_ra_dav/commit.c:487
-#, fuzzy, c-format
+#, c-format
msgid "Could not create a CHECKOUT request (%s)"
msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
#: libsvn_ra_serf/commit.c:436
-#, fuzzy, c-format
+#, c-format
msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
+msgstr "您的文件或目录“%sâ€å¾ˆå¯èƒ½å·²ç»è¿‡æœŸ"
#: libsvn_ra_dav/commit.c:582
msgid "The CHECKOUT response did not contain a 'Location:' header"
msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
#: libsvn_ra_dav/commit.c:881
-#, fuzzy, c-format
+#, c-format
msgid "Could not create a DELETE request (%s)"
msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
@@ -2542,9 +2545,9 @@
msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
#: libsvn_ra_dav/fetch.c:406
-#, fuzzy, c-format
+#, c-format
msgid "Could not get content-type from response"
-msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
+msgstr "ä¸èƒ½ä»Žå“应ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
#: libsvn_ra_dav/fetch.c:451
#, c-format
@@ -2573,7 +2576,7 @@
#: libsvn_ra_dav/fetch.c:1151
msgid "Server response missing the expected deadprop-count property"
-msgstr ""
+msgstr "æœåŠ¡ç«¯å“应丢失了deadprop-count属性"
#: libsvn_ra_dav/fetch.c:1324
msgid "Server does not support date-based operations"
@@ -2585,21 +2588,18 @@
# as-is
#: libsvn_ra_dav/fetch.c:1470
-#, fuzzy
msgid "'get-locations' REPORT not implemented"
msgstr "get-locations REPORT 未实现"
#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
#: libsvn_ra_dav/session.c:1474
-#, fuzzy
msgid "Incomplete lock data returned"
msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
-#, fuzzy
msgid "Server does not support locking features"
-msgstr "æœåС噍䏿”¯æŒé”定特性"
+msgstr "æœåС噍䏿”¯æŒåŠ é”"
#: libsvn_ra_dav/fetch.c:1908
msgid ""
@@ -2626,7 +2626,6 @@
# as-is
#: libsvn_ra_dav/file_revs.c:363
-#, fuzzy
msgid "'get-file-revs' REPORT not implemented"
msgstr "get-file-revs REPORT 未实现"
@@ -2692,12 +2691,12 @@
#: libsvn_ra_dav/props.c:685
msgid "The path was not part of a repository"
-msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
+msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部分"
#: libsvn_ra_dav/props.c:696
#, c-format
msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
+msgstr "路径“%sâ€çš„任何一部分在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
msgid "The VCC property was not found on the resource"
@@ -2720,55 +2719,52 @@
msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
-#, fuzzy
msgid "Missing revision attr in target-revision element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "target-revisionå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
-#, fuzzy
msgid "Missing revision attr in open-root element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-rootå…ƒç´ ä¸¢å¤±äº†revisioin属性"
#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
msgid "Missing name attr in delete-entry element"
-msgstr ""
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_dav/replay.c:176
msgid "Missing rev attr in delete-entry element"
-msgstr ""
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†rev属性"
#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
-#, fuzzy
msgid "Missing name attr in open-directory element"
-msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "open-directoryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
#: libsvn_ra_serf/replay.c:371
-#, fuzzy, c-format
+#, c-format
msgid "Missing name attr in %s element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "“%sâ€å…ƒç´ 丢失了name属性"
#: libsvn_ra_dav/replay.c:288
msgid "Got apply-textdelta element without preceding add-file or open-file"
-msgstr ""
+msgstr "apply-textdeltaå…ƒç´ ä¹‹å‰æ²¡æœ‰add-file或者open-fileå…ƒç´ "
#: libsvn_ra_dav/replay.c:314
msgid "Got close-file element without preceding add-file or open-file"
-msgstr ""
+msgstr "close-fileå…ƒç´ ä¹‹å‰æ²¡æœ‰add-file或者open-fileå…ƒç´ "
#: libsvn_ra_dav/replay.c:329
msgid "Got close-directory element without ever opening a directory"
-msgstr ""
+msgstr "close-directoryå…ƒç´ ä¹‹å‰æ²¡æœ‰æ‰“开过目录"
#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
-#, fuzzy, c-format
+#, c-format
msgid "Error writing stream: unexpected EOF"
-msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
+msgstr "å†™å…¥æµæ—¶å‘生错误:æå‰åˆ°è¾¾æ–‡ä»¶æœ«å°¾"
#: libsvn_ra_dav/replay.c:463
#, c-format
msgid "Got cdata content for a prop delete"
-msgstr ""
+msgstr "åˆ é™¤å±žæ€§æ—¶ç¢°åˆ°cdata内容"
#: libsvn_ra_dav/session.c:444
msgid "Invalid URL: illegal character in proxy port number"
@@ -2827,34 +2823,30 @@
msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
-#, fuzzy
msgid "Failed to parse URI"
-msgstr "分æžåœ°å€(URI)失败"
+msgstr "è§£æžURI失败"
#: libsvn_ra_dav/session.c:1183
-#, fuzzy
msgid "Lock request failed"
msgstr "é”请求失败"
#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not locked in the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+msgstr "档案库ä¸çš„“%sâ€æ²¡æœ‰è¢«é”定"
#: libsvn_ra_dav/session.c:1349
-#, fuzzy
msgid "Unlock request failed"
-msgstr "解除é”请求失败"
+msgstr "è§£é”请求失败"
#: libsvn_ra_dav/session.c:1560
-#, fuzzy
msgid "Failed to fetch lock information"
msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
#: libsvn_ra_dav/session.c:1633
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_dav RAåŠ è½½å™¨"
#: libsvn_ra_dav/util.c:275
msgid "authorization failed"
@@ -2931,9 +2923,9 @@
# as-is
#: libsvn_ra_local/ra_plugin.c:1340
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
+msgstr "䏿”¯æŒ%d版本的ra_local RA 载入器"
#: libsvn_ra_local/split_url.c:44
#, c-format
@@ -2957,84 +2949,76 @@
#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
#: libsvn_repos/commit.c:393
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' not present"
msgstr "路径“%sâ€ä¸å˜åœ¨"
#: libsvn_ra_serf/commit.c:910
#, c-format
msgid "Failed writing updated file"
-msgstr ""
+msgstr "写更新文件失败"
#: libsvn_ra_serf/getlocations.c:289
-#, fuzzy
msgid "File doesn't exist on HEAD"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽHEAD修订版ä¸"
#: libsvn_ra_serf/locks.c:354
-#, fuzzy, c-format
+#, c-format
msgid "Lock request failed: %d %s"
-msgstr "é”请求失败"
+msgstr "é”请求失败:%d %s"
#: libsvn_ra_serf/locks.c:703
-#, fuzzy, c-format
+#, c-format
msgid "Unlock request failed: %d %s"
-msgstr "解除é”请求失败"
+msgstr "è§£é”请求失败:%d %s"
#: libsvn_ra_serf/replay.c:204
-#, fuzzy
msgid "Missing revision attr in delete-entry element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "delete-entryå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:230
-#, fuzzy
msgid "Missing revision attr in open-directory element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-directoryå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:250
-#, fuzzy
msgid "Missing name attr in add-directory element"
-msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "add-directoryå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_serf/replay.c:285
-#, fuzzy
msgid "Missing name attr in open-file element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "open-fileå…ƒç´ ä¸¢å¤±äº†name属性"
#: libsvn_ra_serf/replay.c:291
-#, fuzzy
msgid "Missing revision attr in open-file element"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "open-fileå…ƒç´ ä¸¢å¤±äº†revision属性"
#: libsvn_ra_serf/replay.c:311
-#, fuzzy
msgid "Missing name attr in add-file element"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "add-fileå…ƒç´ ä¸¢å¤±äº†name属性"
# as-is
#: libsvn_ra_serf/serf.c:52
-#, fuzzy
msgid "Access repository via WebDAV protocol through serf."
-msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
+msgstr "使用serf库通过WebDAVå议访问档案库。"
#: libsvn_ra_serf/serf.c:155
#, c-format
msgid "Could not lookup hostname: %s://%s"
-msgstr ""
+msgstr "找�到主机:%s://%s"
#: libsvn_ra_serf/serf.c:741
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_serf"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_serf RAåŠ è½½å™¨"
#: libsvn_ra_serf/update.c:2112
#, c-format
msgid "Error retrieving REPORT (%d)"
-msgstr ""
+msgstr "èŽ·å–æŠ¥å‘Šæ—¶å‡ºé”™ï¼ˆ%d)"
#: libsvn_ra_serf/util.c:743
msgid "Premature EOF seen from server"
-msgstr ""
+msgstr "æœåŠ¡ç«¯å‘é€çš„æ•°æ®æµæå‰ç»ˆæ¢"
#: libsvn_ra_svn/client.c:127
#, c-format
@@ -3136,7 +3120,7 @@
#: libsvn_ra_svn/client.c:982
msgid "Non-string as part of file contents"
-msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨åˆ†ä¸æ˜¯å—串"
# as-is
#: libsvn_ra_svn/client.c:1081
@@ -3155,13 +3139,11 @@
# as-is
#: libsvn_ra_svn/client.c:1327
-#, fuzzy
msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+msgstr "stat未实现"
# as-is
#: libsvn_ra_svn/client.c:1384
-#, fuzzy
msgid "'get-locations' not implemented"
msgstr "get-locations 未实现"
@@ -3172,7 +3154,6 @@
# as-is
#: libsvn_ra_svn/client.c:1446
-#, fuzzy
msgid "'get-file-revs' not implemented"
msgstr "get-file-revs 未实现"
@@ -3190,65 +3171,56 @@
msgstr "get-file-revs 命令没有返回任何修订版"
#: libsvn_ra_svn/client.c:1557
-#, fuzzy
msgid "Server doesn't support the lock command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+msgstr "æœåС噍䏿”¯æŒåŠ é”命令"
#: libsvn_ra_svn/client.c:1621
-#, fuzzy
msgid "Server doesn't support the unlock command"
-msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
+msgstr "æœåС噍䏿”¯æŒè§£é”命令"
# as-is
#: libsvn_ra_svn/client.c:1718
-#, fuzzy
msgid "Lock response not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "åŠ é”å“åº”ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1732
-#, fuzzy
msgid "Unknown status for lock command"
-msgstr "未知的 svn 通讯å定命令"
+msgstr "åŠ é”å‘½ä»¤çš„çŠ¶æ€æœªçŸ¥"
#: libsvn_ra_svn/client.c:1754
msgid "Didn't receive end marker for lock responses"
-msgstr ""
+msgstr "åŠ é”å“åº”ä¸¢å¤±äº†ç»“å°¾æ ‡è®°"
# as-is
#: libsvn_ra_svn/client.c:1841
-#, fuzzy
msgid "Unlock response not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "è§£é”å“åº”ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1855
-#, fuzzy
msgid "Unknown status for unlock command"
-msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
+msgstr "è§£é”å‘½ä»¤çš„çŠ¶æ€æœªçŸ¥"
#: libsvn_ra_svn/client.c:1876
msgid "Didn't receive end marker for unlock responses"
-msgstr ""
+msgstr "è§£é”å“åº”ä¸¢å¤±äº†ç»“æŸæ ‡è®°"
#: libsvn_ra_svn/client.c:1900 libsvn_ra_svn/client.c:1928
-#, fuzzy
msgid "Server doesn't support the get-lock command"
-msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
+msgstr "æœåС噍䏿”¯æŒå‘½ä»¤get-lock"
# as-is
#: libsvn_ra_svn/client.c:1941
-#, fuzzy
msgid "Lock element not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+msgstr "Lockå…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
#: libsvn_ra_svn/client.c:1964
-#, fuzzy
msgid "Server doesn't support the replay command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+msgstr "æœåС噍䏿”¯æŒreplay命令"
#: libsvn_ra_svn/client.c:2028
-#, fuzzy, c-format
+#, c-format
msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
+msgstr "䏿”¯æŒ%d版本的ra_svn RAåŠ è½½å™¨"
# as-is
#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
@@ -3257,12 +3229,12 @@
#: libsvn_ra_svn/editor.c:621
msgid "Non-string as part of text delta"
-msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨åˆ†ä¸æ˜¯å—串"
#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
#, c-format
msgid "Command 'finish-replay' invalid outside of replays"
-msgstr ""
+msgstr "finish-replay命令åªåœ¨é‡æ”¾æ—¶æœ‰æ•ˆ"
# as-is
#: libsvn_ra_svn/editorp.c:129
@@ -3393,15 +3365,15 @@
# as-is
#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
+#, c-format
msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+msgstr "* 已导出修订版 %ld。\n"
# as-is
#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
+#, c-format
msgid "* Verified revision %ld.\n"
-msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
+msgstr "* å·²æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1207
msgid "Commit succeeded, but post-commit hook failed"
@@ -3415,9 +3387,9 @@
msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
+#, c-format
msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
+msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒè¯»å–所有修订版 %ld。"
#: libsvn_repos/fs-wrap.c:484
#, c-format
@@ -3425,9 +3397,8 @@
msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
+msgstr "è§£é”æˆåŠŸï¼Œä½†æ˜¯post-unlock外挂失败"
#: libsvn_repos/hooks.c:71
#, c-format
@@ -3435,14 +3406,14 @@
msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
#: libsvn_repos/hooks.c:83
-#, fuzzy, c-format
+#, c-format
msgid "Can't make pipe read handle non-inherited for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€å¤–挂创建éžç»§æ‰¿çš„管é“è¯»å¥æŸ„"
#: libsvn_repos/hooks.c:89
-#, fuzzy, c-format
+#, c-format
msgid "Can't make pipe write handle non-inherited for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€å¤–挂创建éžç»§æ‰¿çš„管é“写奿Ÿ„"
#: libsvn_repos/hooks.c:98
#, c-format
@@ -3455,7 +3426,7 @@
msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
#: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
+#, c-format
msgid "Failed to start '%s' hook"
msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
@@ -3469,7 +3440,7 @@
"%s"
#: libsvn_repos/hooks.c:144
-#, fuzzy, c-format
+#, c-format
msgid "'%s' hook failed; no error output available"
msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
@@ -3506,12 +3477,12 @@
#: libsvn_repos/load.c:173
#, c-format
msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
-msgstr ""
+msgstr "导出æµåœ¨â€œ%.20sâ€åŒ…å«é”™è¯¯å¤´éƒ¨ï¼ˆæ²¡æœ‰â€œ:â€ï¼‰"
#: libsvn_repos/load.c:186
#, c-format
msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
-msgstr ""
+msgstr "导出æµåœ¨â€œ%.20sâ€åŒ…å«é”™è¯¯å¤´éƒ¨ï¼ˆæ²¡æœ‰å€¼ï¼‰"
#: libsvn_repos/load.c:270
msgid "Incomplete or unterminated property block"
@@ -3579,7 +3550,6 @@
msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
#: libsvn_repos/load.c:1154
-#, fuzzy
msgid " done.\n"
msgstr "完æˆã€‚\n"
@@ -3627,9 +3597,8 @@
msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
#: libsvn_repos/reporter.c:843
-#, fuzzy
msgid "Target path does not exist"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+msgstr "ç›®æ ‡è·¯å¾„ä¸å˜åœ¨"
#: libsvn_repos/reporter.c:850
msgid "Cannot replace a directory from within"
@@ -3697,9 +3666,8 @@
msgstr "æ£åœ¨åˆ›å»º passwd 文件"
#: libsvn_repos/repos.c:1527
-#, fuzzy
msgid "Creating authz file"
-msgstr "æ£åœ¨åˆ›å»º passwd 文件"
+msgstr "æ£åœ¨åˆ›å»º authz 文件"
#: libsvn_repos/repos.c:1560
msgid "Could not create top-level directory"
@@ -3718,9 +3686,9 @@
msgstr "档案库创建失败"
#: libsvn_repos/repos.c:1763
-#, fuzzy, c-format
+#, c-format
msgid "Expected repository format '%d' or '%d'; found format '%d'"
-msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+msgstr "æœŸå¾…æ¡£æ¡ˆåº“æ ¼å¼æ˜¯â€œ%dâ€æˆ–“%dâ€ï¼›ä½†å‘çŽ°æ˜¯æ ¼å¼â€œ%dâ€"
#: libsvn_repos/rev_hunt.c:64
#, c-format
@@ -3738,14 +3706,13 @@
msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
#: libsvn_repos/rev_hunt.c:315
-#, fuzzy
msgid "Unreadable path encountered; access denied"
-msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
+msgstr "é‡åˆ°ä¸å¯è¯»çš„路径;访问被拒ç»"
#: libsvn_subr/cmdline.c:481
#, c-format
msgid "Error initializing command line arguments"
-msgstr ""
+msgstr "åˆå§‹åŒ–å‘½ä»¤è¡Œå‚æ•°å‡ºé”™"
#: libsvn_subr/config.c:630
#, c-format
@@ -3795,14 +3762,14 @@
msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
#: libsvn_subr/dso.c:70
-#, fuzzy, c-format
+#, c-format
msgid "Can't grab DSO mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•èŽ·å–动æ€å…±äº«å¯¹è±¡ï¼ˆDSO)互斥体"
#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
-#, fuzzy, c-format
+#, c-format
msgid "Can't ungrab DSO mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgstr "æ— æ³•é‡Šæ”¾åŠ¨æ€å…±äº«å¯¹è±¡ï¼ˆDSO)互斥体"
#: libsvn_subr/error.c:326
msgid "Can't recode error string from APR"
@@ -3903,19 +3870,19 @@
# as-is
#: libsvn_subr/io.c:1192
-#, fuzzy, c-format
+#, c-format
msgid "Can't open file at '%s'"
msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
#: libsvn_subr/io.c:1196
-#, fuzzy, c-format
+#, c-format
msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+msgstr "ä¸èƒ½èŽ·å–“%sâ€æ–‡ä»¶çš„æƒé™(文件 stat 错误)"
#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
-#, fuzzy, c-format
+#, c-format
msgid "Can't change perms of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
+msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€çš„æƒé™"
#: libsvn_subr/io.c:1370
#, c-format
@@ -3976,7 +3943,7 @@
#: libsvn_subr/io.c:1731
#, c-format
msgid "Can't rewind directory '%s'"
-msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
+msgstr "æ— æ³•å›žç»•ç›®å½•â€œ%sâ€"
#: libsvn_subr/io.c:1766 libsvn_subr/io.c:2833 libsvn_subr/io.c:2919
#, c-format
@@ -4001,32 +3968,32 @@
#: libsvn_subr/io.c:2017
#, c-format
msgid "Can't set process '%s' directory"
-msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
+msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€çš„目录"
#: libsvn_subr/io.c:2030
#, c-format
msgid "Can't set process '%s' child input"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å输入"
#: libsvn_subr/io.c:2037
#, c-format
msgid "Can't set process '%s' child outfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å输出文件"
#: libsvn_subr/io.c:2044
#, c-format
msgid "Can't set process '%s' child errfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å错误文件"
#: libsvn_subr/io.c:2051
-#, fuzzy, c-format
+#, c-format
msgid "Can't set process '%s' child errfile for error handler"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„å错误输出文件"
#: libsvn_subr/io.c:2057
-#, fuzzy, c-format
+#, c-format
msgid "Can't set process '%s' error handler"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„错误处ç†å‡½æ•°"
# as-is
#: libsvn_subr/io.c:2080
@@ -4133,12 +4100,11 @@
# as-is
#: libsvn_subr/io.c:2635
-#, fuzzy, c-format
+#, c-format
msgid "Can't read length line in file '%s'"
msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
#: libsvn_subr/io.c:2639
-#, fuzzy
msgid "Can't read length line in stream"
msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
@@ -4198,12 +4164,11 @@
msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string to UCS-2: '%s'"
msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
#: libsvn_subr/nls.c:86
-#, fuzzy
msgid "Can't get module file name"
msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
@@ -4266,7 +4231,6 @@
# as-is
#: libsvn_subr/opt.c:957
-#, fuzzy
msgid ""
"Copyright (C) 2000-2006 CollabNet.\n"
"Subversion is open source software, see http://subversion.tigris.org/\n"
@@ -4274,8 +4238,8 @@
"Net/).\n"
"\n"
msgstr ""
-"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
+"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2006 CollabNet.\n"
+"Subversion 是开放æº�代ç �软件,请å�‚考 http://subversion.tigris.org/\n"
"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
"\n"
@@ -4300,9 +4264,9 @@
msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
#: libsvn_subr/path.c:1253
-#, fuzzy, c-format
+#, c-format
msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
+msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符“0x%1$02xâ€"
#: libsvn_subr/prompt.c:97 svnserve/main.c:475
#, c-format
@@ -4390,9 +4354,9 @@
msgstr "“%sâ€çš„密ç :"
#: libsvn_subr/subst.c:1559
-#, fuzzy, c-format
+#, c-format
msgid "'%s' has unsupported special file type '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgstr "“%sâ€å˜åœ¨ä¸æ”¯æŒçš„特殊文件类型“%sâ€"
#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
#, c-format
@@ -4408,51 +4372,51 @@
msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
#: libsvn_subr/utf.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from native encoding to '%s'"
msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:275
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%s' to native encoding"
msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:279
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%s' to '%s'"
msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:285
-#, fuzzy, c-format
+#, c-format
msgid "Can't create a character converter from '%i' to '%i'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%iâ€åˆ°â€œ%iâ€çš„å—符转æ¢å™¨"
#: libsvn_subr/utf.c:513
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from native encoding to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€œ%sâ€ç¼–ç :"
#: libsvn_subr/utf.c:517
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from '%s' to native encoding:"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从“%sâ€ç¼–ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç :"
#: libsvn_subr/utf.c:521
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from '%s' to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从“%sâ€ç¼–ç 转æ¢ä¸ºâ€œ%sâ€ç¼–ç :"
#: libsvn_subr/utf.c:527
-#, fuzzy, c-format
+#, c-format
msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
+msgstr "ä¸èƒ½æŠŠå—符串从CCSID“%iâ€è½¬æ¢ä¸ºCCSID“%iâ€ï¼š"
#: libsvn_subr/utf.c:572
-#, fuzzy, c-format
+#, c-format
msgid ""
"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
"UTF-8"
-msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
+msgstr "安全数æ®â€œ%sâ€æ˜¯å޿ޥéžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/自 UTF-8"
#: libsvn_subr/utf.c:580
#, c-format
@@ -4512,9 +4476,9 @@
msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
#: libsvn_wc/adm_files.c:100
-#, fuzzy, c-format
+#, c-format
msgid "'%s' is not a valid administrative directory name"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„管ç†ç›®å½•å"
# plz leave this as-is
#: libsvn_wc/adm_files.c:260
@@ -4582,11 +4546,11 @@
msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
#: libsvn_wc/adm_ops.c:1105
-#, fuzzy, c-format
+#, c-format
msgid ""
"Can't replace '%s' with a node of a differing type; the deletion must be "
"committed and the parent updated before adding '%s'"
-msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
+msgstr "æ— æ³•ä»¥ä¸åŒç±»åž‹èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼›åœ¨æ–°å¢žâ€œ%sâ€å‰å¿…é¡»æäº¤åˆ 除æ“作并更新父目录"
#: libsvn_wc/adm_ops.c:1122
#, c-format
@@ -4599,14 +4563,14 @@
msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
#: libsvn_wc/adm_ops.c:1143
-#, fuzzy, c-format
+#, c-format
msgid "The URL '%s' has a different repository root than its parent"
-msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
+msgstr "地å€(URL)“%sâ€ä¸Žå…¶å‰ä¸€ä¿®è®¢ç‰ˆçš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸åŒ"
#: libsvn_wc/adm_ops.c:1472
#, c-format
msgid "Error restoring text for '%s'"
-msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
+msgstr "还原“%sâ€æ–‡æœ¬æ—¶å‡ºé”™"
#: libsvn_wc/adm_ops.c:1603
#, c-format
@@ -4669,9 +4633,9 @@
msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
#: libsvn_wc/copy.c:444
-#, fuzzy, c-format
+#, c-format
msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
+msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€ï¼Œå› ä¸ºå®ƒä¸æ˜¯æ¥è‡ªäºŽæ¡£æ¡ˆåº““%sâ€è€Œæ˜¯â€œ%sâ€"
#: libsvn_wc/copy.c:451
#, c-format
@@ -4685,25 +4649,22 @@
msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
#: libsvn_wc/entries.c:111
-#, fuzzy
msgid "Invalid escape sequence"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+msgstr "æ— æ•ˆçš„è½¬ä¹‰åºåˆ—"
#: libsvn_wc/entries.c:118
-#, fuzzy
msgid "Invalid escaped character"
-msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
+msgstr "æ— æ•ˆçš„è½¬ä¹‰å—符"
#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
#: libsvn_wc/entries.c:203
-#, fuzzy
msgid "Unexpected end of entry"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+msgstr "æ¡ç›®æå‰ç»ˆæ¢"
#: libsvn_wc/entries.c:225
#, c-format
msgid "Invalid value for field '%s'"
-msgstr ""
+msgstr "“%sâ€åŸŸçš„å€¼æ— æ•ˆ"
#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:533
#, c-format
@@ -4711,9 +4672,9 @@
msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:510
-#, fuzzy, c-format
+#, c-format
msgid "Entry for '%s' has invalid repository root"
-msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
+msgstr "“%sâ€æ¡ç›®çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
#: libsvn_wc/entries.c:931
#, c-format
@@ -4733,24 +4694,22 @@
msgstr "默认项目没有地å€(URL)"
#: libsvn_wc/entries.c:1076
-#, fuzzy, c-format
+#, c-format
msgid "Invalid version line in entries file of '%s'"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+msgstr "“%sâ€æ¡ç›®æ–‡ä»¶ä¸çš„ç‰ˆæœ¬è¡Œæ— æ•ˆ"
#: libsvn_wc/entries.c:1093
-#, fuzzy
msgid "Missing entry terminator"
-msgstr "丢失默认项目"
+msgstr "æ¡ç›®ç»ˆç»“符丢失"
#: libsvn_wc/entries.c:1096
-#, fuzzy
msgid "Invalid entry terminator"
-msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+msgstr "æ— æ•ˆçš„æ¡ç›®ç»ˆæ¢ç¬¦"
#: libsvn_wc/entries.c:1100
-#, fuzzy, c-format
+#, c-format
msgid "Error at entry %d in entries file for '%s':"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+msgstr "“%2$sâ€æ¡ç›®æ–‡ä»¶ä¸çš„%1$dæ¡ç›®å‡ºé”™"
#: libsvn_wc/entries.c:1196
#, c-format
@@ -4865,39 +4824,39 @@
msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
-#, fuzzy, c-format
+#, c-format
msgid "Unable to check path existence for '%s'"
-msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
+msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€æ˜¯å¦å˜åœ¨"
#: libsvn_wc/lock.c:937
#, c-format
msgid "Expected '%s' to be a directory but found a file"
-msgstr ""
+msgstr "期望“%sâ€æ˜¯ä¸€ä¸ªç›®å½•,但它是一个文件"
#: libsvn_wc/lock.c:944
-#, fuzzy, c-format
+#, c-format
msgid "Expected '%s' to be a file but found a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+msgstr "期望“%sâ€æ˜¯ä¸€ä¸ªæ–‡ä»¶ï¼Œä½†å®ƒæ˜¯ä¸€ä¸ªç›®å½•"
#: libsvn_wc/lock.c:963
-#, fuzzy, c-format
+#, c-format
msgid "Directory '%s' is missing"
-msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgstr "目录“%sâ€ä¸¢å¤±"
#: libsvn_wc/lock.c:968
#, c-format
msgid "Directory '%s' containing working copy admin area is missing"
-msgstr ""
+msgstr "包å«å·¥ä½œæ‹·è´ç®¡ç†åŒºçš„目录“%sâ€ä¸¢å¤±äº†"
#: libsvn_wc/lock.c:973
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock '%s'"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+msgstr "æ— æ³•é”定“%sâ€"
#: libsvn_wc/lock.c:978
-#, fuzzy, c-format
+#, c-format
msgid "Working copy '%s' is not locked"
-msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
+msgstr "工作拷è´â€œ%sâ€æœªè¢«é”定"
#: libsvn_wc/lock.c:1371
#, c-format
@@ -4954,7 +4913,7 @@
msgstr "修改“%sâ€çš„项目时å‘生错误"
#: libsvn_wc/log.c:852
-#, fuzzy, c-format
+#, c-format
msgid "Error removing lock from entry for '%s'"
msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
@@ -4999,9 +4958,8 @@
msgstr "修改“%sâ€çš„项目时å‘生错误"
#: libsvn_wc/log.c:1486
-#, fuzzy
msgid "Invalid 'format' attribute"
-msgstr "æ— æ•ˆçš„é…置值"
+msgstr "æ— æ•ˆçš„format属性"
#: libsvn_wc/log.c:1521
#, c-format
@@ -5071,12 +5029,10 @@
"但是属性并ä¸å˜åœ¨ã€‚"
#: libsvn_wc/props.c:679
-#, fuzzy, c-format
+#, c-format
msgid ""
"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
-msgstr ""
-"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
-"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
+msgstr "å°è¯•åˆ é™¤å±žæ€§â€œ%sâ€ï¼Œä½†æ˜¯å…¶å€¼å·²ä»Žâ€œ%sâ€ä¿®æ”¹ä¸ºâ€œ%sâ€ã€‚"
#: libsvn_wc/props.c:697
#, c-format
@@ -5088,9 +5044,9 @@
"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
#: libsvn_wc/props.c:880
-#, fuzzy, c-format
+#, c-format
msgid "Missing end of line in wcprops file for '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgstr "wcprops文件“%sâ€ä¸¢å¤±äº†è¡Œç»ˆæ¢ç¬¦"
#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
#: libsvn_wc/props.c:1626
@@ -5166,7 +5122,7 @@
#: libsvn_wc/relocate.c:69
msgid "Relocate can only change the repository part of an URL"
-msgstr ""
+msgstr "Relocateåªèƒ½æ”¹å˜URLä¸çš„æ¡£æ¡ˆåº“部分"
#: libsvn_wc/update_editor.c:387
#, c-format
@@ -5246,7 +5202,7 @@
msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
#: libsvn_wc/update_editor.c:2849
-#, fuzzy, c-format
+#, c-format
msgid "Copyfrom-url '%s' has different repository root than '%s'"
msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
@@ -5288,9 +5244,8 @@
msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
#: svn/diff-cmd.c:184
-#, fuzzy
msgid "'--new' option only valid with '--old' option"
-msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
+msgstr "--newé€‰é¡¹åªæœ‰å’Œ--old选项一åŒä½¿ç”¨æ—¶æ‰æœ‰æ•ˆ"
#: svn/diff-cmd.c:214
#, c-format
@@ -5304,7 +5259,7 @@
msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
#: svn/help-cmd.c:45
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: svn <subcommand> [options] [args]\n"
"Subversion command-line client, version %s.\n"
@@ -5320,10 +5275,12 @@
msgstr ""
"用法:svn <subcommand> [options] [args]\n"
"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
-"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
-"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
-"行递归å˜å–。\n"
+"使用“svn help <subcommand>â€æ˜¾ç¤ºç‰¹å®šå命令帮助。\n"
+"使用“svn --versionâ€æŸ¥çœ‹ç¨‹åºä»¥åŠRA模å—的版本å·ï¼Œæˆ–者\n"
+"使用“svn --version --quietâ€ä»…查看程åºç‰ˆæœ¬å·ã€‚\n"
+"\n"
+"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递归处ç†ï¼Œå¦‚æ²¡æœ‰æŒ‡å®šå‚æ•°ï¼Œåˆ™é»˜è®¤\n"
+"对当å‰ç›®å½•(包å«å½“å‰ç›®å½•)递归处ç†ã€‚\n"
"\n"
"å¯ç”¨çš„å命令:\n"
@@ -5357,9 +5314,9 @@
msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
#: svn/info-cmd.c:111
-#, fuzzy, c-format
+#, c-format
msgid "'%s' has invalid revision"
-msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
+msgstr "“%sâ€æœ‰æ— 效的修订版"
#: svn/info-cmd.c:263 svnadmin/main.c:1046
#, c-format
@@ -5378,7 +5335,7 @@
msgstr "地å€(URL):%s\n"
#: svn/info-cmd.c:276
-#, fuzzy, c-format
+#, c-format
msgid "Repository Root: %s\n"
msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
@@ -5535,7 +5492,7 @@
"\n"
#: svn/info-cmd.c:514
-#, fuzzy, c-format
+#, c-format
msgid ""
"%s: (Not a valid URL)\n"
"\n"
@@ -5544,9 +5501,8 @@
"\n"
#: svn/lock-cmd.c:52
-#, fuzzy
msgid "Lock comment contains a zero byte"
-msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
+msgstr "åŠ é”æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
#: svn/log-cmd.c:162
msgid "(no author)"
@@ -5589,9 +5545,8 @@
msgstr "显示å命令帮助"
#: svn/main.c:65
-#, fuzzy
msgid "specify log message ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+msgstr "指定日志消æ¯ARG"
#: svn/main.c:66
msgid "print as little as possible"
@@ -5610,9 +5565,10 @@
"the change made by revision ARG (like -r ARG-1:ARG)\n"
" If ARG is negative this is like -r ARG:ARG-1"
msgstr ""
+"在ARGä¿®è®¢ç‰ˆï¼ˆå¦‚åŒ -r ARG-1:ARG)作的修改\n"
+" 如果ARG为负数则ç‰ä»·äºŽ -r ARG:ARG-1"
#: svn/main.c:74
-#, fuzzy
msgid ""
"ARG (some commands also take ARG1:ARG2 range)\n"
" A revision argument can be one of:\n"
@@ -5624,19 +5580,18 @@
" 'COMMITTED' last commit at or before BASE\n"
" 'PREV' revision just before COMMITTED"
msgstr ""
-"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
+"ARG (一些命令也接å—ARG1:ARG2范围)\n"
" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
-" æ•°å— ä¿®è®¢ç‰ˆå·\n"
-" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
-" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
-" \"PREV\" 修订版æäº¤ä¹‹å‰"
+" NUMBER 修订版å·\n"
+" '{' DATE '}' 在指定时间以åŽçš„修订版\n"
+" 'HEAD' 档案库ä¸çš„æœ€æ–°ä¿®è®¢ç‰ˆ\n"
+" 'BASE' 工作拷è´çš„基线版本\n"
+" 'COMMITTED' 最åŽä¸€æ¬¡æäº¤çš„修订版\n"
+" 'PREV' COMMITTEDçš„å‰ä¸€ä¿®è®¢ç‰ˆ"
#: svn/main.c:84
-#, fuzzy
msgid "read log message from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件ARGè¯»å–æ—¥å¿—消æ¯"
#: svn/main.c:86
msgid "give output suitable for concatenation"
@@ -5649,9 +5604,8 @@
#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
#: svnversion/main.c:125
-#, fuzzy
msgid "show program version information"
-msgstr "显示版本信æ¯"
+msgstr "显示程åºç‰ˆæœ¬ä¿¡æ¯"
#: svn/main.c:93
msgid "print extra information"
@@ -5690,6 +5644,17 @@
" --ignore-eol-style:\n"
" Ignore changes in EOL style"
msgstr ""
+"缺çœï¼šâ€œ-uâ€ã€‚当Subversion调用一个外部diffç¨‹åºæ—¶ï¼Œ\n"
+" ARGç›´æŽ¥ä¼ ç»™è¿™ä¸ªç¨‹åºã€‚但是当Subversion使用缺çœçš„\n"
+" 内部diffå®žçŽ°æˆ–è€…æ£æ˜¾ç¤ºblame评注时,ARGå¯ä»¥æ˜¯ï¼š\n"
+" -u (--unified):\n"
+" 输出三行统一上下文。\n"
+" -b (--ignore-space-change):\n"
+" 忽略空白数é‡çš„æ›´æ”¹ã€‚\n"
+" -w (--ignore-all-space):\n"
+" 忽略所有的空白。\n"
+" --ignore-eol-style:\n"
+" 忽略EOLæ ·å¼çš„æ›´æ”¹ã€‚"
#: svn/main.c:130
msgid "pass contents of file ARG as additional args"
@@ -5725,7 +5690,7 @@
#: svn/main.c:144 svnlook/main.c:111
msgid "do not print differences for deleted files"
-msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
+msgstr "ä¸è¦è¾“å‡ºåˆ é™¤æ–‡ä»¶é€ æˆçš„差异"
#: svn/main.c:146
msgid "notice ancestry when calculating differences"
@@ -5780,16 +5745,14 @@
msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
#: svn/main.c:174
-#, fuzzy
msgid ""
"use a different EOL marker than the standard\n"
" system marker for files with the svn:eol-style\n"
" property set to 'native'.\n"
" ARG may be one of 'LF', 'CR', 'CRLF'"
msgstr ""
-"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
-" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属性为 'native'。\n"
-" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
+"设置svn:eol-style为“nativeâ€ä»¥åœ¨æ–‡ä»¶ä¸ä½¿ç”¨éžç³»ç»Ÿé»˜è®¤çš„è¡Œç»“æŸæ ‡è®°ã€‚\n"
+" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ï¼š'LF','CR','CRLF'"
#: svn/main.c:182
msgid "maximum number of log entries"
@@ -5801,7 +5764,7 @@
#: svn/main.c:186
msgid "show a summary of the results"
-msgstr ""
+msgstr "显示结果的摘è¦"
#: svn/main.c:225
msgid ""
@@ -5844,7 +5807,6 @@
" \n"
#: svn/main.c:251
-#, fuzzy
msgid ""
"Check out a working copy from a repository.\n"
"usage: checkout URL[@REV]... [PATH]\n"
@@ -5860,9 +5822,11 @@
"从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
"用法:checkout 地å€[@版本]... [路径]\n"
"\n"
-" 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
-" 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
-" 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
+" â€œç‰ˆæœ¬â€æŒ‡å®šä»Žå“ªä¸€ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾URL。\n"
+"\n"
+" 如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡ç›®å½•ã€‚\n"
+" 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
+" 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
"\n"
#: svn/main.c:265
@@ -5871,12 +5835,11 @@
"unfinished operations, etc.\n"
"usage: cleanup [PATH...]\n"
msgstr ""
-"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
+"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œç»§ç»æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
"\n"
"用法:cleanup [路径...]\n"
#: svn/main.c:272
-#, fuzzy
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -5886,16 +5849,14 @@
" If any targets are (or contain) locked items, those will be\n"
" unlocked after a successful commit.\n"
msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"把更改从工作拷è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
"用法:commit [路径...]\n"
"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+" å¿…é¡»æä¾›æ—¥å¿—消æ¯ï¼Œä½†å®ƒå¯ä»¥æ˜¯ç©ºçš„。如果没有指定 --message 或 --file 选项,\n"
+" 则会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚å¦‚æžœä»»ä½•ç›®æ ‡æ˜¯é”定的或者包å«é”定æ¡ç›®ï¼Œåˆ™åœ¨æˆåŠŸæäº¤åŽå®ƒ\n"
+" 们都会被解é”。\n"
#: svn/main.c:280
-#, fuzzy
msgid ""
"Send changes from your working copy to the repository.\n"
"usage: commit [PATH...]\n"
@@ -5906,13 +5867,12 @@
" (or contain) locked items, those will be unlocked after a\n"
" successful commit.\n"
msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"把更改从工作拷è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
"用法:commit [路径...]\n"
"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+" å¿…é¡»æä¾›æ—¥å¿—消æ¯ï¼Œä½†å®ƒå¯ä»¥æ˜¯ç©ºçš„。OS400䏿”¯æŒå¯åŠ¨ç¼–è¾‘å™¨ï¼Œå› æ¤å¿…须指定--message\n"
+" 或 --file é€‰é¡¹ã€‚å¦‚æžœä»»ä½•ç›®æ ‡æ˜¯é”定的或者包å«é”定æ¡ç›®ï¼Œåˆ™åœ¨æˆåŠŸæäº¤åŽå®ƒä»¬éƒ½ä¼šè¢«\n"
+" è§£é”。\n"
#: svn/main.c:293
msgid ""
@@ -5963,7 +5923,6 @@
" \n"
#: svn/main.c:321
-#, fuzzy
msgid ""
"Display the differences between two revisions or paths.\n"
"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
@@ -5991,31 +5950,29 @@
"\n"
" Use just 'svn diff' to display local modifications in a working copy.\n"
msgstr ""
-"显示两个路径ä¸çš„差异。\n"
+"显示两个路径或者两个修订版的差异。\n"
"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
-" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
+" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
+" [路径...]\n"
+" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
"\n"
-" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
-" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
+" 1ã€æ˜¾ç¤ºä¿®è®¢ç‰ˆREVä¸â€œç›®æ ‡â€åœ¨ä¸¤ä¸ªä¸åŒçš„修订版Nã€Mä¹‹é—´çš„å·®å¼‚ã€‚â€œç›®æ ‡â€è¦ä¹ˆå…¨æ˜¯å·¥ä½œæ‹·è´\n"
+" 路径,è¦ä¹ˆå…¨æ˜¯åœ°å€(URL)。\n"
"\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
-" HEAD。\n"
-"\n"
-" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
-" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
-" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
-" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
-" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
-" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
-"法。\n"
+" å¦‚æžœâ€œç›®æ ‡â€æ˜¯å·¥ä½œæ‹·è´è·¯å¾„,N 默认为 BASE,M 指工作拷è´ï¼›\n"
+" å¦‚æžœâ€œç›®æ ‡â€æ˜¯URL,N 必须指定, M 默认是HEAD。\n"
+" \n"
+" “-c Mâ€ç‰ä»·ä¸Žâ€œ-r M-1:Mâ€ï¼Œâ€œ-c -Mâ€ç‰ä»·ä¸Žâ€œ-r M:M-1â€ã€‚\n"
+"\n"
+" 2ã€æ˜¾ç¤ºæ–°æ—§ä¿®è®¢ç‰ˆä¸å¯¹åº”ç›®æ ‡çš„å·®å¼‚ã€‚â€œè·¯å¾„â€æ˜¯ç›¸å¯¹äºŽæ–°æ—§ç›®æ ‡çš„相对路径,它é™åˆ¶åªè¾“出这些\n"
+" è·¯å¾„ä¸Šçš„å·®å¼‚ã€‚æ–°æ—§ç›®æ ‡å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€URL[@REV]ã€‚æ–°ç›®æ ‡é»˜è®¤ä¸Žæ—§ç›®æ ‡ç›¸åŒï¼Œ\n"
+" OLDREV 默认为 N,NEWREV 默认为 M。\n"
+"\n"
+" 3ã€â€œsvn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]â€çš„简写。\n"
"\n"
-" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
+" ä¸åР傿•°ä½¿ç”¨â€œsvn diffâ€æ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
#: svn/main.c:351
-#, fuzzy
msgid ""
"Create an unversioned copy of a tree.\n"
"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
@@ -6037,20 +5994,19 @@
" looked up.\n"
msgstr ""
"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
-"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
+"用法: 1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
"\n"
-" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
-" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
-" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-"\n"
-" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
-" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
-" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
-" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
+" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。REV缺çœä¸ºHEAD。如果çœç•¥PATH,\n"
+" 地å€(URL)的最åŽéƒ¨åˆ†ä¼šè¢«å½“æˆç›®æ ‡ç›®å½•å。\n"
"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+" 2ã€ä»ŽPATH1指定的工作拷è´å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2,REV缺çœä¸ºå·¥ä½œç‰ˆæœ¬ã€‚\n"
+" 如果çœç•¥PATH2,PATH1 的最åŽéƒ¨åˆ†ä¼šè¢«ç”¨æ¥å½“æˆç›®æ ‡ç›®å½•å。如果çœç•¥REV,\n"
+" 所有的本地修改都会被导出。没有纳入版本控制的文件ä¸ä¼šè¢«æ‹·è´ã€‚\n"
+" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入版本控制\n"
+" 的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
+"\n"
+" 如果指定了PEGREV ,则从æ¤ä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
"\n"
#: svn/main.c:374
@@ -6062,7 +6018,6 @@
"用法:help [å命令...]\n"
#: svn/main.c:380
-#, fuzzy
msgid ""
"Commit an unversioned file or tree into the repository.\n"
"usage: import [PATH] URL\n"
@@ -6073,14 +6028,14 @@
" If PATH is a directory, the contents of the directory are added\n"
" directly under URL.\n"
msgstr ""
-"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
+"å°†æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘å¯¼å…¥æ¡£æ¡ˆåº“ã€‚\n"
"用法:import [PATH] URL\n"
"\n"
-" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
-" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
+" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL),PATH默认为 '.'。\n"
+" 父目录会ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。如果 PATHæ˜¯ä¸€ä¸ªç›®å½•ï¼Œåˆ™å…¶ä¸‹çš„å†…å®¹ç›´æŽ¥åŠ å…¥åˆ°\n"
+" URL指定的ä½ç½®ä¸‹ã€‚\n"
#: svn/main.c:393
-#, fuzzy
msgid ""
"Display information about a local or remote item.\n"
"usage: info [TARGET[@REV]...]\n"
@@ -6092,11 +6047,11 @@
"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
"用法:info [TARGET...]\n"
"\n"
-" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
-" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
+" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认是'.')。\n"
+" TARGET å¯ä»¥æ˜¯å·¥ä½œæ‹·è´ä¸çš„路径或档案库ä¸çš„地å€(URL)。REV指定在哪一个\n"
+" ä¿®è®¢ç‰ˆä¸æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
#: svn/main.c:403
-#, fuzzy
msgid ""
"List directory entries in the repository.\n"
"usage: list [TARGET[@REV]...]\n"
@@ -6117,25 +6072,23 @@
" Size (in bytes)\n"
" Date and time of the last commit\n"
msgstr ""
-"列出档案库ä¸çš„目录项目。\n"
+"列出档案库ä¸çš„目录内容。\n"
"用法:list [TARGET[@REV]...]\n"
"\n"
-" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸æ–‡ä»¶å’Œå目录列表。如果 TARGET 是工作拷è´è·¯å¾„,那么æ“作对应的档案库地å€\n"
+" (URL)上的TARGET。REV指定从在哪个修订版查找TARGET。\n"
"\n"
-" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
+" TARGET默认是'.',表示当å‰å·¥ä½œç›®å½•对应的档案库地å€(URL)。\n"
"\n"
-" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
+" åŠ ä¸Š --verbose çš„è¯ï¼Œæ¯ä¸ªæ¡ç›®ä¼šæ˜¾ç¤ºä»¥ä¸‹é¢å¤–ä¿¡æ¯ï¼š\n"
"\n"
-" 剿¬¡æäº¤çš„修订版å·ç \n"
-" 剿¬¡æäº¤çš„作者\n"
+" 最åŽä¸€æ¬¡æäº¤çš„修订版å·ç \n"
+" 最åŽä¸€æ¬¡æäº¤çš„作者\n"
" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
" å¤§å° (以å—节为å•ä½)\n"
-" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
+" 最åŽä¸€æ¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
#: svn/main.c:425
-#, fuzzy
msgid ""
"Lock working copy paths or URLs in the repository, so that\n"
"no other user can commit changes to them.\n"
@@ -6143,24 +6096,20 @@
"\n"
" Use --force to steal the lock from another user or working copy.\n"
msgstr ""
-"在档案库ä¸é”定工作目录或地å€(URL),\n"
-"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
+"é”定档案库ä¸ä¸çš„路径,使得其他用户ä¸èƒ½å‘å…¶æäº¤ä¿®æ”¹ã€‚\n"
"用法:lock TARGET...\n"
"\n"
-" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
+" 使用 --force 选项å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
#: svn/main.c:433
-#, fuzzy
msgid "read lock comment from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件 ARG 读å–åŠ é”æ³¨é‡Š"
#: svn/main.c:434
-#, fuzzy
msgid "specify lock comment ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+msgstr "æŒ‡å®šåŠ é”æ³¨é‡ŠARG"
#: svn/main.c:437
-#, fuzzy
msgid ""
"Show the log messages for a set of revision(s) and/or file(s).\n"
"usage: 1. log [PATH]\n"
@@ -6190,20 +6139,19 @@
msgstr ""
"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
"用法:1ã€log [PATH]\n"
-" 2ã€log URL [PATH...]\n"
+" 2ã€log URL[@REV] [PATH...]\n"
"\n"
" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
" BASE:1。\n"
"\n"
-" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" HEAD:1。\n"
+" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚REV指定从哪一个修订版开始查找\n"
+" URL。默认的修订版范围为 HEAD:1。\n"
"\n"
-" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
+" 使用 -v 时,在日志信æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径å。\n"
" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
"\n"
-" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
-" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
-" 个功能,这在找出分支点的很方便。\n"
+" æ¯ä¸€æ¡æ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡ï¼Œå³ä½¿æŒ‡å®šæŸä¸€ä¸ªæ›´æ”¹ä¸æ¶‰åŠåˆ°çš„多个文件。默认logä¿¡æ¯ä¼š\n"
+" 追溯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™ç§è¡Œä¸ºï¼Œè¿™ä¾¿äºŽæ‰¾å‡ºåˆ†æ”¯ç‚¹ã€‚\n"
"\n"
" 范例:\n"
" svn log\n"
@@ -6212,7 +6160,6 @@
" svn log http://www.example.com/repo/project foo.c bar.c\n"
#: svn/main.c:467
-#, fuzzy
msgid ""
"Apply the differences between two sources to a working copy path.\n"
"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
@@ -6242,22 +6189,17 @@
"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
+" 3ã€merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæº URL 的修订版 N 与 Mä½œä¸ºæ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版,默认为 HEAD。\n"
"\n"
-" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
-" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
+" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œä¸¤ä¸ªæºå·¥ä½œæ‹·è´è·¯å¾„对应的档案库ä¸çš„URLä½œä¸ºæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
"\n"
-" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
-" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
+" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´ä¸çš„路径,åŽè€…会使用档案库ä¸å¯¹åº”的地å€(URL)。\n"
+" 比较æºå°±æ˜¯REV修订版ä¸çš„地å€(URL) 在修订版 N å’Œ M时的状æ€ã€‚REV默认为HEAD。\n"
"\n"
-" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
-" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
-"作\n"
-" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
-"\n"
-" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
-" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+" WCPATH 是接收更改的工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º'.'ï¼Œé™¤éžæ¥æºä¸æœ‰ä¸Žå½“å‰ç›®å½•\n"
+" ä¸åŒå的文件,这时更改会直接应用至该文件去。\n"
#: svn/main.c:496
msgid ""
@@ -6289,7 +6231,6 @@
" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
#: svn/main.c:513
-#, fuzzy
msgid ""
"Move and/or rename something in working copy or repository.\n"
"usage: move SRC DST\n"
@@ -6301,17 +6242,17 @@
" WC -> WC: move and schedule for addition (with history)\n"
" URL -> URL: complete server-side rename.\n"
msgstr ""
-"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
+"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的文件或目录。\n"
"用法:move SRC DST\n"
"\n"
-" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
+" 注æ„:本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
+" 注æ„:æ¤å‘½ä»¤ä¸èƒ½ä½¿ç”¨--revision选项。\n"
"\n"
" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
#: svn/main.c:526
-#, fuzzy
msgid ""
"Remove a property from files, dirs, or revisions.\n"
"usage: 1. propdel PROPNAME [PATH...]\n"
@@ -6321,15 +6262,15 @@
" 2. Removes unversioned remote prop on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"移除目录,文件,或修订版的属性。\n"
+"ç§»é™¤ç›®å½•ã€æ–‡ä»¶æˆ–修订版的属性。\n"
"用法:1ã€propdel PROPNAME [PATH...]\n"
" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
+" 1ã€ç§»é™¤å·¥ä½œæ‹·è´ä¸çº³å…¥ç‰ˆæœ¬ç®¡ç†çš„æ–‡ä»¶æˆ–目录上的属性。\n"
+" 2ã€ç§»é™¤æ¡£æ¡ˆåº“ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:538
-#, fuzzy
msgid ""
"Edit a property with an external editor.\n"
"usage: 1. propedit PROPNAME PATH...\n"
@@ -6339,15 +6280,15 @@
" 2. Edits unversioned remote prop on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
-"用法:1ã€propedit PROPNAME PATH...\n"
+"å¯åŠ¨å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘å±žæ€§ã€‚\n"
+"用法:1ã€propedit PROPNAME [PATH...]\n"
" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+" 1ã€ç¼–辑工作拷è´ä¸çº³å…¥ç‰ˆæœ¬ç®¡ç†çš„æ–‡ä»¶æˆ–目录上的属性。\n"
+" 2ã€ç¼–辑档案库ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:551
-#, fuzzy
msgid ""
"Print the value of a property on files, dirs, or revisions.\n"
"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
@@ -6365,21 +6306,19 @@
" the --strict option to disable these beautifications (useful,\n"
" for example, when redirecting binary property values to a file).\n"
msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
+"æ˜¾ç¤ºç›®å½•ã€æ–‡ä»¶æˆ–修订版的一个属性。\n"
"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
"\n"
-" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
-" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
-" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
-" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
+" 1ã€æ˜¾ç¤ºç›®æ ‡ä¸Šçš„属性。REVæŒ‡å®šä»Žå“ªä¸€ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
+" 2ã€æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
+"\n"
+" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶\n"
+" 处ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåœ¨å¼€å¤´æ·»åŠ ä¸Šå®ƒæ‰€å¯¹åº”çš„è·¯å¾„ã€‚ä½¿ç”¨ --strict 选项\n"
+" 以关é—这项美化行为 (è¿™æ ·åšåˆ©äºŽå°†äºŒè¿›åˆ¶å±žæ€§å†…容é‡å®šå‘至一个文件时)。\n"
#: svn/main.c:570
-#, fuzzy
msgid ""
"List all properties on files, dirs, or revisions.\n"
"usage: 1. proplist [TARGET[@REV]...]\n"
@@ -6390,16 +6329,15 @@
" 2. Lists unversioned remote props on repos revision.\n"
" TARGET only determines which repository to access.\n"
msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
+"åˆ—å‡ºç›®å½•ã€æ–‡ä»¶æˆ–修订版上的所有属性。\n"
"用法:1ã€proplist [TARGET[@REV]...]\n"
-" 2ã€proplist --revprop -r REV [URL]\n"
+" 2ã€proplist --revprop -r REV [TARGET]\n"
"\n"
-" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚REVæŒ‡å®šä»Žå“ªä¸€ä¸ªä¿®è®¢ç‰ˆå¼€å§‹æŸ¥æ‰¾ç›®æ ‡ã€‚\n"
+" 2ã€åˆ—出档案库ä¸ä¿®è®¢ç‰ˆä¸Šçš„属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
#: svn/main.c:582
-#, fuzzy
msgid ""
"Set the value of a property on files, dirs, or revisions.\n"
"usage: 1. propset PROPNAME PROPVAL PATH...\n"
@@ -6443,43 +6381,44 @@
" attempt will fail, and a recursive attempt will set the property\n"
" only on the file children of the directory.\n"
msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
-" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
-"\n"
-" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
-" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
-" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
-" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
-" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
-" LastChangedRevision\n"
-" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
-" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
-" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
-" 下的文件å项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
-" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
-" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
-" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
+"è®¾å®šç›®å½•ã€æ–‡ä»¶æˆ–修订版的属性。\n"
+"用法:1ã€propset PROPNAME PROPVAL PATH...\n"
+" 2ã€propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸åˆ›å»ºæˆ–者修改一个属性。\n"
+" 2ã€åœ¨æ¡£æ¡ˆåº“ä¸REV修订版上创建或者修改一个属性。\n"
+" TARGETåªç”¨æ¥åˆ¤æ–访问哪一个档案库。\n"
+"\n"
+" 如果没有PROPVAL傿•°ï¼Œåˆ™å¿…é¡»æä¾›--file选项。\n"
+"\n"
+" 注æ„:svn 除了能å˜å‚¨ä»»æ„属性外,还识别以下特殊版本控制属性:\n"
+" svn:ignore - 以æ¢è¡Œç¬¦éš”开的忽略文件模å¼åˆ—表。\n"
+" svn:keywords - 将被展开的关键å—。有效的关键å—为。\n"
+" URL, HeadURL - æ¤å¯¹è±¡HEAD版本的地å€(URL)。\n"
+" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„人。\n"
+" Date, LastChangedDate - æ¤å¯¹è±¡æœ€è¿‘一次更改的日期。\n"
+" Rev, Revision, - æ¤å¯¹è±¡æœ€åŽä¸€æ¬¡æ›´æ”¹çš„修订版。\n"
+" LastChangedRevision\n"
+" Id - å‰å››ä¸ªå…³é”®å—的紧凑摘è¦ã€‚\n"
+" svn:executable - 如果å˜åœ¨æ¤å±žæ€§åˆ™è®¾ç½®æ–‡ä»¶ä¸ºå¯æ‰§è¡Œçš„。\n"
+" svn:eol-style - 'native','LF','CR','CRLF'之一。\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
+" 以åŠApache如何处ç†å®ƒã€‚mime类别以 'text/' (或是没有指定 mime 类别)\n"
+" 开头的文件会被视为纯文本文件,å¦åˆ™å°±æ˜¯äºŒè¿›åˆ¶æ•°æ®ã€‚\n"
+" svn:externals - 以æ¢è¡Œç¬¦éš”开的模å—说明列表,æ¯ä¸€æ¡è¯´æ˜Žéƒ½ç”±ä¸€ä¸ªç›¸å¯¹è·¯å¾„ã€\n"
+" å¯é€‰çš„ä¿®è®¢ç‰ˆæ ‡å¿—ã€ä¸€ä¸ªURL组æˆã€‚例如:\n"
" foo http://example.com/repos/zig\n"
" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
-"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
-"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
-"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
+" svn:needs-lock - 如果å˜åœ¨æ¤å±žæ€§åˆ™è¡¨æ˜Žæ¤æ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”è¢«åŠ é”ï¼Œå¦‚æžœæ²¡æœ‰è¢«åŠ é”\n"
+" åˆ™æ¤æ–‡ä»¶åœ¨å·¥ä½œæ‹·è´ä¸åº”被设为åªè¯»ã€‚\n"
+"\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type 以åŠ\n"
+" svn:needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。ä¸èƒ½åœ¨è®¾ç½®è¿™äº›å±žæ€§æ—¶ä½¿ç”¨éžé€’归选项\n"
+" (-N),递归æ“作时åªä¼šä½œç”¨äºŽæŒ‡å®šç›®å½•下的文件上。\n"
#: svn/main.c:624
-#, fuzzy
msgid "read property value from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+msgstr "从文件 ARG 读å–属性值"
#: svn/main.c:627
msgid ""
@@ -6504,14 +6443,13 @@
" Note: this subcommand does not require network access, and resolves\n"
" any conflicted states. However, it does not restore removed directories.\n"
msgstr ""
-"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
+"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨åˆ†çš„æœ¬åœ°ä¿®æ”¹)。\n"
"用法:revert PATH...\n"
"\n"
" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
" è¢«åˆ é™¤çš„ç›®å½•\n"
#: svn/main.c:644
-#, fuzzy
msgid ""
"Print the status of working copy files and directories.\n"
"usage: status [PATH...]\n"
@@ -6585,15 +6523,15 @@
" 965 687 joe wc/zig.c\n"
" Status against revision: 981\n"
msgstr ""
-"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
+"显示工作拷è´ä¸ç›®å½•与文件的状æ€ã€‚\n"
"用法:status [PATH...]\n"
"\n"
-" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
-" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
-" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
+" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œåªæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„æ¡ç›® (没有网络的å˜å–æ“作)。\n"
+" 使用 -u æ—¶ï¼ŒåŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸Žé’ˆå¯¹æœåŠ¡å™¨ä¸Šç‰ˆæœ¬æ˜¯å¦è¿‡æœŸçš„ä¿¡æ¯ã€‚\n"
+" 使用 -v 时,显示æ¯ä¸€ä¸ªæ¡ç›®çš„完整修订版信æ¯ã€‚\n"
"\n"
-" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
-" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
+" 输出的å‰å…æ å„å 一个å—符宽度:\n"
+" 第一æ :表示一个项目是新增ã€åˆ 除,还是修改的\n"
" ' ' æ— ä¿®æ”¹\n"
" 'A' 新增\n"
" 'C' 冲çª\n"
@@ -6603,40 +6541,41 @@
" 'M' 改å˜\n"
" 'R' 替æ¢\n"
" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
+" '?' 未纳入版本控制\n"
" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
-" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
+" '~' 版本控制下的项目与其它类型的项目é‡å\n"
" 第二æ :显示目录或文件的属性状æ€\n"
" ' ' æ— ä¿®æ”¹\n"
" 'C' 冲çª\n"
" 'M' 改å˜\n"
-" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
+" 第三æ :工作拷è´ç›®å½•是å¦è¢«é”定\n"
" ' ' 未é”定\n"
" 'L' é”定\n"
-" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
-" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
-" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
-" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
+" 第四æ :已调度的æäº¤æ˜¯å¦åŒ…嫿‹·è´åކå²ï¼ˆåŒºåˆ†æ˜¯svn add还是svn copy引起的add)\n"
+" ' ' ä¸åŒ…å«\n"
+" '+' 包å«\n"
+" 第五æ :该æ¡ç›®ç›¸å¯¹å…¶çˆ¶ç›®å½•是å¦å·²åˆ‡æ¢ï¼ˆæœ‰æ— svn switchæ“作)\n"
" ' ' æ£å¸¸\n"
-" 'S' 被切æ¢\n"
-" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
+" 'S' 已切æ¢\n"
+" ç¬¬å…æ :档案库é”å®šæ ‡è®°\n"
+" (没有 -u时)\n"
" ' ' 没有é”å®šæ ‡è®°\n"
" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
-" (有 -u)\n"
+" (有 -u时)\n"
" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
"\n"
-" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
+" 是å¦è¿‡æœŸçš„ä¿¡æ¯å‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
"\n"
" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
+" å·¥ä½œä¿®è®¢ç‰ˆå· (与 -u 或 -v 并用时)\n"
" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
-" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
+" 工作拷è´è·¯å¾„总是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
"\n"
" 范例输出:\n"
" svn status wc\n"
@@ -6657,7 +6596,6 @@
" Status against revision: 981\n"
#: svn/main.c:720
-#, fuzzy
msgid ""
"Update the working copy to a different URL.\n"
"usage: 1. switch URL [PATH]\n"
@@ -6676,15 +6614,15 @@
"用法:1ã€switch URL [PATH]\n"
" 2ã€switch --relocate FROM TO [PATH...]\n"
"\n"
-" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
-" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
-"\n"
-" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
-" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
-" 档案库的åŒä¸€ç›®å½•时用之。\n"
+" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL),其行为跟“svn updateâ€å¾ˆåƒï¼Œä¹Ÿä¼šå°†\n"
+" æœåŠ¡å™¨ä¸Šæ–‡ä»¶ä¸Žæœ¬åœ°æ–‡ä»¶åˆå¹¶ã€‚这是将工作拷è´å¯¹åº”到åŒä¸€æ¡£æ¡ˆåº“䏿Ÿä¸ªåˆ†æ”¯æˆ–è€…æ ‡è®°çš„\n"
+" 方法。\n"
+"\n"
+" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„URL元数æ®ï¼Œä»¥åæ˜ å•纯的URL上的改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹åœ°å€(URL)å˜åЍ \n"
+" (æ¯”å¦‚æ–¹æ¡ˆåæˆ–是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€æ¡£æ¡ˆåº“çš„åŒä¸€ç›®å½•时使用\n"
+" 这个命令更新工作拷è´ä¸Žæ¡£æ¡ˆåº“的对应关系。\n"
#: svn/main.c:736
-#, fuzzy
msgid ""
"Unlock working copy paths or URLs.\n"
"usage: unlock TARGET...\n"
@@ -6694,10 +6632,9 @@
"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
"用法:unlock TARGET...\n"
"\n"
-" 使用 -force 䏿¢é”定。\n"
+" 使用 --force 䏿¢é”定。\n"
#: svn/main.c:744
-#, fuzzy
msgid ""
"Bring changes from the repository into the working copy.\n"
"usage: update [PATH...]\n"
@@ -6719,24 +6656,21 @@
" A 'B' in the third column signifies that the lock for the file has\n"
" been broken or stolen.\n"
msgstr ""
-"将档案库的改å˜å应至工作拷è´ã€‚\n"
+"将档案库的更改åˆå¹¶åˆ°å·¥ä½œæ‹·è´ä¸ã€‚\n"
"用法:update [PATH...]\n"
"\n"
-" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
-" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
+" å¦‚æžœæ²¡æœ‰æŒ‡å®šä¿®è®¢ç‰ˆï¼Œåˆ™å°†å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。å¦åˆ™åŒæ¥è‡³ -r 选项所指定的修订版。\n"
"\n"
-" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
-" 这些å—符代表如下:\n"
+" æ¯æ›´æ–°ä¸€ä¸ªæ¡ç›®å°±è¾“出一行信æ¯ï¼Œè¿™è¡Œçš„第一个å—符表示所采å–的动作,这些å—符å«ä¹‰å¦‚下:\n"
"\n"
-" A 新增\n"
-" D åˆ é™¤\n"
-" U æ›´æ–°\n"
-" C 冲çª\n"
-" G åˆå¹¶\n"
-"\n"
-" 第一æ çš„å—符表示实际文件的更新,\n"
-" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
-" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
+" A å·²æ·»åŠ \n"
+" D å·²åˆ é™¤\n"
+" U 已更新\n"
+" C 有冲çª\n"
+" G åˆå¹¶æˆåŠŸ\n"
+"\n"
+" 第一æ çš„å—符表示实际文件上的更新,第二æ çš„å—符表示文件上属性的更新,第三æ ä¸Šçš„å—æ¯\n"
+" “Bâ€è¡¨ç¤ºæ¤æ–‡ä»¶ä¸Šçš„é”è¢«ä¸æ¢æˆ–窃å–。\n"
#: svn/main.c:806 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
msgid "Caught signal"
@@ -6748,35 +6682,31 @@
#: svn/main.c:924
msgid "Argument to --limit must be positive"
-msgstr ""
+msgstr "--limité€‰é¡¹çš„å‚æ•°å¿…é¡»æ˜¯æ£æ•°"
#: svn/main.c:944
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -c twice, or both -c "
"and -r"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚æ•°ï¼›ä¸èƒ½æŒ‡å®š -c ä¸¤æ¬¡æˆ–è€…åŒæ—¶ä½¿ç”¨ -c å’Œ -r"
#: svn/main.c:952 svn/main.c:1143
msgid "Can't specify -c with --old"
-msgstr ""
+msgstr "ä¸èƒ½åŒæ—¶æŒ‡å®š-cå’Œ--old"
#: svn/main.c:959
-#, fuzzy
msgid "Non-numeric change argument given to -c"
-msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
+msgstr "-cé€‰é¡¹çš„å‚æ•°ä¸æ˜¯æ•°å—"
#: svn/main.c:965
-#, fuzzy
msgid "There is no change 0"
-msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
+msgstr "没有 0 修订版"
#: svn/main.c:992
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
"N:M' instead of '-r N -r M'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚æ•°ï¼›ä¸èƒ½åŒæ—¶æŒ‡å®š -r å’Œ -c,请使用“-r N:Mâ€è€Œéžâ€œ-r N -r Mâ€"
#: svn/main.c:1005 svnadmin/main.c:1244
#, c-format
@@ -6817,24 +6747,20 @@
msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
#: svn/main.c:1345
-#, fuzzy
msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+msgstr "锿³¨é‡Šæ–‡ä»¶æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制覆盖"
#: svn/main.c:1366
msgid ""
"The log message is a pathname (was -F intended?); use '--force-log' to "
"override"
-msgstr ""
-"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
+msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (本是想用 -F 选项的å—?);请使用 '--force-log' 以强制覆盖"
#: svn/main.c:1373
-#, fuzzy
msgid ""
"The lock comment is a pathname (was -F intended?); use '--force-log' to "
"override"
-msgstr ""
-"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
+msgstr "锿³¨é‡Šæ˜¯ä¸€ä¸ªè·¯å¾„åç§° (本是想用-F 选项的å—?);请使用 '--force-log' 强制覆盖"
#: svn/main.c:1498
msgid ""
@@ -6848,9 +6774,8 @@
msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
-#, fuzzy
msgid "Too many arguments given"
-msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
+msgstr "傿•°è¿‡å¤š"
#: svn/merge-cmd.c:117
msgid "A working copy merge source needs an explicit revision"
@@ -7092,19 +7017,17 @@
msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
#: svn/proplist-cmd.c:119
-#, fuzzy, c-format
+#, c-format
msgid "Properties on '%s':\n"
-msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
+msgstr "“%sâ€ä¸Šçš„属性:\n"
#: svn/props.c:51
-#, fuzzy
msgid ""
"Must specify the revision as a number, a date or 'HEAD' when operating on a "
"revision property"
-msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
+msgstr "æ“作修订版属性时,必须指定数å—ã€æ—¥æœŸå½¢å¼çš„ä¿®è®¢ç‰ˆå·æˆ–“HEADâ€"
#: svn/props.c:58
-#, fuzzy
msgid "Wrong number of targets specified"
msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
@@ -7138,9 +7061,8 @@
msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
#: svn/revert-cmd.c:61
-#, fuzzy
msgid "Try 'svn revert --recursive' instead?"
-msgstr "å°è¯•用 “svn revert -recursive†代替?"
+msgstr "用“svn revert --recursiveâ€çœ‹çœ‹ï¼Ÿ"
#: svn/status.c:263
#, c-format
@@ -7162,11 +7084,11 @@
"æäº¤åŽçš„修订版为 %ld。\n"
#: svn/util.c:68
-#, fuzzy, c-format
+#, c-format
msgid ""
"\n"
"Warning: %s\n"
-msgstr "%sè¦å‘Šï¼š%s\n"
+msgstr "\nè¦å‘Šï¼š%s\n"
#: svn/util.c:136
msgid ""
@@ -7215,13 +7137,12 @@
msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
#: svn/util.c:510
-#, fuzzy
msgid ""
"Use of an external editor to fetch log message is not supported on OS400; "
"consider using the --message (-m) or --file (-F) options"
msgstr ""
-"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
-"message (-m) 或 --file (-F) 选项"
+"OS400ä¸Šä¸æ”¯æŒé€šè¿‡å¤–部外部编辑器获得日志信æ¯ï¼›è¯·ä½¿ç”¨ --message (-m) 或\n"
+"--file (-F) 选项"
#: svn/util.c:592
msgid "Cannot invoke editor to get log message when non-interactive"
@@ -7293,7 +7214,6 @@
msgstr "如果有的è¯ï¼Œä»¥æµä¸çš„æ•°å€¼æ¥è®¾å®šæ¡£æ¡ˆåº“çš„ UUID"
#: svnadmin/main.c:257
-#, fuzzy
msgid "type of repository: 'fsfs' (default) or 'bdb'"
msgstr "档案库类型:“fsfsâ€(默认)或“bdbâ€"
@@ -7310,11 +7230,10 @@
msgstr "关闿—¥å¿—文件自动移除 [Berkeley DB]"
#: svnadmin/main.c:272
-#, fuzzy
msgid ""
"remove redundant Berkeley DB log files\n"
" from source repository [Berkeley DB]"
-msgstr "è‡ªæ¥æºæ¡£æ¡ˆåº“移除多余的日志文件"
+msgstr "åˆ é™¤æºæ¡£æ¡ˆåº“ä¸å¤šä½™çš„Berkely DB日志文件"
#: svnadmin/main.c:276
msgid "call pre-commit hook before committing revisions"
@@ -7336,7 +7255,7 @@
msgid ""
"disallow use of SVNDIFF1 in on-disk storage,\n"
" for backwards compatibility"
-msgstr ""
+msgstr "ä¸å…è®¸å› å‘åŽå…¼å®¹è€Œåœ¨ç£ç›˜å˜å‚¨é‡Œä½¿ç”¨SVNDIFF1"
#: svnadmin/main.c:299
msgid ""
@@ -7345,6 +7264,10 @@
"Open the repository at REPOS_PATH, then abort, thus simulating\n"
"a process that crashes while holding an open repository handle.\n"
msgstr ""
+"用法:svnadmin crashtest REPOS_PATH\n"
+"\n"
+"打开REPOS_PATH上的档案库,然åŽä¸æ–ï¼Œä»Žè€Œæ¨¡æ‹Ÿä¸€ä¸ªè¿›ç¨‹åœ¨æŒæœ‰æ‰“å¼€çš„æ¡£æ¡ˆåº“å¥æŸ„æ—¶\n"
+"崩溃的情形。\n"
#: svnadmin/main.c:305
msgid ""
@@ -7454,7 +7377,6 @@
"进度报告会é€è‡³æ ‡å‡†è¾“出。\n"
#: svnadmin/main.c:362
-#, fuzzy
msgid ""
"usage: svnadmin lslocks REPOS_PATH\n"
"\n"
@@ -7462,7 +7384,7 @@
msgstr ""
"用法:svnadmin lslocks REPOS_PATH\n"
"\n"
-"显示所有é”的相信信æ¯ã€‚\n"
+"显示所有é”çš„æè¿°ã€‚\n"
#: svnadmin/main.c:367
msgid ""
@@ -7548,14 +7470,13 @@
"æ ¡éªŒå‚¨å˜äºŽæ¡£æ¡ˆåº“的数æ®ã€‚\n"
#: svnadmin/main.c:456
-#, fuzzy
msgid "Invalid revision specifier"
-msgstr "æŒ‡å®šäº†æ— æ•ˆçš„ä¿®è®¢ç‰ˆæœ¬"
+msgstr "æ— æ•ˆçš„ä¿®è®¢ç‰ˆæè¿°"
#: svnadmin/main.c:461
-#, fuzzy, c-format
+#, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
-msgstr "修订版必须ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
+msgstr "修订版å·ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
#: svnadmin/main.c:534 svnadmin/main.c:629
msgid "First revision cannot be higher than second"
@@ -7572,7 +7493,6 @@
msgstr "完æˆã€‚\n"
#: svnadmin/main.c:654
-#, fuzzy
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
@@ -7581,18 +7501,16 @@
"Available subcommands:\n"
msgstr ""
"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnadmin --versionâ€å·²æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬å·ä»¥åŠå¯ç”¨çš„æ–‡ä»¶ç³»ç»Ÿæ¨¡å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
-#, fuzzy
msgid ""
"The following repository back-end (FS) modules are available:\n"
"\n"
-msgstr ""
-"以下的档案库åŽå°(FS) 模å—å¯ç”¨ï¼š\n"
-"\n"
+msgstr "以下的档案库åŽç«¯(FS) 模å—å¯ç”¨ï¼š\n\n"
#: svnadmin/main.c:738
#, c-format
@@ -7657,12 +7575,12 @@
# this points to filename according to sunny256
#: svnadmin/main.c:1048 svnlook/main.c:1729
-#, fuzzy, c-format
+#, c-format
msgid "Owner: %s\n"
msgstr "所有者:%s\n"
#: svnadmin/main.c:1049 svnlook/main.c:1730
-#, fuzzy, c-format
+#, c-format
msgid "Created: %s\n"
msgstr "创建于:%s\n"
@@ -7694,20 +7612,19 @@
"\n"
#: svnadmin/main.c:1110
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "路径“%sâ€æ²¡æœ‰è¢«é”定。\n"
#: svnadmin/main.c:1122
-#, fuzzy, c-format
+#, c-format
msgid "Removed lock on '%s'.\n"
msgstr "åˆ é™¤â€œ%sâ€ä¸Šçš„é”。\n"
#: svnadmin/main.c:1230
-#, fuzzy
msgid ""
"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请使用“-r N:Mâ€è€Œéžâ€œ-r M -r Nâ€"
#: svnadmin/main.c:1349
#, c-format
@@ -7746,7 +7663,7 @@
#: svndumpfilter/main.c:558
#, c-format
msgid "No valid copyfrom revision in filtered stream"
-msgstr ""
+msgstr "在被过滤的æµä¸æ²¡æœ‰æœ‰æ•ˆçš„copyfrom修订版"
#: svndumpfilter/main.c:663
msgid "Delta property block detected - not supported by svndumpfilter"
@@ -7793,7 +7710,6 @@
"用法:svndumpfilter help [SUBCOMMAND...]\n"
#: svndumpfilter/main.c:888
-#, fuzzy
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
@@ -7802,7 +7718,8 @@
"Available subcommands:\n"
msgstr ""
"一般用法:svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
-"请使用 “svndumpfilter help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svndumpfilter help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svndumpfilter --versionâ€ä»¥æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬å·ã€‚\n"
"\n"
"å¯ç”¨çš„å命令:\n"
@@ -7859,7 +7776,7 @@
"错误:没有æä¾›å‰ç½®å—首,\n"
#: svndumpfilter/main.c:1289
-#, fuzzy, c-format
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svndumpfilter help %s' for usage.\n"
@@ -7884,18 +7801,16 @@
msgstr "为æ¯ä¸ªè·¯å¾„显示节点修订版编å·"
#: svnlook/main.c:114
-#, fuzzy
msgid "do not print differences for added files"
-msgstr "ä¸è¦æ‰“å°å·²æ–°åŠ æ–‡ä»¶çš„ä¸åŒå¤„"
+msgstr "ä¸è¦è¾“å‡ºæ–°åŠ æ–‡ä»¶é€ æˆçš„差异"
#: svnlook/main.c:117
msgid "print differences against the copy source"
msgstr "显示差异并对照原始内容"
#: svnlook/main.c:120
-#, fuzzy
msgid "operate on a revision property (use with -r or -t)"
-msgstr "在修订版属性上作æ“作(使用-r傿•°)"
+msgstr "æ“作修订版上的属性(使用-r或-t选项)"
#: svnlook/main.c:123
msgid "show full paths instead of indenting them"
@@ -7903,7 +7818,7 @@
#: svnlook/main.c:126
msgid "show details for copies"
-msgstr ""
+msgstr "显示å„个拷è´çš„详细信æ¯"
#: svnlook/main.c:138
msgid ""
@@ -7998,7 +7913,6 @@
"显示作者,日期戳,日志信æ¯å¤§å°ï¼Œä»¥åŠæ—¥å¿—ä¿¡æ¯ã€‚\n"
#: svnlook/main.c:186
-#, fuzzy
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
@@ -8006,7 +7920,7 @@
msgstr ""
"用法:svnlook lock REPOS_PATH PATH_IN_REPOS\n"
"\n"
-"如果档案库路径已ç»å˜åœ¨é”,æè¿°å®ƒã€‚\n"
+"如果档案库指定路径上å˜åœ¨é”,则æè¿°å®ƒã€‚\n"
#: svnlook/main.c:191
msgid ""
@@ -8019,7 +7933,6 @@
"显示日志信æ¯ã€‚\n"
#: svnlook/main.c:196
-#, fuzzy
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
@@ -8028,11 +7941,10 @@
msgstr ""
"用法:svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
"\n"
-"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性的原始内容。\n"
-"åŠ ä¸Š --revprop, 显示修订版属性的原始值。\n"
+"æ˜¾ç¤ºæ¡£æ¡ˆåº“ä¸æŸä¸ªè·¯å¾„上属性的原始值。\n"
+"用--revprop选项显示修订版上属性的原始值。\n"
#: svnlook/main.c:202
-#, fuzzy
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -8042,9 +7954,9 @@
msgstr ""
"用法:svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
-"列出档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性。\n"
-"åŠ ä¸Š --revprop 选项, 修订版属性。\n"
-"åŠ ä¸Š -v çš„è¯ï¼Œä¸€å¹¶æ˜¾ç¤ºå±žæ€§å†…容。\n"
+"åˆ—å‡ºæ¡£æ¡ˆåº“ä¸æŸä¸ªè·¯å¾„的属性。\n"
+"使用 --revprop 选项列出修订版的属性。\n"
+"使用 -v 选项一并显示属性的内容。\n"
#: svnlook/main.c:209
msgid ""
@@ -8138,18 +8050,18 @@
"REVISION PATH\n"
"-------- ----\n"
msgstr ""
-"修 订 版 路径\n"
+"修 订 版 路径\n"
"-------- ----\n"
#: svnlook/main.c:1419
-#, fuzzy, c-format
+#, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "属性“%sâ€åœ¨ä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
#: svnlook/main.c:1423
-#, fuzzy, c-format
+#, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
-msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸æ‰¾ä¸åˆ°"
+msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸Šæ‰¾ä¸åˆ°"
#: svnlook/main.c:1592 svnlook/main.c:1807
#, c-format
@@ -8157,7 +8069,6 @@
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
#: svnlook/main.c:1653
-#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
@@ -8170,15 +8081,15 @@
msgstr ""
"一般用法:svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"注æ„ï¼šä»»ä½•æŽ¥å— â€œ--revisionâ€ä¸Ž “--transactionâ€é€‰é¡¹çš„å命令,在没有\n"
-" 指定两者其一的情况下使用,会直接作用在档案库最新的修订版。\n"
-"请使用 “svnlook help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+" 指定两者其一的情况下会直接作用在档案库最新的修订版上。\n"
+"请使用“svnlook help <subcommand>â€ä»¥å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnlook --versionâ€ä»¥æŸ¥çœ‹ç¨‹åºçš„版本以åŠå¯ç”¨çš„æ–‡ä»¶ç³»ç»Ÿæ¨¡å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnlook/main.c:1709
-#, fuzzy
msgid "Missing path argument"
-msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+msgstr "ä¸¢å¤±è·¯å¾„å‚æ•°"
#: svnlook/main.c:1734
#, c-format
@@ -8199,9 +8110,9 @@
"%s\n"
#: svnlook/main.c:1781
-#, fuzzy, c-format
+#, c-format
msgid "Missing propname argument"
-msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+msgstr "丢失属性å傿•°"
#: svnlook/main.c:1782
#, c-format
@@ -8222,9 +8133,9 @@
msgstr "'--transaction' (-t) 与 '--revision' (-r) 傿•°ä¸èƒ½åŒæ—¶å˜åœ¨"
#: svnlook/main.c:2089
-#, fuzzy, c-format
+#, c-format
msgid "Repository argument required\n"
-msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
+msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
#: svnlook/main.c:2098
#, c-format
@@ -8232,12 +8143,12 @@
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径\n"
#: svnlook/main.c:2149
-#, fuzzy, c-format
+#, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnlook help %s' for usage.\n"
msgstr ""
-"å命令“%sâ€å¹¶ä¸æŽ¥å—选项“%sâ€\n"
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svnlook help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
#: svnserve/main.c:140
@@ -8269,9 +8180,8 @@
msgstr "æœåŠ¡æ ¹ç›®å½•"
#: svnserve/main.c:153
-#, fuzzy
msgid "force read only, overriding repository config file"
-msgstr "ä¸èµžæˆï¼›ä½¿ç”¨æ¡£æ¡ˆåº“é…置文件"
+msgstr "强制åªè¯»æˆï¼›ä¼˜å…ˆäºŽæ¡£æ¡ˆåº“é…置文件"
#: svnserve/main.c:154
msgid "tunnel mode"
@@ -8291,30 +8201,28 @@
#: svnserve/main.c:162
msgid "write server process ID to file arg"
-msgstr ""
+msgstr "å°†æœåŠ¡è¿›ç¨‹çš„ID写入文件ARGä¸"
#: svnserve/main.c:165
msgid "run as a windows service (SCM only)"
-msgstr ""
+msgstr "以WindowsæœåŠ¡æ–¹å¼è¿è¡Œï¼ˆä»…对æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨æœ‰æ•ˆï¼‰"
#: svnserve/main.c:177
#, c-format
msgid "Type '%s --help' for usage.\n"
-msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
+msgstr "请使用“%s --helpâ€ä»¥å¾—到用法和帮助。\n"
#: svnserve/main.c:186
-#, fuzzy
msgid ""
"usage: svnserve [options]\n"
"\n"
"Valid options:\n"
msgstr ""
-"用户:svnserve [选项]\n"
+"用法:svnserve [选项]\n"
"\n"
"有效选项:\n"
#: svnserve/main.c:453
-#, fuzzy
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "您必须指定 -d, -i, -t 或 -X ä¸çš„一个。\n"
@@ -8328,65 +8236,65 @@
msgid ""
"svnserve: The --service flag is only valid if the process is started by the "
"Service Control Manager.\n"
-msgstr ""
+msgstr "svnserve: åªæœ‰è¢«æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨å¯åŠ¨æ—¶--serviceé€‰é¡¹æ‰æœ‰æ•ˆ\n"
#: svnserve/main.c:568
-#, fuzzy, c-format
+#, c-format
msgid "Can't get address info"
-msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯"
#: svnserve/main.c:584
-#, fuzzy, c-format
+#, c-format
msgid "Can't create server socket"
-msgstr "æ— æ³•åˆ›å»ºæœåŠ¡å™¨å¥—æŽ¥å—:%s\n"
+msgstr "æ— æ³•åˆ›å»ºæœåŠ¡ç«¯å¥—æŽ¥å—"
#: svnserve/main.c:597
-#, fuzzy, c-format
+#, c-format
msgid "Can't bind server socket"
-msgstr "ä¸èƒ½ç»‘定æœåŠ¡å™¨å¥—æŽ¥å—:“%sâ€\n"
+msgstr "ä¸èƒ½ç»‘定æœåŠ¡ç«¯å¥—æŽ¥å—"
#: svnserve/main.c:665
-#, fuzzy, c-format
+#, c-format
msgid "Can't accept client connection"
-msgstr "æ— æ³•æŽ¥å—客户连接:%s\n"
+msgstr "æ— æ³•æŽ¥å—客户端连接"
#: svnserve/main.c:719
-#, fuzzy, c-format
+#, c-format
msgid "Can't create threadattr"
-msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§ï¼šâ€œ%sâ€\n"
+msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§"
# as-is
#: svnserve/main.c:727
-#, fuzzy, c-format
+#, c-format
msgid "Can't set detached state"
-msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çš„状æ€ï¼šâ€œ%sâ€\n"
+msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çжæ€"
#: svnserve/main.c:740
-#, fuzzy, c-format
+#, c-format
msgid "Can't create thread"
-msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s\n"
+msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹"
#: svnserve/winservice.c:341
#, c-format
msgid "Failed to create winservice_start_event"
-msgstr ""
+msgstr "创建windowsæœåŠ¡å¯åŠ¨äº‹ä»¶å¤±è´¥"
#: svnserve/winservice.c:352
#, c-format
msgid "The service failed to start"
-msgstr ""
+msgstr "æœåŠ¡å¯åŠ¨å¤±è´¥"
#: svnserve/winservice.c:400
#, c-format
msgid "Failed to connect to Service Control Manager"
-msgstr ""
+msgstr "连接æœåŠ¡æŽ§åˆ¶ç®¡ç†å™¨å¤±è´¥"
#: svnserve/winservice.c:411
#, c-format
msgid ""
"The service failed to start; an internal error occurred while starting the "
"service"
-msgstr ""
+msgstr "å‘生内部错误,æœåŠ¡å¯åŠ¨å¤±è´¥"
#: svnsync/main.c:56
msgid ""
@@ -8404,6 +8312,15 @@
"In other words, the destination repository should be a read-only\n"
"mirror of the source repository.\n"
msgstr ""
+"用法:svnsync initialize ç›®æ ‡URL æºURL\n"
+"\n"
+"åˆå§‹åŒ–ä¸€ä¸ªç›®æ ‡æ¡£æ¡ˆåº“ä»¥ä»Žå¦ä¸€ä¸ªæ¡£æ¡ˆåº“åŒæ¥ã€‚\n"
+"\n"
+"ç›®æ ‡URL必须指å‘ä¸€ä¸ªæ¡£æ¡ˆåº“çš„æ ¹ç›®å½•ï¼Œè¿™ä¸ªæ¡£æ¡ˆåº“å¿…é¡»æ²¡æœ‰æäº¤è¿‡çš„修订版并且å…许\n"
+"更改修订版属性。\n"
+"\n"
+"除了svnsyncå¤–ï¼Œä½ ä¸åº”è¯¥åœ¨ç›®æ ‡æ¡£æ¡ˆåº“ä¸æäº¤æˆ–è€…æ›´æ”¹ä¿®è®¢ç‰ˆå±žæ€§ã€‚ä¹Ÿå°±æ˜¯è¯´ï¼Œç›®æ ‡\n"
+"æ¡£æ¡ˆåº“åº”è¯¥æ˜¯æºæ¡£æ¡ˆåº“çš„åªè¯»é•œåƒã€‚\n"
#: svnsync/main.c:71
msgid ""
@@ -8411,6 +8328,9 @@
"\n"
"Transfer all pending revisions from source to destination.\n"
msgstr ""
+"用法: svnsync synchronize ç›®æ ‡URL\n"
+"\n"
+"ä»Žæºæ¡£æ¡ˆåº“ä¼ é€ä¿®è®¢ç‰ˆåˆ°ç›®æ ‡æ¡£æ¡ˆåº“。\n"
#: svnsync/main.c:76
msgid ""
@@ -8419,73 +8339,73 @@
"Copy all revision properties for revision REV from source to\n"
"destination.\n"
msgstr ""
+"用法:svnsync copy-revprops ç›®æ ‡URL 修订版\n"
+"\n"
+"ä»Žæºæ¡£æ¡ˆåº“æ‹·è´æ‰€æœ‰æŒ‡å®šä¿®è®¢ç‰ˆä¸Šçš„å±žæ€§åˆ°ç›®æ ‡æ¡£æ¡ˆåº“ã€‚\n"
#: svnsync/main.c:82
-#, fuzzy
msgid ""
"usage: svnsync help [SUBCOMMAND...]\n"
"\n"
"Describe the usage of this program or its subcommands.\n"
msgstr ""
-"用法:svnadmin help [SUBCOMMAND...]\n"
+"用法:svnsync help [SUBCOMMAND...]\n"
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
#: svnsync/main.c:184
-#, fuzzy, c-format
+#, c-format
msgid "Can't get local hostname"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+msgstr "æ— æ³•èŽ·å–æœ¬åœ°ä¸»æœºå"
#: svnsync/main.c:206
#, c-format
msgid "Failed to get lock on destination repos, currently held by '%s'\n"
-msgstr ""
+msgstr "å¯¹ç›®æ ‡æ¡£æ¡ˆåº“åŠ é”失败,当å‰è¢«â€œ%sâ€é”定ä¸\n"
#: svnsync/main.c:301
#, c-format
msgid "Session is rooted at '%s' but the repos root is '%s'"
-msgstr ""
+msgstr "会è¯çš„æ ¹ç›®å½•在“%sâ€ä½†æ¡£æ¡ˆåº“çš„æ ¹ç›®å½•æ˜¯â€œ%sâ€"
#: svnsync/main.c:341
#, c-format
msgid "Copied properties for revision %ld (%s* properties skipped).\n"
-msgstr ""
+msgstr "修订版%ld的属性拷è´å®Œæ¯•(%s* 属性被跳过)\n"
#: svnsync/main.c:346
-#, fuzzy, c-format
+#, c-format
msgid "Copied properties for revision %ld.\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgstr "æ‹·è´äº†ä¿®è®¢ç‰ˆ%ld上的属性。\n"
#: svnsync/main.c:387
msgid "Cannot initialize a repository with content in it"
-msgstr ""
+msgstr "档案库éžç©ºï¼Œåˆå§‹åŒ–失败"
#: svnsync/main.c:398
#, c-format
msgid "Destination repository is already synchronizing from '%s'"
-msgstr ""
+msgstr "ç›®æ ‡æ¡£æ¡ˆåº“å·²ç»åœ¨ä¸Žâ€œ%sâ€åŒæ¥"
#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
#: svnsync/main.c:1200
-#, fuzzy, c-format
+#, c-format
msgid "Path '%s' is not a URL"
-msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
+msgstr "路径“%sâ€ä¸æ˜¯URL"
#: svnsync/main.c:838
-#, fuzzy, c-format
+#, c-format
msgid "Committed revision %ld.\n"
-msgstr ""
-"\n"
-"æäº¤åŽçš„修订版为 %ld。\n"
+msgstr "æäº¤åŽçš„修订版为 %ld。\n"
#: svnsync/main.c:877
msgid "Destination repository has not been initialized"
-msgstr ""
+msgstr "ç›®æ ‡æ¡£æ¡ˆåº“å°šæœªè¢«åˆå§‹åŒ–"
#: svnsync/main.c:892
#, c-format
msgid "UUID of source repository (%s) does not match expected UUID (%s)"
-msgstr ""
+msgstr "æºæ¡£æ¡ˆåº“(%s)的UUID与期望的UUID(%s)ä¸åŒ¹é…"
#: svnsync/main.c:954
#, c-format
@@ -8494,6 +8414,8 @@
"destination HEAD (%ld) are inconsistent; have you committed to the "
"destination without using svnsync?"
msgstr ""
+"当剿£è¢«æ‹·è´çš„修订版(%ldï¼‰ã€æœ€åŽåˆå¹¶çš„修订版(%ld)以åŠç›®æ ‡æ¡£æ¡ˆåº“çš„HEAD(%ld)\n"
+"ä¸ä¸€è‡´ï¼›ä½ 是å¦ç”¨svnsync之外的办法å‘ç›®æ ‡æ¡£æ¡ˆåº“æäº¤è¿‡ï¼Ÿ"
#: svnsync/main.c:992
#, c-format
@@ -8501,23 +8423,23 @@
"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
"committed to the destination without using svnsync?"
msgstr ""
+"ç›®æ ‡æ¡£æ¡ˆåº“çš„HEAD(%ldï¼‰ä¸æ˜¯æœ€åŽåˆå¹¶çš„修订版(%ldï¼‰ï¼›ä½ æ˜¯å¦ç”¨svnsync之外的办法å‘ç›®æ ‡\n"
+"档案库æäº¤è¿‡ï¼Ÿ"
#: svnsync/main.c:1069
#, c-format
msgid "Commit created rev %ld but should have created %ld"
-msgstr ""
+msgstr "æäº¤åˆ›å»ºäº†ä¿®è®¢ç‰ˆ%ld 但本应创建%ld"
#: svnsync/main.c:1171
msgid "Cannot copy revprops for a revision that has not been synchronized yet"
-msgstr ""
+msgstr "ä¸èƒ½æ‹·è´å°šæœªåŒæ¥çš„修订版的修订属性"
#: svnsync/main.c:1203
-#, fuzzy
msgid "Invalid revision number"
-msgstr "æä¾›äº†æ— 效的版本å·ç "
+msgstr "æ— æ•ˆçš„ä¿®è®¢ç‰ˆå·"
#: svnsync/main.c:1239
-#, fuzzy
msgid ""
"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
@@ -8525,31 +8447,32 @@
"\n"
"Available subcommands:\n"
msgstr ""
-"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
-"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"一般用法:svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"请使用“svnsync help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"请使用“svnsync --versionâ€æŸ¥çœ‹ç¨‹åºç‰ˆæœ¬ä»¥åŠå¯ç”¨çš„RA模å—。\n"
"\n"
"å¯ç”¨çš„å命令:\n"
#: svnsync/main.c:1429
-#, fuzzy, c-format
+#, c-format
msgid ""
"subcommand '%s' doesn't accept option '%s'\n"
"Type 'svnsync help %s' for usage.\n"
msgstr ""
"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
-"请输入“svn help %sâ€ä»¥å–得用法。\n"
+"请输入“svnsync help %sâ€ä»¥å–得用法。\n"
#: svnsync/main.c:1490
msgid "Not enough arguments provided; try 'svnsync help' for more info"
-msgstr ""
+msgstr "傿•°ä¸å¤Ÿï¼›è¯·ç”¨â€œsvnsync helpâ€èŽ·å–æ›´å¤šå¸®åŠ©"
#: svnversion/main.c:39
-#, fuzzy, c-format
+#, c-format
msgid "Type 'svnversion --help' for usage.\n"
-msgstr "请使用“svnversion --helpâ€ä»¥å¾—到用法和帮助。\n"
+msgstr "请使用“svnversion --helpâ€ä»¥å¾—到帮助。\n"
#: svnversion/main.c:50
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
@@ -8581,25 +8504,26 @@
msgstr ""
"用法:svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
-" 为工作拷è´è·¯å¾„ WC_PATH 产生简æ´çš„ “版本å·ç â€ã€‚ TRAIL_URL 是\n"
-" URL 的结尾部份,用以决定 WC_PATH 是å¦å·²è¢«åˆ‡æ¢ (WC_PATH 内的切æ¢\n"
-" 侦测并ä¸å€šèµ– TRAIL_URL)。版本å·ç ä¼šå†™è‡³æ ‡å‡†è¾“å‡ºã€‚ä¸¾ä¾‹è¯´æ˜Žï¼š\n"
+" 为工作拷è´è·¯å¾„ WC_PATH 产生紧凑的 “版本å·â€ã€‚ TRAIL_URL 是\n"
+" URL çš„ç»“å°¾éƒ¨åˆ†ï¼Œç”¨ä»¥åˆ¤æ– WC_PATH 是å¦å·²åˆ‡æ¢è¿‡ (探测WC_PATH\n"
+" 内的切æ¢å¹¶ä¸ä¾é TRAIL_URL)。版本å·ç ä¼šå†™è‡³æ ‡å‡†è¾“å‡ºã€‚ä¸¾ä¾‹è¯´æ˜Žï¼š\n"
"\n"
" $ svnversion . /repos/svn/trunk \n"
" 4168\n"
"\n"
-" å¦‚æžœå·¥ä½œæ‹·è´æ˜¯å•一版本,未ç»ä¿®æ”¹ï¼Œæœªè¢«åˆ‡æ¢ï¼Œè€Œä¸”其地å€(URL)符åˆ\n"
-" TRAIL_URL 傿•°ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç 将会是å•一å·ç 。如果工作拷è´å†…ä¸\n"
-" 太å•纯的è¯ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç å°±ä¼šå¤æ‚地多:\n"
+" å¦‚æžœå·¥ä½œæ‹·è´æ˜¯å•一版本,未ç»ä¿®æ”¹ï¼Œæœªç»åˆ‡æ¢ï¼Œè€Œä¸”其地å€(URL)符åˆ\n"
+" TRAIL_URL 傿•°ï¼Œé‚£ä¹ˆç‰ˆæœ¬å·ç 将会是å•一数å—。如果工作拷è´ä¸æ™®é€šï¼Œ\n"
+" 那么版本å·å°±ä¼šå¤æ‚得多:\n"
"\n"
" 4123:4168 æ··åˆä¿®è®¢ç‰ˆçš„工作拷è´\n"
" 4168M 有修改的工作拷è´\n"
" 4123S 切æ¢äº†çš„工作拷è´\n"
-" 4123:4168MS æ··åˆä¿®è®¢ç‰ˆï¼Œæœ‰ä¿®æ”¹ï¼Œåˆ‡æ¢äº†çš„工作拷è´\n"
+" 4123:4168MS æ··åˆä¿®è®¢ç‰ˆï¼Œæœ‰ä¿®æ”¹ï¼Œå·¥ä½œæ‹·è´åˆ‡æ¢è¿‡\n"
+"\n"
+" 如果使用在éžå·¥ä½œæ‹·è´çš„目录上,例如导出的目录,那么它会输出“已导出â€ã€‚\n"
+"\n"
+" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•°åˆ™WC_PATH默认为当å‰ç›®å½•。\n"
"\n"
-" 如果在éžå·¥ä½œæ‹·è´çš„目录ä¸ï¼Œä¾‹å¦‚导出的目录执行的è¯ï¼Œé‚£ä¹ˆ\n"
-" 这个程åºä¼šè¾“出“已导出â€ã€‚\n"
-" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•° WC_PATH 会使用当å‰ç›®å½•。\n"
"有效选项:\n"
#: svnversion/main.c:121
@@ -8620,219 +8544,3 @@
msgid "'%s' not versioned, and not exported\n"
msgstr "“%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œå¹¶æœªå¯¼å‡º\n"
-#~ msgid "Finished"
-#~ msgstr "完æˆ"
-
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
-
-#, fuzzy
-#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
-
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
-
-#~ msgid "No URL target available"
-#~ msgstr "没有æä¾› URL ç›®æ ‡"
-
-#~ msgid "repository argument required\n"
-#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
-
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%sâ€\n"
-
-#~ msgid "Can't recode string"
-#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
-
-#~ msgid "native"
-#~ msgstr "本地"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
-
-# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
-#~ msgstr "䏿”¯æŒra_davçš„ RA æ’ä»¶ ABI 版本 (%d)"
-
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
-
-#~ msgid "Working copy not locked"
-#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
-
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信æ¯\n"
-
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
-
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
-
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
-
-#~ msgid "print client version info"
-#~ msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
-
-#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
-#~ msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
-
-#~ msgid "Wrong number of paths given"
-#~ msgstr "指定了错误数目的路径"
-
-#~ msgid "Not enough args provided"
-#~ msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
-
-# as-is
-#~ msgid "Can't seek in '%s'"
-#~ msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
-
-#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-#~ msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
-
-#~ msgid "Unrecognized node kind of '%s'"
-#~ msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-
-#~ msgid "'%s' is in the way"
-#~ msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
-
-#~ msgid "'%s' is not supported"
-#~ msgstr "“%sâ€ä¸æ”¯æŒ"
-
-#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
-
-#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-#~ msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
-
-#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-#~ msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-
-#~ msgid "Search for malformed path '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for reading"
-#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
-
-# as-is
-#, fuzzy
-#~ msgid "Can't open file '%s' for writing"
-#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
-
-#, fuzzy
-#~ msgid "Error reading file '%s'"
-#~ msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
-
-#, fuzzy
-#~ msgid "Error writing file '%s'"
-#~ msgstr "写入文件“%sâ€æ—¶å‘生错误"
-
-#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-#~ msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
-
-#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-#~ msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
-
-#~ msgid "Found malformed header block in dumpfile stream"
-#~ msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
-
-# as-is
-#~ msgid "Creating readme file"
-#~ msgstr "æ£åœ¨åˆ›å»º readme 文件"
-
-#, fuzzy
-#~ msgid "Expected format '%d' of repository; found format '%d'"
-#~ msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
-
-# as-is
-#~ msgid "Can't open config file '%s'"
-#~ msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
-
-# as-is
-#~ msgid "Can't find config file '%s'"
-#~ msgstr "找ä¸åˆ°é…置文件“%sâ€"
-
-#~ msgid "Can't change executability of file '%s'"
-#~ msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
-
-#~ msgid "Can't stat new directory '%s'"
-#~ msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
-
-#~ msgid "Too few arguments"
-#~ msgstr "傿•°å¤ªå°‘"
-
-#~ msgid ""
-#~ "The entry '%s' is no longer a directory; remove the entry before updating"
-#~ msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-
-#~ msgid "Error restoring props for '%s'"
-#~ msgstr "还原“%sâ€çš„属性时å‘生错误"
-
-#~ msgid "Error removing props for '%s'"
-#~ msgstr "移除“%sâ€çš„属性时å‘生错误"
-
-#~ msgid ""
-#~ "'%s' is scheduled for deletion; it must be committed before being "
-#~ "overwritten"
-#~ msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
-
-#, fuzzy
-#~ msgid "Working copy '%s' is missing or not locked"
-#~ msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
-
-#~ msgid "Error checking path '%s'"
-#~ msgstr "检查路径“%sâ€æ—¶å‘生错误"
-
-#~ msgid "Unable to delete temporary file"
-#~ msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
-
-#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
-
-#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
-
-#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
-
-#~ msgid "Unknown node kind: '%s'"
-#~ msgstr "未知的节点类型:“%sâ€"
-
-#~ msgid "'%s' has unknown value for svn:eol-style property"
-#~ msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
-
-#~ msgid "Move failed"
-#~ msgstr "移动失败"
-
-#~ msgid "Node with dropped parent sneaked in"
-#~ msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
-
-#, fuzzy
-#~ msgid "Error creating dir '%s' (path exists)"
-#~ msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
-
-#~ msgid "Can't create temporary directory"
-#~ msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
-
-#~ msgid ""
-#~ "Warning: -R is deprecated.\n"
-#~ "Anonymous access is now read-only by default.\n"
-#~ "To change, use conf/svnserve.conf in repos:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (default read)\n"
-#~ " auth-access = read|write|none (default write)\n"
-#~ "Forcing all access to read-only for now\n"
-#~ msgstr ""
-#~ "è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
-#~ "匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
-#~ "修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
-#~ " [general]\n"
-#~ " anon-access = read|write|none (默认 read)\n"
-#~ " auth-access = read|write|none (默认 write)\n"
-#~ "强制所有访问为åªè¯»\n"
[[[
* subversion/po/zh_CN.po: msgmerge with latest subversion.pot in trunk
untranslated yet.
]]]
diff -u origin\zh_CN.po msgmerged\zh_CN.po
--- origin\zh_CN.po Wed Aug 23 10:59:38 2006
+++ msgmerged\zh_CN.po Wed Aug 23 10:59:56 2006
@@ -5,6763 +5,7370 @@
msgid ""
msgstr ""
"Project-Id-Version: subversion 1.2.0\n"
-"POT-Creation-Date: 2005-08-16 16:28+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
+"POT-Creation-Date: 2006-08-21 06:57-0400\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-#: clients/cmdline/blame-cmd.c:236 clients/cmdline/ls-cmd.c:316
-msgid "'verbose' option invalid in XML mode"
-msgstr "在XML模å¼ä¸â€œè¯¦ç»†â€é€‰é¡¹æ— 效"
+# as-is
+#: include/svn_error_codes.h:154
+msgid "Bad parent pool passed to svn_make_pool()"
+msgstr "æ— æ•ˆçš„å†…å˜æ± (pool)ä¼ é€’åˆ° svn_make_pool()"
-#: clients/cmdline/blame-cmd.c:248 clients/cmdline/ls-cmd.c:328
-#: clients/cmdline/status-cmd.c:192
-msgid "'incremental' option only valid in XML mode"
-msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
+#: include/svn_error_codes.h:158
+msgid "Bogus filename"
+msgstr "有问题的文件å"
-#: clients/cmdline/blame-cmd.c:307
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "跳过二进制文件:“%sâ€\n"
+#: include/svn_error_codes.h:162
+msgid "Bogus URL"
+msgstr "有问题的地å€(URL)"
-#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125
-#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "“%sâ€ä¸åƒæ˜¯åœ°å€(URL)"
+#: include/svn_error_codes.h:166
+msgid "Bogus date"
+msgstr "有问题的日期"
-#: clients/cmdline/copy-cmd.c:106 clients/cmdline/delete-cmd.c:64
-#: clients/cmdline/mkdir-cmd.c:66
-msgid "Local, non-commit operations do not take a log message"
-msgstr "本地æ“ä½œï¼Œéžæäº¤çš„æ“作ä¸èƒ½èŽ·å–æ—¥å¿—ä¿¡æ¯"
+#: include/svn_error_codes.h:170
+msgid "Bogus mime-type"
+msgstr "有问题的 mime-type"
-#: clients/cmdline/diff-cmd.c:65
-msgid "Can't open stdout"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å‡º (stdout)"
+#: include/svn_error_codes.h:176
+msgid "Version file format not correct"
+msgstr "ç‰ˆæœ¬æ–‡ä»¶æ ¼å¼ä¸æ£ç¡®"
-#: clients/cmdline/diff-cmd.c:67
-msgid "Can't open stderr"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
+#: include/svn_error_codes.h:182
+msgid "No such XML tag attribute"
+msgstr "æ²¡æœ‰è¿™æ ·çš„ XML æ ‡ç¾å±žæ€§"
-#: clients/cmdline/diff-cmd.c:156
-msgid "Target lists to diff may not contain both working copy paths and URLs"
-msgstr "å·®å¼‚æ¯”è¾ƒç›®æ ‡ä¸å¯åŒæ—¶åŒ…å«å·¥ä½œæ‹·è´è·¯å¾„与地å€(URL)"
+#: include/svn_error_codes.h:186
+msgid "<delta-pkg> is missing ancestry"
+msgstr "<delta-pkg> 没有演进历程"
-#: clients/cmdline/export-cmd.c:82
-msgid ""
-"Destination directory exists; please remove the directory or use --force to "
-"overwrite"
-msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
+#: include/svn_error_codes.h:190
+msgid "Unrecognized binary data encoding; can't decode"
+msgstr "æ— æ³•è¾¨è¯†çš„äºŒè¿›åˆ¶æ•°æ®ç¼–ç ï¼šæ— æ³•è§£è¯‘"
-#: clients/cmdline/help-cmd.c:45
-#, c-format
-msgid ""
-"usage: svn <subcommand> [options] [args]\n"
-"Subversion command-line client, version %s.\n"
-"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
-"\n"
-"Most subcommands take file and/or directory arguments, recursing\n"
-"on the directories. If no arguments are supplied to such a\n"
-"command, it recurses on the current directory (inclusive) by default.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"用法:svn <subcommand> [options] [args]\n"
-"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
-"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
-"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
-"行递归å˜å–。\n"
-"\n"
-"å¯ç”¨çš„å命令:\n"
+#: include/svn_error_codes.h:194
+msgid "XML data was not well-formed"
+msgstr "XML 的数æ®ä¸åˆè¯æ³•"
-#: clients/cmdline/help-cmd.c:56
-msgid ""
-"Subversion is a tool for version control.\n"
-"For additional information, see http://subversion.tigris.org/\n"
-msgstr ""
-"Subversion 是个版本控制系统的工具。\n"
-"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+#: include/svn_error_codes.h:198
+msgid "Data cannot be safely XML-escaped"
+msgstr "XML æ•°æ®ä¸èƒ½æ£ç¡®åœ°è§£ç "
-#: clients/cmdline/help-cmd.c:63
-msgid ""
-"The following repository access (RA) modules are available:\n"
-"\n"
-msgstr ""
-"å¯ä½¿ç”¨ä»¥ä¸‹çš„æ¡£æ¡ˆåº“å˜å– (RA) 模å—:\n"
-"\n"
+#: include/svn_error_codes.h:204
+msgid "Inconsistent line ending style"
+msgstr "ä¸ä¸€è‡´çš„è¡Œç»“æŸæ ·å¼"
-#: clients/cmdline/import-cmd.c:82
-msgid "Repository URL required when importing"
-msgstr "导入时必须æä¾›æ¡£æ¡ˆåº“的地å€(URL)"
+#: include/svn_error_codes.h:208
+msgid "Unrecognized line ending style"
+msgstr "æ— æ³•è¾¨è¯†çš„è¡Œç»“æŸæ ·å¼"
-#: clients/cmdline/import-cmd.c:86
-msgid "Too many arguments to import command"
-msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
+#: include/svn_error_codes.h:213
+msgid "Line endings other than expected"
+msgstr "ä¸€è¡Œä»¥æ„æ–™ä¹‹å¤–的方å¼ç»“æŸ"
-#: clients/cmdline/import-cmd.c:101
-#, c-format
-msgid "Invalid URL '%s'"
-msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
+#: include/svn_error_codes.h:217
+msgid "Ran out of unique names"
+msgstr "已用完ä¸é‡å¤çš„åç§°"
-#: clients/cmdline/info-cmd.c:56 svnadmin/main.c:1028
-#, c-format
-msgid "Path: %s\n"
-msgstr "路径:%s\n"
+# as-is
+#: include/svn_error_codes.h:222
+msgid "Framing error in pipe protocol"
+msgstr "管é“å议帧错误"
-# this points to filename according to sunny256
-#: clients/cmdline/info-cmd.c:62 svnlook/main.c:782
-#, c-format
-msgid "Name: %s\n"
-msgstr "文件å:%s\n"
+#: include/svn_error_codes.h:227
+msgid "Read error in pipe"
+msgstr "管é“å‘生读å–错误"
-#: clients/cmdline/info-cmd.c:66
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
+#: libsvn_subr/cmdline.c:308 svn/util.c:716
#, c-format
-msgid "URL: %s\n"
-msgstr "地å€(URL):%s\n"
+msgid "Write error"
+msgstr "写入错误"
-#: clients/cmdline/info-cmd.c:69
-#, fuzzy, c-format
-msgid "Repository Root: %s\n"
-msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
+#: include/svn_error_codes.h:237
+msgid "Unexpected EOF on stream"
+msgstr "æµä¸æœ‰æ„料之外的结æŸç¬¦"
-#: clients/cmdline/info-cmd.c:73
-#, c-format
-msgid "Repository UUID: %s\n"
-msgstr "档案库 UUID:%s\n"
+#: include/svn_error_codes.h:241
+msgid "Malformed stream data"
+msgstr "ç•¸å½¢çš„æµæ•°æ®"
-#: clients/cmdline/info-cmd.c:77
-#, c-format
-msgid "Revision: %ld\n"
-msgstr "修订版:%ld\n"
+#: include/svn_error_codes.h:245
+msgid "Unrecognized stream data"
+msgstr "æ— æ³•è¾¨è¯†çš„æµæ•°æ®"
-#: clients/cmdline/info-cmd.c:82
-msgid "Node Kind: file\n"
-msgstr "节点ç§ç±»ï¼šæ–‡ä»¶\n"
+#: include/svn_error_codes.h:251
+msgid "Unknown svn_node_kind"
+msgstr "未知的 svn_node_kind"
-#: clients/cmdline/info-cmd.c:86
-msgid "Node Kind: directory\n"
-msgstr "节点ç§ç±»ï¼šç›®å½•\n"
+#: include/svn_error_codes.h:255
+msgid "Unexpected node kind found"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
-#: clients/cmdline/info-cmd.c:90
-msgid "Node Kind: none\n"
-msgstr "节点ç§ç±»ï¼šæ— \n"
+#: include/svn_error_codes.h:261
+msgid "Can't find an entry"
+msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªé¡¹ç›®"
-#: clients/cmdline/info-cmd.c:95
-msgid "Node Kind: unknown\n"
-msgstr "节点ç§ç±»ï¼šæœªçŸ¥\n"
+#: include/svn_error_codes.h:267
+msgid "Entry already exists"
+msgstr "项目已å˜åœ¨"
-#: clients/cmdline/info-cmd.c:104
-msgid "Schedule: normal\n"
-msgstr "调度:æ£å¸¸\n"
+#: include/svn_error_codes.h:271
+msgid "Entry has no revision"
+msgstr "项目没有修订版"
-#: clients/cmdline/info-cmd.c:108
-msgid "Schedule: add\n"
-msgstr "调度:新增\n"
+#: include/svn_error_codes.h:275
+msgid "Entry has no URL"
+msgstr "项目没有地å€(URL)"
-#: clients/cmdline/info-cmd.c:112
-msgid "Schedule: delete\n"
-msgstr "è°ƒåº¦ï¼šåˆ é™¤\n"
+#: include/svn_error_codes.h:279
+msgid "Entry has an invalid attribute"
+msgstr "é¡¹ç›®æœ‰æ— æ•ˆçš„å±žæ€§"
-#: clients/cmdline/info-cmd.c:116
-msgid "Schedule: replace\n"
-msgstr "调度:替æ¢\n"
+#: include/svn_error_codes.h:285
+msgid "Obstructed update"
+msgstr "塞ä½çš„æ›´æ–°"
-#: clients/cmdline/info-cmd.c:124
-#, c-format
-msgid "Copied From URL: %s\n"
-msgstr "å¤åˆ¶è‡ªåœ°å€(URL):%s\n"
+# as-is
+#: include/svn_error_codes.h:290
+msgid "Mismatch popping the WC unwind stack"
+msgstr "ä¸åŒ¹é…的弹出工作拷è´(WC)å±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:128
-#, c-format
-msgid "Copied From Rev: %ld\n"
-msgstr "å¤åˆ¶è‡ªä¿®è®¢ç‰ˆï¼š%ld\n"
+# as-is
+#: include/svn_error_codes.h:295
+msgid "Attempt to pop empty WC unwind stack"
+msgstr "å°è¯•弹出空的工作拷è´(WC)å±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:133
-#, c-format
-msgid "Last Changed Author: %s\n"
-msgstr "最åŽä¿®æ”¹çš„作者:%s\n"
+# as-is
+#: include/svn_error_codes.h:300
+msgid "Attempt to unlock with non-empty unwind stack"
+msgstr "å°è¯•è§£é”éžç©ºå±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:137
-#, c-format
-msgid "Last Changed Rev: %ld\n"
-msgstr "最åŽä¿®æ”¹çš„修订版:%ld\n"
+#: include/svn_error_codes.h:304
+msgid "Attempted to lock an already-locked dir"
+msgstr "å°è¯•è¦é”定一个已é”定的目录"
-#: clients/cmdline/info-cmd.c:142
-msgid "Last Changed Date"
-msgstr "最åŽä¿®æ”¹çš„æ—¶é—´"
+#: include/svn_error_codes.h:308
+msgid "Working copy not locked; this is probably a bug, please report"
+msgstr "工作目录没有被é”定;这å¯èƒ½æ˜¯ä¸€ä¸ªæ¼æ´žï¼Œè¯·æŠ¥å‘Šå¼€å‘者"
-#: clients/cmdline/info-cmd.c:148
-msgid "Text Last Updated"
-msgstr "æ–‡æœ¬æœ€åŽæ›´æ–°"
+#: include/svn_error_codes.h:313
+msgid "Invalid lock"
+msgstr "æ— æ•ˆçš„é”定"
-#: clients/cmdline/info-cmd.c:152
-msgid "Properties Last Updated"
-msgstr "å±žæ€§æœ€åŽæ›´æ–°"
+#: include/svn_error_codes.h:317
+msgid "Path is not a working copy directory"
+msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
-#: clients/cmdline/info-cmd.c:155
-#, c-format
-msgid "Checksum: %s\n"
-msgstr "æ ¡éªŒå’Œï¼š%s\n"
+#: include/svn_error_codes.h:321
+msgid "Path is not a working copy file"
+msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´æ–‡ä»¶"
-#: clients/cmdline/info-cmd.c:160
-#, c-format
-msgid "Conflict Previous Base File: %s\n"
-msgstr "冲çªä¹‹å‰çš„æ–‡ä»¶ï¼š%s\n"
+#: include/svn_error_codes.h:325
+msgid "Problem running log"
+msgstr "æ— æ³•æ‰§è¡Œæ—¥å¿—"
-#: clients/cmdline/info-cmd.c:166
-#, c-format
-msgid "Conflict Previous Working File: %s\n"
-msgstr "冲çªä¹‹å‰çš„工作文件:%s\n"
+#: include/svn_error_codes.h:329
+msgid "Can't find a working copy path"
+msgstr "找ä¸åˆ°å·¥ä½œæ‹·è´è·¯å¾„"
-#: clients/cmdline/info-cmd.c:171
-#, c-format
-msgid "Conflict Current Base File: %s\n"
-msgstr "冲çªä¹‹å‰çš„当剿–‡ä»¶ï¼š%s\n"
+#: include/svn_error_codes.h:333
+msgid "Working copy is not up-to-date"
+msgstr "å·¥ä½œæ‹·è´æœªæ›´æ–°è‡³æœ€æ–°ç‰ˆ"
-#: clients/cmdline/info-cmd.c:176
-#, c-format
-msgid "Conflict Properties File: %s\n"
-msgstr "冲çªçš„属性文件:%s\n"
+#: include/svn_error_codes.h:337
+msgid "Left locally modified or unversioned files"
+msgstr "ä¿ç•™æœ¬åœ°ä¿®æ”¹æˆ–未纳入版本管ç†çš„æ–‡ä»¶"
-#: clients/cmdline/info-cmd.c:184
-#, c-format
-msgid "Lock Token: %s\n"
-msgstr "é”定记å·ï¼š%s\n"
+#: include/svn_error_codes.h:341
+msgid "Unmergeable scheduling requested on an entry"
+msgstr "è¯¥é¡¹ç›®æœ‰ä¸€ä¸ªæ— æ³•åˆå¹¶çš„调度请求"
-#: clients/cmdline/info-cmd.c:188
-#, c-format
-msgid "Lock Owner: %s\n"
-msgstr "é”定所有者:%s\n"
+#: include/svn_error_codes.h:345
+msgid "Found a working copy path"
+msgstr "找到一个工作拷è´è·¯å¾„"
-#: clients/cmdline/info-cmd.c:193
-msgid "Lock Created"
-msgstr "é”定已创建的"
+#: include/svn_error_codes.h:349
+msgid "A conflict in the working copy obstructs the current operation"
+msgstr "工作拷è´ä¸çš„冲çªé˜»ç¢äº†ç›®å‰çš„æ“ä½œ"
-#: clients/cmdline/info-cmd.c:197
-msgid "Lock Expires"
-msgstr "é”定过期的"
+#: include/svn_error_codes.h:353
+msgid "Working copy is corrupt"
+msgstr "工作拷è´å·²æŸå"
-#: clients/cmdline/info-cmd.c:206
-#, c-format
-msgid ""
-"Lock Comment (%i lines):\n"
-"%s\n"
-msgstr ""
-"é”定注释(%i 行):\n"
-"%s\n"
+#: include/svn_error_codes.h:357
+msgid "Working copy text base is corrupt"
+msgstr "工作拷è´çš„æ–‡ä»¶å‚考基础已æŸå"
-#: clients/cmdline/info-cmd.c:207
-#, c-format
-msgid ""
-"Lock Comment (%i line):\n"
-"%s\n"
-msgstr ""
-"é”定注释(%i line):\n"
-"%s\n"
+#: include/svn_error_codes.h:361
+msgid "Cannot change node kind"
+msgstr "æ— æ³•æ›´æ”¹èŠ‚ç‚¹ç§ç±»"
-#: clients/cmdline/info-cmd.c:281
-#, c-format
-msgid ""
-"%s: (Not a versioned resource)\n"
-"\n"
-msgstr ""
-"%s:(䏿˜¯å—版本控制的资æº)\n"
-"\n"
-
-#: clients/cmdline/info-cmd.c:290
-#, fuzzy, c-format
-msgid ""
-"%s: (Not a valid URL)\n"
-"\n"
-msgstr ""
-"%s:(䏿˜¯æœ‰æ•ˆçš„地å€(URL))\n"
-"\n"
+#: include/svn_error_codes.h:365
+msgid "Invalid operation on the current working directory"
+msgstr "这个æ“作对目å‰çš„工作拷è´ç›®å½•æ— æ•ˆ"
-#: clients/cmdline/lock-cmd.c:52
-#, fuzzy
-msgid "Lock comment contains a zero byte"
-msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
+#: include/svn_error_codes.h:369
+msgid "Problem on first log entry in a working copy"
+msgstr "æ“作于工作拷è´çš„第一个日志项目时å‘生问题"
-#: clients/cmdline/log-cmd.c:162
-msgid "(no author)"
-msgstr "(没有作者信æ¯)"
+#: include/svn_error_codes.h:373
+msgid "Unsupported working copy format"
+msgstr "䏿”¯æŒçš„å·¥ä½œæ‹·è´æ ¼å¼"
-#: clients/cmdline/log-cmd.c:173
-msgid "(no date)"
-msgstr "(没有时间)"
+#: include/svn_error_codes.h:377
+msgid "Path syntax not supported in this context"
+msgstr "è·¯å¾„è¯æ³•在æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸æ”¯æŒ"
-#: clients/cmdline/log-cmd.c:203
-msgid "Changed paths:\n"
-msgstr "改å˜çš„路径:\n"
+#: include/svn_error_codes.h:382
+msgid "Invalid schedule"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: clients/cmdline/log-cmd.c:218
-#, c-format
-msgid " (from %s:%ld)"
-msgstr " (从 %s:%ld)"
+#: include/svn_error_codes.h:387
+#, fuzzy
+msgid "Invalid relocation"
+msgstr "æ— æ•ˆçš„é”定"
-#: clients/cmdline/log-cmd.c:437
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "当指定工作拷è´è·¯å¾„ï¼Œåªæœ‰ä¸€ä¸ªç›®æ ‡ä¼šè¢«æŒ‡å®š"
+#: include/svn_error_codes.h:392
+#, fuzzy
+msgid "Invalid switch"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: clients/cmdline/log-cmd.c:449
-msgid "Only relative paths can be specified after a URL"
-msgstr "地å€(URL)åŽåªèƒ½æŒ‡å®šç›¸å¯¹è·¯å¾„"
+#: include/svn_error_codes.h:398
+msgid "General filesystem error"
+msgstr "一般性文件系统错误"
-#: clients/cmdline/main.c:63
-msgid "force operation to run"
-msgstr "强制æ“作è¿è¡Œ"
+#: include/svn_error_codes.h:402
+msgid "Error closing filesystem"
+msgstr "关闿–‡ä»¶ç³»ç»Ÿå‘生错误"
-#: clients/cmdline/main.c:65
-msgid "force validity of log message source"
-msgstr "å¼ºåˆ¶æ ¡éªŒæ—¥å¿—ä¿¡æ¯èµ„æº"
+#: include/svn_error_codes.h:406
+msgid "Filesystem is already open"
+msgstr "文件系统已打开"
-#: clients/cmdline/main.c:66 clients/cmdline/main.c:67 svnadmin/main.c:227
-#: svnadmin/main.c:230 svndumpfilter/main.c:756 svndumpfilter/main.c:759
-#: svnlook/main.c:92 svnlook/main.c:95
-msgid "show help on a subcommand"
-msgstr "显示å命令帮助"
+#: include/svn_error_codes.h:410
+msgid "Filesystem is not open"
+msgstr "文件系档未打开"
-#: clients/cmdline/main.c:68
-msgid "specify commit message ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+#: include/svn_error_codes.h:414
+msgid "Filesystem is corrupt"
+msgstr "文件系统æŸå"
-#: clients/cmdline/main.c:69
-msgid "print as little as possible"
-msgstr "打å°å°½å¯èƒ½å°‘"
+#: include/svn_error_codes.h:418
+msgid "Invalid filesystem path syntax"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿè·¯å¾„è¯æ³•"
-#: clients/cmdline/main.c:70
-msgid "descend recursively"
-msgstr "å‘下递归"
+#: include/svn_error_codes.h:422
+msgid "Invalid filesystem revision number"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆå·"
-#: clients/cmdline/main.c:71
-msgid "operate on single directory only"
-msgstr "åªåœ¨å•个目录æ“作"
+#: include/svn_error_codes.h:426
+msgid "Invalid filesystem transaction name"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿäº‹åŠ¡åç§°"
-#: clients/cmdline/main.c:73
-msgid ""
-"ARG (some commands also take ARG1:ARG2 range)\n"
-" A revision argument can be one of:\n"
-" NUMBER revision number\n"
-" \"{\" DATE \"}\" revision at start of the "
-"date\n"
-" \"HEAD\" latest in repository\n"
-" \"BASE\" base rev of item's working "
-"copy\n"
-" \"COMMITTED\" last commit at or before "
-"BASE\n"
-" \"PREV\" revision just before COMMITTED"
-msgstr ""
-"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
-" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
-" æ•°å— ä¿®è®¢ç‰ˆå·\n"
-" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
-" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
-" \"PREV\" 修订版æäº¤ä¹‹å‰"
+#: include/svn_error_codes.h:430
+msgid "Filesystem directory has no such entry"
+msgstr "æ–‡ä»¶ç³»ç»Ÿç›®å½•æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®"
-#: clients/cmdline/main.c:87
-msgid "read data from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+#: include/svn_error_codes.h:434
+msgid "Filesystem has no such representation"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
-#: clients/cmdline/main.c:89
-msgid "give output suitable for concatenation"
-msgstr "给予适åˆè¾“出的"
+#: include/svn_error_codes.h:438
+msgid "Filesystem has no such string"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„å—串"
-#: clients/cmdline/main.c:91
-msgid "treat value as being in charset encoding ARG"
-msgstr "指定的值 ARG 为å—符编ç "
+#: include/svn_error_codes.h:442
+msgid "Filesystem has no such copy"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„æ‹·è´"
-#: clients/cmdline/main.c:92
-msgid "print client version info"
-msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
+#: include/svn_error_codes.h:446
+msgid "The specified transaction is not mutable"
+msgstr "指定的事务ä¸å¯æ”¹å˜"
-#: clients/cmdline/main.c:93
-msgid "print extra information"
-msgstr "打å°é™„åŠ ä¿¡æ¯"
+#: include/svn_error_codes.h:450
+msgid "Filesystem has no item"
+msgstr "文件系统没有项目"
-#: clients/cmdline/main.c:94
-msgid "display update information"
-msgstr "显示更新信æ¯"
+#: include/svn_error_codes.h:454
+msgid "Filesystem has no such node-rev-id"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„ node-rev-id"
-#: clients/cmdline/main.c:96
-msgid "specify a username ARG"
-msgstr "指定用户 ARG"
+#: include/svn_error_codes.h:458
+msgid "String does not represent a node or node-rev-id"
+msgstr "å—串并未表示一个节点或 node-rev-id"
-#: clients/cmdline/main.c:98
-msgid "specify a password ARG"
-msgstr "指定密ç ARG"
+#: include/svn_error_codes.h:462
+msgid "Name does not refer to a filesystem directory"
+msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿç›®å½•"
-#: clients/cmdline/main.c:99
-msgid "pass ARG to --diff-cmd as options (default: '-u')"
-msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
+#: include/svn_error_codes.h:466
+msgid "Name does not refer to a filesystem file"
+msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿæ–‡ä»¶"
-#: clients/cmdline/main.c:101
-msgid "pass contents of file ARG as additional args"
-msgstr "ä¼ é€’æ–‡ä»¶ ARG å†…å®¹ä¸ºé™„ä»¶å‚æ•°"
+#: include/svn_error_codes.h:470
+msgid "Name is not a single path component"
+msgstr "åç§°ä¸æ˜¯ä¸€ä¸ªå•一路径"
-#: clients/cmdline/main.c:102
-msgid "output in XML"
-msgstr "输出为 XML"
+#: include/svn_error_codes.h:474
+msgid "Attempt to change immutable filesystem node"
+msgstr "å°è¯•è¦ä¿®æ”¹ä¸å¯æ”¹å˜çš„æ–‡ä»¶ç³»ç»ŸèŠ‚ç‚¹"
-#: clients/cmdline/main.c:103
-msgid "use strict semantics"
-msgstr "ä½¿ç”¨ä¸¥æ ¼çš„è¯æ³•"
+#: include/svn_error_codes.h:478
+msgid "Item already exists in filesystem"
+msgstr "该项目已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿä¸"
-#: clients/cmdline/main.c:105
-msgid "do not cross copies while traversing history"
-msgstr "查看历å²ä¸è¦è·¨è¶Šä¸åŒçš„æ‹·è´"
+#: include/svn_error_codes.h:482
+msgid "Attempt to remove or recreate fs root dir"
+msgstr "å°è¯•è¦ç§»é™¤æˆ–冿¬¡å»ºç«‹æ–‡ä»¶ç³»ç»Ÿçš„æ ¹ç›®å½•"
-#: clients/cmdline/main.c:107
-msgid "disregard default and svn:ignore property ignores"
-msgstr "忽略默认值和 svn:ignore 属性"
+#: include/svn_error_codes.h:486
+msgid "Object is not a transaction root"
+msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹ç‰©ä»¶"
-#: clients/cmdline/main.c:109
-msgid "do not cache authentication tokens"
-msgstr "ä¸è¦ç¼“冲用户验è¯"
+#: include/svn_error_codes.h:490
+msgid "Object is not a revision root"
+msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªä¿®è®¢ç‰ˆçš„æ ¹ç‰©ä»¶"
-#: clients/cmdline/main.c:111
-msgid "do no interactive prompting"
-msgstr "ä¸è¦äº¤äº’æç¤º"
+#: include/svn_error_codes.h:494
+msgid "Merge conflict during commit"
+msgstr "æäº¤æ—¶å‘生åˆå¹¶å†²çª"
-#: clients/cmdline/main.c:113
-msgid "try operation but make no changes"
-msgstr "å°è¯•æ“作但ä¸ä¿®æ”¹"
+# as-is
+#: include/svn_error_codes.h:498
+msgid "A representation vanished or changed between reads"
+msgstr "表现消失或读时被改å˜"
-#: clients/cmdline/main.c:115 svnlook/main.c:113
-msgid "do not print differences for deleted files"
-msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
+#: include/svn_error_codes.h:502
+msgid "Tried to change an immutable representation"
+msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
-#: clients/cmdline/main.c:117
-msgid "notice ancestry when calculating differences"
-msgstr "比较差异时æç¤ºåŽŸå§‹ä¿¡æ¯"
+#: include/svn_error_codes.h:506
+msgid "Malformed skeleton data"
+msgstr "畸形的框架数æ®"
-#: clients/cmdline/main.c:119
-msgid "ignore ancestry when calculating merges"
-msgstr "åˆå¹¶æ—¶å¿½ç•¥åŽŸå§‹ä¿¡æ¯"
+#: include/svn_error_codes.h:510
+msgid "Transaction is out of date"
+msgstr "事务已过时"
-#: clients/cmdline/main.c:121
-msgid "ignore externals definitions"
-msgstr "忽略外部定义"
+#: include/svn_error_codes.h:514
+msgid "Berkeley DB error"
+msgstr "Berkeley DB 错误"
-#: clients/cmdline/main.c:123
-msgid "use ARG as diff command"
-msgstr "使用 ARG 作为差异比较命令"
+#: include/svn_error_codes.h:518
+msgid "Berkeley DB deadlock error"
+msgstr "Berkeley DB å‘生æ»é”错误"
-#: clients/cmdline/main.c:125
-msgid "use ARG as merge command"
-msgstr "使用 ARG 作为åˆå¹¶å‘½ä»¤"
+#: include/svn_error_codes.h:522
+msgid "Transaction is dead"
+msgstr "事务已结æŸ"
-#: clients/cmdline/main.c:127
-msgid "use ARG as external editor"
-msgstr "使用 ARG 作为外部编辑器"
+#: include/svn_error_codes.h:526
+msgid "Transaction is not dead"
+msgstr "事务未结æŸ"
-#: clients/cmdline/main.c:129
-msgid "use ARG as the older target"
-msgstr "使用 ARG ä½œä¸ºæ—§ç›®æ ‡"
+#: include/svn_error_codes.h:531
+msgid "Unknown FS type"
+msgstr "未知的 FS 类别"
-#: clients/cmdline/main.c:131
-msgid "use ARG as the newer target"
-msgstr "使用 ARG ä½œä¸ºæ–°ç›®æ ‡"
+#: include/svn_error_codes.h:536
+#, fuzzy
+msgid "No user associated with filesystem"
+msgstr "没有用户与文件系统关è”"
-#: clients/cmdline/main.c:133
-msgid "operate on a revision property (use with -r)"
-msgstr "在修订版属性上作æ“作(使用-r傿•°)"
+#: include/svn_error_codes.h:541
+#, fuzzy
+msgid "Path is already locked"
+msgstr "路径“%sâ€å·²ç»è¢«é”定"
-#: clients/cmdline/main.c:135
-msgid "relocate via URL-rewriting"
-msgstr "通过URLæ”¹å†™é‡æ–°éƒ¨ç½²"
+#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
+#, fuzzy
+msgid "Path is not locked"
+msgstr "路径没有被é”定"
-#: clients/cmdline/main.c:137 svnadmin/main.c:269
-msgid "read user configuration files from directory ARG"
-msgstr "从目录 ARG 读å–用户é…置文件"
+#: include/svn_error_codes.h:551
+msgid "Lock token is incorrect"
+msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
-#: clients/cmdline/main.c:139
-msgid "enable automatic properties"
-msgstr "使自动属性有效"
+#: include/svn_error_codes.h:556
+#, fuzzy
+msgid "No lock token provided"
+msgstr "没有æä¾›é”å®šæ ‡è®°"
-#: clients/cmdline/main.c:141
-msgid "disable automatic properties"
-msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
+#: include/svn_error_codes.h:561
+msgid "Username does not match lock owner"
+msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
-#: clients/cmdline/main.c:143
+#: include/svn_error_codes.h:566
#, fuzzy
-msgid ""
-"use a different EOL marker than the standard\n"
-" system marker for files with the svn:eol-style\n"
-" property set to 'native'.\n"
-" ARG may be one of 'LF', 'CR', 'CRLF'"
-msgstr ""
-"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
-" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属"
-"性为 'native'。\n"
-" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
+msgid "Filesystem has no such lock"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
-#: clients/cmdline/main.c:151
-msgid "maximum number of log entries"
-msgstr "日值项最大值"
+#: include/svn_error_codes.h:571
+msgid "Lock has expired"
+msgstr "é”过期"
-#: clients/cmdline/main.c:153
-msgid "don't unlock the targets"
-msgstr "ä¸è¦é”å®šç›®æ ‡"
+#: include/svn_error_codes.h:576
+#, fuzzy
+msgid "Item is out of date"
+msgstr "æ¡ç›®å·²è¿‡æ—¶"
-#: clients/cmdline/main.c:192
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository. They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"把文件和目录放入版本控制ä¸ï¼Œ\n"
-"é€šè¿‡è°ƒåº¦åŠ åˆ°æ¡£æ¡ˆåº“ã€‚å®ƒä»¬ä¼šåœ¨ä¸‹ä¸€æ¬¡æäº¤æ—¶åŠ å…¥ã€‚\n"
-"用法:add 路径...\n"
+#: include/svn_error_codes.h:588
+#, fuzzy
+msgid "Unsupported FS format"
+msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
-#: clients/cmdline/main.c:200
-msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地å€(URL)的内容,æ¯è¡ŒåŒ…å«ä¿®è®¢ç‰ˆå’Œä½œè€…ä¿¡æ¯ã€‚\n"
-"\n"
-"用法:blame ç›®æ ‡[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:594
+msgid "The repository is locked, perhaps for db recovery"
+msgstr "档案库被é”定,也许æ£åœ¨ä½œæ•°æ®åº“ä¿®å¤"
-#: clients/cmdline/main.c:210
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地å€(URL)的内容。\n"
-"用法:cat ç›®æ ‡[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:598
+msgid "A repository hook failed"
+msgstr "档案库外挂错误"
-#: clients/cmdline/main.c:218
-#, fuzzy
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-" If specified, REV determines in which revision the URL is first\n"
-" looked up.\n"
-"\n"
-" If PATH is omitted, the basename of the URL will be used as\n"
-" the destination. If multiple URLs are given each will be checked\n"
-" out into a sub-directory of PATH, with the name of the sub-directory\n"
-" being the basename of the URL.\n"
-msgstr ""
-"从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
-"用法:checkout 地å€[@版本]... [路径]\n"
-"\n"
-" 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
-" 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
-" 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
-"\n"
+#: include/svn_error_codes.h:602
+msgid "Incorrect arguments supplied"
+msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
-#: clients/cmdline/main.c:232
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [PATH...]\n"
-msgstr ""
-"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
-"\n"
-"用法:cleanup [路径...]\n"
+#: include/svn_error_codes.h:606
+msgid "A report cannot be generated because no data was supplied"
+msgstr "æ— æ³•äº§ç”ŸæŠ¥å‘Šï¼Œå› ä¸ºæ²¡æœ‰æä¾›ä»»ä½•æ•°æ®"
-#: clients/cmdline/main.c:238
-#, fuzzy
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-" A log message must be provided, but it can be empty. If it is not\n"
-" given by a --message or --file option, an editor will be started.\n"
-" If any targets are (or contain) locked items, those will be\n"
-" unlocked after a successful commit.\n"
-msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
-"用法:commit [路径...]\n"
-"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+#: include/svn_error_codes.h:610
+msgid "Bogus revision report"
+msgstr "有问题的修订版报告"
-#: clients/cmdline/main.c:249
-msgid ""
-"Duplicate something in working copy or repository, remembering history.\n"
-"usage: copy SRC DST\n"
-"\n"
-" SRC and DST can each be either a working copy (WC) path or URL:\n"
-" WC -> WC: copy and schedule for addition (with history)\n"
-" WC -> URL: immediately commit a copy of WC to URL\n"
-" URL -> WC: check out URL into WC, schedule for addition\n"
-" URL -> URL: complete server-side copy; used to branch & tag\n"
-msgstr ""
-"åœ¨å·¥ä½œæ‹·è´æˆ–档案库ä¸å¤åˆ¶æ•°æ®ï¼Œæ¢å¤åކå²ã€‚\n"
-"用法:copy èµ·æº ç›®çš„\n"
-"\n"
-" èµ·æº å’Œ 目的 å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€(URL):\n"
-" å·¥ä½œæ‹·è´ -> å·¥ä½œæ‹·è´ ï¼š å¤åˆ¶å’Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ (包å«åކå²)\n"
-" å·¥ä½œæ‹·è´ -> 地å€(URL) : 马上æäº¤ä¸€ä¸ªå·¥ä½œæ‹·è´åˆ°åœ°å€(URL)\n"
-" 地å€(URL) -> å·¥ä½œæ‹·è´ ï¼š ç¾å‡ºåœ°å€(URL)åˆ°å·¥ä½œç›®å½•ï¼Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ \n"
-" 地å€(URL) -> 地å€(URL) : 完全æœåŠ¡å™¨ç«¯å¤åˆ¶ï¼›ä¸€èˆ¬ç”¨äºŽåˆ†æ”¯å’Œæ ‡ç¾\n"
+#: include/svn_error_codes.h:619
+msgid "Unsupported repository version"
+msgstr "䏿”¯æŒçš„æ¡£æ¡ˆåº“版本"
-#: clients/cmdline/main.c:262
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. Each item specified by a PATH is scheduled for deletion upon\n"
-" the next commit. Files, and directories that have not been\n"
-" committed, are immediately removed from the working copy.\n"
-" PATHs that are, or contain, unversioned or modified items will\n"
-" not be removed unless the --force option is given.\n"
-"\n"
-" 2. Each item specified by a URL is deleted from the repository\n"
-" via an immediate commit.\n"
-msgstr ""
-"从版本控制ä¸åˆ 除文件和目录。\n"
-"用法:1ã€delete 路径...\n"
-" 2ã€delete 地å€...\n"
-"\n"
-" 1ã€æ¯ä¸€ä¸ªé€šè¿‡è·¯å¾„æŒ‡å®šçš„é¡¹ç›®ä¼šè¢«è¿›è¡Œè°ƒåº¦åˆ é™¤ï¼Œä¸‹æ¬¡æäº¤æ—¶è¢«çœŸæ£åˆ 除。\n"
-" 文件和目录若未改å˜å°†é©¬ä¸Šä»Žå·¥ä½œæ‹·è´ä¸åˆ 除。\n"
-" 路径本身或包å«ä¸å—版本控制或已修改项目,\n"
-" ä¸ä¼šè¢«åˆ é™¤ï¼Œé™¤éžæŒ‡å®šäº† --force 选项。\n"
-" \n"
-"\n"
-" 2ã€æ¯ä¸€ä¸ªåœ°å€(URL)指定的项目会被马上从档案库ä¸åˆ 除,并æäº¤ã€‚\n"
-" \n"
+#: include/svn_error_codes.h:623
+msgid "Disabled repository feature"
+msgstr "å…³é—了的档案库功能"
-#: clients/cmdline/main.c:278
-msgid ""
-"Display the differences between two paths.\n"
-"usage: 1. diff [-r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
-"\\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. Display the changes made to TARGETs as they are seen in REV between\n"
-" two revisions. TARGETs may be working copy paths or URLs.\n"
-"\n"
-" N defaults to BASE if any TARGET is a working copy path, otherwise it\n"
-" must be specified. M defaults to the current working version if any\n"
-" TARGET is a working copy path, otherwise it defaults to HEAD.\n"
-"\n"
-" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
-" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
-"default\n"
-" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-" Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"显示两个路径ä¸çš„差异。\n"
-"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
-" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
-" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
-"\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
-" HEAD。\n"
-"\n"
-" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
-" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
-" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
-" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
-" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
-" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
-"法。\n"
-"\n"
-" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
+#: include/svn_error_codes.h:627
+msgid "Error running post-commit hook"
+msgstr "执行 post-commit 外挂时å‘生错误"
-#: clients/cmdline/main.c:318
+#: include/svn_error_codes.h:632
#, fuzzy
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. Exports a clean directory tree from the repository specified by\n"
-" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
-"\n"
-" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
-"\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
-"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
-" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
-" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-"\n"
-" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
-" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
-" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
-" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
-"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
-"\n"
-
-#: clients/cmdline/main.c:347
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-"用法:help [å命令...]\n"
+msgid "Error running post-lock hook"
+msgstr "执行 post-lock 外挂时å‘生错误"
-#: clients/cmdline/main.c:356
+#: include/svn_error_codes.h:637
#, fuzzy
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-" Recursively commit a copy of PATH to URL.\n"
-" If PATH is omitted '.' is assumed.\n"
-" Parent directories are created as necessary in the repository.\n"
-" If PATH is a directory, the contents of the directory are added\n"
-" directly under URL.\n"
-msgstr ""
-"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
-"用法:import [PATH] URL\n"
-"\n"
-" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
-" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
+msgid "Error running post-unlock hook"
+msgstr "执行 post-unlock 外挂时å‘生错误"
-#: clients/cmdline/main.c:369
-#, fuzzy
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET...]\n"
-"\n"
-" Print information about each TARGET (default: '.')\n"
-" TARGET may be either a working-copy path or URL.\n"
-msgstr ""
-"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
-"用法:info [TARGET...]\n"
-"\n"
-" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
-" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
+#: include/svn_error_codes.h:644
+msgid "Bad URL passed to RA layer"
+msgstr "ä¼ é€’è‡³ RA 层的地å€(URL)有问题"
-#: clients/cmdline/main.c:378
-#, fuzzy
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-" List each TARGET file and the contents of each TARGET directory as\n"
-" they exist in the repository. If TARGET is a working copy path, the\n"
-" corresponding repository URL will be used. If specified, REV determines\n"
-" in which revision the target is first looked up.\n"
-"\n"
-" The default TARGET is '.', meaning the repository URL of the current\n"
-" working directory.\n"
-"\n"
-" With --verbose, the following fields will be shown for each item:\n"
-"\n"
-" Revision number of the last commit\n"
-" Author of the last commit\n"
-" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
-" Size (in bytes)\n"
-" Date and time of the last commit\n"
-msgstr ""
-"列出档案库ä¸çš„目录项目。\n"
-"用法:list [TARGET[@REV]...]\n"
-"\n"
-" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-"\n"
-" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
-"\n"
-" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
-"\n"
-" 剿¬¡æäº¤çš„修订版å·ç \n"
-" 剿¬¡æäº¤çš„作者\n"
-" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
-" å¤§å° (以å—节为å•ä½)\n"
-" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
+#: include/svn_error_codes.h:648
+msgid "Authorization failed"
+msgstr "授æƒå¤±è´¥"
-#: clients/cmdline/main.c:403
-#, fuzzy
-msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-" Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"在档案库ä¸é”定工作目录或地å€(URL),\n"
-"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
-"用法:lock TARGET...\n"
-"\n"
-" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
+#: include/svn_error_codes.h:652
+msgid "Unknown authorization method"
+msgstr "æœªçŸ¥çš„æŽˆæƒæ–¹æ³•"
-#: clients/cmdline/main.c:412
-msgid ""
-"Show the log messages for a set of revision(s) and/or file(s).\n"
-"usage: 1. log [PATH]\n"
-" 2. log URL [PATH...]\n"
-"\n"
-" 1. Print the log messages for a local PATH (default: '.').\n"
-" The default revision range is BASE:1.\n"
-"\n"
-" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
-" The default revision range is HEAD:1.\n"
-"\n"
-" With -v, also print all affected paths with each log message.\n"
-" With -q, don't print the log message body itself (note that this is\n"
-" compatible with -v).\n"
-"\n"
-" Each log message is printed just once, even if more than one of the\n"
-" affected paths for that revision were explicitly requested. Logs\n"
-" follow copy history by default. Use --stop-on-copy to disable this\n"
-" behavior, which can be useful for determining branchpoints.\n"
-"\n"
-" Examples:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-msgstr ""
-"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
-"用法:1ã€log [PATH]\n"
-" 2ã€log URL [PATH...]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" BASE:1。\n"
-"\n"
-" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" HEAD:1。\n"
-"\n"
-" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
-" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
-"\n"
-" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
-" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
-" 个功能,这在找出分支点的很方便。\n"
-"\n"
-" 范例:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
+#: include/svn_error_codes.h:656
+msgid "Repository access method not implemented"
+msgstr "该档案库å˜å–方法未实作"
-#: clients/cmdline/main.c:444
-msgid ""
-"Apply the differences between two sources to a working copy path.\n"
-"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. In the first form, the source URLs are specified at revisions\n"
-" N and M. These are the two sources to be compared. The revisions\n"
-" default to HEAD if omitted.\n"
-"\n"
-" 2. In the second form, the URLs corresponding to the source working\n"
-" copy paths define the sources to be compared. The revisions must\n"
-" be specified.\n"
-"\n"
-" 3. In the third form, SOURCE can be a URL, or working copy item\n"
-" in which case the corresponding URL is used. This URL in\n"
-" revision REV is compared as it existed between revisions N and \n"
-" M. If REV is not specified, HEAD is assumed.\n"
-"\n"
-" WCPATH is the working copy path that will receive the changes.\n"
-" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
-" the sources have identical basenames that match a file within '.':\n"
-" in which case, the differences will be applied to that file.\n"
-msgstr ""
-"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
-"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
-" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
-"\n"
-" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
-" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
-"\n"
-" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
-" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
-"作\n"
-" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
-"\n"
-" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
-" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+#: include/svn_error_codes.h:660
+msgid "Item is out-of-date"
+msgstr "项目已过时"
-#: clients/cmdline/main.c:474
-msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" Create version controlled directories.\n"
-"\n"
-" 1. Each directory specified by a working copy PATH is created locally\n"
-" and scheduled for addition upon the next commit.\n"
-"\n"
-" 2. Each directory specified by a URL is created in the repository via\n"
-" an immediate commit.\n"
-"\n"
-" In both cases, all the intermediate directories must already exist.\n"
-msgstr ""
-"建立纳入版本控制下的新目录。\n"
-"用法:1ã€mkdir PATH...\n"
-" 2ã€mkdir URL...\n"
-"\n"
-" 建立版本控制的目录。\n"
-"\n"
-" 1ã€æ¯ä¸€ä¸ªä»¥å·¥ä½œæ‹·è´ PATH æŒ‡å®šçš„ç›®å½•ï¼Œéƒ½ä¼šå»ºç«‹åœ¨æœ¬åœ°ç«¯ï¼Œå¹¶ä¸”åŠ å…¥æ–°å¢ž\n"
-" 调度,以待下一次的æäº¤ã€‚\n"
-"\n"
-" 2ã€æ¯ä¸ªä»¥åœ°å€(URL)指定的目录,都会é€è¿‡ç«‹å³æäº¤äºŽæ¡£æ¡ˆåº“ä¸å»ºç«‹ã€‚\n"
-"\n"
-" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
+#: include/svn_error_codes.h:664
+msgid "Repository has no UUID"
+msgstr "档案库没有 UUID"
-#: clients/cmdline/main.c:494
-msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC DST\n"
-"\n"
-" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
-"\n"
-" SRC and DST can both be working copy (WC) paths or URLs:\n"
-" WC -> WC: move and schedule for addition (with history)\n"
-" URL -> URL: complete server-side rename.\n"
-msgstr ""
-"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
-"用法:move SRC DST\n"
-"\n"
-" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
-"\n"
-" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
-" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
-" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
+#: include/svn_error_codes.h:668
+msgid "Unsupported RA plugin ABI version"
+msgstr "䏿”¯æŒçš„ RA 外挂 ABI 版本"
-#: clients/cmdline/main.c:506
-msgid ""
-"Remove PROPNAME from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Removes versioned props in working copy.\n"
-" 2. Removes unversioned remote prop on repos revision.\n"
-msgstr ""
-"移除目录,文件,或修订版的属性。\n"
-"用法:1ã€propdel PROPNAME [PATH...]\n"
-" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
+#: include/svn_error_codes.h:680
+msgid "RA layer failed to init socket layer"
+msgstr "RA å±‚æ— æ³•èµ·å§‹ socket 层"
-#: clients/cmdline/main.c:516
-msgid ""
-"Edit property PROPNAME with an external editor on targets.\n"
-"usage: 1. propedit PROPNAME PATH...\n"
-" 2. propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Edits versioned props in working copy.\n"
-" 2. Edits unversioned remote prop on repos revision.\n"
-msgstr ""
-"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
-"用法:1ã€propedit PROPNAME PATH...\n"
-" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+#: include/svn_error_codes.h:684
+msgid "RA layer failed to create HTTP request"
+msgstr "RA 层建立 HTTP 请求失败"
-#: clients/cmdline/main.c:527
-msgid ""
-"Print value of PROPNAME on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Prints versioned prop. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Prints unversioned remote prop on repos revision.\n"
-"\n"
-" By default, this subcommand will add an extra newline to the end\n"
-" of the property values so that the output looks pretty. Also,\n"
-" whenever there are multiple paths involved, each property value\n"
-" is prefixed with the path with which it is associated. Use\n"
-" the --strict option to disable these beautifications (useful,\n"
-" for example, when redirecting binary property values to a file).\n"
-msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
-"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
-" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
-" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
-" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
-" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
+#: include/svn_error_codes.h:688
+msgid "RA layer request failed"
+msgstr "RA 层请求失败"
+
+#: include/svn_error_codes.h:692
+msgid "RA layer didn't receive requested OPTIONS info"
+msgstr "RA å±‚æ— æ³•å–得请求的 OPTIONS ä¿¡æ¯"
+
+#: include/svn_error_codes.h:696
+msgid "RA layer failed to fetch properties"
+msgstr "RA å±‚æ— æ³•å–得属性"
+
+#: include/svn_error_codes.h:700
+msgid "RA layer file already exists"
+msgstr "RA 层文件已å˜åœ¨"
+
+#: include/svn_error_codes.h:704
+msgid "Invalid configuration value"
+msgstr "æ— æ•ˆçš„é…置值"
+
+#: include/svn_error_codes.h:708
+msgid "HTTP Path Not Found"
+msgstr "找ä¸åˆ° HTTP 路径"
+
+#: include/svn_error_codes.h:712
+#, fuzzy
+msgid "Failed to execute WebDAV PROPPATCH"
+msgstr "执行 WebDAV PROPPATCH 失败"
+
+#: include/svn_error_codes.h:717 include/svn_error_codes.h:753
+#: libsvn_ra_svn/marshal.c:609 libsvn_ra_svn/marshal.c:717
+#: libsvn_ra_svn/marshal.c:744
+msgid "Malformed network data"
+msgstr "畸形的网络数æ®"
+
+#: include/svn_error_codes.h:722
+msgid "Unable to extract data from response header"
+msgstr "ä¸èƒ½ä»Žå›žåº”的头信æ¯ä¸èŽ·å–æ•°æ®"
+
+#: include/svn_error_codes.h:728 include/svn_error_codes.h:757
+msgid "Couldn't find a repository"
+msgstr "æ— æ³•æ‰¾åˆ°æ¡£æ¡ˆåº“"
+
+#: include/svn_error_codes.h:732
+msgid "Couldn't open a repository"
+msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“"
+
+# as-is
+#: include/svn_error_codes.h:737
+msgid "Special code for wrapping server errors to report to client"
+msgstr "指定的代ç å°è£…æœåŠ¡å™¨é”™è¯¯ä»¥ä¾¿æŠ¥å‘Šå®¢æˆ·ç«¯"
+
+#: include/svn_error_codes.h:741
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 通讯å定命令"
+
+#: include/svn_error_codes.h:745
+msgid "Network connection closed unexpectedly"
+msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
+
+#: include/svn_error_codes.h:749
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: include/svn_error_codes.h:761
+msgid "Client/server version mismatch"
+msgstr "客户端/æœåŠ¡å™¨ç‰ˆæœ¬ä¸åŒ¹é…"
+
+#: include/svn_error_codes.h:769
+msgid "Credential data unavailable"
+msgstr "æ— æ³•å–å¾—å‡è¯æ•°æ®"
+
+#: include/svn_error_codes.h:773
+msgid "No authentication provider available"
+msgstr "æ— å¯ç”¨çš„è®¤è¯æä¾›è€…"
+
+#: include/svn_error_codes.h:777 include/svn_error_codes.h:781
+msgid "All authentication providers exhausted"
+msgstr "æ‰€æœ‰çš„è®¤è¯æä¾›è€…å·²è€—å°½"
+
+#: include/svn_error_codes.h:787
+msgid "Read access denied for root of edit"
+msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
+
+#: include/svn_error_codes.h:792
+#, fuzzy
+msgid "Item is not readable"
+msgstr "项目ä¸èƒ½è¯»ã€‚"
+
+#: include/svn_error_codes.h:797
+#, fuzzy
+msgid "Item is partially readable"
+msgstr "项目部分å¯è¯»ã€‚"
+
+#: include/svn_error_codes.h:801
+#, fuzzy
+msgid "Invalid authz configuration"
+msgstr "æ— æ•ˆçš„é…置值"
+
+#: include/svn_error_codes.h:806
+#, fuzzy
+msgid "Item is not writable"
+msgstr "项目ä¸èƒ½å†™ã€‚"
+
+#: include/svn_error_codes.h:812
+msgid "Svndiff data has invalid header"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+
+# as-is
+#: include/svn_error_codes.h:816
+msgid "Svndiff data contains corrupt window"
+msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+
+# as-is
+#: include/svn_error_codes.h:820
+msgid "Svndiff data contains backward-sliding source view"
+msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+
+#: include/svn_error_codes.h:824
+msgid "Svndiff data contains invalid instruction"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的指令"
+
+#: include/svn_error_codes.h:828
+msgid "Svndiff data ends unexpectedly"
+msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+
+#: include/svn_error_codes.h:832
+#, fuzzy
+msgid "Svndiff compressed data is invalid"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+
+#: include/svn_error_codes.h:838
+#, fuzzy
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+
+#: include/svn_error_codes.h:844
+msgid "Apache has no path to an SVN filesystem"
+msgstr "Apache æ²¡æœ‰æŒ‡å‘ SVN 文件系统的路径"
+
+#: include/svn_error_codes.h:848
+msgid "Apache got a malformed URI"
+msgstr "Apache 得到一个畸形的 URI"
+
+# as-is
+#: include/svn_error_codes.h:852
+msgid "Activity not found"
+msgstr "没有找到活动项"
+
+#: include/svn_error_codes.h:856
+msgid "Baseline incorrect"
+msgstr "åŸºçº¿ä¸æ£ç¡®"
+
+#: include/svn_error_codes.h:860
+msgid "Input/output error"
+msgstr "输出入错误"
+
+#: include/svn_error_codes.h:866
+msgid "A path under version control is needed for this operation"
+msgstr "本æ“作仅能作用于纳入版本控制的路径"
+
+#: include/svn_error_codes.h:870
+msgid "Repository access is needed for this operation"
+msgstr "本æ“作需è¦å¯¹æ¡£æ¡ˆåº“进行å˜å–"
+
+#: include/svn_error_codes.h:874
+msgid "Bogus revision information given"
+msgstr "使用了有问题的修订版信æ¯"
+
+#: include/svn_error_codes.h:878
+msgid "Attempting to commit to a URL more than once"
+msgstr "å°è¯•对地å€(URL)进行一次以上的æäº¤"
+
+#: include/svn_error_codes.h:882
+msgid "Operation does not apply to binary file"
+msgstr "本æ“作ä¸é€‚用于二进制文件"
+
+#: include/svn_error_codes.h:888
+msgid "Format of an svn:externals property was invalid"
+msgstr "svn:externals å±žæ€§çš„æ ¼å¼æ˜¯æ— 效的"
+
+#: include/svn_error_codes.h:892
+msgid "Attempting restricted operation for modified resource"
+msgstr "å°è¯•对已修改的资æºè¿›è¡Œå—é™çš„æ“ä½œ"
+
+#: include/svn_error_codes.h:896
+msgid "Operation does not apply to directory"
+msgstr "本æ“作ä¸é€‚用于目录"
+
+#: include/svn_error_codes.h:900
+msgid "Revision range is not allowed"
+msgstr "ä¸å…许的修订版范围"
+
+#: include/svn_error_codes.h:904
+msgid "Inter-repository relocation not allowed"
+msgstr "䏿”¯æŒä¸åŒæ¡£æ¡ˆåº“ä¹‹é—´çš„é‡æ–°å®‰ç½® (relocation)"
+
+#: include/svn_error_codes.h:908
+msgid "Author name cannot contain a newline"
+msgstr "作者åç§°ä¸å¯åŒ…嫿¢è¡Œç¬¦"
+
+#: include/svn_error_codes.h:912
+msgid "Bad property name"
+msgstr "有问题的属性åç§°"
+
+#: include/svn_error_codes.h:917
+msgid "Two versioned resources are unrelated"
+msgstr "ä¸¤ä¸ªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„èµ„æºæ²¡æœ‰ç›¸å…³æ€§"
+
+#: include/svn_error_codes.h:922
+msgid "Path has no lock token"
+msgstr "路径没有é”å®šæ ‡è®°"
+
+#: include/svn_error_codes.h:928
+msgid "A problem occurred; see later errors for details"
+msgstr "有问题å‘生;请å‚阅éšé™„的细节"
+
+#: include/svn_error_codes.h:932
+msgid "Failure loading plugin"
+msgstr "载入外挂失败"
+
+#: include/svn_error_codes.h:936
+msgid "Malformed file"
+msgstr "畸形的文件"
+
+#: include/svn_error_codes.h:940
+msgid "Incomplete data"
+msgstr "ä¸å®Œå…¨çš„æ•°æ®"
+
+#: include/svn_error_codes.h:944
+msgid "Incorrect parameters given"
+msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+
+#: include/svn_error_codes.h:948
+msgid "Tried a versioning operation on an unversioned resource"
+msgstr "å°è¯•对未纳入版本控制的资æºè¿›è¡Œç‰ˆæœ¬æŽ§åˆ¶æ“作"
+
+#: include/svn_error_codes.h:952
+msgid "Test failed"
+msgstr "测试失败"
+
+#: include/svn_error_codes.h:956
+msgid "Trying to use an unsupported feature"
+msgstr "å°è¯•è¦ä½¿ç”¨ä¸æ”¯æŒçš„功能"
+
+#: include/svn_error_codes.h:960
+msgid "Unexpected or unknown property kind"
+msgstr "æ„æƒ³ä¸åˆ°æˆ–未知的属性ç§ç±»"
+
+#: include/svn_error_codes.h:964
+msgid "Illegal target for the requested operation"
+msgstr "对请求的æ“作æ¥è¯´æ˜¯ä¸åˆæ³•çš„ç›®æ ‡"
+
+#: include/svn_error_codes.h:968
+msgid "MD5 checksum is missing"
+msgstr "没有 MD5 指纹检查值"
+
+#: include/svn_error_codes.h:972
+msgid "Directory needs to be empty but is not"
+msgstr "目录必须为空的,但是结果并éžå¦‚æ¤"
+
+#: include/svn_error_codes.h:976
+msgid "Error calling external program"
+msgstr "呼å«å¤–éƒ¨ç¨‹åºæ—¶å‘生错误"
+
+#: include/svn_error_codes.h:980
+msgid "Python exception has been set with the error"
+msgstr "Python 异常已被设定为错误"
+
+#: include/svn_error_codes.h:984
+msgid "A checksum mismatch occurred"
+msgstr "总和检查值ä¸ç¬¦"
+
+#: include/svn_error_codes.h:988
+msgid "The operation was interrupted"
+msgstr "æ“ä½œè¢«ä¸æ–"
+
+#: include/svn_error_codes.h:992
+msgid "The specified diff option is not supported"
+msgstr "指定的 diff 选项䏿”¯æŒ"
+
+#: include/svn_error_codes.h:996
+msgid "Property not found"
+msgstr "找ä¸åˆ°å±žæ€§"
+
+#: include/svn_error_codes.h:1000
+msgid "No auth file path available"
+msgstr "未æä¾› auth 文件路径"
+
+#: include/svn_error_codes.h:1005
+msgid "Incompatible library version"
+msgstr "ä¸ç›¸å®¹çš„程åºåº“版本"
+
+#: include/svn_error_codes.h:1011
+msgid "Client error in parsing arguments"
+msgstr "客户端于剖æžå‚æ•°æ—¶å‘生错误"
+
+#: include/svn_error_codes.h:1015
+msgid "Not enough arguments provided; try 'svn help' for more info"
+msgstr ""
+
+#: include/svn_error_codes.h:1019
+msgid "Mutually exclusive arguments specified"
+msgstr "æŒ‡å®šäº†äº’æ–¥çš„å‚æ•°"
+
+#: include/svn_error_codes.h:1023
+msgid "Attempted command in administrative dir"
+msgstr "å°è¯•于管ç†ç›®å½•䏿‰§è¡Œå‘½ä»¤"
+
+#: include/svn_error_codes.h:1027
+msgid "The log message file is under version control"
+msgstr "æ—¥å¿—ä¿¡æ¯æ–‡ä»¶äºŽç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹"
+
+#: include/svn_error_codes.h:1031
+msgid "The log message is a pathname"
+msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯è·¯å¾„å"
+
+#: include/svn_error_codes.h:1035
+msgid "Committing in directory scheduled for addition"
+msgstr "于预计新增的目录ä¸è¿›è¡Œæäº¤"
+
+#: include/svn_error_codes.h:1039
+msgid "No external editor available"
+msgstr "æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨"
+
+#: include/svn_error_codes.h:1043
+msgid "Something is wrong with the log message's contents"
+msgstr "日志信æ¯çš„内容有ä¸å¦¥çš„地方"
+
+#: include/svn_error_codes.h:1047
+msgid "A log message was given where none was necessary"
+msgstr "在没有需è¦çš„地方给出一个日志信æ¯"
+
+#: libsvn_client/add.c:377
+#, c-format
+msgid "Error during recursive add of '%s'"
+msgstr "进行“%sâ€çš„递归新增时å‘生错误"
+
+#: libsvn_client/add.c:388
+#, c-format
+msgid "Can't close directory '%s'"
+msgstr "æ— æ³•å…³é—目录“%sâ€"
+
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
+#, c-format
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr "æ— æ³•ä¸ºäºŒè¿›åˆ¶æ–‡ä»¶â€œ%sâ€è®¡ç®—谴责信æ¯"
+
+#: libsvn_client/blame.c:522
+msgid "blame of the WORKING revision is not supported"
+msgstr ""
+
+#: libsvn_client/blame.c:535
+msgid "Start revision must precede end revision"
+msgstr "起始修订版必须大于结æŸä¿®è®¢ç‰ˆ"
+
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
+#, c-format
+msgid "URL '%s' refers to a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个目录"
+
+#: libsvn_client/blame.c:798
+#, c-format
+msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
+msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
+
+#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#, fuzzy, c-format
+msgid "'%s' is not under version control or doesn't exist"
+msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
+
+#: libsvn_client/cat.c:79
+#, fuzzy, c-format
+msgid "'%s' refers to a directory"
+msgstr "“%sâ€å¼•用一个目录"
+
+# as-is
+#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+msgid "(local)"
+msgstr "(本地)"
+
+#: libsvn_client/checkout.c:92
+#, c-format
+msgid "URL '%s' doesn't exist"
+msgstr "地å€(URL)“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_client/checkout.c:96
+#, c-format
+msgid "URL '%s' refers to a file, not a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+
+#: libsvn_client/checkout.c:167
+#, c-format
+msgid "'%s' is already a working copy for a different URL"
+msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
+
+#: libsvn_client/checkout.c:171
+#, fuzzy
+msgid "; run 'svn update' to complete it"
+msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
+
+#: libsvn_client/checkout.c:181
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a directory"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+
+#: libsvn_client/commit.c:198
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr "类型“%sâ€æœªçŸ¥æˆ–ä¸å¯ç‰ˆæœ¬æŽ§åˆ¶"
+
+#: libsvn_client/commit.c:512
+msgid "New entry name required when importing a file"
+msgstr "导入文件时,需è¦ä¸€ä¸ªæ–°çš„项目åç§°"
+
+#: libsvn_client/commit.c:546 libsvn_wc/adm_ops.c:710 libsvn_wc/questions.c:91
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_client/commit.c:606 libsvn_client/copy.c:76 svnlook/main.c:1206
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_client/commit.c:736 libsvn_client/copy.c:85 libsvn_client/copy.c:399
+#: libsvn_client/copy.c:608 libsvn_client/copy.c:758
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径“%sâ€å·²å˜åœ¨"
+
+#: libsvn_client/commit.c:751
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªä¿ç•™çš„åç§°ï¼Œæ— æ³•è¢«å¯¼å…¥"
+
+#: libsvn_client/commit.c:867 libsvn_client/copy.c:524
+msgid "Commit failed (details follow):"
+msgstr "æäº¤å¤±è´¥(细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:875 libsvn_client/copy.c:532
+msgid "Commit succeeded, but other errors follow:"
+msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘生了其它的错误,如åŽï¼š"
+
+#: libsvn_client/commit.c:882 libsvn_client/copy.c:539
+msgid "Error unlocking locked dirs (details follow):"
+msgstr "解除é”定目录时å‘生错误(细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:893
+msgid "Error bumping revisions post-commit (details follow):"
+msgstr "post-commit å¢žåŠ ä¿®è®¢ç‰ˆæ—¶å‘生错误 (细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:904 libsvn_client/copy.c:550
+msgid "Error in post-commit clean-up (details follow):"
+msgstr "post-commit 清除时å‘生错误 (细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:1209
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªåœ°å€(URL),但是地å€(URL)ä¸å¯ä¸ºä½œæäº¤çš„ç›®æ ‡"
+
+#: libsvn_client/commit.c:1407
+msgid "Are all the targets part of the same working copy?"
+msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+
+#: libsvn_client/commit.c:1422
+msgid "Cannot non-recursively commit a directory deletion"
+msgstr "æ— æ³•ä»¥éžé€’å½’æäº¤ç›®å½•åˆ é™¤"
+
+#: libsvn_client/commit_util.c:251 libsvn_client/commit_util.c:262
+#, c-format
+msgid "Unknown entry kind for '%s'"
+msgstr "未知的项目类型“%sâ€"
+
+#: libsvn_client/commit_util.c:279
+#, c-format
+msgid "Entry '%s' has unexpectedly changed special status"
+msgstr "项目“%sâ€æ„想ä¸åˆ°åœ°å˜æ¢ç‰¹æ®Šçжæ€"
+
+#: libsvn_client/commit_util.c:330
+#, c-format
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "䏿¢æäº¤ï¼šâ€œ%sâ€ä»å¤„于冲çªçжæ€"
+
+#: libsvn_client/commit_util.c:396
+#, c-format
+msgid "Did not expect '%s' to be a working copy root"
+msgstr "并未预期“%sâ€æ˜¯å·¥ä½œæ‹·è´çš„æ ¹ç›®å½•"
+
+#: libsvn_client/commit_util.c:414 libsvn_client/commit_util.c:1030
+#, c-format
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶åœ°å€åœ°å€(copyfrom URL)"
+
+#: libsvn_client/commit_util.c:704 libsvn_client/commit_util.c:835
+#: libsvn_client/copy.c:1001 libsvn_client/delete.c:67
+#: libsvn_client/diff.c:1410 libsvn_client/diff.c:2140
+#: libsvn_client/diff.c:2735 libsvn_client/diff.c:2862
+#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
+#: libsvn_client/prop_commands.c:180 libsvn_client/prop_commands.c:413
+#: libsvn_client/prop_commands.c:576 libsvn_client/prop_commands.c:917
+#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
+#: libsvn_client/status.c:256 libsvn_client/switch.c:107
+#: libsvn_wc/adm_crawler.c:453 libsvn_wc/adm_crawler.c:477
+#: libsvn_wc/adm_crawler.c:770 libsvn_wc/adm_ops.c:1044
+#: libsvn_wc/adm_ops.c:2329 libsvn_wc/adm_ops.c:2355 libsvn_wc/adm_ops.c:2391
+#: libsvn_wc/adm_ops.c:2433 libsvn_wc/copy.c:86 libsvn_wc/copy.c:442
+#: libsvn_wc/copy.c:564 libsvn_wc/copy.c:571 libsvn_wc/diff.c:1793
+#: libsvn_wc/entries.c:2256 libsvn_wc/entries.c:2813 libsvn_wc/props.c:479
+#: libsvn_wc/props.c:1088 libsvn_wc/props.c:1506 libsvn_wc/questions.c:186
+#: libsvn_wc/questions.c:295 libsvn_wc/status.c:726 libsvn_wc/translate.c:199
+#: libsvn_wc/update_editor.c:2167 libsvn_wc/update_editor.c:3006
+#, c-format
+msgid "'%s' is not under version control"
+msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+
+#: libsvn_client/commit_util.c:707
+#, c-format
+msgid "Entry for '%s' has no URL"
+msgstr "“%sâ€çš„项目没有地å€(URL)"
+
+#: libsvn_client/commit_util.c:740
+#, c-format
+msgid "'%s' is scheduled for addition within unversioned parent"
+msgstr "“%sâ€äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„父路径ä¸è¢«åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: clients/cmdline/main.c:545
+#: libsvn_client/commit_util.c:760
+#, c-format
msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [URL]\n"
-"\n"
-" 1. Lists versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Lists unversioned remote props on repos revision.\n"
+"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
+"for addition. Perhaps you're committing a target that is\n"
+"inside an unversioned (or not-yet-versioned) directory?"
msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
-"用法:1ã€proplist [TARGET[@REV]...]\n"
-" 2ã€proplist --revprop -r REV [URL]\n"
-"\n"
-" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+"“%sâ€é¡¹ç›®è¢«æ ‡è®°ä¸ºâ€œå·²å¤åˆ¶â€ï¼Œä½†æ˜¯æœ¬èº«å°šæœªåŠ å…¥æ–°å¢žè°ƒåº¦ã€‚ä¹Ÿè®¸æ‚¨æäº¤çš„\n"
+"ç›®æ ‡æ˜¯ä½äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ (或尚未纳入) 的目录ä¸ï¼Ÿ"
-#: clients/cmdline/main.c:556
-#, fuzzy
+#: libsvn_client/commit_util.c:801
+#, c-format
msgid ""
-"Set PROPNAME to PROPVAL on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-"\n"
-" Note: svn recognizes the following special versioned properties\n"
-" but will store any arbitrary properties set:\n"
-" svn:ignore - A newline separated list of file patterns to ignore.\n"
-" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the "
-"object.\n"
-" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last "
-"modified.\n"
-" Rev, Revision, - The last revision the object changed.\n"
-" LastChangedRevision\n"
-" Id - A compressed summary of the previous\n"
-" 4 keywords.\n"
-" svn:executable - If present, make the file executable.\n"
-" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-" svn:mime-type - The mimetype of the file. Used to determine\n"
-" whether to merge the file, and how to serve it from Apache.\n"
-" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-" treated as text. Anything else is treated as binary.\n"
-" svn:externals - A newline separated list of module specifiers,\n"
-" each of which consists of a relative directory path, optional\n"
-" revision flags, and an URL. For example\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - If present, indicates that the file should be locked\n"
-" before it is modified. Makes the working copy file read-only\n"
-" when it is not locked.\n"
-" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
-" attempt will fail, and a recursive attempt will set the property\n"
-" only on the file children of the directory.\n"
+"'%s' is not under version control and is not part of the commit, yet its "
+"child '%s' is part of the commit"
msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
-" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
-"\n"
-" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
-" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
-" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
-" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
-" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
-" LastChangedRevision\n"
-" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
-" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
-" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
-" 下的文件å项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
-" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
-" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
-" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
-"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
-"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
-"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
+"“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œä¹Ÿä¸æ˜¯æäº¤çš„一部份,但是它的å路径“%sâ€æ˜¯æäº¤çš„一部份"
+
+#: libsvn_client/commit_util.c:885
+#, 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:1035
+#, c-format
+msgid "Commit item '%s' has copy flag but an invalid revision"
+msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
+
+#: libsvn_client/copy.c:95 libsvn_client/copy.c:768
+#, fuzzy, c-format
+msgid "Path '%s' is not a directory"
+msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
-#: clients/cmdline/main.c:606
+#: libsvn_client/copy.c:138
+msgid "Move will not be attempted unless forced"
+msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
+
+#: libsvn_client/copy.c:334
+#, c-format
msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
-"\n"
-" Note: this subcommand does not semantically resolve conflicts or\n"
-" remove conflict markers; it merely removes the conflict-related\n"
-" artifact files and allows PATH to be committed again.\n"
+"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
+"s')"
+msgstr "æ¥æºä¸Žç›®çš„似乎ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸ (æ¥æºï¼šâ€œ%sâ€ï¼›ç›®çš„:“%sâ€)"
+
+#: libsvn_client/copy.c:370
+#, c-format
+msgid "Cannot move URL '%s' into itself"
+msgstr "æ— æ³•ç§»åŠ¨åœ°å€(URL)“%sâ€è‡³æœ¬èº«"
+
+#: libsvn_client/copy.c:390
+#, c-format
+msgid "Path '%s' does not exist in revision %ld"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
+
+#: libsvn_client/copy.c:745
+#, c-format
+msgid "Path '%s' not found in revision %ld"
+msgstr "路径“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
+
+#: libsvn_client/copy.c:750
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
+
+#: libsvn_client/copy.c:786
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "å˜åœ¨â€œ%sâ€çš„项目 (ä¸è¿‡å·¥ä½œæ–‡ä»¶å·²ä¸¢å¤±)"
+
+#: libsvn_client/copy.c:877
+#, c-format
+msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
+msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“;把它当作是脱离的工作拷è´(WC)"
+
+#: libsvn_client/copy.c:956
+#, c-format
+msgid "Cannot copy path '%s' into its own child '%s'"
+msgstr "æ— æ³•å¤åˆ¶è·¯å¾„“%sâ€è‡³å…¶å目录“%sâ€ä¸"
+
+#: libsvn_client/copy.c:967
+#, c-format
+msgid "Cannot move path '%s' into itself"
+msgstr "æ— æ³•ç§»åŠ¨è·¯å¾„â€œ%sâ€è‡³å…¶æœ¬èº«"
+
+#: libsvn_client/copy.c:975
+msgid "No support for repos <--> working copy moves"
+msgstr "䏿”¯æŒæ¡£æ¡ˆåº“ <--> 工作拷è´ç§»åЍ"
+
+#: libsvn_client/copy.c:1007
+#, c-format
+msgid "'%s' does not seem to have a URL associated with it"
+msgstr "“%sâ€ä¼¼ä¹Žæ²¡æœ‰å…³è”的地å€(URL)"
+
+#: libsvn_client/copy.c:1204 svn/move-cmd.c:72
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "移动æ“作ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+
+#: libsvn_client/delete.c:62
+#, c-format
+msgid "'%s' is in the way of the resource actually under version control"
+msgstr "“%sâ€æŒ¡äº†å®žé™…纳入版本控制资æºçš„è·¯"
+
+#: libsvn_client/delete.c:77
+#, c-format
+msgid "'%s' has local modifications"
+msgstr "“%sâ€å·²æœ‰æœ¬åœ°ä¿®æ”¹"
+
+# as-is
+#: libsvn_client/diff.c:99
+#, c-format
+msgid "%sProperty changes on: %s%s"
+msgstr "%s 属性改å˜äºŽï¼š%s%s"
+
+# as-is
+#: libsvn_client/diff.c:127
+#, c-format
+msgid "Name: %s%s"
+msgstr "åå—:%s%s"
+
+#: libsvn_client/diff.c:203
+#, fuzzy, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
msgstr ""
-"移除工作拷è´çš„目录或文件的 '冲çª' 状æ€ã€‚\n"
-"用法:resolved PATH...\n"
-"\n"
-" 注æ„:本å命令ä¸ä¼šä¾è¯æ³•æ¥è§£å†³å†²çªæˆ–æ˜¯ç§»é™¤å†²çªæ ‡è®°ï¼›å®ƒåªæ˜¯ç§»é™¤å†²çªçš„\n"
-" 相关文件,然åŽè®© PATH å¯ä»¥å†æ¬¡æäº¤ã€‚\n"
+"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
+"sâ€ä¸Žâ€œ%sâ€)"
-#: clients/cmdline/main.c:615
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
-"\n"
-" Note: this subcommand does not require network access, and resolves\n"
-" any conflicted states. However, it does not restore removed directories.\n"
+#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
+#, fuzzy, c-format
+msgid "URL has no scheme: '%s'"
msgstr ""
-"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
-"用法:revert PATH...\n"
-"\n"
-" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
-" è¢«åˆ é™¤çš„ç›®å½•\n"
+"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
+"sâ€"
+
+#: libsvn_client/diff.c:222
+#, fuzzy, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
+
+# as-is
+#: libsvn_client/diff.c:287
+#, c-format
+msgid "%s\t(revision %ld)"
+msgstr "%s\t(修订版 %ld)"
+
+# as-is
+#: libsvn_client/diff.c:289
+#, c-format
+msgid "%s\t(working copy)"
+msgstr "%s\t(工作拷è´ï¼‰"
+
+#: libsvn_client/diff.c:433
+#, c-format
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr "æ— æ³•æ˜¾ç¤ºï¼šæ–‡ä»¶æ ‡è®°ä¸ºäºŒè¿›åˆ¶ç±»åž‹ã€‚%s"
+
+# as-is
+#. 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/diff.c:861
+msgid ".working"
+msgstr ".working"
+
+# as-is
+#: libsvn_client/diff.c:863
+#, c-format
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
+
+# as-is
+#: libsvn_client/diff.c:866
+#, c-format
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
+
+#: libsvn_client/diff.c:1475 libsvn_client/diff.c:1679
+msgid "Not all required revisions are specified"
+msgstr "并未æä¾›å…¨éƒ¨æ‰€éœ€çš„修订版"
+
+#: libsvn_client/diff.c:1490
+msgid "At least one revision must be non-local for a pegged diff"
+msgstr "对于 peg å·®å¼‚ï¼Œå¿…é¡»è‡³å°‘æœ‰ä¸€ä¸ªéžæœ¬åœ°ç«¯çš„修订版"
+
+#: libsvn_client/diff.c:1602 libsvn_client/diff.c:1614
+#, c-format
+msgid "'%s' was not found in the repository at revision %ld"
+msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
-#: clients/cmdline/main.c:625
+#: libsvn_client/diff.c:1960
#, fuzzy
+msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
+
+#: libsvn_client/diff.c:1999
msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
-"\n"
-" With no args, print only locally modified items (no network access).\n"
-" With -u, add working revision and server out-of-date information.\n"
-" With -v, print full revision information on every item.\n"
-"\n"
-" The first six columns in the output are each one character wide:\n"
-" First column: Says if item was added, deleted, or otherwise changed\n"
-" ' ' no modifications\n"
-" 'A' Added\n"
-" 'C' Conflicted\n"
-" 'D' Deleted\n"
-" 'I' Ignored\n"
-" 'M' Modified\n"
-" 'R' Replaced\n"
-" 'X' item is unversioned, but is used by an externals definition\n"
-" '?' item is not under version control\n"
-" '!' item is missing (removed by non-svn command) or incomplete\n"
-" '~' versioned item obstructed by some item of a different kind\n"
-" Second column: Modifications of a file's or directory's properties\n"
-" ' ' no modifications\n"
-" 'C' Conflicted\n"
-" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
-" Fourth column: Scheduled commit will contain addition-with-history\n"
-" ' ' no history scheduled with commit\n"
-" '+' history scheduled with commit\n"
-" Fifth column: Whether the item is switched relative to its parent\n"
-" ' ' normal\n"
-" 'S' switched\n"
-" Sixth column: Repository lock token\n"
-" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
-" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
-"\n"
-" The out-of-date information appears in the eighth column (with -u):\n"
-" '*' a newer revision exists on the server\n"
-" ' ' the working copy is up to date\n"
-"\n"
-" Remaining fields are variable width and delimited by spaces:\n"
-" The working revision (with -u or -v)\n"
-" The last committed revision and last committed author (with -v)\n"
-" The working copy path is always the final field, so it can\n"
-" include spaces.\n"
-"\n"
-" Example output:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr "ç›®å‰åªæ”¯æŒè·¯å¾„的文件å‚考基础与其工作文件之间的文件差异"
+
+#: libsvn_client/diff.c:2144 libsvn_client/switch.c:111
+#, c-format
+msgid "Directory '%s' has no URL"
+msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
+
+#: libsvn_client/diff.c:2351
+msgid "Summarizing diff can only compare repository to repository"
msgstr ""
-"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
-"用法:status [PATH...]\n"
-"\n"
-" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
-" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
-" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
-"\n"
-" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
-" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
-" ' ' æ— ä¿®æ”¹\n"
-" 'A' 新增\n"
-" 'C' 冲çª\n"
-" 'D' åˆ é™¤\n"
-" 'G' åˆå¹¶\n"
-" 'I' 忽略\n"
-" 'M' 改å˜\n"
-" 'R' 替æ¢\n"
-" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
-" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
-" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
-" 第二æ :显示目录或文件的属性状æ€\n"
-" ' ' æ— ä¿®æ”¹\n"
-" 'C' 冲çª\n"
-" 'M' 改å˜\n"
-" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
-" ' ' 未é”定\n"
-" 'L' é”定\n"
-" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
-" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
-" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
-" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
-" ' ' æ£å¸¸\n"
-" 'S' 被切æ¢\n"
-" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
-" ' ' 没有é”å®šæ ‡è®°\n"
-" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
-" (有 -u)\n"
-" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
-" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
-" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
-" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
-" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
-"\n"
-" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
-" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
-" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
-"\n"
-" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
-" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
-" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
-"\n"
-" 范例输出:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
-#: clients/cmdline/main.c:702
-#, fuzzy
-msgid ""
-"Update the working copy to a different URL.\n"
-"usage: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\n"
-" move a working copy to a branch or tag within the same repository.\n"
-"\n"
-" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-" This is used when repository's root URL changes (such as a scheme\n"
-" or hostname change) but your working copy still reflects the same\n"
-" directory within the same repository.\n"
-msgstr ""
-"更新工作拷è´è‡³ä¸åŒçš„地å€(URL)。\n"
-"用法:1ã€switch URL [PATH]\n"
-" 2ã€switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
-" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
-"\n"
-" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
-" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
-" 档案库的åŒä¸€ç›®å½•时用之。\n"
+#: libsvn_client/diff.c:2708 libsvn_client/diff.c:2714
+#: libsvn_client/diff.c:2847 libsvn_client/locking_commands.c:263
+#: libsvn_client/ra.c:372 libsvn_client/ra.c:738 libsvn_client/ra.c:875
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%sâ€æ²¡æœ‰åœ°å€(URL)"
+
+#: libsvn_client/export.c:87
+#, c-format
+msgid "'%s' is not a valid EOL value"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
+
+#: libsvn_client/export.c:271
+msgid "Destination directory exists, and will not be overwritten unless forced"
+msgstr "目的目录已å˜åœ¨ï¼Œé™¤éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™ä¸ä¼šè¦†ç›–"
+
+#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#, c-format
+msgid "'%s' exists and is not a directory"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+
+#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#, c-format
+msgid "'%s' already exists"
+msgstr "“%sâ€å·²å˜åœ¨"
+
+#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1679
+#: libsvn_wc/update_editor.c:2297
+#, c-format
+msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
+
+#: libsvn_client/info.c:244
+#, fuzzy, c-format
+msgid "Cannot read entry for '%s'"
+msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
+
+#: libsvn_client/info.c:380 libsvn_client/info.c:405 libsvn_client/info.c:415
+#, fuzzy, c-format
+msgid "URL '%s' non-existent in revision %ld"
+msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
+
+#: libsvn_client/list.c:225
+#, c-format
+msgid "URL '%s' non-existent in that revision"
+msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽè¯¥ä¿®è®¢ç‰ˆä¸"
+
+#: libsvn_client/locking_commands.c:198
+msgid "No common parent found, unable to operate on disjoint arguments"
+msgstr "没有找到公共父节点,ä¸èƒ½åœ¨åˆ†ç¦»çš„傿•°ä¸Šæ“作"
-#: clients/cmdline/main.c:723
+#: libsvn_client/locking_commands.c:287
+msgid "Unable to lock/unlock across multiple repositories"
+msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
+
+#: libsvn_client/locking_commands.c:328
+#, fuzzy, c-format
+msgid "'%s' is not locked in this working copy"
+msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
+
+#: libsvn_client/locking_commands.c:376
+#, fuzzy, c-format
+msgid "'%s' is not locked"
+msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
+
+#: libsvn_client/locking_commands.c:409 libsvn_fs/fs-loader.c:895
+#: libsvn_ra/ra_loader.c:625
+msgid "Lock comment has illegal characters"
+msgstr "é”定注释å˜åœ¨éžæ³•å—符"
+
+#: libsvn_client/log.c:73
+msgid "Missing required revision specification"
+msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
+
+#: libsvn_client/log.c:86
#, fuzzy
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
-"\n"
-" Use --force to break the lock.\n"
-msgstr ""
-"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
-"用法:unlock TARGET...\n"
-"\n"
-" 使用 -force 䏿¢é”定。\n"
+msgid "Revision type requires a working copy path, not a URL"
+msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+
+#: libsvn_client/log.c:139 libsvn_client/status.c:261
+#: libsvn_client/update.c:87
+#, c-format
+msgid "Entry '%s' has no URL"
+msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
-#: clients/cmdline/main.c:731
+#: libsvn_client/log.c:370
#, fuzzy
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
-"\n"
-" If no revision given, bring working copy up-to-date with HEAD rev.\n"
-" Else synchronize working copy to revision given by -r.\n"
-"\n"
-" For each updated item a line will start with a character reporting the\n"
-" action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-"\n"
-" A character in the first column signifies an update to the actual file,\n"
-" while updates to the file's properties are shown in the second column.\n"
-" A 'B' in the third column signifies that the lock for the file has\n"
-" been broken or stolen.\n"
-msgstr ""
-"将档案库的改å˜å应至工作拷è´ã€‚\n"
-"用法:update [PATH...]\n"
-"\n"
-" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
-" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
-"\n"
-" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
-" 这些å—符代表如下:\n"
-"\n"
-" A 新增\n"
-" D åˆ é™¤\n"
-" U æ›´æ–°\n"
-" C 冲çª\n"
-" G åˆå¹¶\n"
-"\n"
-" 第一æ çš„å—符表示实际文件的更新,\n"
-" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
-" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
+msgid "No commits in repository"
+msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
-#: clients/cmdline/main.c:797 svnadmin/main.c:77 svnlook/main.c:284
-msgid "Caught signal"
-msgstr "æ•æ‰åˆ°ä¿¡å·(䏿–)"
+#: libsvn_client/prop_commands.c:71
+#, c-format
+msgid "'%s' is a wcprop, thus not accessible to clients"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªå·¥ä½œæ‹·è´å±žæ€§(wcprop),应æ¤ä¸èƒ½è¢«å®¢æˆ·ç«¯å˜å–"
-#: clients/cmdline/main.c:895
-msgid "Non-numeric limit argument given"
-msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
+#: libsvn_client/prop_commands.c:150
+#, c-format
+msgid "Revision property '%s' not allowed in this context"
+msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
-#: clients/cmdline/main.c:912 svnadmin/main.c:1219
-msgid ""
-"Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+#: libsvn_client/prop_commands.c:166
+#, fuzzy, c-format
+msgid "Setting property on non-local target '%s' is not supported"
+msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
-#: clients/cmdline/main.c:924 svnadmin/main.c:1233
+#: libsvn_client/prop_commands.c:172 libsvn_client/prop_commands.c:247
#, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "ä¿®è®¢ç‰ˆå‚æ•°â€œ%sâ€ä¸æœ‰è¯æ³•错误"
+msgid "Bad property name: '%s'"
+msgstr "有问题的属性å称:“%sâ€"
-#: clients/cmdline/main.c:1072 clients/cmdline/main.c:1082
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+#: libsvn_client/prop_commands.c:243
+msgid "Value will not be set unless forced"
+msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
+
+#: libsvn_client/prop_commands.c:466
+#, fuzzy, c-format
+msgid "'%s' does not exist in revision %ld"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
-#: clients/cmdline/main.c:1098
+#: libsvn_client/prop_commands.c:473 libsvn_client/prop_commands.c:724
#, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生æ¢åˆ—符å·å‚数“%sâ€ä¸æœ‰è¯æ³•错误"
+msgid "Unknown node kind for '%s'"
+msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
-#: clients/cmdline/main.c:1144 svndumpfilter/main.c:1167 svnlook/main.c:2121
-msgid "Subcommand argument required\n"
-msgstr "å¿…é¡»æä¾›å命令傿•°\n"
+#: libsvn_client/ra.c:132
+#, c-format
+msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgstr "è¯•å›¾åœ¨éžæäº¤æ“作ä¸ï¼Œè®¾å®šå·¥ä½œæ‹·è´å±žæ€§â€œ%sâ€äºŽâ€œ%sâ€"
-#: clients/cmdline/main.c:1162 svnadmin/main.c:1341 svndumpfilter/main.c:1185
-#: svnlook/main.c:2139
+#: libsvn_client/ra.c:349
#, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知的命令:“%sâ€\n"
+msgid "Can't find entry for '%s'"
+msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„项目"
-#: clients/cmdline/main.c:1195
+#: libsvn_client/ra.c:493
#, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
-msgstr ""
-"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
-"请输入“svn help %sâ€ä»¥å–得用法。\n"
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "未æä¾›â€œ%sâ€äºŽä¿®è®¢ç‰ˆ %ld çš„ changed-path ä¿¡æ¯"
-#: clients/cmdline/main.c:1232
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
+#: libsvn_client/ra.c:613
+#, c-format
+msgid "path '%s' doesn't exist in revision %ld"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld ä¸"
-#: clients/cmdline/main.c:1239
-#, fuzzy
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+#: libsvn_client/ra.c:660 libsvn_client/ra.c:823
+#, c-format
+msgid "Unable to find repository location for '%s' in revision %ld"
+msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„æ¡£æ¡ˆåº“ä½ç½®äºŽä¿®è®¢ç‰ˆ %ld"
-#: clients/cmdline/main.c:1260
-msgid ""
-"The log message is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
+#: libsvn_client/ra.c:671
+#, c-format
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr "“%sâ€äºŽä¿®è®¢ç‰ˆ %ld æ˜¯ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
-#: clients/cmdline/main.c:1267
-#, fuzzy
+#: libsvn_client/ra.c:828
+#, c-format
msgid ""
-"The lock comment is a pathname (was -F intended?); use '--force-log' to "
-"override"
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
msgstr ""
-"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
+"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
-#: clients/cmdline/main.c:1480
-msgid ""
-"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
-"details)\n"
-msgstr ""
-"svn:请执行“svn cleanupâ€ä»¥ç§»åŽ»é”定 (输入“svn help cleanupâ€ä»¥å–得详细说明)\n"
+#: libsvn_client/relocate.c:101
+#, fuzzy, c-format
+msgid "'%s' is not the root of the repository"
+msgstr "â€%s“没有在档案库ä¸è¢«é”定"
-#: clients/cmdline/merge-cmd.c:61
-msgid "Second revision required"
-msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
+#: libsvn_client/relocate.c:108
+#, c-format
+msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
+msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
+
+#: libsvn_client/revisions.c:99
+#, fuzzy, c-format
+msgid "Path '%s' has no committed revision"
+msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
-#: clients/cmdline/merge-cmd.c:81 clients/cmdline/merge-cmd.c:106
-msgid "Wrong number of paths given"
-msgstr "指定了错误数目的路径"
+#: libsvn_client/revisions.c:109
+#, c-format
+msgid "Unrecognized revision type requested for '%s'"
+msgstr "æ— æ³•è¾¨è¯†è¯·æ±‚çš„â€œ%sâ€çš„修订版类别"
-#: clients/cmdline/merge-cmd.c:128
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作拷è´çš„åˆå¹¶æ¥æºéœ€ç‰¹åˆ«æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_delta/svndiff.c:144
+msgid "Compression of svndiff data failed"
+msgstr ""
-#: clients/cmdline/mkdir-cmd.c:84
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "å°è¯•用 “svn addâ€æˆ– “svn add --non-recursiveâ€ä»£æ›¿ï¼Ÿ"
+#: libsvn_delta/svndiff.c:407
+msgid "Decompression of svndiff data failed"
+msgstr ""
-#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1215
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移动æ“作ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_delta/svndiff.c:414
+msgid "Size of uncompressed data does not match stored original length"
+msgstr ""
-#: clients/cmdline/notify.c:69
+#: libsvn_delta/svndiff.c:484
#, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "跳过找ä¸åˆ°çš„ç›®æ ‡ï¼šâ€œ%sâ€\n"
+msgid "Invalid diff stream: insn %d cannot be decoded"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d ä¸èƒ½è§£ç "
-#: clients/cmdline/notify.c:76
+#: libsvn_delta/svndiff.c:488
#, c-format
-msgid "Skipped '%s'\n"
-msgstr "跳过“%sâ€\n"
+msgid "Invalid diff stream: insn %d has non-positive length"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d å‡ºçŽ°éžæ£çš„长度"
-#: clients/cmdline/notify.c:94
+#: libsvn_delta/svndiff.c:492
#, c-format
-msgid "Restored '%s'\n"
-msgstr "已还原“%sâ€\n"
+msgid "Invalid diff stream: insn %d overflows the target view"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d æº¢å‡ºç›®æ ‡è§†å›¾"
-#: clients/cmdline/notify.c:100
+#: libsvn_delta/svndiff.c:501
#, c-format
-msgid "Reverted '%s'\n"
-msgstr "å·²æ¢å¤â€œ%sâ€\n"
+msgid "Invalid diff stream: [src] insn %d overflows the source view"
+msgstr "æ— æ•ˆçš„è¯§å¼‚æµï¼š[src] insn %d 溢出æºè§†å›¾"
-#: clients/cmdline/notify.c:106
+#: libsvn_delta/svndiff.c:508
#, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€-- 请改用更新试试。\n"
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[tgt] insn %d èµ·ç‚¹è¶…è¿‡ç›®æ ‡è§†å›¾ä½ç½®"
-#: clients/cmdline/notify.c:114
+#: libsvn_delta/svndiff.c:515
#, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "“%sâ€çš„已解决的冲çªçжæ€\n"
+msgid "Invalid diff stream: [new] insn %d overflows the new data section"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[new] insn %d 溢出新数æ®åŒºåŸŸ"
+
+#: libsvn_delta/svndiff.c:525
+msgid "Delta does not fill the target window"
+msgstr "Delta ä¸èƒ½å¡«å……ç›®æ ‡çª—å£"
+
+#: libsvn_delta/svndiff.c:528
+msgid "Delta does not contain enough new data"
+msgstr "Deltaä¸èƒ½åŒ…å«è¶³å¤Ÿçš„æ–°æ•°æ®"
+
+#: libsvn_delta/svndiff.c:634
+msgid "Svndiff has invalid header"
+msgstr "Svndiff æ•°æ®åŒ…å«äº†æ— 效的数æ®å¤´"
+
+# as-is
+#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+msgid "Svndiff contains corrupt window header"
+msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+
+# as-is
+#: libsvn_delta/svndiff.c:698
+msgid "Svndiff has backwards-sliding source views"
+msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+
+#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
+#: libsvn_delta/svndiff.c:867
+msgid "Unexpected end of svndiff input"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+
+#: libsvn_diff/diff_file.c:593
+#, c-format
+msgid "The file '%s' changed unexpectedly during diff"
+msgstr ""
+
+#: libsvn_diff/diff_file.c:714
+#, fuzzy, c-format
+msgid "Error parsing diff options"
+msgstr "分解“%sâ€æ—¶å‘生错误"
-#: clients/cmdline/notify.c:195
+#: libsvn_diff/diff_file.c:737
#, c-format
-msgid ""
-"\n"
-"Fetching external item into '%s'\n"
+msgid "Invalid argument '%s' in diff options"
msgstr ""
-"\n"
-"æ£åœ¨å–得外部项目至“%sâ€\n"
-#: clients/cmdline/notify.c:210
+#: libsvn_diff/diff_file.c:1019
#, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "导出修订版 %ld 的外部定义。\n"
+msgid "%s\\ No newline at end of file%s"
+msgstr "%s\\ 在文件 %s 末尾没有新行"
-#: clients/cmdline/notify.c:211
+#: libsvn_diff/diff_file.c:1608
#, c-format
-msgid "Exported revision %ld.\n"
-msgstr "导出修订版 %ld。\n"
+msgid "Failed to delete mmap '%s'"
+msgstr "åˆ é™¤mmap â€%s“失败"
-#: clients/cmdline/notify.c:219
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
+#: libsvn_ra/ra_loader.c:171
#, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "å–出修订版 %ld 的外部定义。\n"
+msgid "'%s' does not define '%s()'"
+msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
-#: clients/cmdline/notify.c:220
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "å–出修订版 %ld。\n"
+#: libsvn_fs/fs-loader.c:131
+#, fuzzy, c-format
+msgid "Failed to load module for FS type '%s'"
+msgstr "装载FS类别“%sâ€æ¨¡å—失败"
-#: clients/cmdline/notify.c:230
+#: libsvn_fs/fs-loader.c:138
#, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部定义至修订版 %ld。\n"
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "对“%sâ€æœ‰ä¸ç¬¦åˆçš„ FS 模å—版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
-#: clients/cmdline/notify.c:231
+#: libsvn_fs/fs-loader.c:163
#, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新至修订版 %ld。\n"
+msgid "Unknown FS type '%s'"
+msgstr "未知的文件系统(FS)类别“%sâ€"
-#: clients/cmdline/notify.c:239
-#, c-format
-msgid "External at revision %ld.\n"
-msgstr "于修订版 %ld 的外部定义。\n"
+#: libsvn_fs/fs-loader.c:253
+#, fuzzy, c-format
+msgid "Can't allocate FS mutex"
+msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
+
+#: libsvn_fs/fs-loader.c:289
+#, fuzzy, c-format
+msgid "Can't grab FS mutex"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: clients/cmdline/notify.c:240
+#: libsvn_fs/fs-loader.c:295
#, c-format
-msgid "At revision %ld.\n"
-msgstr "于修订版 %ld。\n"
+msgid "Can't ungrab FS mutex"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: clients/cmdline/notify.c:252
-msgid "External export complete.\n"
-msgstr "外部定义导出完æˆã€‚\n"
+#: libsvn_fs/fs-loader.c:901
+msgid "Negative expiration date passed to svn_fs_lock"
+msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
-#: clients/cmdline/notify.c:253
-msgid "Export complete.\n"
-msgstr "导出完æˆã€‚\n"
+#: libsvn_fs_base/bdb/bdb-err.c:101
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while %s:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: clients/cmdline/notify.c:260
-msgid "External checkout complete.\n"
-msgstr "外部定义å–出完æˆã€‚\n"
+#: libsvn_fs_base/bdb/changes-table.c:87
+msgid "creating change"
+msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
-#: clients/cmdline/notify.c:261
-msgid "Checkout complete.\n"
-msgstr "å–出完æˆã€‚\n"
+#: libsvn_fs_base/bdb/changes-table.c:113
+msgid "deleting changes"
+msgstr "æ£åœ¨åˆ 除更改"
-#: clients/cmdline/notify.c:268
-msgid "External update complete.\n"
-msgstr "外部定义更新完æˆã€‚\n"
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2025
+msgid "Missing required node revision ID"
+msgstr "未æä¾›å¿…须的节点修订版 ID"
-#: clients/cmdline/notify.c:269
-msgid "Update complete.\n"
-msgstr "更新完æˆã€‚\n"
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2035
+msgid "Invalid change ordering: new node revision ID without delete"
+msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šæœ‰æ–°çš„节点修订版 ID è€Œæ²¡åˆ é™¤"
-#: clients/cmdline/notify.c:285
-#, c-format
-msgid ""
-"\n"
-"Performing status on external item at '%s'\n"
-msgstr ""
-"\n"
-"对外部项目“%sâ€è¿›è¡ŒçŠ¶æ€æ£€æŸ¥\n"
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2046
+msgid "Invalid change ordering: non-add change on deleted path"
+msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šå¯¹åˆ é™¤è·¯å¾„è¿›è¡Œéžæ–°å¢žçš„æ”¹å˜"
-#: clients/cmdline/notify.c:293
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "状æ€äºŽä¿®è®¢ç‰ˆï¼š%6ld\n"
+#: libsvn_fs_base/bdb/changes-table.c:256
+#: libsvn_fs_base/bdb/changes-table.c:380
+msgid "creating cursor for reading changes"
+msgstr "æ£åœ¨ä¸ºè¯»å–更改创建指针"
-#: clients/cmdline/notify.c:301
-#, c-format
-msgid "Sending %s\n"
-msgstr "æ£åœ¨å‘é€ %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:282
+#: libsvn_fs_base/bdb/changes-table.c:401
+#, fuzzy, c-format
+msgid "Error reading changes for key '%s'"
+msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
-#: clients/cmdline/notify.c:310
-#, c-format
-msgid "Adding (bin) %s\n"
-msgstr "新增 (二进制) %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:341
+#: libsvn_fs_base/bdb/changes-table.c:424
+msgid "fetching changes"
+msgstr "æ£åœ¨èŽ·å–æ›´æ”¹"
-#: clients/cmdline/notify.c:317
-#, c-format
-msgid "Adding %s\n"
-msgstr "新增 %s\n"
+#: libsvn_fs_base/bdb/changes-table.c:354
+#: libsvn_fs_base/bdb/changes-table.c:437
+msgid "closing changes cursor"
+msgstr "æ£åœ¨å…³é—更改指针"
-#: clients/cmdline/notify.c:324
-#, c-format
-msgid "Deleting %s\n"
-msgstr "åˆ é™¤ %s\n"
+#: libsvn_fs_base/bdb/copies-table.c:85
+#, fuzzy
+msgid "storing copy record"
+msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
-#: clients/cmdline/notify.c:331
-#, c-format
-msgid "Replacing %s\n"
-msgstr "æ›¿æ¢ %s\n"
+#: libsvn_fs_base/bdb/copies-table.c:110
+msgid "allocating new copy ID (getting 'next-key')"
+msgstr "æ£åœ¨åˆ†é…æ–°æ‹·è´ID (æ£åœ¨èŽ·å–'next-key')"
-#: clients/cmdline/notify.c:341
-msgid "Transmitting file data "
-msgstr "ä¼ è¾“æ–‡ä»¶æ•°æ®"
+#: libsvn_fs_base/bdb/copies-table.c:128
+msgid "bumping next copy key"
+msgstr "æ£åœ¨æå–下一个拷è´å…³é”®å—"
-#: clients/cmdline/notify.c:351
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "“%sâ€è¢«ç”¨æˆ·â€œ%sâ€é”定。\n"
+#: libsvn_fs_base/bdb/copies-table.c:167
+msgid "deleting entry from 'copies' table"
+msgstr "æ£åœ¨ä»Ž 'copies' 表ä¸åˆ 除æ¡ç›®"
-#: clients/cmdline/notify.c:357
-#, c-format
-msgid "'%s' unlocked.\n"
-msgstr "“%sâ€è¢«è§£é™¤é”定。\n"
+# as-is
+#: libsvn_fs_base/bdb/copies-table.c:195
+#, fuzzy
+msgid "reading copy"
+msgstr "æ£åœ¨è¯»å–æ‹·è´"
-#: clients/cmdline/prompt.c:94
-msgid "Can't open stdin"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å…¥"
+#: libsvn_fs_base/bdb/nodes-table.c:97
+msgid "allocating new node ID (getting 'next-key')"
+msgstr "æ£åœ¨åˆ†é…新的节点 ID (æ£åœ¨èŽ·å– 'next-key')"
-#: clients/cmdline/prompt.c:112 clients/cmdline/prompt.c:116
-msgid "Can't read stdin"
-msgstr "æ— æ³•è¯»å–æ ‡å‡†è¾“å…¥"
+#: libsvn_fs_base/bdb/nodes-table.c:115
+msgid "bumping next node ID key"
+msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
-#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:310
-msgid "Can't get password"
-msgstr "æ— æ³•å–得密ç "
+#: libsvn_fs_base/bdb/nodes-table.c:152
+#, fuzzy, c-format
+msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
+msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
-#: clients/cmdline/prompt.c:175
-#, c-format
-msgid "Authentication realm: %s\n"
-msgstr "认è¯é¢†åŸŸï¼š%s\n"
+#: libsvn_fs_base/bdb/nodes-table.c:178
+msgid "deleting entry from 'nodes' table"
+msgstr "æ£åœ¨ä»Ž 'nodes' è¡¨åˆ é™¤æ¡ç›®"
-#: clients/cmdline/prompt.c:201 clients/cmdline/prompt.c:224
-msgid "Username: "
-msgstr "用户登录å:"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/nodes-table.c:218
+#, fuzzy
+msgid "reading node revision"
+msgstr "æ£åœ¨è¯»å–节点修订版"
-#: clients/cmdline/prompt.c:203
-#, c-format
-msgid "Password for '%s': "
-msgstr "“%sâ€çš„密ç :"
+#: libsvn_fs_base/bdb/nodes-table.c:250
+#, fuzzy
+msgid "storing node revision"
+msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
-#: clients/cmdline/prompt.c:246
-#, c-format
-msgid "Error validating server certificate for '%s':\n"
-msgstr "验è¯â€œ%sâ€çš„æœåŠ¡å™¨å‡è¯æ—¶å‘生错误:\n"
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
+#, fuzzy, c-format
+msgid "No such representation '%s'"
+msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
-#: clients/cmdline/prompt.c:252
-msgid ""
-" - The certificate is not issued by a trusted authority. Use the\n"
-" fingerprint to validate the certificate manually!\n"
-msgstr ""
-" - 本å‡è¯å¹¶ä¸æ˜¯ç”±å—信任的æƒå¨æœºæƒæ‰€æ ¸å‘。请手动利用指纹以验è¯\n"
-" å‡è¯çš„æœ‰æ•ˆæ€§ï¼\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:96
+#, fuzzy
+msgid "reading representation"
+msgstr "æ£åœ¨è¯»å–请求"
-#: clients/cmdline/prompt.c:259
-msgid " - The certificate hostname does not match.\n"
-msgstr " - 本å‡è¯çš„主机åç§°ä¸ç¬¦ã€‚\n"
+#: libsvn_fs_base/bdb/reps-table.c:124
+#, fuzzy
+msgid "storing representation"
+msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
-#: clients/cmdline/prompt.c:265
-msgid " - The certificate is not yet valid.\n"
-msgstr " - 本å‡è¯å°šæœªè¿›å…¥æœ‰æ•ˆæœŸé—´ã€‚\n"
+#: libsvn_fs_base/bdb/reps-table.c:154
+msgid "allocating new representation (getting next-key)"
+msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
-#: clients/cmdline/prompt.c:271
-msgid " - The certificate has expired.\n"
-msgstr " - 本å‡è¯å·²è¿‡æœŸã€‚\n"
+#: libsvn_fs_base/bdb/reps-table.c:175
+#, fuzzy
+msgid "bumping next representation key"
+msgstr "æ£åœ¨æå–下一个请求关键å—"
-#: clients/cmdline/prompt.c:277
-msgid " - The certificate has an unknown error.\n"
-msgstr " - 本å‡è¯å‘ç”Ÿä¸æ˜Žçš„错误。\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:203
+#, fuzzy
+msgid "deleting representation"
+msgstr "æ£åœ¨åˆ 除请求"
-#: clients/cmdline/prompt.c:282
-#, c-format
-msgid ""
-"Certificate information:\n"
-" - Hostname: %s\n"
-" - Valid: from %s until %s\n"
-" - Issuer: %s\n"
-" - Fingerprint: %s\n"
-msgstr ""
-"å‡è¯ä¿¡æ¯ï¼š\n"
-" - 主机å称:%s\n"
-" - 有效期间:自 %s 至 %s\n"
-" - å‘行者:%s\n"
-" - 指纹:%s\n"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/rev-table.c:87
+#, fuzzy
+msgid "reading filesystem revision"
+msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
-#: clients/cmdline/prompt.c:297
-msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
-msgstr "(R)æ‹’ç»ï¼Œ(t)æš‚æ—¶æŽ¥å— æˆ– (p)永远接å—?"
+#: libsvn_fs_base/bdb/strings-table.c:89
+msgid "creating cursor for reading a string"
+msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
-#: clients/cmdline/prompt.c:301
-msgid "(R)eject or accept (t)emporarily? "
-msgstr "(R)æ‹’ç» æˆ– (t)æš‚æ—¶æŽ¥å— ï¼Ÿ"
+#: libsvn_fs_base/bdb/txn-table.c:92
+#, fuzzy
+msgid "storing transaction record"
+msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
-#: clients/cmdline/prompt.c:339
-msgid "Client certificate filename: "
-msgstr "用户å‡è¯æ–‡ä»¶å:"
+#: libsvn_fs_base/bdb/uuids-table.c:114
+#, fuzzy
+msgid "get repository uuid"
+msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+
+#: libsvn_fs_base/bdb/uuids-table.c:142
+#, fuzzy
+msgid "set repository uuid"
+msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+
+#: libsvn_fs_base/dag.c:217
+#, fuzzy, c-format
+msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+
+#: libsvn_fs_base/dag.c:225
+#, fuzzy, c-format
+msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+
+#: libsvn_fs_base/dag.c:234
+#, fuzzy, c-format
+msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+
+#: libsvn_fs_base/dag.c:282 libsvn_fs_base/dag.c:458 libsvn_fs_fs/dag.c:317
+#, fuzzy
+msgid "Attempted to create entry in non-directory parent"
+msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
+
+#: libsvn_fs_base/dag.c:452 libsvn_fs_fs/dag.c:311
+#, c-format
+msgid "Attempted to create a node with an illegal name '%s'"
+msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
+
+#: libsvn_fs_base/dag.c:464 libsvn_fs_base/dag.c:698 libsvn_fs_fs/dag.c:323
+#, fuzzy, c-format
+msgid "Attempted to clone child of non-mutable node"
+msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
-#: clients/cmdline/prompt.c:362
-#, c-format
-msgid "Passphrase for '%s': "
-msgstr "“%sâ€çš„密ç :"
+#: libsvn_fs_base/dag.c:471
+#, fuzzy, c-format
+msgid "Attempted to create entry that already exists"
+msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
-#: clients/cmdline/propdel-cmd.c:77
-#, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "属性“%sâ€è‡ªæ¡£æ¡ˆåº“修订版 %ld ä¸åˆ 除\n"
+#: libsvn_fs_base/dag.c:522 libsvn_fs_fs/dag.c:385
+#, fuzzy
+msgid "Attempted to set entry in non-directory node"
+msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
-#: clients/cmdline/propdel-cmd.c:86
-#, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "åˆ é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„å±žæ€§â€œ%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_fs_base/dag.c:528 libsvn_fs_fs/dag.c:391
+#, fuzzy
+msgid "Attempted to set entry in immutable node"
+msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
-#: clients/cmdline/propdel-cmd.c:116
+#: libsvn_fs_base/dag.c:592
#, c-format
-msgid "property '%s' deleted (recursively) from '%s'.\n"
-msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除 (递归)。\n"
+msgid "Can't set proplist on *immutable* node-revision %s"
+msgstr "ä¸èƒ½åœ¨ä¸å¯æ›´æ”¹èŠ‚ç‚¹ä¿®è®¢ç‰ˆ %s 设置属性列表"
-#: clients/cmdline/propdel-cmd.c:117
+#: libsvn_fs_base/dag.c:704
#, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除。\n"
+msgid "Attempted to make a child clone with an illegal name '%s'"
+msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
-#: clients/cmdline/propedit-cmd.c:101 clients/cmdline/propedit-cmd.c:225
-#: clients/cmdline/propset-cmd.c:85
-msgid "Bad encoding option: prop value not stored as UTF8"
-msgstr "有问题的编ç 选项:属性内容未以 UTF8 储å˜"
+#: libsvn_fs_base/dag.c:830
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from *non*-directory node"
+msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
-#: clients/cmdline/propedit-cmd.c:110
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 设为新值\n"
+#: libsvn_fs_base/dag.c:836
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from immutable directory node"
+msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
-#: clients/cmdline/propedit-cmd.c:116
+#: libsvn_fs_base/dag.c:843
#, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 没有改å˜\n"
+msgid "Attempted to delete a node with an illegal name '%s'"
+msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
-#: clients/cmdline/propedit-cmd.c:124
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "编辑纳入版本控制的属性“%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_fs_base/dag.c:858 libsvn_fs_base/dag.c:891
+#, fuzzy, c-format
+msgid "Delete failed: directory has no entry '%s'"
+msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
-#: clients/cmdline/propedit-cmd.c:150 clients/cmdline/propset-cmd.c:158
-msgid "Explicit target argument required"
-msgstr "必须明确地æä¾›ç›®æ ‡"
+#: libsvn_fs_base/dag.c:940
+#, fuzzy, c-format
+msgid "Attempted removal of immutable node"
+msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
-#: clients/cmdline/propedit-cmd.c:173
+#: libsvn_fs_base/dag.c:1060
#, c-format
-msgid "Editing property on non-local target '%s' not yet supported"
-msgstr "å°šä¸æ”¯æŒç¼–è¾‘éžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„属性"
+msgid "Attempted to get textual contents of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
-#: clients/cmdline/propedit-cmd.c:200 clients/cmdline/switch-cmd.c:138
+#: libsvn_fs_base/dag.c:1095
#, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "“%sâ€ä¸åƒæ˜¯å·¥ä½œæ‹·è´è·¯å¾„"
+msgid "Attempted to get length of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„é•¿åº¦"
-#: clients/cmdline/propedit-cmd.c:232
+#: libsvn_fs_base/dag.c:1121
#, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§è¢«è®¾ä¸ºæ–°å€¼\n"
+msgid "Attempted to get checksum of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
-#: clients/cmdline/propedit-cmd.c:239
-#, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§æ²¡æœ‰æ”¹å˜\n"
+#: libsvn_fs_base/dag.c:1152 libsvn_fs_base/dag.c:1206
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of a *non*-file node"
+msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
-#: clients/cmdline/proplist-cmd.c:71
-#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+#: libsvn_fs_base/dag.c:1158 libsvn_fs_base/dag.c:1212
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of an immutable node"
+msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
-#: clients/cmdline/props.c:51
-#, fuzzy
+#: libsvn_fs_base/dag.c:1235
+#, fuzzy, c-format
msgid ""
-"Must specify the revision as a number, a date or 'HEAD' when operating on a "
-"revision property"
-msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
+"Checksum mismatch, rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: clients/cmdline/props.c:58
-#, fuzzy
-msgid "Wrong number of targets specified"
-msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
+#: libsvn_fs_base/dag.c:1290
+#, c-format
+msgid "Attempted to open non-existent child node '%s'"
+msgstr "ä¼å›¾æ‰“å¼€ä¸å˜åœ¨çš„å节点“%sâ€"
-#: clients/cmdline/props.c:67
-msgid "Either a URL or versioned item is required"
-msgstr "å¿…é¡»æä¾›åœ°å€(URL)或纳入版本控制的项目"
+#: libsvn_fs_base/dag.c:1296
+#, c-format
+msgid "Attempted to open node with an illegal name '%s'"
+msgstr "ä¼å›¾ä»¥ä¸åˆæ³•çš„åå—“%sâ€æ‰“开节点"
+
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
+msgid "Filesystem object has not been opened yet"
+msgstr "文件系统对象尚未打开"
-#: clients/cmdline/propset-cmd.c:111
+#: libsvn_fs_base/err.c:51
#, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "设定属性“%sâ€äºŽæ¡£æ¡ˆåº“修订版 %ld\n"
+msgid "Corrupt filesystem revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸çš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆ %1$ld æŸå"
-#: clients/cmdline/propset-cmd.c:119
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
#, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "æ— æ³•æŒ‡å®šä¿®è®¢ç‰ˆä»¥è®¾å®šç‰ˆæœ¬æŽ§åˆ¶ä¸‹çš„å±žæ€§â€œ%sâ€"
+msgid "Reference to non-existent node '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„节点“%1$sâ€"
-#: clients/cmdline/propset-cmd.c:151
+#: libsvn_fs_base/err.c:72
#, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必须明确地æä¾›ç›®çš„ (“%sâ€è§£é‡Šä¸ºå±žæ€§å†…容)"
+msgid "Reference to non-existent revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„修订版“%1$ldâ€"
-#: clients/cmdline/propset-cmd.c:184
+#: libsvn_fs_base/err.c:84
#, c-format
-msgid "property '%s' set (recursively) on '%s'\n"
-msgstr "属性“%sâ€è®¾å®š (递归) 于“%sâ€\n"
+msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'transactions' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-#: clients/cmdline/propset-cmd.c:185
+#: libsvn_fs_base/err.c:95
#, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
+msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'copies' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-#: clients/cmdline/revert-cmd.c:61
-#, fuzzy
-msgid "Try 'svn revert --recursive' instead?"
-msgstr "å°è¯•用 “svn revert -recursive†代替?"
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "æ–‡ä»¶æ— æ³•å˜æ›´ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-#: clients/cmdline/status.c:261
+#: libsvn_fs_base/err.c:117
#, c-format
-msgid "'%s' has lock token, but no lock owner"
-msgstr "‘%s’é”被盗å–,但没有é”的所有者"
+msgid "No transaction named '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸ä¸å˜åœ¨å为“%1$sâ€çš„事务"
-#: clients/cmdline/switch-cmd.c:58
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
#, c-format
-msgid "'%s' to '%s' is not a valid relocation"
-msgstr "“%sâ€åˆ°â€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„é‡å®šä½"
+msgid "Cannot modify transaction named '%s' in filesystem '%s'"
+msgstr "æ— æ³•åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%2$sâ€ä¸ä¿®æ”¹å为“%1$sâ€çš„事务"
-#: clients/cmdline/util.c:58
+#: libsvn_fs_base/err.c:139
#, c-format
-msgid ""
-"\n"
-"Committed revision %ld.\n"
-msgstr ""
-"\n"
-"æäº¤åŽçš„修订版为 %ld。\n"
+msgid "No copy with id '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸æ²¡æœ‰ç¼–å·â€œ%1$sâ€çš„æ‹·è´"
-#: clients/cmdline/util.c:126
-msgid ""
-"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
-"no 'editor-cmd' run-time configuration option was found"
-msgstr ""
-"没有一个 SVN_EDITOR,VISUAL 或 EDITOR çŽ¯å¢ƒå˜æ•°è¢«è®¾å®šï¼Œæ‰§è¡Œæ—¶æœŸçš„设定ä¸ä¹Ÿæ²¡æœ‰ "
-"'editor-cmd' 选项"
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-#: clients/cmdline/util.c:153
-msgid "Can't get working directory"
-msgstr "æ— æ³•å–得工作目录"
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
+#, fuzzy, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-#: clients/cmdline/util.c:164
-#, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "æ— æ³•æ›´æ”¹å·¥ä½œæ‹·è´è‡³â€œ%sâ€"
+#: libsvn_fs_base/err.c:171
+#, fuzzy, c-format
+msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
+msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
-#: clients/cmdline/util.c:190
-#, c-format
-msgid "Can't write to '%s'"
-msgstr "æ— æ³•å†™å…¥è‡³â€œ%sâ€"
+#: libsvn_fs_base/err.c:181
+#, fuzzy, c-format
+msgid "No token given for path '%s' in filesystem '%s'"
+msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
-# as-is
-#: clients/cmdline/util.c:205 clients/cmdline/util.c:229
-#: libsvn_fs_fs/fs_fs.c:1082 libsvn_fs_fs/fs_fs.c:3590 libsvn_subr/io.c:2359
-#, c-format
-msgid "Can't stat '%s'"
-msgstr "ä¸èƒ½å–得“%sâ€çжæ€"
+#: libsvn_fs_base/err.c:190
+#, fuzzy, c-format
+msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
-#: clients/cmdline/util.c:220
-#, c-format
-msgid "system('%s') returned %d"
-msgstr "系统(“%sâ€) 返回 %d"
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
+#, fuzzy, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
-#: clients/cmdline/util.c:285
-msgid "Can't restore working directory"
-msgstr "æ— æ³•è¿˜åŽŸå·¥ä½œç›®å½•"
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
-#: clients/cmdline/util.c:325
-msgid "Log message contains a zero byte"
-msgstr "日志信æ¯ä¸æœ‰ä¸€ä¸ªé›¶å—节"
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
-#: clients/cmdline/util.c:385
-msgid "Your commit message was left in a temporary file:"
-msgstr "您的æäº¤ä¿¡æ¯ä¿ç•™åœ¨ä¸´æ—¶æ–‡ä»¶ä¸ï¼š"
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
+#, fuzzy, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
-# as-is
-#: clients/cmdline/util.c:437
-msgid "--This line, and those below, will be ignored--"
-msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
+#, fuzzy, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
-#: clients/cmdline/util.c:550
-msgid "Cannot invoke editor to get log message when non-interactive"
-msgstr "在éžäº¤äº’å¼çš„æƒ…况下ä¸èƒ½è°ƒç”¨ç¼–è¾‘å™¨èŽ·å–æ—¥å¿—ä¿¡æ¯"
+#: libsvn_fs_base/fs.c:79
+#, c-format
+msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
+msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
-#: clients/cmdline/util.c:563
-msgid ""
-"Could not use external editor to fetch log message; consider setting the "
-"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
-"options"
-msgstr ""
-"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
-"message (-m) 或 --file (-F) 选项"
+#: libsvn_fs_base/fs.c:90
+#, c-format
+msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
+msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
-#: clients/cmdline/util.c:598
-msgid ""
-"\n"
-"Log message unchanged or not specified\n"
-"a)bort, c)ontinue, e)dit\n"
-msgstr ""
-"\n"
-"æ—¥å¿—ä¿¡æ¯æœªæ”¹å˜ï¼Œæˆ–是未指定\n"
-"a)䏿–,c)ç»§ç»ï¼Œe)编辑\n"
+#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
+#, fuzzy
+msgid "Filesystem object already open"
+msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
-#: clients/cmdline/util.c:651
-msgid "Use --force to override this restriction"
-msgstr "请用 --force æ¥æ’¤é”€é™åˆ¶"
+#: libsvn_fs_base/fs.c:189
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: clients/cmdline/util.c:673 include/svn_error_codes.h:229
-#: libsvn_subr/cmdline.c:278 libsvn_subr/cmdline.c:295
-msgid "Write error"
-msgstr "写入错误"
+#: libsvn_fs_base/fs.c:539
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-# as-is
-#: include/svn_error_codes.h:152
-msgid "Bad parent pool passed to svn_make_pool()"
-msgstr "æ— æ•ˆçš„å†…å˜æ± (pool)ä¼ é€’åˆ° svn_make_pool()"
+#: libsvn_fs_base/fs.c:545
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: include/svn_error_codes.h:156
-msgid "Bogus filename"
-msgstr "有问题的文件å"
+#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:281
+#, c-format
+msgid "Expected FS format '%d'; found format '%d'"
+msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
-#: include/svn_error_codes.h:160
-msgid "Bogus URL"
-msgstr "有问题的地å€(URL)"
+#: libsvn_fs_base/fs.c:1094
+#, fuzzy
+msgid ""
+"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
+"may be interfering with the hotcopy algorithm. If \n"
+"the problem persists, try deactivating this feature \n"
+"in DB_CONFIG"
+msgstr ""
+"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
+"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
+"在 DB_CONFIG ä¸å–消这个功能。"
-#: include/svn_error_codes.h:164
-msgid "Bogus date"
-msgstr "有问题的日期"
+#: libsvn_fs_base/fs.c:1113
+#, fuzzy
+msgid ""
+"Error running catastrophic recovery on hotcopy; the \n"
+"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
+"hotcopy algorithm. If the problem persists, try deactivating \n"
+"this feature in DB_CONFIG"
+msgstr ""
+"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
+"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
+"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
-#: include/svn_error_codes.h:168
-msgid "Bogus mime-type"
-msgstr "有问题的 mime-type"
+#: libsvn_fs_base/fs.c:1222
+msgid "Module for working with a Berkeley DB repository."
+msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
-#: include/svn_error_codes.h:174
-msgid "Version file format not correct"
-msgstr "ç‰ˆæœ¬æ–‡ä»¶æ ¼å¼ä¸æ£ç¡®"
+#: libsvn_fs_base/fs.c:1255
+#, c-format
+msgid "Unsupported FS loader version (%d) for bdb"
+msgstr "䏿”¯æŒçš„ bdb çš„ FS 载入器版本 (%d)"
-#: include/svn_error_codes.h:180
-msgid "No such XML tag attribute"
-msgstr "æ²¡æœ‰è¿™æ ·çš„ XML æ ‡ç¾å±žæ€§"
+#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#, c-format
+msgid "Cannot verify lock on path '%s'; no username available"
+msgstr "ä¸èƒ½åœ¨è·¯å¾„“%sâ€æ ¡éªŒé”;没有有效的用户å"
-#: include/svn_error_codes.h:184
-msgid "<delta-pkg> is missing ancestry"
-msgstr "<delta-pkg> 没有演进历程"
+#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#, c-format
+msgid "User %s does not own lock on path '%s' (currently locked by %s)"
+msgstr "用户 %s 䏿˜¯è·¯å¾„“%sâ€é”的所有者(当å‰ç”±ç”¨æˆ· %s é”定)"
-#: include/svn_error_codes.h:188
-msgid "Unrecognized binary data encoding; can't decode"
-msgstr "æ— æ³•è¾¨è¯†çš„äºŒè¿›åˆ¶æ•°æ®ç¼–ç ï¼šæ— æ³•è§£è¯‘"
+#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#, c-format
+msgid "Cannot verify lock on path '%s'; no matching lock-token available"
+msgstr "ä¸èƒ½æ ¡éªŒè·¯å¾„“%sâ€ä¸Šçš„é”;没有匹é…çš„å¯ç”¨é”æ ‡è¯†"
-#: include/svn_error_codes.h:192
-msgid "XML data was not well-formed"
-msgstr "XML 的数æ®ä¸åˆè¯æ³•"
+#. Helper macro that evaluates to an error message indicating that
+#. the representation referred to by X has an unknown node kind.
+#: libsvn_fs_base/reps-strings.c:57
+#, fuzzy, c-format
+msgid "Unknown node kind for representation '%s'"
+msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
-#: include/svn_error_codes.h:196
-msgid "Data cannot be safely XML-escaped"
-msgstr "XML æ•°æ®ä¸èƒ½æ£ç¡®åœ°è§£ç "
+#: libsvn_fs_base/reps-strings.c:108
+#, fuzzy
+msgid "Representation is not of type 'delta'"
+msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
-#: include/svn_error_codes.h:202
-msgid "Inconsistent line ending style"
-msgstr "ä¸ä¸€è‡´çš„è¡Œç»“æŸæ ·å¼"
+#: libsvn_fs_base/reps-strings.c:379
+msgid "Svndiff source length inconsistency"
+msgstr ""
-#: include/svn_error_codes.h:206
-msgid "Unrecognized line ending style"
-msgstr "æ— æ³•è¾¨è¯†çš„è¡Œç»“æŸæ ·å¼"
+#: libsvn_fs_base/reps-strings.c:506
+#, c-format
+msgid "Diff version inconsistencies in representation '%s'"
+msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
-#: include/svn_error_codes.h:211
-msgid "Line endings other than expected"
-msgstr "ä¸€è¡Œä»¥æ„æ–™ä¹‹å¤–的方å¼ç»“æŸ"
+#: libsvn_fs_base/reps-strings.c:532
+#, c-format
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to '%"
+"s'"
+msgstr ""
-#: include/svn_error_codes.h:215
-msgid "Ran out of unique names"
-msgstr "已用完ä¸é‡å¤çš„åç§°"
+#: libsvn_fs_base/reps-strings.c:780
+#, c-format
+msgid "Rep contents are too large: got %s, limit is %s"
+msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
-# as-is
-#: include/svn_error_codes.h:220
-msgid "Framing error in pipe protocol"
-msgstr "管é“å议帧错误"
+#: libsvn_fs_base/reps-strings.c:796
+#, fuzzy, c-format
+msgid "Failure reading rep '%s'"
+msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
-#: include/svn_error_codes.h:225
-msgid "Read error in pipe"
-msgstr "管é“å‘生读å–错误"
+#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch on rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+" 预期: %s\n"
+" 实际: %s\n"
-#: include/svn_error_codes.h:235
-msgid "Unexpected EOF on stream"
-msgstr "æµä¸æœ‰æ„料之外的结æŸç¬¦"
+#: libsvn_fs_base/reps-strings.c:912
+msgid "Null rep, but offset past zero already"
+msgstr "空的报告,å移已ç»è¶…过零值"
-#: include/svn_error_codes.h:239
-msgid "Malformed stream data"
-msgstr "ç•¸å½¢çš„æµæ•°æ®"
+#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
+#, fuzzy, c-format
+msgid "Rep '%s' is not mutable"
+msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
-#: include/svn_error_codes.h:243
-msgid "Unrecognized stream data"
-msgstr "æ— æ³•è¾¨è¯†çš„æµæ•°æ®"
+#: libsvn_fs_base/reps-strings.c:1040
+#, c-format
+msgid "Rep '%s' both mutable and non-fulltext"
+msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
-#: include/svn_error_codes.h:249
-msgid "Unknown svn_node_kind"
-msgstr "未知的 svn_node_kind"
+#: libsvn_fs_base/reps-strings.c:1340
+msgid "Failed to get new string key"
+msgstr "å–æ–°çš„å—符串关键å—失败"
-#: include/svn_error_codes.h:253
-msgid "Unexpected node kind found"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+#: libsvn_fs_base/reps-strings.c:1416
+#, c-format
+msgid "Attempt to deltify '%s' against itself"
+msgstr "ä¼å›¾ deltify “%s†自身"
-#: include/svn_error_codes.h:259
-msgid "Can't find an entry"
-msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªé¡¹ç›®"
+#: libsvn_fs_base/reps-strings.c:1487
+#, fuzzy, c-format
+msgid "Failed to calculate MD5 digest for '%s'"
+msgstr "计算“%sâ€çš„MD5指纹失败"
-#: include/svn_error_codes.h:265
-msgid "Entry already exists"
-msgstr "项目已å˜åœ¨"
+#: libsvn_fs_base/revs-txns.c:65
+#, fuzzy, c-format
+msgid "Transaction is not dead: '%s'"
+msgstr "事务未结æŸï¼šâ€œ%sâ€"
-#: include/svn_error_codes.h:269
-msgid "Entry has no revision"
-msgstr "项目没有修订版"
+#: libsvn_fs_base/revs-txns.c:68
+#, fuzzy, c-format
+msgid "Transaction is dead: '%s'"
+msgstr "事务已结æŸï¼šâ€œ%sâ€"
-#: include/svn_error_codes.h:273
-msgid "Entry has no URL"
-msgstr "项目没有地å€(URL)"
+#: libsvn_fs_base/revs-txns.c:981
+#, fuzzy
+msgid "Transaction aborted, but cleanup failed"
+msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
-#: include/svn_error_codes.h:277
-msgid "Entry has an invalid attribute"
-msgstr "é¡¹ç›®æœ‰æ— æ•ˆçš„å±žæ€§"
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT.
+#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
+#, fuzzy, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
-#: include/svn_error_codes.h:283
-msgid "Obstructed update"
-msgstr "塞ä½çš„æ›´æ–°"
+#: libsvn_fs_base/tree.c:393 libsvn_fs_fs/tree.c:317
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "文件找ä¸åˆ°ï¼šä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-# as-is
-#: include/svn_error_codes.h:288
-msgid "Mismatch popping the WC unwind stack"
-msgstr "ä¸åŒ¹é…的弹出工作拷è´(WC)å±•å¼€å †æ ˆ"
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
+#, fuzzy, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
-# as-is
-#: include/svn_error_codes.h:293
-msgid "Attempt to pop empty WC unwind stack"
-msgstr "å°è¯•弹出空的工作拷è´(WC)å±•å¼€å †æ ˆ"
+#: libsvn_fs_base/tree.c:408 libsvn_fs_fs/tree.c:338
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-# as-is
-#: include/svn_error_codes.h:298
-msgid "Attempt to unlock with non-empty unwind stack"
-msgstr "å°è¯•è§£é”éžç©ºå±•å¼€å †æ ˆ"
+#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
+#, fuzzy
+msgid "Root object must be a transaction root"
+msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
-#: include/svn_error_codes.h:302
-msgid "Attempted to lock an already-locked dir"
-msgstr "å°è¯•è¦é”定一个已é”定的目录"
+#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
+#, fuzzy, c-format
+msgid "Failure opening '%s'"
+msgstr "打开“%sâ€å¤±è´¥"
-#: include/svn_error_codes.h:306
-msgid "Working copy not locked; this is probably a bug, please report"
-msgstr "工作目录没有被é”定;这å¯èƒ½æ˜¯ä¸€ä¸ªæ¼æ´žï¼Œè¯·æŠ¥å‘Šå¼€å‘者"
+#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
+#, fuzzy
+msgid "Cannot compare property value between two different filesystems"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
-#: include/svn_error_codes.h:311
-msgid "Invalid lock"
-msgstr "æ— æ•ˆçš„é”定"
+#: libsvn_fs_base/tree.c:1735
+msgid "Corrupt DB: faulty predecessor count"
+msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
-#: include/svn_error_codes.h:315
-msgid "Path is not a working copy directory"
-msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
+#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
+#, fuzzy, c-format
+msgid "Unexpected immutable node at '%s'"
+msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
-#: include/svn_error_codes.h:319
-msgid "Path is not a working copy file"
-msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´æ–‡ä»¶"
+# as-is
+#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
+#, fuzzy, c-format
+msgid "Conflict at '%s'"
+msgstr "在“%sâ€å†²çª"
-#: include/svn_error_codes.h:323
-msgid "Problem running log"
-msgstr "æ— æ³•æ‰§è¡Œæ—¥å¿—"
+#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
+#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1751
+msgid "Bad merge; ancestor, source, and target not all in same fs"
+msgstr "错误的åˆå¹¶ï¼›æœ€åˆçš„ï¼ŒåŽŸå§‹ï¼Œç›®æ ‡ä¸æ˜¯å…¨éƒ¨åœ¨åŒä¸€ä¸ªæ–‡ä»¶ç³»ç»Ÿ(fs)"
-#: include/svn_error_codes.h:327
-msgid "Can't find a working copy path"
-msgstr "找ä¸åˆ°å·¥ä½œæ‹·è´è·¯å¾„"
+#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1280
+#, c-format
+msgid "Bad merge; target '%s' has id '%s', same as ancestor"
+msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
-#: include/svn_error_codes.h:331
-msgid "Working copy is not up-to-date"
-msgstr "å·¥ä½œæ‹·è´æœªæ›´æ–°è‡³æœ€æ–°ç‰ˆ"
+#: libsvn_fs_base/tree.c:2373
+#, fuzzy, c-format
+msgid "Transaction '%s' out of date with respect to revision '%s'"
+msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
-#: include/svn_error_codes.h:335
-msgid "Left locally modified or unversioned files"
-msgstr "ä¿ç•™æœ¬åœ°ä¿®æ”¹æˆ–未纳入版本管ç†çš„æ–‡ä»¶"
+#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
+#, fuzzy
+msgid "The root directory cannot be deleted"
+msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
-#: include/svn_error_codes.h:339
-msgid "Unmergeable scheduling requested on an entry"
-msgstr "è¯¥é¡¹ç›®æœ‰ä¸€ä¸ªæ— æ³•åˆå¹¶çš„调度请求"
+#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
+#, fuzzy, c-format
+msgid "Cannot copy between two different filesystems ('%s' and '%s')"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
-#: include/svn_error_codes.h:343
-msgid "Found a working copy path"
-msgstr "找到一个工作拷è´è·¯å¾„"
+#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
+msgid "Copy from mutable tree not currently supported"
+msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
-#: include/svn_error_codes.h:347
-msgid "A conflict in the working copy obstructs the current operation"
-msgstr "工作拷è´ä¸çš„冲çªé˜»ç¢äº†ç›®å‰çš„æ“ä½œ"
+#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
+#, fuzzy, c-format
+msgid ""
+"Base checksum mismatch on '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:351
-msgid "Working copy is corrupt"
-msgstr "工作拷è´å·²æŸå"
+#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
+#, fuzzy
+msgid "Cannot compare file contents between two different filesystems"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
-#: include/svn_error_codes.h:355
-msgid "Working copy text base is corrupt"
-msgstr "工作拷è´çš„æ–‡ä»¶å‚考基础已æŸå"
+#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
+#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
+#: libsvn_repos/rev_hunt.c:605
+#, fuzzy, c-format
+msgid "'%s' is not a file"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
-#: include/svn_error_codes.h:359
-msgid "Cannot change node kind"
-msgstr "æ— æ³•æ›´æ”¹èŠ‚ç‚¹ç§ç±»"
+#: libsvn_fs_fs/dag.c:367
+#, fuzzy
+msgid "Can't get entries of non-directory"
+msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
-#: include/svn_error_codes.h:363
-msgid "Invalid operation on the current working directory"
-msgstr "这个æ“作对目å‰çš„工作拷è´ç›®å½•æ— æ•ˆ"
+#: libsvn_fs_fs/dag.c:914
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, file '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:367
-msgid "Problem on first log entry in a working copy"
-msgstr "æ“作于工作拷è´çš„第一个日志项目时å‘生问题"
+#: libsvn_fs_fs/err.c:107
+#, fuzzy, c-format
+msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
-#: include/svn_error_codes.h:371
-msgid "Unsupported working copy format"
-msgstr "䏿”¯æŒçš„å·¥ä½œæ‹·è´æ ¼å¼"
+#: libsvn_fs_fs/fs.c:97
+#, c-format
+msgid "Can't fetch FSFS mutex"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:375
-msgid "Path syntax not supported in this context"
-msgstr "è·¯å¾„è¯æ³•在æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸æ”¯æŒ"
+#: libsvn_fs_fs/fs.c:104
+#, fuzzy, c-format
+msgid "Can't create FSFS mutex"
+msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:380
-msgid "Invalid schedule"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+#: libsvn_fs_fs/fs.c:108
+#, c-format
+msgid "Can't store FSFS mutex"
+msgstr "ä¸èƒ½å˜å‚¨æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:386
-msgid "General filesystem error"
-msgstr "一般性文件系统错误"
+#: libsvn_fs_fs/fs.c:334
+msgid "Module for working with a plain file (FSFS) repository."
+msgstr "模å—与纯文本文件(FSFS)档案库一起工作。"
-#: include/svn_error_codes.h:390
-msgid "Error closing filesystem"
-msgstr "关闿–‡ä»¶ç³»ç»Ÿå‘生错误"
+#: libsvn_fs_fs/fs.c:367
+#, c-format
+msgid "Unsupported FS loader version (%d) for fsfs"
+msgstr "䏿”¯æŒçš„ fsfs çš„ FS 载入器版本 (%d)"
-#: include/svn_error_codes.h:394
-msgid "Filesystem is already open"
-msgstr "文件系统已打开"
+#: libsvn_fs_fs/fs_fs.c:475 libsvn_fs_fs/fs_fs.c:489
+msgid "Found malformed header in revision file"
+msgstr "åœ¨ä¿®è®¢ç‰ˆæ–‡ä»¶ä¸æ‰¾åˆ°ç•¸å½¢çš„æ–‡ä»¶å¤´"
-#: include/svn_error_codes.h:398
-msgid "Filesystem is not open"
-msgstr "文件系档未打开"
+#: libsvn_fs_fs/fs_fs.c:591 libsvn_fs_fs/fs_fs.c:605 libsvn_fs_fs/fs_fs.c:612
+#: libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627 libsvn_fs_fs/fs_fs.c:635
+msgid "Malformed text rep offset line in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
-#: include/svn_error_codes.h:402
-msgid "Filesystem is corrupt"
-msgstr "文件系统æŸå"
+#: libsvn_fs_fs/fs_fs.c:704
+msgid "Missing kind field in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ kind æ ä½"
-#: include/svn_error_codes.h:406
-msgid "Invalid filesystem path syntax"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿè·¯å¾„è¯æ³•"
+#: libsvn_fs_fs/fs_fs.c:735
+msgid "Missing cpath in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ cpath"
-#: include/svn_error_codes.h:410
-msgid "Invalid filesystem revision number"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆå·"
+#: libsvn_fs_fs/fs_fs.c:762 libsvn_fs_fs/fs_fs.c:768
+msgid "Malformed copyroot line in node-rev"
+msgstr "node-rev ä¸çš„ copyroot 行畸形"
-#: include/svn_error_codes.h:414
-msgid "Invalid filesystem transaction name"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿäº‹åŠ¡åç§°"
+#: libsvn_fs_fs/fs_fs.c:786 libsvn_fs_fs/fs_fs.c:792
+msgid "Malformed copyfrom line in node-rev"
+msgstr "node-rev ä¸çš„ copyfrom 行畸形"
-#: include/svn_error_codes.h:418
-msgid "Filesystem directory has no such entry"
-msgstr "æ–‡ä»¶ç³»ç»Ÿç›®å½•æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®"
+#: libsvn_fs_fs/fs_fs.c:891 libsvn_fs_fs/fs_fs.c:3252
+msgid "Attempted to write to non-transaction"
+msgstr "ä¼å›¾å†™è‡³éžäº‹åŠ¡"
-#: include/svn_error_codes.h:422
-msgid "Filesystem has no such representation"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
+#: libsvn_fs_fs/fs_fs.c:975
+msgid "Malformed representation header"
+msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
-#: include/svn_error_codes.h:426
-msgid "Filesystem has no such string"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„å—串"
+#: libsvn_fs_fs/fs_fs.c:999
+msgid "Missing node-id in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ node-id"
-#: include/svn_error_codes.h:430
-msgid "Filesystem has no such copy"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„æ‹·è´"
+#: libsvn_fs_fs/fs_fs.c:1005
+msgid "Corrupt node-id in node-rev"
+msgstr "node-rev ä¸çš„ node-id æŸå"
-#: include/svn_error_codes.h:434
-msgid "The specified transaction is not mutable"
-msgstr "指定的事务ä¸å¯æ”¹å˜"
+#: libsvn_fs_fs/fs_fs.c:1050
+#, c-format
+msgid "Revision file lacks trailing newline"
+msgstr "修订版文件缺少结尾æ¢è¡Œç¬¦"
-#: include/svn_error_codes.h:438
-msgid "Filesystem has no item"
-msgstr "文件系统没有项目"
+#: libsvn_fs_fs/fs_fs.c:1062
+#, c-format
+msgid "Final line in revision file longer than 64 characters"
+msgstr "修订版文件的最åŽä¸€åˆ—大于 64 个å—符长"
-#: include/svn_error_codes.h:442
-msgid "Filesystem has no such node-rev-id"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„ node-rev-id"
+#: libsvn_fs_fs/fs_fs.c:1077
+msgid "Final line in revision file missing space"
+msgstr "修订版文件的最åŽä¸€åˆ—少掉空白å—符"
-#: include/svn_error_codes.h:446
-msgid "String does not represent a node or node-rev-id"
-msgstr "å—串并未表示一个节点或 node-rev-id"
+#: libsvn_fs_fs/fs_fs.c:1106 libsvn_fs_fs/fs_fs.c:1164 libsvn_repos/log.c:514
+#: libsvn_repos/log.c:518
+#, c-format
+msgid "No such revision %ld"
+msgstr "没有这个修订版 %ld"
-#: include/svn_error_codes.h:450
-msgid "Name does not refer to a filesystem directory"
-msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿç›®å½•"
+#: libsvn_fs_fs/fs_fs.c:1224
+msgid "Malformed svndiff data in representation"
+msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
-#: include/svn_error_codes.h:454
-msgid "Name does not refer to a filesystem file"
-msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿæ–‡ä»¶"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:1367 libsvn_fs_fs/fs_fs.c:1380
+msgid "Reading one svndiff window read beyond the end of the representation"
+msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
-#: include/svn_error_codes.h:458
-msgid "Name is not a single path component"
-msgstr "åç§°ä¸æ˜¯ä¸€ä¸ªå•一路径"
+#: libsvn_fs_fs/fs_fs.c:1516
+msgid "svndiff data requested non-existent source"
+msgstr "svndiff æ•°æ®è¯·æ±‚ä¸å˜åœ¨çš„æ¥æº"
-#: include/svn_error_codes.h:462
-msgid "Attempt to change immutable filesystem node"
-msgstr "å°è¯•è¦ä¿®æ”¹ä¸å¯æ”¹å˜çš„æ–‡ä»¶ç³»ç»ŸèŠ‚ç‚¹"
+#: libsvn_fs_fs/fs_fs.c:1522
+msgid "svndiff requested position beyond end of stream"
+msgstr "svndiff 请求的ä½ç½®è¶…出了æµçš„结尾"
-#: include/svn_error_codes.h:466
-msgid "Item already exists in filesystem"
-msgstr "该项目已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿä¸"
+#: libsvn_fs_fs/fs_fs.c:1545 libsvn_fs_fs/fs_fs.c:1562
+msgid "svndiff window length is corrupt"
+msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
-#: include/svn_error_codes.h:470
-msgid "Attempt to remove or recreate fs root dir"
-msgstr "å°è¯•è¦ç§»é™¤æˆ–冿¬¡å»ºç«‹æ–‡ä»¶ç³»ç»Ÿçš„æ ¹ç›®å½•"
+#: libsvn_fs_fs/fs_fs.c:1610
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch while reading representation:\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+" 预期: %s\n"
+" 实际: %s\n"
-#: include/svn_error_codes.h:474
-msgid "Object is not a transaction root"
-msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹ç‰©ä»¶"
+#: libsvn_fs_fs/fs_fs.c:1833 libsvn_fs_fs/fs_fs.c:1846
+#: libsvn_fs_fs/fs_fs.c:1852
+msgid "Directory entry corrupt"
+msgstr "目录æ¡ç›®æŸå"
-#: include/svn_error_codes.h:478
-msgid "Object is not a revision root"
-msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªä¿®è®¢ç‰ˆçš„æ ¹ç‰©ä»¶"
+#: libsvn_fs_fs/fs_fs.c:2191 libsvn_fs_fs/fs_fs.c:2199
+#: libsvn_fs_fs/fs_fs.c:2231 libsvn_fs_fs/fs_fs.c:2251
+#: libsvn_fs_fs/fs_fs.c:2285 libsvn_fs_fs/fs_fs.c:2290
+msgid "Invalid changes line in rev-file"
+msgstr "rev-file 䏿œ‰æ— æ•ˆçš„å˜æ›´è¡Œ"
-#: include/svn_error_codes.h:482
-msgid "Merge conflict during commit"
-msgstr "æäº¤æ—¶å‘生åˆå¹¶å†²çª"
+#: libsvn_fs_fs/fs_fs.c:2224
+msgid "Invalid change kind in rev file"
+msgstr "rev æ–‡ä»¶ä¸æœ‰æ— 效的改å˜ç§ç±»"
-# as-is
-#: include/svn_error_codes.h:486
-msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改å˜"
+#: libsvn_fs_fs/fs_fs.c:2244
+msgid "Invalid text-mod flag in rev-file"
+msgstr "rev-file 䏿œ‰æ— 效的 text-mod æ ‡å¿—"
-#: include/svn_error_codes.h:490
-msgid "Tried to change an immutable representation"
-msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
+#: libsvn_fs_fs/fs_fs.c:2264
+msgid "Invalid prop-mod flag in rev-file"
+msgstr "rev-file 䏿œ‰æ— 效的 prop-mod æ ‡å¿—"
-#: include/svn_error_codes.h:494
-msgid "Malformed skeleton data"
-msgstr "畸形的框架数æ®"
+#: libsvn_fs_fs/fs_fs.c:2447
+msgid "Copying from transactions not allowed"
+msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
-#: include/svn_error_codes.h:498
-msgid "Transaction is out of date"
-msgstr "事务已过时"
+#: libsvn_fs_fs/fs_fs.c:2503
+#, fuzzy, c-format
+msgid "Unable to create transaction directory in '%s' for revision %ld"
+msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
-#: include/svn_error_codes.h:502
-msgid "Berkeley DB error"
-msgstr "Berkeley DB 错误"
+#: libsvn_fs_fs/fs_fs.c:2680 libsvn_fs_fs/fs_fs.c:2687
+msgid "next-id file corrupt"
+msgstr "next-id 文件æŸå"
-#: include/svn_error_codes.h:506
-msgid "Berkeley DB deadlock error"
-msgstr "Berkeley DB å‘生æ»é”错误"
+#: libsvn_fs_fs/fs_fs.c:2772
+#, fuzzy
+msgid "Transaction cleanup failed"
+msgstr "事务清除失败"
-#: include/svn_error_codes.h:510
-msgid "Transaction is dead"
-msgstr "事务已结æŸ"
+#: libsvn_fs_fs/fs_fs.c:2940
+msgid "Invalid change type"
+msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
-#: include/svn_error_codes.h:514
-msgid "Transaction is not dead"
-msgstr "事务未结æŸ"
+#: libsvn_fs_fs/fs_fs.c:3271
+msgid "Can't set text contents of a directory"
+msgstr "æ— æ³•è®¾å®šç›®å½•çš„æ–‡å—内容"
-#: include/svn_error_codes.h:519
-msgid "Unknown FS type"
-msgstr "未知的 FS 类别"
+#: libsvn_fs_fs/fs_fs.c:3361 libsvn_fs_fs/fs_fs.c:3366
+#: libsvn_fs_fs/fs_fs.c:3373
+msgid "Corrupt current file"
+msgstr "当剿–‡ä»¶æŸå"
-#: include/svn_error_codes.h:524
-#, fuzzy
-msgid "No user associated with filesystem"
-msgstr "没有用户与文件系统关è”"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:3663 libsvn_subr/io.c:2662 svn/util.c:236
+#: svn/util.c:260
+#, c-format
+msgid "Can't stat '%s'"
+msgstr "ä¸èƒ½å–得“%sâ€çжæ€"
-#: include/svn_error_codes.h:529
-#, fuzzy
-msgid "Path is already locked"
-msgstr "路径“%sâ€å·²ç»è¢«é”定"
+#: libsvn_fs_fs/fs_fs.c:3667
+#, c-format
+msgid "Can't chmod '%s'"
+msgstr "æ— æ³• chmod“%sâ€"
-#: include/svn_error_codes.h:534 include/svn_error_codes.h:661
-#, fuzzy
-msgid "Path is not locked"
-msgstr "路径没有被é”定"
+#: libsvn_fs_fs/fs_fs.c:3806
+#, c-format
+msgid "Can't grab FSFS repository mutex"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶(FSFS)档案库互斥体"
-#: include/svn_error_codes.h:539
-msgid "Lock token is incorrect"
-msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
+#: libsvn_fs_fs/fs_fs.c:3820
+#, c-format
+msgid "Can't ungrab FSFS repository mutex"
+msgstr "ä¸èƒ½æ˜¯å¦æ–‡ä»¶(FSFS)档案库互斥体"
-#: include/svn_error_codes.h:544
-#, fuzzy
-msgid "No lock token provided"
-msgstr "没有æä¾›é”å®šæ ‡è®°"
+#: libsvn_fs_fs/fs_fs.c:3937
+msgid "Transaction out of date"
+msgstr "事务过时"
-#: include/svn_error_codes.h:549
-msgid "Username does not match lock owner"
-msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
+#: libsvn_fs_fs/fs_fs.c:4234
+msgid "No such transaction"
+msgstr "æ— æ¤äº‹åŠ¡"
-#: include/svn_error_codes.h:554
-#, fuzzy
-msgid "Filesystem has no such lock"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
+#: libsvn_fs_fs/lock.c:230
+#, fuzzy, c-format
+msgid "Cannot write lock/entries hashfile '%s'"
+msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
-#: include/svn_error_codes.h:559
-msgid "Lock has expired"
-msgstr "é”过期"
+#: libsvn_fs_fs/lock.c:286
+#, fuzzy, c-format
+msgid "Can't parse lock/entries hashfile '%s'"
+msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
-#: include/svn_error_codes.h:564
-#, fuzzy
-msgid "Item is out of date"
-msgstr "æ¡ç›®å·²è¿‡æ—¶"
+#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
-#: include/svn_error_codes.h:576
-#, fuzzy
-msgid "Unsupported FS format"
-msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
+#: libsvn_fs_fs/lock.c:741
+#, c-format
+msgid "Lock failed: newer version of '%s' exists"
+msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
-#: include/svn_error_codes.h:582
-msgid "The repository is locked, perhaps for db recovery"
-msgstr "档案库被é”定,也许æ£åœ¨ä½œæ•°æ®åº“ä¿®å¤"
+#: libsvn_ra/ra_loader.c:213
+#, fuzzy, c-format
+msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
-#: include/svn_error_codes.h:586
-msgid "A repository hook failed"
-msgstr "档案库外挂错误"
+#: libsvn_ra/ra_loader.c:285
+#, fuzzy, c-format
+msgid "Unrecognized URL scheme for '%s'"
+msgstr ""
+"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%sâ€"
-#: include/svn_error_codes.h:590
-msgid "Incorrect arguments supplied"
-msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+#: libsvn_ra/ra_loader.c:336
+#, fuzzy, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr ""
+"“%sâ€\n"
+"与\n"
+"“%sâ€\n"
+"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
-#: include/svn_error_codes.h:594
-msgid "A report cannot be generated because no data was supplied"
-msgstr "æ— æ³•äº§ç”ŸæŠ¥å‘Šï¼Œå› ä¸ºæ²¡æœ‰æä¾›ä»»ä½•æ•°æ®"
+# as-is
+#: libsvn_ra/ra_loader.c:707
+#, fuzzy, c-format
+msgid " - handles '%s' scheme\n"
+msgstr " - 处ç†â€œ%sâ€è§„则\n"
-#: include/svn_error_codes.h:598
-msgid "Bogus revision report"
-msgstr "有问题的修订版报告"
+#: libsvn_ra/ra_loader.c:793
+#, c-format
+msgid "Unrecognized URL scheme '%s'"
+msgstr ""
+"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%sâ€"
-#: include/svn_error_codes.h:607
-msgid "Unsupported repository version"
-msgstr "䏿”¯æŒçš„æ¡£æ¡ˆåº“版本"
+#: libsvn_ra_dav/commit.c:199
+#, c-format
+msgid "Could not create a request (%s '%s')"
+msgstr "æ— æ³•å»ºç«‹è¯·æ±‚ (%s“%sâ€)"
-#: include/svn_error_codes.h:611
-msgid "Disabled repository feature"
-msgstr "å…³é—了的档案库功能"
+#: libsvn_ra_dav/commit.c:298
+msgid ""
+"Could not fetch the Version Resource URL (needed during an import or when it "
+"is missing from the local, cached props)"
+msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
-#: include/svn_error_codes.h:615
-msgid "Error running post-commit hook"
-msgstr "执行 post-commit 外挂时å‘生错误"
+#: libsvn_ra_dav/commit.c:487
+#, fuzzy, c-format
+msgid "Could not create a CHECKOUT request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
-#: include/svn_error_codes.h:620
-#, fuzzy
-msgid "Error running post-lock hook"
-msgstr "执行 post-lock 外挂时å‘生错误"
+#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
+#: libsvn_ra_serf/commit.c:436
+#, fuzzy, c-format
+msgid "Your file or directory '%s' is probably out-of-date"
+msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
-#: include/svn_error_codes.h:625
-#, fuzzy
-msgid "Error running post-unlock hook"
-msgstr "执行 post-unlock 外挂时å‘生错误"
+#: libsvn_ra_dav/commit.c:582
+msgid "The CHECKOUT response did not contain a 'Location:' header"
+msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
-#: include/svn_error_codes.h:632
-msgid "Bad URL passed to RA layer"
-msgstr "ä¼ é€’è‡³ RA 层的地å€(URL)有问题"
+#: libsvn_ra_dav/commit.c:881
+#, fuzzy, c-format
+msgid "Could not create a DELETE request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
-#: include/svn_error_codes.h:636
-msgid "Authorization failed"
-msgstr "授æƒå¤±è´¥"
+#: libsvn_ra_dav/commit.c:1169 libsvn_ra_serf/commit.c:1395
+#, c-format
+msgid "File '%s' already exists"
+msgstr "文件“%sâ€å·²å˜åœ¨"
-#: include/svn_error_codes.h:640
-msgid "Unknown authorization method"
-msgstr "æœªçŸ¥çš„æŽˆæƒæ–¹æ³•"
+#: libsvn_ra_dav/commit.c:1307
+#, c-format
+msgid "Could not write svndiff to temp file"
+msgstr "æ— æ³•å†™ svndiff 至临时文件"
-#: include/svn_error_codes.h:644
-msgid "Repository access method not implemented"
-msgstr "该档案库å˜å–方法未实作"
+#: libsvn_ra_dav/commit.c:1397
+#, c-format
+msgid "Could not create a PUT request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåŠ å…¥(PUT)请求 (%s)"
-#: include/svn_error_codes.h:648
-msgid "Item is out-of-date"
-msgstr "项目已过时"
+#: libsvn_ra_dav/commit.c:1559
+#, c-format
+msgid "applying log message to %s"
+msgstr "应用日志信æ¯è‡³â€œ%sâ€"
-#: include/svn_error_codes.h:652
-msgid "Repository has no UUID"
-msgstr "档案库没有 UUID"
+#: libsvn_ra_dav/fetch.c:285
+msgid "Could not save the URL of the version resource"
+msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
-#: include/svn_error_codes.h:656
-msgid "Unsupported RA plugin ABI version"
-msgstr "䏿”¯æŒçš„ RA 外挂 ABI 版本"
+#: libsvn_ra_dav/fetch.c:406
+#, fuzzy, c-format
+msgid "Could not get content-type from response"
+msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
-#: include/svn_error_codes.h:668
-msgid "RA layer failed to init socket layer"
-msgstr "RA å±‚æ— æ³•èµ·å§‹ socket 层"
+#: libsvn_ra_dav/fetch.c:451
+#, c-format
+msgid "Could not create a GET request for '%s'"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€åˆ›å»º GET 请求"
-#: include/svn_error_codes.h:672
-msgid "RA layer failed to create HTTP request"
-msgstr "RA 层建立 HTTP 请求失败"
+#: libsvn_ra_dav/fetch.c:526
+#, c-format
+msgid "GET request failed for '%s'"
+msgstr "对“%sâ€çš„ GET 请求失败"
-#: include/svn_error_codes.h:676
-msgid "RA layer request failed"
-msgstr "RA 层请求失败"
+#: libsvn_ra_dav/fetch.c:665
+msgid "Could not save file"
+msgstr "æ— æ³•å‚¨å˜æ–‡ä»¶"
-#: include/svn_error_codes.h:680
-msgid "RA layer didn't receive requested OPTIONS info"
-msgstr "RA å±‚æ— æ³•å–得请求的 OPTIONS ä¿¡æ¯"
+#: libsvn_ra_dav/fetch.c:906 libsvn_ra_svn/client.c:900
+#, c-format
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:684
-msgid "RA layer failed to fetch properties"
-msgstr "RA å±‚æ— æ³•å–得属性"
+#: libsvn_ra_dav/fetch.c:1151
+msgid "Server response missing the expected deadprop-count property"
+msgstr ""
-#: include/svn_error_codes.h:688
-msgid "RA layer file already exists"
-msgstr "RA 层文件已å˜åœ¨"
+#: libsvn_ra_dav/fetch.c:1324
+msgid "Server does not support date-based operations"
+msgstr "æœåС噍䏿”¯æŒåŸºäºŽæ—¥æœŸçš„æ“ä½œ"
-#: include/svn_error_codes.h:692
-msgid "Invalid configuration value"
-msgstr "æ— æ•ˆçš„é…置值"
+#: libsvn_ra_dav/fetch.c:1331
+msgid "Invalid server response to dated-rev request"
+msgstr "对 dated-rev è¯·æ±‚çš„æ— æ•ˆæœåŠ¡å™¨å›žåº”"
-#: include/svn_error_codes.h:696
-msgid "HTTP Path Not Found"
-msgstr "找ä¸åˆ° HTTP 路径"
+# as-is
+#: libsvn_ra_dav/fetch.c:1470
+#, fuzzy
+msgid "'get-locations' REPORT not implemented"
+msgstr "get-locations REPORT 未实现"
-#: include/svn_error_codes.h:700
+#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
+#: libsvn_ra_dav/session.c:1474
#, fuzzy
-msgid "Failed to execute WebDAV PROPPATCH"
-msgstr "执行 WebDAV PROPPATCH 失败"
+msgid "Incomplete lock data returned"
+msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
-#: include/svn_error_codes.h:705 include/svn_error_codes.h:741
-#: libsvn_ra_svn/marshal.c:600 libsvn_ra_svn/marshal.c:708
-#: libsvn_ra_svn/marshal.c:735
-msgid "Malformed network data"
-msgstr "畸形的网络数æ®"
+#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
+#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
+#, fuzzy
+msgid "Server does not support locking features"
+msgstr "æœåС噍䏿”¯æŒé”定特性"
-#: include/svn_error_codes.h:710
-msgid "Unable to extract data from response header"
-msgstr "ä¸èƒ½ä»Žå›žåº”的头信æ¯ä¸èŽ·å–æ•°æ®"
+#: libsvn_ra_dav/fetch.c:1908
+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 外挂执行失败;或是ä¸å˜åœ¨"
-#: include/svn_error_codes.h:716 include/svn_error_codes.h:745
-msgid "Couldn't find a repository"
-msgstr "æ— æ³•æ‰¾åˆ°æ¡£æ¡ˆåº“"
+#: libsvn_ra_dav/fetch.c:2643
+#, c-format
+msgid "Error writing to '%s': unexpected EOF"
+msgstr "写入“%sâ€æ—¶å‘生错误:æ„外的 EOF"
-#: include/svn_error_codes.h:720
-msgid "Couldn't open a repository"
-msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“"
+#: libsvn_ra_dav/fetch.c:2788
+#, c-format
+msgid "Unknown XML encoding: '%s'"
+msgstr "未知的 XML ç¼–ç :“%sâ€"
# as-is
-#: include/svn_error_codes.h:725
-msgid "Special code for wrapping server errors to report to client"
-msgstr "指定的代ç å°è£…æœåŠ¡å™¨é”™è¯¯ä»¥ä¾¿æŠ¥å‘Šå®¢æˆ·ç«¯"
-
-#: include/svn_error_codes.h:729
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 通讯å定命令"
-
-#: include/svn_error_codes.h:733
-msgid "Network connection closed unexpectedly"
-msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
-
-#: include/svn_error_codes.h:737
-msgid "Network read/write error"
-msgstr "网络读写错误"
+#: libsvn_ra_dav/fetch.c:3075
+#, c-format
+msgid "REPORT response handling failed to complete the editor drive"
+msgstr "报告å“应处ç†å¤±è´¥ä¸èƒ½å®Œæˆç¼–辑驱动"
-#: include/svn_error_codes.h:749
-msgid "Client/server version mismatch"
-msgstr "客户端/æœåŠ¡å™¨ç‰ˆæœ¬ä¸åŒ¹é…"
+# as-is
+#: libsvn_ra_dav/file_revs.c:363
+#, fuzzy
+msgid "'get-file-revs' REPORT not implemented"
+msgstr "get-file-revs REPORT 未实现"
-#: include/svn_error_codes.h:757
-msgid "Credential data unavailable"
-msgstr "æ— æ³•å–å¾—å‡è¯æ•°æ®"
+#: libsvn_ra_dav/file_revs.c:379
+msgid "The file-revs report didn't contain any revisions"
+msgstr "file-revs æŠ¥å‘Šä¸æ²¡æœ‰ä»»ä½•修订版"
-#: include/svn_error_codes.h:761
-msgid "No authentication provider available"
-msgstr "æ— å¯ç”¨çš„è®¤è¯æä¾›è€…"
+#: libsvn_ra_dav/merge.c:220
+#, c-format
+msgid ""
+"Protocol error: we told the server not to auto-merge any resources, but it "
+"said that '%s' was merged"
+msgstr ""
+"通讯å定错误:我们告知æœåС噍ä¸è¦è‡ªåЍåˆå¹¶ä»»ä½•资æºï¼Œä½†æ˜¯å®ƒæŠ¥å‘Šâ€œ%sâ€å·²è¢«åˆå¹¶"
-#: include/svn_error_codes.h:765 include/svn_error_codes.h:769
-msgid "All authentication providers exhausted"
-msgstr "æ‰€æœ‰çš„è®¤è¯æä¾›è€…å·²è€—å°½"
+#: libsvn_ra_dav/merge.c:229
+#, c-format
+msgid ""
+"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
+"element within the MERGE response"
+msgstr "内部错误:在 MERGE 回应ä¸ï¼Œâ€œDAV:responseâ€å…ƒç´ 有个未知的父项目 (%d)"
-#: include/svn_error_codes.h:775
-msgid "Read access denied for root of edit"
-msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
+#: libsvn_ra_dav/merge.c:244
+#, 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 回应并未返回所有我们请求的属性 (è¿™äº›æ˜¯å®Œæˆæäº¤æ“"
+"作所ä¸å¯ç¼ºå°‘çš„)"
-#: include/svn_error_codes.h:780
-#, fuzzy
-msgid "Item is not readable"
-msgstr "项目ä¸èƒ½è¯»ã€‚"
+#: libsvn_ra_dav/merge.c:263
+#, c-format
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr "对“%sâ€çš„ MERGE å›žåº”å¹¶ä¸æ˜¯ç›®æ ‡ (“%sâ€) çš„å项目"
-#: include/svn_error_codes.h:785
-#, fuzzy
-msgid "Item is partially readable"
-msgstr "项目部分å¯è¯»ã€‚"
+#: libsvn_ra_dav/merge.c:485
+msgid "The MERGE property response had an error status"
+msgstr "MERGE 属性回应包å«é”™è¯¯çжæ€"
-#: include/svn_error_codes.h:789
-#, fuzzy
-msgid "Invalid authz configuration"
-msgstr "æ— æ•ˆçš„é…置值"
+#: libsvn_ra_dav/options.c:130
+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"
-#: include/svn_error_codes.h:794
-#, fuzzy
-msgid "Item is not writable"
-msgstr "项目ä¸èƒ½å†™ã€‚"
+#: libsvn_ra_dav/props.c:588
+#, c-format
+msgid "Failed to find label '%s' for URL '%s'"
+msgstr "æ— æ³•æ‰¾åˆ°æ ‡è®°â€œ%sâ€äºŽåœ°å€(URL)“%sâ€"
-#: include/svn_error_codes.h:800
-msgid "Svndiff data has invalid header"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+#: libsvn_ra_dav/props.c:617
+#, c-format
+msgid "'%s' was not present on the resource"
+msgstr "“%sâ€ä¸å˜åœ¨äºŽæœ¬èµ„æºä¸Š"
-# as-is
-#: include/svn_error_codes.h:804
-msgid "Svndiff data contains corrupt window"
-msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+#: libsvn_ra_dav/props.c:656
+#, c-format
+msgid "Neon was unable to parse URL '%s'"
+msgstr "Neon ä¸èƒ½åˆ†æžåœ°å€(URL)â€%s“"
-# as-is
-#: include/svn_error_codes.h:808
-msgid "Svndiff data contains backward-sliding source view"
-msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+#: libsvn_ra_dav/props.c:685
+msgid "The path was not part of a repository"
+msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
-#: include/svn_error_codes.h:812
-msgid "Svndiff data contains invalid instruction"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的指令"
+#: libsvn_ra_dav/props.c:696
+#, c-format
+msgid "No part of path '%s' was found in repository HEAD"
+msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
-#: include/svn_error_codes.h:816
-msgid "Svndiff data ends unexpectedly"
-msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
+msgid "The VCC property was not found on the resource"
+msgstr "æœ¬èµ„æºæ‰¾ä¸åˆ° VCC 属性"
-#: include/svn_error_codes.h:822
-msgid "Apache has no path to an SVN filesystem"
-msgstr "Apache æ²¡æœ‰æŒ‡å‘ SVN 文件系统的路径"
+#: libsvn_ra_dav/props.c:798
+msgid "The relative-path property was not found on the resource"
+msgstr "本资æºä¸Šæ‰¾ä¸åˆ°ç›¸å¯¹è·¯å¾„属性"
-#: include/svn_error_codes.h:826
-msgid "Apache got a malformed URI"
-msgstr "Apache 得到一个畸形的 URI"
+#: libsvn_ra_dav/props.c:919
+msgid "'DAV:baseline-collection' was not present on the baseline resource"
+msgstr "'DAV:baseline-collection' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
-# as-is
-#: include/svn_error_codes.h:830
-msgid "Activity not found"
-msgstr "没有找到活动项"
+#: libsvn_ra_dav/props.c:938
+msgid "'DAV:version-name' was not present on the baseline resource"
+msgstr "'DAV:version-name' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
-#: include/svn_error_codes.h:834
-msgid "Baseline incorrect"
-msgstr "åŸºçº¿ä¸æ£ç¡®"
+#: libsvn_ra_dav/props.c:1106 libsvn_ra_serf/commit.c:719
+msgid "At least one property change failed; repository is unchanged"
+msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
-#: include/svn_error_codes.h:838
-msgid "Input/output error"
-msgstr "输出入错误"
+#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
+#, fuzzy
+msgid "Missing revision attr in target-revision element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: include/svn_error_codes.h:844
-msgid "A path under version control is needed for this operation"
-msgstr "本æ“作仅能作用于纳入版本控制的路径"
+#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
+#, fuzzy
+msgid "Missing revision attr in open-root element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: include/svn_error_codes.h:848
-msgid "Repository access is needed for this operation"
-msgstr "本æ“作需è¦å¯¹æ¡£æ¡ˆåº“进行å˜å–"
+#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
+msgid "Missing name attr in delete-entry element"
+msgstr ""
-#: include/svn_error_codes.h:852
-msgid "Bogus revision information given"
-msgstr "使用了有问题的修订版信æ¯"
+#: libsvn_ra_dav/replay.c:176
+msgid "Missing rev attr in delete-entry element"
+msgstr ""
-#: include/svn_error_codes.h:856
-msgid "Attempting to commit to a URL more than once"
-msgstr "å°è¯•对地å€(URL)进行一次以上的æäº¤"
+#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
+#, fuzzy
+msgid "Missing name attr in open-directory element"
+msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: include/svn_error_codes.h:860
-msgid "Operation does not apply to binary file"
-msgstr "本æ“作ä¸é€‚用于二进制文件"
+#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
+#: libsvn_ra_serf/replay.c:371
+#, fuzzy, c-format
+msgid "Missing name attr in %s element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: include/svn_error_codes.h:866
-msgid "Format of an svn:externals property was invalid"
-msgstr "svn:externals å±žæ€§çš„æ ¼å¼æ˜¯æ— 效的"
+#: libsvn_ra_dav/replay.c:288
+msgid "Got apply-textdelta element without preceding add-file or open-file"
+msgstr ""
-#: include/svn_error_codes.h:870
-msgid "Attempting restricted operation for modified resource"
-msgstr "å°è¯•对已修改的资æºè¿›è¡Œå—é™çš„æ“ä½œ"
+#: libsvn_ra_dav/replay.c:314
+msgid "Got close-file element without preceding add-file or open-file"
+msgstr ""
-#: include/svn_error_codes.h:874
-msgid "Operation does not apply to directory"
-msgstr "本æ“作ä¸é€‚用于目录"
+#: libsvn_ra_dav/replay.c:329
+msgid "Got close-directory element without ever opening a directory"
+msgstr ""
-#: include/svn_error_codes.h:878
-msgid "Revision range is not allowed"
-msgstr "ä¸å…许的修订版范围"
+#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
+#, fuzzy, c-format
+msgid "Error writing stream: unexpected EOF"
+msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
-#: include/svn_error_codes.h:882
-msgid "Inter-repository relocation not allowed"
-msgstr "䏿”¯æŒä¸åŒæ¡£æ¡ˆåº“ä¹‹é—´çš„é‡æ–°å®‰ç½® (relocation)"
+#: libsvn_ra_dav/replay.c:463
+#, c-format
+msgid "Got cdata content for a prop delete"
+msgstr ""
-#: include/svn_error_codes.h:886
-msgid "Author name cannot contain a newline"
-msgstr "作者åç§°ä¸å¯åŒ…嫿¢è¡Œç¬¦"
+#: libsvn_ra_dav/session.c:444
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr "æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)通信端å£ç¼–å·ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: include/svn_error_codes.h:890
-msgid "Bad property name"
-msgstr "有问题的属性åç§°"
+#: libsvn_ra_dav/session.c:448
+msgid "Invalid URL: negative proxy port number"
+msgstr "æ— æ•ˆçš„åœ°å€(URL):负的代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼"
-#: include/svn_error_codes.h:895
-msgid "Two versioned resources are unrelated"
-msgstr "ä¸¤ä¸ªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„èµ„æºæ²¡æœ‰ç›¸å…³æ€§"
+#: libsvn_ra_dav/session.c:451
+msgid ""
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+"æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼å¤§äºŽæœ€å¤§å€¼çš„ TCP é€šä¿¡ç«¯å£æ•°å€¼ 65535"
-#: include/svn_error_codes.h:900
-msgid "Path has no lock token"
-msgstr "路径没有é”å®šæ ‡è®°"
+#: libsvn_ra_dav/session.c:465
+msgid "Invalid config: illegal character in timeout value"
+msgstr "æ— æ•ˆçš„é…ç½®ï¼šè¶…æ—¶æ•°å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: include/svn_error_codes.h:906
-msgid "A problem occurred; see later errors for details"
-msgstr "有问题å‘生;请å‚阅éšé™„的细节"
+#: libsvn_ra_dav/session.c:469
+msgid "Invalid config: negative timeout value"
+msgstr "æ— æ•ˆçš„é…置:负的超时数值"
-#: include/svn_error_codes.h:910
-msgid "Failure loading plugin"
-msgstr "载入外挂失败"
+#: libsvn_ra_dav/session.c:482
+msgid "Invalid config: illegal character in debug mask value"
+msgstr "æ— æ•ˆçš„é…置:除错é®ç½©å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: include/svn_error_codes.h:914
-msgid "Malformed file"
-msgstr "畸形的文件"
+# as-is
+#: libsvn_ra_dav/session.c:545
+msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
+msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
-#: include/svn_error_codes.h:918
-msgid "Incomplete data"
-msgstr "ä¸å®Œå…¨çš„æ•°æ®"
+#: libsvn_ra_dav/session.c:600
+msgid "Malformed URL for repository"
+msgstr "档案库的地å€(URL)畸形"
-#: include/svn_error_codes.h:922
-msgid "Incorrect parameters given"
-msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+#: libsvn_ra_dav/session.c:636
+msgid "Network socket initialization failed"
+msgstr "网络 socket å¯å§‹å¤±è´¥"
-#: include/svn_error_codes.h:926
-msgid "Tried a versioning operation on an unversioned resource"
-msgstr "å°è¯•对未纳入版本控制的资æºè¿›è¡Œç‰ˆæœ¬æŽ§åˆ¶æ“作"
+#: libsvn_ra_dav/session.c:662
+msgid "SSL is not supported"
+msgstr "䏿”¯æŒ SSL"
-#: include/svn_error_codes.h:930
-msgid "Test failed"
-msgstr "测试失败"
+#: libsvn_ra_dav/session.c:803
+#, c-format
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr "æ— æ•ˆçš„é…ç½®ï¼šæ— æ³•è½½å…¥å‡è¯æ–‡ä»¶â€œ%sâ€"
-#: include/svn_error_codes.h:934
-msgid "Trying to use an unsupported feature"
-msgstr "å°è¯•è¦ä½¿ç”¨ä¸æ”¯æŒçš„功能"
+#: libsvn_ra_dav/session.c:910
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr "æ— æ³•åœ¨æœ¬èµ„æºæˆ–ä»»ä½•å…¶çˆ¶é¡¹ç›®ä¸æ‰¾åˆ° UUID 属性"
-#: include/svn_error_codes.h:938
-msgid "Unexpected or unknown property kind"
-msgstr "æ„æƒ³ä¸åˆ°æˆ–未知的属性ç§ç±»"
+#: libsvn_ra_dav/session.c:918
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
-#: include/svn_error_codes.h:942
-msgid "Illegal target for the requested operation"
-msgstr "对请求的æ“作æ¥è¯´æ˜¯ä¸åˆæ³•çš„ç›®æ ‡"
+#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
+#, fuzzy
+msgid "Failed to parse URI"
+msgstr "分æžåœ°å€(URI)失败"
-#: include/svn_error_codes.h:946
-msgid "MD5 checksum is missing"
-msgstr "没有 MD5 指纹检查值"
+#: libsvn_ra_dav/session.c:1183
+#, fuzzy
+msgid "Lock request failed"
+msgstr "é”请求失败"
-#: include/svn_error_codes.h:950
-msgid "Directory needs to be empty but is not"
-msgstr "目录必须为空的,但是结果并éžå¦‚æ¤"
+#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
+#, fuzzy, c-format
+msgid "'%s' is not locked in the repository"
+msgstr "â€%s“没有在档案库ä¸è¢«é”定"
-#: include/svn_error_codes.h:954
-msgid "Error calling external program"
-msgstr "呼å«å¤–éƒ¨ç¨‹åºæ—¶å‘生错误"
+#: libsvn_ra_dav/session.c:1349
+#, fuzzy
+msgid "Unlock request failed"
+msgstr "解除é”请求失败"
-#: include/svn_error_codes.h:958
-msgid "Python exception has been set with the error"
-msgstr "Python 异常已被设定为错误"
+#: libsvn_ra_dav/session.c:1560
+#, fuzzy
+msgid "Failed to fetch lock information"
+msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
-#: include/svn_error_codes.h:962
-msgid "A checksum mismatch occurred"
-msgstr "总和检查值ä¸ç¬¦"
+#: libsvn_ra_dav/session.c:1633
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_dav"
+msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
-#: include/svn_error_codes.h:966
-msgid "The operation was interrupted"
-msgstr "æ“ä½œè¢«ä¸æ–"
+#: libsvn_ra_dav/util.c:275
+msgid "authorization failed"
+msgstr "授æƒå¤±è´¥"
-#: include/svn_error_codes.h:970
-msgid "The specified diff option is not supported"
-msgstr "指定的 diff 选项䏿”¯æŒ"
+#: libsvn_ra_dav/util.c:279
+msgid "could not connect to server"
+msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåС噍"
-#: include/svn_error_codes.h:974
-msgid "Property not found"
-msgstr "找ä¸åˆ°å±žæ€§"
+#: libsvn_ra_dav/util.c:283
+msgid "timed out waiting for server"
+msgstr "ç‰å¾…æœåŠ¡å™¨è¶…æ—¶"
-#: include/svn_error_codes.h:978
-msgid "No auth file path available"
-msgstr "未æä¾› auth 文件路径"
+#: libsvn_ra_dav/util.c:489
+#, c-format
+msgid "Can't calculate the request body size"
+msgstr "æ— æ³•ç®—å‡ºè¯·æ±‚çš„ä¸»ä½“å¤§å°"
-#: include/svn_error_codes.h:983
-msgid "Incompatible library version"
-msgstr "ä¸ç›¸å®¹çš„程åºåº“版本"
+#: libsvn_ra_dav/util.c:726
+#, c-format
+msgid "Error spooling the %s request response to disk"
+msgstr "请求 %s çš„å“应脱机ä¿å˜åˆ°ç£ç›˜æ—¶å‡ºçŽ°é”™è¯¯"
-#: include/svn_error_codes.h:989
-msgid "Client error in parsing arguments"
-msgstr "客户端于剖æžå‚æ•°æ—¶å‘生错误"
+#: libsvn_ra_dav/util.c:774
+#, c-format
+msgid "'%s' path not found"
+msgstr "找ä¸åˆ°è·¯å¾„“%sâ€"
-#: include/svn_error_codes.h:993
-msgid "Not enough args provided"
-msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
+#. We either have a neon error, or some other error
+#. that we didn't expect.
+#: libsvn_ra_dav/util.c:779 libsvn_ra_dav/util.c:1014
+#, c-format
+msgid "%s of '%s'"
+msgstr "%s 的结果 “%sâ€"
-#: include/svn_error_codes.h:997
-msgid "Mutually exclusive arguments specified"
-msgstr "æŒ‡å®šäº†äº’æ–¥çš„å‚æ•°"
+#: libsvn_ra_dav/util.c:797
+#, c-format
+msgid "Error reading spooled %s request response"
+msgstr "读å–请求 %s å›žåº”çš„è„±æœºæ•°æ®æ—¶å‡ºçŽ°é”™è¯¯"
-#: include/svn_error_codes.h:1001
-msgid "Attempted command in administrative dir"
-msgstr "å°è¯•于管ç†ç›®å½•䏿‰§è¡Œå‘½ä»¤"
+#: libsvn_ra_dav/util.c:808
+#, c-format
+msgid "The %s request returned invalid XML in the response: %s (%s)"
+msgstr "%s è¯·æ±‚çš„å›žåº”è¿”å›žæ— æ•ˆçš„ XML:%s (%s)"
-#: include/svn_error_codes.h:1005
-msgid "The log message file is under version control"
-msgstr "æ—¥å¿—ä¿¡æ¯æ–‡ä»¶äºŽç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹"
+#: libsvn_ra_dav/util.c:828
+#, c-format
+msgid "%s request failed on '%s'"
+msgstr "%s 请求“%sâ€å¤±è´¥"
-#: include/svn_error_codes.h:1009
-msgid "The log message is a pathname"
-msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯è·¯å¾„å"
+#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:587
+#: libsvn_wc/update_editor.c:2464
+#, c-format
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"“%sâ€\n"
+"与\n"
+"“%sâ€\n"
+"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
-#: include/svn_error_codes.h:1013
-msgid "Committing in directory scheduled for addition"
-msgstr "于预计新增的目录ä¸è¿›è¡Œæäº¤"
+# as-is
+#. ----------------------------------------------------------------
+#. * The RA vtable routines *
+#: libsvn_ra_local/ra_plugin.c:245
+msgid "Module for accessing a repository on local disk."
+msgstr "访问本地ç£ç›˜çš„æ¡£æ¡ˆåº“模å—。"
-#: include/svn_error_codes.h:1017
-msgid "No external editor available"
-msgstr "æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨"
+#: libsvn_ra_local/ra_plugin.c:285
+msgid "Unable to open an ra_local session to URL"
+msgstr "æ— æ³•æ‰“å¼€åœ°å€(URL)çš„ ra_local 会è¯"
-#: include/svn_error_codes.h:1021
-msgid "Something is wrong with the log message's contents"
-msgstr "日志信æ¯çš„内容有ä¸å¦¥çš„地方"
+# as-is
+#: libsvn_ra_local/ra_plugin.c:1340
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
-#: include/svn_error_codes.h:1025
-msgid "A log message was given where none was necessary"
-msgstr "在没有需è¦çš„地方给出一个日志信æ¯"
+#: libsvn_ra_local/split_url.c:44
+#, c-format
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
-#: libsvn_client/add.c:371
+#: libsvn_ra_local/split_url.c:55
#, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "进行“%sâ€çš„递归新增时å‘生错误"
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr "本地地å€(URL)“%sâ€ä»…å«ä¸»æœºå称,没有路径"
-#: libsvn_client/add.c:382
+#: libsvn_ra_local/split_url.c:117
#, c-format
-msgid "Can't close directory '%s'"
-msgstr "æ— æ³•å…³é—目录“%sâ€"
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr "本地地å€(URL)“%sâ€åŒ…嫿œªæ”¯æŒçš„主机åç§°"
-#: libsvn_client/blame.c:382 libsvn_client/blame.c:774
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
#, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "æ— æ³•ä¸ºäºŒè¿›åˆ¶æ–‡ä»¶â€œ%sâ€è®¡ç®—谴责信æ¯"
+msgid "Unable to open repository '%s'"
+msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“â€œ%sâ€"
-#: libsvn_client/blame.c:543
-msgid "Start revision must precede end revision"
-msgstr "起始修订版必须大于结æŸä¿®è®¢ç‰ˆ"
+#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
+#: libsvn_repos/commit.c:393
+#, fuzzy, c-format
+msgid "Path '%s' not present"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
-#: libsvn_client/blame.c:659 libsvn_client/cat.c:205
+#: libsvn_ra_serf/commit.c:910
#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个目录"
+msgid "Failed writing updated file"
+msgstr ""
-#: libsvn_client/blame.c:732
-#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
+#: libsvn_ra_serf/getlocations.c:289
+#, fuzzy
+msgid "File doesn't exist on HEAD"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#: libsvn_ra_serf/locks.c:354
#, fuzzy, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
+msgid "Lock request failed: %d %s"
+msgstr "é”请求失败"
-#: libsvn_client/cat.c:79
+#: libsvn_ra_serf/locks.c:703
#, fuzzy, c-format
-msgid "'%s' refers to a directory"
-msgstr "“%sâ€å¼•用一个目录"
+msgid "Unlock request failed: %d %s"
+msgstr "解除é”请求失败"
-# as-is
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
-msgid "(local)"
-msgstr "(本地)"
+#: libsvn_ra_serf/replay.c:204
+#, fuzzy
+msgid "Missing revision attr in delete-entry element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-# as-is
-#: libsvn_client/cat.c:245
-#, c-format
-msgid "Can't seek in '%s'"
-msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
+#: libsvn_ra_serf/replay.c:230
+#, fuzzy
+msgid "Missing revision attr in open-directory element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/checkout.c:88
-#, c-format
-msgid "URL '%s' doesn't exist"
-msgstr "地å€(URL)“%sâ€ä¸å˜åœ¨"
+#: libsvn_ra_serf/replay.c:250
+#, fuzzy
+msgid "Missing name attr in add-directory element"
+msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: libsvn_client/checkout.c:92
-#, c-format
-msgid "URL '%s' refers to a file, not a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+#: libsvn_ra_serf/replay.c:285
+#, fuzzy
+msgid "Missing name attr in open-file element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: libsvn_client/checkout.c:152
-#, c-format
-msgid "'%s' is already a working copy for a different URL"
-msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
+#: libsvn_ra_serf/replay.c:291
+#, fuzzy
+msgid "Missing revision attr in open-file element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/checkout.c:156
+#: libsvn_ra_serf/replay.c:311
#, fuzzy
-msgid "; run 'svn update' to complete it"
-msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
+msgid "Missing name attr in add-file element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: libsvn_client/checkout.c:166
-#, fuzzy, c-format
-msgid "'%s' already exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+# as-is
+#: libsvn_ra_serf/serf.c:52
+#, fuzzy
+msgid "Access repository via WebDAV protocol through serf."
+msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
-#: libsvn_client/commit.c:209
+#: libsvn_ra_serf/serf.c:155
#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "类型“%sâ€æœªçŸ¥æˆ–ä¸å¯ç‰ˆæœ¬æŽ§åˆ¶"
+msgid "Could not lookup hostname: %s://%s"
+msgstr ""
-#: libsvn_client/commit.c:522
-msgid "New entry name required when importing a file"
-msgstr "导入文件时,需è¦ä¸€ä¸ªæ–°çš„项目åç§°"
+#: libsvn_ra_serf/serf.c:741
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
-#: libsvn_client/commit.c:556 libsvn_wc/props.c:1197 libsvn_wc/questions.c:62
+#: libsvn_ra_serf/update.c:2114
#, c-format
-msgid "'%s' does not exist"
-msgstr "“%sâ€ä¸å˜åœ¨"
+msgid "Error retrieving REPORT (%d)"
+msgstr ""
-#: libsvn_client/commit.c:616 libsvn_client/copy.c:81 svnlook/main.c:1263
-#, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+#: libsvn_ra_serf/util.c:743
+msgid "Premature EOF seen from server"
+msgstr ""
-#: libsvn_client/commit.c:746 libsvn_client/copy.c:398
-#: libsvn_client/copy.c:414
+#: libsvn_ra_svn/client.c:115
#, c-format
-msgid "Path '%s' already exists"
-msgstr "路径“%sâ€å·²å˜åœ¨"
+msgid "Unknown hostname '%s'"
+msgstr "未知的主机å称“%sâ€"
-#: libsvn_client/commit.c:756
+#: libsvn_ra_svn/client.c:127
#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªä¿ç•™çš„åç§°ï¼Œæ— æ³•è¢«å¯¼å…¥"
-
-#: libsvn_client/commit.c:869 libsvn_client/copy.c:544
-msgid "Commit failed (details follow):"
-msgstr "æäº¤å¤±è´¥(细节è§ä¸‹):"
-
-#: libsvn_client/commit.c:877 libsvn_client/copy.c:552
-msgid "Commit succeeded, but other errors follow:"
-msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘生了其它的错误,如åŽï¼š"
-
-#: libsvn_client/commit.c:884 libsvn_client/copy.c:559
-msgid "Error unlocking locked dirs (details follow):"
-msgstr "解除é”定目录时å‘生错误(细节è§ä¸‹):"
-
-#: libsvn_client/commit.c:895
-msgid "Error bumping revisions post-commit (details follow):"
-msgstr "post-commit å¢žåŠ ä¿®è®¢ç‰ˆæ—¶å‘生错误 (细节è§ä¸‹):"
-
-#: libsvn_client/commit.c:906 libsvn_client/copy.c:570
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "post-commit 清除时å‘生错误 (细节è§ä¸‹):"
+msgid "Can't create socket"
+msgstr "æ— æ³•å»ºç«‹ socket"
-#: libsvn_client/commit.c:1220
+#: libsvn_ra_svn/client.c:131
#, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªåœ°å€(URL),但是地å€(URL)ä¸å¯ä¸ºä½œæäº¤çš„ç›®æ ‡"
+msgid "Can't connect to host '%s'"
+msgstr "æ— æ³•è¿žçº¿è‡³ä¸»æœºâ€œ%sâ€"
-#: libsvn_client/commit.c:1412
-msgid "Are all the targets part of the same working copy?"
-msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+# as-is
+#: libsvn_ra_svn/client.c:152
+msgid "Proplist element not a list"
+msgstr "å±žæ€§åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/commit.c:1427
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr "æ— æ³•ä»¥éžé€’å½’æäº¤ç›®å½•åˆ é™¤"
+# as-is
+#: libsvn_ra_svn/client.c:176
+msgid "Prop diffs element not a list"
+msgstr "Prop diffs å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/commit_util.c:243 libsvn_client/commit_util.c:254
+#: libsvn_ra_svn/client.c:214
#, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "未知的项目类型“%sâ€"
+msgid "Unrecognized node kind '%s' from server"
+msgstr "æ— æ³•è¾¨è¯†æ¥è‡ªæœåŠ¡å™¨çš„èŠ‚ç‚¹ç§ç±»â€œ%sâ€"
-#: libsvn_client/commit_util.c:271
+#: libsvn_ra_svn/client.c:365
#, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "项目“%sâ€æ„想ä¸åˆ°åœ°å˜æ¢ç‰¹æ®Šçжæ€"
+msgid "Undefined tunnel scheme '%s'"
+msgstr "æ— æ³•è¾¨è¯†çš„éš§é“规则“%sâ€"
-#: libsvn_client/commit_util.c:322
+#: libsvn_ra_svn/client.c:382
#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "䏿¢æäº¤ï¼šâ€œ%sâ€ä»å¤„于冲çªçжæ€"
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr "éš§é“规则 %s 需è¦è®¾å®šçŽ¯å¢ƒå˜æ•° %s"
-#: libsvn_client/commit_util.c:388
+# as-is
+#: libsvn_ra_svn/client.c:393
#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "并未预期“%sâ€æ˜¯å·¥ä½œæ‹·è´çš„æ ¹ç›®å½•"
+msgid "Can't tokenize command '%s'"
+msgstr "ä¸èƒ½ tokenize 命令“%sâ€"
-#: libsvn_client/commit_util.c:406
+#: libsvn_ra_svn/client.c:424
#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
+msgid "Error in child process: %s"
+msgstr "å程åºé”™è¯¯ï¼š%s"
-#: libsvn_client/commit_util.c:678 libsvn_client/commit_util.c:808
-#: libsvn_client/copy.c:1073 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1390 libsvn_client/diff.c:1988
-#: libsvn_client/diff.c:2510 libsvn_client/diff.c:2619
-#: libsvn_client/locking_commands.c:248 libsvn_client/locking_commands.c:272
-#: libsvn_client/log.c:129 libsvn_client/prop_commands.c:213
-#: libsvn_client/prop_commands.c:446 libsvn_client/prop_commands.c:602
-#: libsvn_client/prop_commands.c:951 libsvn_client/ra.c:180
-#: libsvn_client/revisions.c:89 libsvn_client/status.c:256
-#: libsvn_client/switch.c:104 libsvn_wc/adm_ops.c:2261
-#: libsvn_wc/adm_ops.c:2287 libsvn_wc/adm_ops.c:2324 libsvn_wc/copy.c:448
-#: libsvn_wc/entries.c:1498 libsvn_wc/entries.c:1990 libsvn_wc/props.c:286
-#: libsvn_wc/props.c:1124 libsvn_wc/questions.c:171
+#: libsvn_ra_svn/client.c:448
#, c-format
-msgid "'%s' is not under version control"
-msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+msgid "Can't create tunnel"
+msgstr "æ— æ³•å»ºç«‹ tunnel"
-#: libsvn_client/commit_util.c:681
+#: libsvn_ra_svn/client.c:486
#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "“%sâ€çš„项目没有地å€(URL)"
+msgid "Illegal svn repository URL '%s'"
+msgstr "ä¸åˆæ³•çš„ svn 档案库地å€(URL)“%sâ€"
-#: libsvn_client/commit_util.c:714
+#: libsvn_ra_svn/client.c:525
#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "“%sâ€äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„父路径ä¸è¢«åŠ å…¥æ–°å¢žè°ƒåº¦"
+msgid "Server requires minimum version %d"
+msgstr "æœåŠ¡å™¨æœ€ä½Žè¦æ±‚的版å·ä¸º %d"
-#: libsvn_client/commit_util.c:734
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
-msgstr ""
-"“%sâ€é¡¹ç›®è¢«æ ‡è®°ä¸ºâ€œå·²å¤åˆ¶â€ï¼Œä½†æ˜¯æœ¬èº«å°šæœªåŠ å…¥æ–°å¢žè°ƒåº¦ã€‚ä¹Ÿè®¸æ‚¨æäº¤çš„\n"
-"ç›®æ ‡æ˜¯ä½äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ (或尚未纳入) 的目录ä¸ï¼Ÿ"
+#: libsvn_ra_svn/client.c:580
+msgid "Impossibly long repository root from server"
+msgstr "æœåŠ¡å™¨å›žä¼ çš„æ¡£æ¡ˆåº“æ ¹è·¯å¾„é•¿å¾—å¤ªå¤¸å¼ "
-#: libsvn_client/commit_util.c:774
-#, 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â€æ˜¯æäº¤çš„一部份"
+# as-is
+#: libsvn_ra_svn/client.c:591
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr "使用svn网络å议访问档案库的模å—。"
-#: libsvn_client/commit_util.c:857
-#, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr "æ— æ³•æäº¤â€œ%sâ€ä¸Žâ€œ%sâ€ï¼Œå› 为它们都指å‘åŒä¸€ä¸ªåœ°å€(URL)"
+#: libsvn_ra_svn/client.c:739
+msgid "Server did not send repository root"
+msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”å›žæ¡£æ¡ˆåº“æ ¹è·¯å¾„"
-#: libsvn_client/commit_util.c:1002
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶åœ°å€åœ°å€(copyfrom URL)"
+#: libsvn_ra_svn/client.c:880
+msgid "Non-string as part of file contents"
+msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
-#: libsvn_client/commit_util.c:1007
-#, c-format
-msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
+# as-is
+#: libsvn_ra_svn/client.c:979
+msgid "Dirlist element not a list"
+msgstr "ç›®å½•åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:101 libsvn_client/copy.c:646 libsvn_client/copy.c:832
-#: libsvn_ra_dav/commit.c:1172
-#, c-format
-msgid "File '%s' already exists"
-msgstr "文件“%sâ€å·²å˜åœ¨"
+# as-is
+#: libsvn_ra_svn/client.c:1136
+msgid "Log entry not a list"
+msgstr "日志æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:144
-msgid "Move will not be attempted unless forced"
-msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
+# as-is
+#: libsvn_ra_svn/client.c:1149
+msgid "Changed-path entry not a list"
+msgstr "已修改路径æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:328
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "æ— æ³•ç§»åŠ¨åœ°å€(URL)“%sâ€è‡³æœ¬èº«"
+# as-is
+#: libsvn_ra_svn/client.c:1225
+#, fuzzy
+msgid "'stat' not implemented"
+msgstr "get-locations 未实现"
-#: libsvn_client/copy.c:359
-#, c-format
-msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
-msgstr "æ¥æºä¸Žç›®çš„似乎ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸ (æ¥æºï¼šâ€œ%sâ€ï¼›ç›®çš„:“%sâ€)"
+# as-is
+#: libsvn_ra_svn/client.c:1282
+#, fuzzy
+msgid "'get-locations' not implemented"
+msgstr "get-locations 未实现"
-#: libsvn_client/copy.c:385
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
+# as-is
+#: libsvn_ra_svn/client.c:1294
+msgid "Location entry not a list"
+msgstr "区域æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:419
-#, c-format
-msgid "Unrecognized node kind of '%s'"
-msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
+# as-is
+#: libsvn_ra_svn/client.c:1344
+#, fuzzy
+msgid "'get-file-revs' not implemented"
+msgstr "get-file-revs 未实现"
-#: libsvn_client/copy.c:790
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "路径“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
+# as-is
+#: libsvn_ra_svn/client.c:1357
+msgid "Revision entry not a list"
+msgstr "修订版æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+
+#: libsvn_ra_svn/client.c:1370 libsvn_ra_svn/client.c:1395
+msgid "Text delta chunk not a string"
+msgstr "æ–‡å—差异区段并éžå—串"
+
+#: libsvn_ra_svn/client.c:1407
+msgid "The get-file-revs command didn't return any revisions"
+msgstr "get-file-revs 命令没有返回任何修订版"
+
+#: libsvn_ra_svn/client.c:1455
+#, fuzzy
+msgid "Server doesn't support the lock command"
+msgstr "æœåС噍䏿”¯æŒé”命令"
+
+#: libsvn_ra_svn/client.c:1519
+#, fuzzy
+msgid "Server doesn't support the unlock command"
+msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
+
+# as-is
+#: libsvn_ra_svn/client.c:1616
+#, fuzzy
+msgid "Lock response not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:795
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
+#: libsvn_ra_svn/client.c:1630
+#, fuzzy
+msgid "Unknown status for lock command"
+msgstr "未知的 svn 通讯å定命令"
-#: libsvn_client/copy.c:841
-#, c-format
-msgid "'%s' is in the way"
-msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
+#: libsvn_ra_svn/client.c:1652
+msgid "Didn't receive end marker for lock responses"
+msgstr ""
-#: libsvn_client/copy.c:858
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "å˜åœ¨â€œ%sâ€çš„项目 (ä¸è¿‡å·¥ä½œæ–‡ä»¶å·²ä¸¢å¤±)"
+# as-is
+#: libsvn_ra_svn/client.c:1739
+#, fuzzy
+msgid "Unlock response not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:949
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“;把它当作是脱离的工作拷è´(WC)"
+#: libsvn_ra_svn/client.c:1753
+#, fuzzy
+msgid "Unknown status for unlock command"
+msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
-#: libsvn_client/copy.c:1028
-#, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "æ— æ³•å¤åˆ¶è·¯å¾„“%sâ€è‡³å…¶å目录“%sâ€ä¸"
+#: libsvn_ra_svn/client.c:1774
+msgid "Didn't receive end marker for unlock responses"
+msgstr ""
-#: libsvn_client/copy.c:1039
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "æ— æ³•ç§»åŠ¨è·¯å¾„â€œ%sâ€è‡³å…¶æœ¬èº«"
+#: libsvn_ra_svn/client.c:1798 libsvn_ra_svn/client.c:1826
+#, fuzzy
+msgid "Server doesn't support the get-lock command"
+msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
-#: libsvn_client/copy.c:1047
-msgid "No support for repos <--> working copy moves"
-msgstr "䏿”¯æŒæ¡£æ¡ˆåº“ <--> 工作拷è´ç§»åЍ"
+# as-is
+#: libsvn_ra_svn/client.c:1839
+#, fuzzy
+msgid "Lock element not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/copy.c:1079
-#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "“%sâ€ä¼¼ä¹Žæ²¡æœ‰å…³è”的地å€(URL)"
+#: libsvn_ra_svn/client.c:1862
+#, fuzzy
+msgid "Server doesn't support the replay command"
+msgstr "æœåС噍䏿”¯æŒé”命令"
-#: libsvn_client/delete.c:62
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "“%sâ€æŒ¡äº†å®žé™…纳入版本控制资æºçš„è·¯"
+#: libsvn_ra_svn/client.c:1926
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_svn"
+msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
-#: libsvn_client/delete.c:77
-#, c-format
-msgid "'%s' has local modifications"
-msgstr "“%sâ€å·²æœ‰æœ¬åœ°ä¿®æ”¹"
+#: libsvn_ra_svn/cram.c:194 libsvn_ra_svn/cram.c:212
+#: libsvn_ra_svn/sasl_auth.c:302 libsvn_ra_svn/sasl_auth.c:357
+#: libsvn_ra_svn/simple_auth.c:61
+msgid "Unexpected server response to authentication"
+msgstr "æ„æƒ³ä¸åˆ°çš„è®¤è¯æ—¶æœåŠ¡å™¨å›žåº”"
# as-is
-#: libsvn_client/diff.c:94
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%s 属性改å˜äºŽï¼š%s%s"
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
+msgid "Invalid file or dir token during edit"
+msgstr "编辑时é‡åˆ°æ— 效的文件或目录"
-# as-is
-#: libsvn_client/diff.c:122
-#, c-format
-msgid "Name: %s%s"
-msgstr "åå—:%s%s"
+#: libsvn_ra_svn/editor.c:621
+msgid "Non-string as part of text delta"
+msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
-#: libsvn_client/diff.c:198
-#, fuzzy, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"sâ€ä¸Žâ€œ%sâ€)"
-#: libsvn_client/diff.c:204 libsvn_client/diff.c:210
-#, fuzzy, c-format
-msgid "URL has no scheme: '%s'"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"sâ€"
+# as-is
+#: libsvn_ra_svn/editorp.c:129
+msgid "Successful edit status returned too soon"
+msgstr "æˆåŠŸä¿®æ”¹çŠ¶æ€è¿”回太快"
-#: libsvn_client/diff.c:217
-#, fuzzy, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
+# as-is
+#: libsvn_ra_svn/editorp.c:665
+msgid "Apply-textdelta already active"
+msgstr "Apply-textdelta å·²ç»æ¿€æ´»"
# as-is
-#: libsvn_client/diff.c:282
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
+msgid "Apply-textdelta not active"
+msgstr "Apply-textdelta 没有激活"
+
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:842
#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(修订版 %ld)"
+msgid "Unknown command '%s'"
+msgstr "未知的命令:“%sâ€"
# as-is
-#: libsvn_client/diff.c:284
-#, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(工作拷è´ï¼‰"
+#: libsvn_ra_svn/marshal.c:78
+msgid "Capability entry is not a word"
+msgstr "容釿¡ç›®ä¸æ˜¯ä¸€ä¸ª word"
-#: libsvn_client/diff.c:428
+#: libsvn_ra_svn/marshal.c:166
#, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "æ— æ³•æ˜¾ç¤ºï¼šæ–‡ä»¶æ ‡è®°ä¸ºäºŒè¿›åˆ¶ç±»åž‹ã€‚%s"
+msgid "Can't write to connection"
+msgstr "æ— æ³•å†™å…¥è¿žçº¿"
-#: libsvn_client/diff.c:501
+#: libsvn_ra_svn/marshal.c:259
#, c-format
-msgid "'%s' is not supported"
-msgstr "“%sâ€ä¸æ”¯æŒ"
+msgid "Can't read from connection"
+msgstr "æ— æ³•è¯»å–连线"
-# as-is
-#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
-#. strings are used to tag onto a filename in case of a merge conflict
-#: libsvn_client/diff.c:771
-msgid ".working"
-msgstr ".working"
+#: libsvn_ra_svn/marshal.c:262
+msgid "Connection closed unexpectedly"
+msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
-# as-is
-#: libsvn_client/diff.c:773
-#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
+#: libsvn_ra_svn/marshal.c:506
+msgid "String length larger than maximum"
+msgstr "å—串长度超出上é™"
-# as-is
-#: libsvn_client/diff.c:776
-#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
+#: libsvn_ra_svn/marshal.c:543
+msgid "Too many nested items"
+msgstr "太多嵌套的项目"
-#: libsvn_client/diff.c:1446 libsvn_client/diff.c:2088
-#: libsvn_client/diff.c:2168
-msgid "Not all required revisions are specified"
-msgstr "并未æä¾›å…¨éƒ¨æ‰€éœ€çš„修订版"
+#: libsvn_ra_svn/marshal.c:562
+msgid "Number is larger than maximum"
+msgstr "æ•°å—大å°è¶…过上é™"
-#: libsvn_client/diff.c:1717
-#, fuzzy
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
+#: libsvn_ra_svn/marshal.c:765
+msgid "Empty error list"
+msgstr "空的错误列表"
-#: libsvn_client/diff.c:1756
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr "ç›®å‰åªæ”¯æŒè·¯å¾„的文件å‚考基础与其工作文件之间的文件差异"
+#: libsvn_ra_svn/marshal.c:774
+msgid "Malformed error list"
+msgstr "畸形的错误列表"
-#: libsvn_client/diff.c:1871 libsvn_client/diff.c:1876
+#: libsvn_ra_svn/marshal.c:813
#, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
+msgid "Unknown status '%s' in command response"
+msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
-#: libsvn_client/diff.c:1992 libsvn_client/switch.c:108
+#: libsvn_ra_svn/sasl_auth.c:155
+msgid "Could not initialize the SASL library"
+msgstr ""
+
+#: libsvn_ra_svn/sasl_auth.c:215 libsvn_ra_svn/simple_auth.c:58
+#: libsvn_ra_svn/simple_auth.c:110
#, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgid "Authentication error from server: %s"
+msgstr "æ¥è‡ªæœåŠ¡å™¨çš„è®¤è¯é”™è¯¯ï¼š%s"
-#: libsvn_client/diff.c:2179
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于 peg å·®å¼‚ï¼Œå¿…é¡»è‡³å°‘æœ‰ä¸€ä¸ªéžæœ¬åœ°ç«¯çš„修订版"
+#: libsvn_ra_svn/sasl_auth.c:232
+msgid "Unhandled SASL interaction"
+msgstr ""
-#: libsvn_client/diff.c:2483 libsvn_client/diff.c:2489
-#: libsvn_client/diff.c:2604 libsvn_client/locking_commands.c:252
-#: libsvn_client/locking_commands.c:276 libsvn_client/ra.c:368
-#: libsvn_client/ra.c:729 libsvn_client/ra.c:865
+#: libsvn_ra_svn/simple_auth.c:97 libsvn_subr/prompt.c:156
#, c-format
-msgid "'%s' has no URL"
-msgstr "“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgid "Can't get password"
+msgstr "æ— æ³•å–得密ç "
-#: libsvn_client/export.c:87
-#, c-format
-msgid "'%s' is not a valid EOL value"
-msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
+#: libsvn_ra_svn/simple_auth.c:117
+msgid "Cannot negotiate authentication mechanism"
+msgstr "æ— æ³•å商出认识机制"
-#: libsvn_client/export.c:271
-msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr "目的目录已å˜åœ¨ï¼Œé™¤éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™ä¸ä¼šè¦†ç›–"
+#: libsvn_repos/commit.c:128
+#, c-format
+msgid "Out of date: '%s' in transaction '%s'"
+msgstr "过期:â€%s“在事务â€%s“"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
#, c-format
-msgid "'%s' exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+msgid "Got source path but no source revision for '%s'"
+msgstr "获得æºè·¯å¾„,但â€%s“没有æºä¿®è®¢ç‰ˆ"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
#, c-format
-msgid "'%s' already exists"
-msgstr "“%sâ€å·²å˜åœ¨"
+msgid "Source url '%s' is from different repository"
+msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“"
-#: libsvn_client/export.c:686 libsvn_wc/update_editor.c:1634
-#: libsvn_wc/update_editor.c:2407
+#: libsvn_repos/commit.c:609
#, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
+msgid ""
+"Checksum mismatch for resulting fulltext\n"
+"(%s):\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: libsvn_client/info.c:234
-#, fuzzy, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
+#: libsvn_repos/delta.c:180
+msgid "Unable to open root of edit"
+msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
-#: libsvn_client/info.c:321 libsvn_client/info.c:346 libsvn_client/info.c:356
-#, fuzzy, c-format
-msgid "URL '%s' non-existent in revision '%ld'"
-msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
+#: libsvn_repos/delta.c:231
+msgid "Invalid target path"
+msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
-#: libsvn_client/locking_commands.c:198
-msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "没有找到公共父节点,ä¸èƒ½åœ¨åˆ†ç¦»çš„傿•°ä¸Šæ“作"
+#: libsvn_repos/delta.c:257
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr "æ— æ•ˆçš„ç¼–è¾‘å™¨å®šä½ï¼›è‡³å°‘ä¸€ä¸ªè¾“å…¥è·¯å¾„ä¸æ˜¯ç›®å½•并且没有æºå…¥å£"
-#: libsvn_client/locking_commands.c:300
-msgid "Unable to lock/unlock across multiple repositories"
-msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
+# as-is
+#: libsvn_repos/dump.c:416
+#, c-format
+msgid ""
+"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
+"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
+"WARNING: will fail.\n"
+msgstr ""
+"è¦å‘Šï¼šä¿®è®¢ç‰ˆ %ld çš„å‚è€ƒæ•°æ®æ¯”æœ€æ—§çš„è½¬å˜æ•°æ®ä¿®è®¢ç‰ˆ (%ld)还旧。\n"
+"è¦å‘Šï¼š 装载这个转å˜åˆ°ç©ºçš„æ¡£æ¡ˆåº“会失败。\n"
+"\n"
+
+#: libsvn_repos/dump.c:933
+#, c-format
+msgid "Start revision %ld is greater than end revision %ld"
+msgstr "起始修订版 %ld 比结æŸä¿®è®¢ç‰ˆå· %ld 为大"
+
+#: libsvn_repos/dump.c:938
+#, c-format
+msgid "End revision %ld is invalid (youngest revision is %ld)"
+msgstr "结æŸä¿®è®¢ç‰ˆ %ld æ— æ•ˆ (最新的修订版为 %ld)"
-#: libsvn_client/locking_commands.c:341
+# as-is
+#: libsvn_repos/dump.c:1045
#, fuzzy, c-format
-msgid "'%s' is not locked in this working copy"
-msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
+msgid "* Dumped revision %ld.\n"
+msgstr "* 导出修订版 %ld。\n"
-#: libsvn_client/locking_commands.c:389
+# as-is
+#: libsvn_repos/dump.c:1046
#, fuzzy, c-format
-msgid "'%s' is not locked"
-msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
+msgid "* Verified revision %ld.\n"
+msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
-#: libsvn_client/locking_commands.c:425 libsvn_fs/fs-loader.c:896
-#: libsvn_ra/ra_loader.c:512
-msgid "Lock comment has illegal characters"
-msgstr "é”定注释å˜åœ¨éžæ³•å—符"
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1211
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘é€æäº¤å¤–æŒ‚(post-commit)失败"
-#: libsvn_client/log.c:72
-msgid "Missing required revision specification"
-msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
+#: libsvn_repos/fs-wrap.c:157
+#, c-format
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
+
+#: libsvn_repos/fs-wrap.c:296
+#, fuzzy, c-format
+msgid "Write denied: not authorized to read all of revision %ld"
+msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
-#: libsvn_client/log.c:135 libsvn_client/status.c:261
-#: libsvn_client/update.c:86
+#: libsvn_repos/fs-wrap.c:484
#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgid "Cannot unlock path '%s', no authenticated username available"
+msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
-#: libsvn_client/log.c:321
+#: libsvn_repos/fs-wrap.c:498
#, fuzzy
-msgid "No commits in repository"
-msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
-
-#: libsvn_client/ls.c:140 libsvn_client/ls.c:148
-#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽè¯¥ä¿®è®¢ç‰ˆä¸"
+msgid "Unlock succeeded, but post-unlock hook failed"
+msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
-#: libsvn_client/prop_commands.c:104
+#: libsvn_repos/hooks.c:71
#, c-format
-msgid "'%s' is a wcprop, thus not accessible to clients"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªå·¥ä½œæ‹·è´å±žæ€§(wcprop),应æ¤ä¸èƒ½è¢«å®¢æˆ·ç«¯å˜å–"
+msgid "Can't create pipe for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
-#: libsvn_client/prop_commands.c:183
-#, c-format
-msgid "Revision property '%s' not allowed in this context"
-msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
+#: libsvn_repos/hooks.c:83
+#, fuzzy, c-format
+msgid "Can't make pipe read handle non-inherited for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
-#: libsvn_client/prop_commands.c:199
+#: libsvn_repos/hooks.c:89
#, fuzzy, c-format
-msgid "Setting property on non-local target '%s' is not supported"
-msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
+msgid "Can't make pipe write handle non-inherited for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
-#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
+#: libsvn_repos/hooks.c:98
#, c-format
-msgid "Bad property name: '%s'"
-msgstr "有问题的属性å称:“%sâ€"
-
-#: libsvn_client/prop_commands.c:276
-msgid "Value will not be set unless forced"
-msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
+msgid "Can't create null stdout for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç©ºçš„æ ‡å‡†è¾“出"
-#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:758
+#: libsvn_repos/hooks.c:110
#, c-format
-msgid "Unknown node kind for '%s'"
-msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
+msgid "Error closing write end of stderr pipe"
+msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
-#: libsvn_client/ra.c:131
-#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr "è¯•å›¾åœ¨éžæäº¤æ“作ä¸ï¼Œè®¾å®šå·¥ä½œæ‹·è´å±žæ€§â€œ%sâ€äºŽâ€œ%sâ€"
+#: libsvn_repos/hooks.c:115
+#, fuzzy, c-format
+msgid "Failed to start '%s' hook"
+msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
-#: libsvn_client/ra.c:345
+#: libsvn_repos/hooks.c:137
#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„项目"
+msgid ""
+"'%s' hook failed with error output:\n"
+"%s"
+msgstr ""
+"外挂“%sâ€å¤±è´¥ï¼Œé”™è¯¯è¾“出:\n"
+"%s"
-#: libsvn_client/ra.c:489
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未æä¾›â€œ%sâ€äºŽä¿®è®¢ç‰ˆ %ld çš„ changed-path ä¿¡æ¯"
+#: libsvn_repos/hooks.c:144
+#, fuzzy, c-format
+msgid "'%s' hook failed; no error output available"
+msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
-#: libsvn_client/ra.c:609
+#: libsvn_repos/hooks.c:163
#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld ä¸"
+msgid "Error closing read end of stderr pipe"
+msgstr "å…³é—è¯»æ ‡å‡†é”™è¯¯ç®¡é“æœ«å°¾å‘生错误"
-#: libsvn_client/ra.c:656 libsvn_client/ra.c:813
+#: libsvn_repos/hooks.c:167
#, c-format
-msgid "Unable to find repository location for '%s' in revision %ld"
-msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„æ¡£æ¡ˆåº“ä½ç½®äºŽä¿®è®¢ç‰ˆ %ld"
+msgid "Error closing null file"
+msgstr "å…³é—空文件å‘生错误"
-#: libsvn_client/ra.c:667
+#: libsvn_repos/hooks.c:464
#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "“%sâ€äºŽä¿®è®¢ç‰ˆ %ld æ˜¯ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
+msgid "Failed to run '%s' hook; broken symlink"
+msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥ï¼›æ— 效的符å·è¿žæŽ¥"
-#: libsvn_client/ra.c:818
-#, c-format
+#: libsvn_repos/hooks.c:605
msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
+"Repository has not been enabled to accept revision propchanges;\n"
+"ask the administrator to create a pre-revprop-change hook"
msgstr ""
-"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
+"档案库未激活接å—修订版属性改å˜ï¼›è¯·ç®¡ç†å‘˜åˆ›å»ºä¸€ä¸ª pre-revprop-change 外挂"
-#: libsvn_client/relocate.c:53
-#, c-format
-msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
+#: libsvn_repos/load.c:117
+msgid "Premature end of content data in dumpstream"
+msgstr "导出æµä¸å†…容数æ®è¿‡æ—©ç»“æŸ"
-#: libsvn_client/revisions.c:105
-#, c-format
-msgid "Unrecognized revision type requested for '%s'"
-msgstr "æ— æ³•è¾¨è¯†è¯·æ±‚çš„â€œ%sâ€çš„修订版类别"
+#: libsvn_repos/load.c:124
+msgid "Dumpstream data appears to be malformed"
+msgstr "å¯¼å‡ºæµæ•°æ®ä¸å‡ºçŽ°ç•¸å½¢"
-#: libsvn_delta/svndiff.c:350
+#: libsvn_repos/load.c:173
#, c-format
-msgid "Invalid diff stream: insn %d cannot be decoded"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d ä¸èƒ½è§£ç "
+msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
+msgstr ""
-#: libsvn_delta/svndiff.c:354
+#: libsvn_repos/load.c:186
#, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d å‡ºçŽ°éžæ£çš„长度"
+msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
+msgstr ""
-#: libsvn_delta/svndiff.c:358
-#, c-format
-msgid "Invalid diff stream: insn %d overflows the target view"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d æº¢å‡ºç›®æ ‡è§†å›¾"
+#: libsvn_repos/load.c:273
+msgid "Incomplete or unterminated property block"
+msgstr "ä¸å®Œæ•´æˆ–未结æŸçš„属性å—"
-#: libsvn_delta/svndiff.c:367
-#, c-format
-msgid "Invalid diff stream: [src] insn %d overflows the source view"
-msgstr "æ— æ•ˆçš„è¯§å¼‚æµï¼š[src] insn %d 溢出æºè§†å›¾"
+#: libsvn_repos/load.c:411
+msgid "Unexpected EOF writing contents"
+msgstr "å†™å†…å®¹æ—¶æœ‰æ„æ–™ä¹‹å¤–的结æŸç¬¦"
-#: libsvn_delta/svndiff.c:374
-#, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[tgt] insn %d èµ·ç‚¹è¶…è¿‡ç›®æ ‡è§†å›¾ä½ç½®"
+#: libsvn_repos/load.c:440
+msgid "Malformed dumpfile header"
+msgstr "畸形的导出文件头"
-#: libsvn_delta/svndiff.c:381
+#: libsvn_repos/load.c:446 libsvn_repos/load.c:488
#, c-format
-msgid "Invalid diff stream: [new] insn %d overflows the new data section"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[new] insn %d 溢出新数æ®åŒºåŸŸ"
-
-#: libsvn_delta/svndiff.c:391
-msgid "Delta does not fill the target window"
-msgstr "Delta ä¸èƒ½å¡«å……ç›®æ ‡çª—å£"
+msgid "Unsupported dumpfile version: %d"
+msgstr "䏿”¯æŒçš„导出文件版本:%d"
-#: libsvn_delta/svndiff.c:394
-msgid "Delta does not contain enough new data"
-msgstr "Deltaä¸èƒ½åŒ…å«è¶³å¤Ÿçš„æ–°æ•°æ®"
+#: libsvn_repos/load.c:591
+msgid "Unrecognized record type in stream"
+msgstr "æµä¸æœ‰æ— 法辨识的记录类型"
-#: libsvn_delta/svndiff.c:471
-msgid "Svndiff has invalid header"
-msgstr "Svndiff æ•°æ®åŒ…å«äº†æ— 效的数æ®å¤´"
+#: libsvn_repos/load.c:703
+msgid "Sum of subblock sizes larger than total block content length"
+msgstr "åå—大尿€»æ•°å¤§äºŽå—内容长度总数"
# as-is
-#: libsvn_delta/svndiff.c:526 libsvn_delta/svndiff.c:681
-msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+#: libsvn_repos/load.c:884
+#, c-format
+msgid "<<< Started new transaction, based on original revision %ld\n"
+msgstr "<<< 开始新的事务,基于最åˆçš„修订版 %ld\n"
-# as-is
-#: libsvn_delta/svndiff.c:535
-msgid "Svndiff has backwards-sliding source views"
-msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+#: libsvn_repos/load.c:929
+#, c-format
+msgid "Relative source revision %ld is not available in current repository"
+msgstr "ç›¸å¯¹æ¥æºä¿®è®¢ç‰ˆ %ld ä¸å˜åœ¨äºŽç›®å‰æ¡£æ¡ˆåº“之ä¸"
-#: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630
-#: libsvn_delta/svndiff.c:703
-msgid "Unexpected end of svndiff input"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+#: libsvn_repos/load.c:978
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr "畸形的导出æµï¼šä¿®è®¢ç‰ˆ 0 ä¸èƒ½åŒ…å«èŠ‚ç‚¹è®°å½•"
-#: libsvn_diff/diff_file.c:666
+#: libsvn_repos/load.c:988
#, c-format
-msgid "%s\\ No newline at end of file%s"
-msgstr "%s\\ 在文件 %s 末尾没有新行"
+msgid " * editing path : %s ..."
+msgstr " * æ£åœ¨ä¿®æ”¹è·¯å¾„:%s ..."
-#: libsvn_diff/diff_file.c:1225
+#: libsvn_repos/load.c:995
#, c-format
-msgid "Failed to delete mmap '%s'"
-msgstr "åˆ é™¤mmap â€%s“失败"
+msgid " * deleting path : %s ..."
+msgstr " * æ£åœ¨åˆ 除路径:%s ..."
-#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:157
-#: libsvn_ra/ra_loader.c:170
+#: libsvn_repos/load.c:1003
#, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
-
-#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
-msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%sâ€æ¨¡å—失败"
+msgid " * adding path : %s ..."
+msgstr " * æ£åœ¨æ·»åŠ è·¯å¾„ï¼š%s ..."
-#: libsvn_fs/fs-loader.c:138
+#: libsvn_repos/load.c:1012
#, c-format
-msgid ""
-"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "对“%sâ€æœ‰ä¸ç¬¦åˆçš„ FS 模å—版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+msgid " * replacing path : %s ..."
+msgstr " * æ£åœ¨æ›¿æ¢è·¯å¾„:%s ..."
-#: libsvn_fs/fs-loader.c:163
+#: libsvn_repos/load.c:1022
#, c-format
-msgid "Unknown FS type '%s'"
-msgstr "未知的文件系统(FS)类别“%sâ€"
-
-#: libsvn_fs/fs-loader.c:244
-#, fuzzy
-msgid "Can't allocate FS mutex"
-msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
+msgid "Unrecognized node-action on node '%s'"
+msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
-#: libsvn_fs/fs-loader.c:280
+#: libsvn_repos/load.c:1158
#, fuzzy
-msgid "Can't grab FS mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-
-#: libsvn_fs/fs-loader.c:286
-msgid "Can't ungrab FS mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-
-#: libsvn_fs/fs-loader.c:902
-msgid "Negative expiration date passed to svn_fs_lock"
-msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
+msgid " done.\n"
+msgstr "完æˆã€‚\n"
-#: libsvn_fs_base/bdb/bdb-err.c:101
+# as-is
+#: libsvn_repos/load.c:1233
#, c-format
-msgid "Berkeley DB error for filesystem %s while %s:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-
-#: libsvn_fs_base/bdb/changes-table.c:88
-msgid "creating change"
-msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
-
-#: libsvn_fs_base/bdb/changes-table.c:114
-msgid "deleting changes"
-msgstr "æ£åœ¨åˆ 除更改"
-
-#: libsvn_fs_base/bdb/changes-table.c:146 libsvn_fs_fs/fs_fs.c:1965
-msgid "Missing required node revision ID"
-msgstr "未æä¾›å¿…须的节点修订版 ID"
-
-#: libsvn_fs_base/bdb/changes-table.c:157 libsvn_fs_fs/fs_fs.c:1975
-msgid "Invalid change ordering: new node revision ID without delete"
-msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šæœ‰æ–°çš„节点修订版 ID è€Œæ²¡åˆ é™¤"
-
-#: libsvn_fs_base/bdb/changes-table.c:167 libsvn_fs_fs/fs_fs.c:1986
-msgid "Invalid change ordering: non-add change on deleted path"
-msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šå¯¹åˆ é™¤è·¯å¾„è¿›è¡Œéžæ–°å¢žçš„æ”¹å˜"
-
-#: libsvn_fs_base/bdb/changes-table.c:257
-#: libsvn_fs_base/bdb/changes-table.c:381
-msgid "creating cursor for reading changes"
-msgstr "æ£åœ¨ä¸ºè¯»å–更改创建指针"
-
-#: libsvn_fs_base/bdb/changes-table.c:283
-#: libsvn_fs_base/bdb/changes-table.c:402
-#, fuzzy, c-format
-msgid "Error reading changes for key '%s'"
-msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
-
-#: libsvn_fs_base/bdb/changes-table.c:342
-#: libsvn_fs_base/bdb/changes-table.c:425
-msgid "fetching changes"
-msgstr "æ£åœ¨èŽ·å–æ›´æ”¹"
-
-#: libsvn_fs_base/bdb/changes-table.c:355
-#: libsvn_fs_base/bdb/changes-table.c:438
-msgid "closing changes cursor"
-msgstr "æ£åœ¨å…³é—更改指针"
-
-#: libsvn_fs_base/bdb/copies-table.c:87
-#, fuzzy
-msgid "storing copy record"
-msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
-
-#: libsvn_fs_base/bdb/copies-table.c:112
-msgid "allocating new copy ID (getting 'next-key')"
-msgstr "æ£åœ¨åˆ†é…æ–°æ‹·è´ID (æ£åœ¨èŽ·å–'next-key')"
-
-#: libsvn_fs_base/bdb/copies-table.c:130
-msgid "bumping next copy key"
-msgstr "æ£åœ¨æå–下一个拷è´å…³é”®å—"
-
-#: libsvn_fs_base/bdb/copies-table.c:169
-msgid "deleting entry from 'copies' table"
-msgstr "æ£åœ¨ä»Ž 'copies' 表ä¸åˆ 除æ¡ç›®"
+msgid ""
+"\n"
+"------- Committed revision %ld >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- æäº¤åŽçš„修订版 %ld >>>\n"
+"\n"
# as-is
-#: libsvn_fs_base/bdb/copies-table.c:197
-#, fuzzy
-msgid "reading copy"
-msgstr "æ£åœ¨è¯»å–æ‹·è´"
-
-#: libsvn_fs_base/bdb/nodes-table.c:99
-msgid "allocating new node ID (getting 'next-key')"
-msgstr "æ£åœ¨åˆ†é…新的节点 ID (æ£åœ¨èŽ·å– 'next-key')"
-
-#: libsvn_fs_base/bdb/nodes-table.c:117
-msgid "bumping next node ID key"
-msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
-
-#: libsvn_fs_base/bdb/nodes-table.c:154
-#, fuzzy, c-format
-msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
-msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+#: libsvn_repos/load.c:1239
+#, c-format
+msgid ""
+"\n"
+"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- æäº¤æ–°ä¿®è®¢ç‰ˆ %ld (从原始修订版 %ld 装载) >>>\n"
+"\n"
-#: libsvn_fs_base/bdb/nodes-table.c:180
-msgid "deleting entry from 'nodes' table"
-msgstr "æ£åœ¨ä»Ž 'nodes' è¡¨åˆ é™¤æ¡ç›®"
+#: libsvn_repos/node_tree.c:238
+#, c-format
+msgid "'%s' not found in filesystem"
+msgstr "åœ¨æ–‡ä»¶ç³»ç»Ÿä¸æ‰¾ä¸åˆ°â€œ%sâ€"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:220
-#, fuzzy
-msgid "reading node revision"
-msgstr "æ£åœ¨è¯»å–节点修订版"
+#: libsvn_repos/replay.c:359
+#, c-format
+msgid "Filesystem path '%s' is neither a file nor a directory"
+msgstr "文件系统ä¸è·¯å¾„“%sâ€æ—¢ä¸æ˜¯æ–‡ä»¶ä¹Ÿä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/bdb/nodes-table.c:252
-#, fuzzy
-msgid "storing node revision"
-msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
+#: libsvn_repos/reporter.c:602
+#, c-format
+msgid "Working copy path '%s' does not exist in repository"
+msgstr "工作拷è´è·¯å¾„“%sâ€ä¸å˜åœ¨æ¡£æ¡ˆåº“ä¸"
-#: libsvn_fs_base/bdb/reps-table.c:95 libsvn_fs_base/bdb/reps-table.c:202
-#, fuzzy, c-format
-msgid "No such representation '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
+#: libsvn_repos/reporter.c:823
+msgid "Not authorized to open root of edit operation"
+msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:98
+#: libsvn_repos/reporter.c:842
#, fuzzy
-msgid "reading representation"
-msgstr "æ£åœ¨è¯»å–请求"
+msgid "Target path does not exist"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
-#: libsvn_fs_base/bdb/reps-table.c:126
-#, fuzzy
-msgid "storing representation"
-msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
+#: libsvn_repos/reporter.c:849
+msgid "Cannot replace a directory from within"
+msgstr "ä¸èƒ½åœ¨ç›®å½•䏿›¿æ¢"
-#: libsvn_fs_base/bdb/reps-table.c:156
-msgid "allocating new representation (getting next-key)"
-msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
+#: libsvn_repos/reporter.c:892
+msgid "Invalid report for top level of working copy"
+msgstr "æ— æ•ˆçš„æœ€ä¸Šå±‚å·¥ä½œæ‹·è´æŠ¥å‘Š"
-#: libsvn_fs_base/bdb/reps-table.c:177
-#, fuzzy
-msgid "bumping next representation key"
-msgstr "æ£åœ¨æå–下一个请求关键å—"
+#: libsvn_repos/reporter.c:907
+msgid "Two top-level reports with no target"
+msgstr "ä¸¤ä¸ªæœ€ä¸Šå±‚æŠ¥å‘Šæ²¡æœ‰ç›®æ ‡"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:205
-#, fuzzy
-msgid "deleting representation"
-msgstr "æ£åœ¨åˆ 除请求"
+#: libsvn_repos/repos.c:176
+#, c-format
+msgid "'%s' exists and is non-empty"
+msgstr "“%sâ€å·²å˜åœ¨å¹¶ä¸”éžç©º"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/rev-table.c:88
-#, fuzzy
-msgid "reading filesystem revision"
-msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
+#: libsvn_repos/repos.c:238
+msgid "Creating db logs lock file"
+msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“æ—¥å€¼é”æ–‡ä»¶"
-#: libsvn_fs_base/bdb/strings-table.c:91
-msgid "creating cursor for reading a string"
-msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
+#: libsvn_repos/repos.c:256
+msgid "Creating db lock file"
+msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“锿–‡ä»¶"
-#: libsvn_fs_base/bdb/txn-table.c:94
-#, fuzzy
-msgid "storing transaction record"
-msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
+#: libsvn_repos/repos.c:266
+msgid "Creating lock dir"
+msgstr "æ£åœ¨åˆ›å»ºé”文件目录"
-#: libsvn_fs_base/bdb/uuids-table.c:112
-#, fuzzy
-msgid "get repository uuid"
-msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+#: libsvn_repos/repos.c:307
+msgid "Creating hook directory"
+msgstr "æ£åœ¨åˆ›å»ºå¤–挂目录"
-#: libsvn_fs_base/bdb/uuids-table.c:140
-#, fuzzy
-msgid "set repository uuid"
-msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+#: libsvn_repos/repos.c:413
+msgid "Creating start-commit hook"
+msgstr "æ£åœ¨åˆ›å»º start-commit 外挂时å‘生错误"
-#: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
-msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+#: libsvn_repos/repos.c:550
+msgid "Creating pre-commit hook"
+msgstr "æ£åœ¨åˆ›å»º pre-commit 外挂"
-#: libsvn_fs_base/dag.c:247
-#, fuzzy, c-format
-msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+#: libsvn_repos/repos.c:682
+msgid "Creating pre-revprop-change hook"
+msgstr "æ£åœ¨åˆ›å»º pre-revprop-change 外挂"
-#: libsvn_fs_base/dag.c:256
-#, fuzzy, c-format
-msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+#: libsvn_repos/repos.c:1057
+msgid "Creating post-commit hook"
+msgstr "æ£åœ¨åˆ›å»º post-commit 外挂"
-#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:386
-#, fuzzy
-msgid "Attempted to create entry in non-directory parent"
-msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
+#: libsvn_repos/repos.c:1377
+msgid "Creating post-revprop-change hook"
+msgstr "æ£åœ¨åˆ›å»º post-revprop-change 外挂"
-#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:380
-#, c-format
-msgid "Attempted to create a node with an illegal name '%s'"
-msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
+#: libsvn_repos/repos.c:1387
+msgid "Creating conf directory"
+msgstr "æ£åœ¨åˆ›å»º conf 目录"
-#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:392
-#, fuzzy
-msgid "Attempted to clone child of non-mutable node"
-msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
+#: libsvn_repos/repos.c:1453
+msgid "Creating svnserve.conf file"
+msgstr "æ£åœ¨åˆ›å»º svnserve.conf 文件"
-#: libsvn_fs_base/dag.c:494
-#, fuzzy
-msgid "Attempted to create entry that already exists"
-msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
+#: libsvn_repos/repos.c:1478
+msgid "Creating passwd file"
+msgstr "æ£åœ¨åˆ›å»º passwd 文件"
-#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:454
+#: libsvn_repos/repos.c:1527
#, fuzzy
-msgid "Attempted to set entry in non-directory node"
-msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
+msgid "Creating authz file"
+msgstr "æ£åœ¨åˆ›å»º passwd 文件"
-#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:460
-#, fuzzy
-msgid "Attempted to set entry in immutable node"
-msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
+#: libsvn_repos/repos.c:1560
+msgid "Could not create top-level directory"
+msgstr "æ— æ³•åˆ›å»ºæœ€ä¸Šå±‚ç›®å½•"
-#: libsvn_fs_base/dag.c:615
-#, c-format
-msgid "Can't set proplist on *immutable* node-revision %s"
-msgstr "ä¸èƒ½åœ¨ä¸å¯æ›´æ”¹èŠ‚ç‚¹ä¿®è®¢ç‰ˆ %s 设置属性列表"
+#: libsvn_repos/repos.c:1564
+msgid "Creating DAV sandbox dir"
+msgstr "æ£åœ¨åˆ›å»º DAV sandbox 目录"
-#: libsvn_fs_base/dag.c:727
-#, c-format
-msgid "Attempted to make a child clone with an illegal name '%s'"
-msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
+#: libsvn_repos/repos.c:1645
+msgid "Error opening db lockfile"
+msgstr "打开数æ®åº“锿–‡ä»¶é”™è¯¯"
-#: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from *non*-directory node"
-msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
+#: libsvn_repos/repos.c:1676
+msgid "Repository creation failed"
+msgstr "档案库创建失败"
-#: libsvn_fs_base/dag.c:858
+#: libsvn_repos/repos.c:1756
#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from immutable directory node"
-msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
+msgid "Expected format '%d' of repository; found format '%d'"
+msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
-#: libsvn_fs_base/dag.c:865
+#: libsvn_repos/rev_hunt.c:64
#, c-format
-msgid "Attempted to delete a node with an illegal name '%s'"
-msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
-
-#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
-#, fuzzy, c-format
-msgid "Delete failed: directory has no entry '%s'"
-msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
-
-#: libsvn_fs_base/dag.c:962
-#, fuzzy
-msgid "Attempted removal of immutable node"
-msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
-
-#: libsvn_fs_base/dag.c:1082
-msgid "Attempted to get textual contents of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
-
-#: libsvn_fs_base/dag.c:1117
-msgid "Attempted to get length of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„é•¿åº¦"
+msgid "Failed to find time on revision %ld"
+msgstr "æ— æ³•æ‰¾åˆ°ä¿®è®¢ç‰ˆ %ld 的时间"
-#: libsvn_fs_base/dag.c:1143
-msgid "Attempted to get checksum of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
+#: libsvn_repos/rev_hunt.c:219
+#, c-format
+msgid "Invalid start revision %ld"
+msgstr "æ— æ•ˆçš„èµ·å§‹ä¿®è®¢ç‰ˆ %ld"
-#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy
-msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+#: libsvn_repos/rev_hunt.c:223
+#, c-format
+msgid "Invalid end revision %ld"
+msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
-#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
+#: libsvn_repos/rev_hunt.c:315
#, fuzzy
-msgid "Attempted to set textual contents of an immutable node"
-msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+msgid "Unreadable path encountered; access denied"
+msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
-#: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
+#: libsvn_subr/cmdline.c:481
+#, c-format
+msgid "Error initializing command line arguments"
msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
-#: libsvn_fs_base/dag.c:1312
+#: libsvn_subr/config.c:630
#, c-format
-msgid "Attempted to open non-existent child node '%s'"
-msgstr "ä¼å›¾æ‰“å¼€ä¸å˜åœ¨çš„å节点“%sâ€"
+msgid "Config error: invalid boolean value '%s'"
+msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„å¸ƒå°”å€¼â€œ%sâ€"
-#: libsvn_fs_base/dag.c:1318
+#: libsvn_subr/config.c:880
#, c-format
-msgid "Attempted to open node with an illegal name '%s'"
-msgstr "ä¼å›¾ä»¥ä¸åˆæ³•çš„åå—“%sâ€æ‰“开节点"
-
-#: libsvn_fs_base/err.c:37 libsvn_fs_fs/err.c:39
-msgid "Filesystem object has not been opened yet"
-msgstr "文件系统对象尚未打开"
+msgid "Config error: invalid integer value '%s'"
+msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„æ•´æ•°å€¼â€œ%sâ€"
-#: libsvn_fs_base/err.c:68 libsvn_fs_fs/err.c:70
-#, c-format
-msgid "Corrupt filesystem revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸çš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆ %1$ld æŸå"
+#: libsvn_subr/config_auth.c:94
+msgid "Unable to open auth file for reading"
+msgstr "ä¸èƒ½æ‰“å¼€è®¤è¯æ–‡ä»¶è¯»å–æ•°æ®"
-#: libsvn_fs_base/err.c:81 libsvn_fs_fs/err.c:83
+#: libsvn_subr/config_auth.c:99
#, c-format
-msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
+msgid "Error parsing '%s'"
+msgstr "分解“%sâ€æ—¶å‘生错误"
-#: libsvn_fs_base/err.c:101 libsvn_fs_fs/err.c:103
-#, c-format
-msgid "Reference to non-existent node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„节点“%1$sâ€"
+#: libsvn_subr/config_auth.c:123
+msgid "Unable to locate auth file"
+msgstr "æ— æ³•å®šä½è®¤è¯æ–‡ä»¶æ–‡ä»¶"
-#: libsvn_fs_base/err.c:111 libsvn_fs_fs/err.c:113
-#, c-format
-msgid "Reference to non-existent revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„修订版“%1$ldâ€"
+#: libsvn_subr/config_auth.c:134
+msgid "Unable to open auth file for writing"
+msgstr "æ— æ³•æ‰“å¼€è®¤è¯æ–‡ä»¶å†™å…¥æ•°æ®"
-#: libsvn_fs_base/err.c:122 libsvn_fs_fs/err.c:124
+#: libsvn_subr/config_auth.c:137
#, c-format
-msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
+msgid "Error writing hash to '%s'"
+msgstr "写哈希数æ®è‡³â€œ%sâ€æ—¶å‘生错误"
-#: libsvn_fs_base/err.c:132 libsvn_fs_fs/err.c:134
+#: libsvn_subr/date.c:204
#, c-format
-msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid "Can't manipulate current date"
+msgstr "ä¸èƒ½è޷得当剿—¥æœŸ"
-#: libsvn_fs_base/err.c:144 libsvn_fs_fs/err.c:146
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
#, c-format
-msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'transactions' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid "Can't calculate requested date"
+msgstr "æ— æ³•è®¡ç®—è¢«è¯·æ±‚çš„æ—¥æœŸ"
-#: libsvn_fs_base/err.c:155 libsvn_fs_fs/err.c:157
+#: libsvn_subr/date.c:281
#, c-format
-msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'copies' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid "Can't expand time"
+msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
-#: libsvn_fs_base/err.c:166 libsvn_fs_fs/err.c:190
-#, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "æ–‡ä»¶æ— æ³•å˜æ›´ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
+#: libsvn_subr/dso.c:70
+#, fuzzy, c-format
+msgid "Can't grab DSO mutex"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: libsvn_fs_base/err.c:177 libsvn_fs_fs/err.c:201
-#, c-format
-msgid "Search for malformed path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
+#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
+#, fuzzy, c-format
+msgid "Can't ungrab DSO mutex"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: libsvn_fs_base/err.c:188 libsvn_fs_fs/err.c:212
-#, c-format
-msgid "No transaction named '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸ä¸å˜åœ¨å为“%1$sâ€çš„事务"
+#: libsvn_subr/error.c:326
+msgid "Can't recode error string from APR"
+msgstr "æ— æ³•è‡ª APR 将错误信æ¯é‡æ–°ç¼–ç "
-#: libsvn_fs_base/err.c:199 libsvn_fs_fs/err.c:223
+#: libsvn_subr/error.c:417
#, c-format
-msgid "Cannot modify transaction named '%s' in filesystem '%s'"
-msgstr "æ— æ³•åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%2$sâ€ä¸ä¿®æ”¹å为“%1$sâ€çš„事务"
+msgid "%swarning: %s\n"
+msgstr "%sè¦å‘Šï¼š%s\n"
-#: libsvn_fs_base/err.c:210 libsvn_fs_fs/err.c:234
+#: libsvn_subr/io.c:122
#, c-format
-msgid "No copy with id '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸æ²¡æœ‰ç¼–å·â€œ%1$sâ€çš„æ‹·è´"
+msgid "Can't check path '%s'"
+msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€"
-#: libsvn_fs_base/err.c:220 libsvn_fs_fs/err.c:266
+#: libsvn_subr/io.c:376 libsvn_subr/io.c:507
#, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgid "Can't open '%s'"
+msgstr "ä¸èƒ½æ‰“开“%sâ€"
-#: libsvn_fs_base/err.c:231 libsvn_fs_fs/err.c:288
-#, fuzzy, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+#: libsvn_subr/io.c:398 libsvn_subr/io.c:520
+#, c-format
+msgid "Unable to make name for '%s'"
+msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
-#: libsvn_fs_base/err.c:242 libsvn_fs_fs/err.c:277
-#, fuzzy, c-format
-msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
-msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
+#: libsvn_subr/io.c:524 libsvn_subr/io.c:578 libsvn_subr/io.c:606
+msgid "Symbolic links are not supported on this platform"
+msgstr "æ¤å¹³å°ä¸æ”¯æŒç¬¦å·é“¾æŽ¥"
-#: libsvn_fs_base/err.c:252
-#, fuzzy, c-format
-msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
+#: libsvn_subr/io.c:557
+#, c-format
+msgid "Can't read contents of link"
+msgstr "ä¸èƒ½è¯»å–连接的内容"
-#: libsvn_fs_base/err.c:261
-#, fuzzy, c-format
-msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
+#: libsvn_subr/io.c:619
+#, c-format
+msgid "Can't find a temporary directory"
+msgstr "æ— æ³•æ‰¾åˆ°ä¸´æ—¶ç›®å½•"
-#: libsvn_fs_base/err.c:271 libsvn_fs_fs/err.c:244
-#, fuzzy, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
+#: libsvn_subr/io.c:752
+#, c-format
+msgid "Can't copy '%s' to '%s'"
+msgstr "ä¸èƒ½å¤åˆ¶â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_base/err.c:282 libsvn_fs_fs/err.c:179
-#, fuzzy, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
+# as-is
+#: libsvn_subr/io.c:786
+#, c-format
+msgid "Can't set permissions on '%s'"
+msgstr "ä¸èƒ½åœ¨â€œ%sâ€è®¾ç½®è®¸å¯æƒé™"
-#: libsvn_fs_base/err.c:293 libsvn_fs_fs/err.c:255
+#: libsvn_subr/io.c:808
#, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
+msgid "Can't append '%s' to '%s'"
+msgstr "ä¸èƒ½é™„åŠ â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_base/err.c:305 libsvn_fs_fs/err.c:312
-#, fuzzy, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
+#: libsvn_subr/io.c:842
+#, c-format
+msgid "Source '%s' is not a directory"
+msgstr "æºâ€œ%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/err.c:317 libsvn_fs_fs/err.c:299
-#, fuzzy, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
+#: libsvn_subr/io.c:848
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的“%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/fs.c:79
+#: libsvn_subr/io.c:854
#, c-format
-msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
-msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
+msgid "Destination '%s' already exists"
+msgstr "目的“%sâ€å·²å˜åœ¨"
-#: libsvn_fs_base/fs.c:90
+#: libsvn_subr/io.c:923 libsvn_subr/io.c:1820 libsvn_subr/io.c:1871
+#: libsvn_subr/io.c:1934
#, c-format
-msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
+msgid "Can't read directory '%s'"
+msgstr "æ— æ³•è¯»å–目录“%sâ€"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:57
-#, fuzzy
-msgid "Filesystem object already open"
-msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
+#: libsvn_subr/io.c:928 libsvn_subr/io.c:1825 libsvn_subr/io.c:1876
+#: libsvn_subr/io.c:1939 libsvn_subr/io.c:2986
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "å…³é—目录“%sâ€æ—¶å‘生错误"
-#: libsvn_fs_base/fs.c:676 libsvn_fs_fs/fs_fs.c:252
+#: libsvn_subr/io.c:954
#, c-format
-msgid "Expected FS format '%d'; found format '%d'"
-msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+msgid "Can't make directory '%s'"
+msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
# as-is
-#: libsvn_fs_base/fs.c:1055
-#, fuzzy, c-format
-msgid "Can't open file '%s' for reading"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
+#: libsvn_subr/io.c:1041
+#, c-format
+msgid "Can't set access time of '%s'"
+msgstr "ä¸èƒ½è®¾ç½®â€œ%sâ€çš„å˜å–æ—¶é—´"
+
+#: libsvn_subr/io.c:1181
+#, c-format
+msgid "Can't get default file perms for file at '%s' (file stat error)"
+msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
# as-is
-#: libsvn_fs_base/fs.c:1064
+#: libsvn_subr/io.c:1192
#, fuzzy, c-format
-msgid "Can't open file '%s' for writing"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
+msgid "Can't open file at '%s'"
+msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
-#: libsvn_fs_base/fs.c:1084
+#: libsvn_subr/io.c:1196
#, fuzzy, c-format
-msgid "Error reading file '%s'"
-msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
+msgid "Can't get file perms for file at '%s' (file stat error)"
+msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
-#: libsvn_fs_base/fs.c:1095
+#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
#, fuzzy, c-format
-msgid "Error writing file '%s'"
-msgstr "写入文件“%sâ€æ—¶å‘生错误"
+msgid "Can't change perms of file '%s'"
+msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
-#: libsvn_fs_base/fs.c:1103 libsvn_fs_base/fs.c:1107 libsvn_subr/io.c:2210
+#: libsvn_subr/io.c:1370
#, c-format
-msgid "Can't close file '%s'"
-msgstr "æ— æ³•å…³é—æ–‡ä»¶â€œ%sâ€"
+msgid "Can't set file '%s' read-only"
+msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€åªè¯»"
-#: libsvn_fs_base/fs.c:1216
-#, fuzzy
-msgid ""
-"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
-"may be interfering with the hotcopy algorithm. If \n"
-"the problem persists, try deactivating this feature \n"
-"in DB_CONFIG"
-msgstr ""
-"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
-"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
-"在 DB_CONFIG ä¸å–消这个功能。"
+#: libsvn_subr/io.c:1402
+#, c-format
+msgid "Can't set file '%s' read-write"
+msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€å¯è¯»å†™"
-#: libsvn_fs_base/fs.c:1235
-#, fuzzy
-msgid ""
-"Error running catastrophic recovery on hotcopy; the \n"
-"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
-"hotcopy algorithm. If the problem persists, try deactivating \n"
-"this feature in DB_CONFIG"
-msgstr ""
-"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
-"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
-"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
+#: libsvn_subr/io.c:1446
+#, c-format
+msgid "Error getting UID of process"
+msgstr "获å–进程用户ID(UID)时å‘生错误"
-#: libsvn_fs_base/fs.c:1345
-msgid "Module for working with a Berkeley DB repository."
-msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
+#: libsvn_subr/io.c:1527
+#, c-format
+msgid "Can't get shared lock on file '%s'"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%s“的共享é”"
-#: libsvn_fs_base/fs.c:1379
+#: libsvn_subr/io.c:1531
#, c-format
-msgid "Unsupported FS loader version (%d) for bdb"
-msgstr "䏿”¯æŒçš„ bdb çš„ FS 载入器版本 (%d)"
+msgid "Can't get exclusive lock on file '%s'"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%sâ€çš„æŽ’ä»–é”"
-#: libsvn_fs_base/lock.c:449 libsvn_fs_fs/lock.c:615
+# as-is
+#: libsvn_subr/io.c:1562
#, c-format
-msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "ä¸èƒ½åœ¨è·¯å¾„“%sâ€æ ¡éªŒé”;没有有效的用户å"
+msgid "Can't flush file '%s'"
+msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_base/lock.c:455 libsvn_fs_fs/lock.c:621
+#: libsvn_subr/io.c:1563
#, c-format
-msgid "User %s does not own lock on path '%s' (currently locked by %s)"
-msgstr "用户 %s 䏿˜¯è·¯å¾„“%sâ€é”的所有者(当å‰ç”±ç”¨æˆ· %s é”定)"
+msgid "Can't flush stream"
+msgstr "ä¸èƒ½å†™å…¥æµ"
-#: libsvn_fs_base/lock.c:462 libsvn_fs_fs/lock.c:628
+#: libsvn_subr/io.c:1575 libsvn_subr/io.c:1592
#, c-format
-msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "ä¸èƒ½æ ¡éªŒè·¯å¾„“%sâ€ä¸Šçš„é”;没有匹é…çš„å¯ç”¨é”æ ‡è¯†"
+msgid "Can't flush file to disk"
+msgstr "ä¸èƒ½æŠŠæ–‡ä»¶å†™å…¥ç£ç›˜"
-#: libsvn_fs_base/reps-strings.c:103
-#, fuzzy
-msgid "Representation is not of type 'delta'"
-msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
+#: libsvn_subr/io.c:1613
+msgid "Reading from stdin is currently broken, so disabled"
+msgstr "ä»Žæ ‡å‡†è¾“å…¥è®¾å¤‡è¯»å–æ•°æ®æ—¶è¢«ä¸æ–ï¼Œæ‰€ä»¥æŠŠå®ƒç¦æ¢"
-#: libsvn_fs_base/reps-strings.c:495
+#: libsvn_subr/io.c:1634
#, c-format
-msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
+msgid "Can't get file name"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
-#: libsvn_fs_base/reps-strings.c:758
+# as-is
+#: libsvn_subr/io.c:1702
#, c-format
-msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
+msgid "Can't remove file '%s'"
+msgstr "ä¸èƒ½ç§»åŠ¨æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_base/reps-strings.c:774
-#, fuzzy, c-format
-msgid "Failure reading rep '%s'"
-msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
+#: libsvn_subr/io.c:1756 libsvn_subr/io.c:2837 libsvn_subr/io.c:2923
+#, c-format
+msgid "Can't open directory '%s'"
+msgstr "æ— æ³•æ‰“å¼€ç›®å½•â€œ%sâ€"
-#: libsvn_fs_base/reps-strings.c:790 libsvn_fs_base/reps-strings.c:876
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch on rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
-" 预期: %s\n"
-" 实际: %s\n"
+#: libsvn_subr/io.c:1801 libsvn_subr/io.c:1831
+#, c-format
+msgid "Can't remove '%s'"
+msgstr "æ— æ³•åˆ é™¤â€œ%sâ€"
-#: libsvn_fs_base/reps-strings.c:890
-msgid "Null rep, but offset past zero already"
-msgstr "空的报告,å移已ç»è¶…过零值"
+#: libsvn_subr/io.c:1811
+#, c-format
+msgid "Can't rewind directory '%s'"
+msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
-#: libsvn_fs_base/reps-strings.c:1003 libsvn_fs_base/reps-strings.c:1199
-#, fuzzy, c-format
-msgid "Rep '%s' is not mutable"
-msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
+#: libsvn_subr/io.c:2003
+#, c-format
+msgid "Can't create process '%s' attributes"
+msgstr "æ— æ³•å»ºç«‹è¿›ç¨‹â€œ%sâ€çš„属性"
-#: libsvn_fs_base/reps-strings.c:1018
+#: libsvn_subr/io.c:2009
#, c-format
-msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
+msgid "Can't set process '%s' cmdtype"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„命令类型"
-#: libsvn_fs_base/reps-strings.c:1318
-msgid "Failed to get new string key"
-msgstr "å–æ–°çš„å—符串关键å—失败"
+#: libsvn_subr/io.c:2021
+#, c-format
+msgid "Can't set process '%s' directory"
+msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
-#: libsvn_fs_base/reps-strings.c:1393
+#: libsvn_subr/io.c:2034
#, c-format
-msgid "Attempt to deltify '%s' against itself"
-msgstr "ä¼å›¾ deltify “%s†自身"
+msgid "Can't set process '%s' child input"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
-#: libsvn_fs_base/reps-strings.c:1459
-#, fuzzy, c-format
-msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%sâ€çš„MD5指纹失败"
+#: libsvn_subr/io.c:2041
+#, c-format
+msgid "Can't set process '%s' child outfile"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
-#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
-msgid "Transaction is not dead: '%s'"
-msgstr "事务未结æŸï¼šâ€œ%sâ€"
+#: libsvn_subr/io.c:2048
+#, c-format
+msgid "Can't set process '%s' child errfile"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
+#: libsvn_subr/io.c:2055
#, fuzzy, c-format
-msgid "Transaction is dead: '%s'"
-msgstr "事务已结æŸï¼šâ€œ%sâ€"
-
-#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
-msgid "Transaction aborted, but cleanup failed"
-msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
+msgid "Can't set process '%s' child errfile for error handler"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:311
+#: libsvn_subr/io.c:2061
#, fuzzy, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
+msgid "Can't set process '%s' error handler"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:317
+# as-is
+#: libsvn_subr/io.c:2084
#, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "文件找ä¸åˆ°ï¼šä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-
-#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
+msgid "Can't start process '%s'"
+msgstr "ä¸èƒ½å–得进程“%sâ€çжæ€"
-#: libsvn_fs_base/tree.c:418 libsvn_fs_fs/tree.c:338
+#: libsvn_subr/io.c:2108
#, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
+msgid "Error waiting for process '%s'"
+msgstr "为进程“%sâ€å†™å…¥æ—¶å‘生错误"
-#: libsvn_fs_base/tree.c:428 libsvn_fs_fs/tree.c:348
-#, fuzzy
-msgid "Root object must be a transaction root"
-msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
+#: libsvn_subr/io.c:2116
+#, c-format
+msgid "Process '%s' failed (exitwhy %d)"
+msgstr "进程“%sâ€å¤±è´¥(返回 %d)"
-#: libsvn_fs_base/tree.c:837 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
-msgid "Failure opening '%s'"
-msgstr "打开“%sâ€å¤±è´¥"
+#: libsvn_subr/io.c:2123
+#, c-format
+msgid "Process '%s' returned error exitcode %d"
+msgstr "进程“%sâ€è¿”回错误退出ç %d"
-#: libsvn_fs_base/tree.c:1407 libsvn_fs_fs/tree.c:1155
-#, fuzzy
-msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+#: libsvn_subr/io.c:2234
+#, c-format
+msgid "'%s' returned %d"
+msgstr "“%s†返回 %d"
-#: libsvn_fs_base/tree.c:1741
-msgid "Corrupt DB: faulty predecessor count"
-msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
+#: libsvn_subr/io.c:2357
+#, c-format
+msgid ""
+"Error running '%s': exitcode was %d, args were:\n"
+"in directory '%s', basenames:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"è¿è¡Œâ€œ%sâ€æ—¶å‘ç”Ÿé”™è¯¯ï¼šé€€å‡ºç æ˜¯ %dï¼Œå‚æ•°æ˜¯ï¼š\n"
+"在目录“%sâ€ï¼Œåå—:\n"
+"%s\n"
+"%s\n"
+"%s"
-#: libsvn_fs_base/tree.c:1796 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
-msgid "Unexpected immutable node at '%s'"
-msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
+#: libsvn_subr/io.c:2410
+#, c-format
+msgid "Can't detect MIME type of non-file '%s'"
+msgstr "ä¸èƒ½æ£€æµ‹éžæ–‡ä»¶çš„“%sâ€çš„MIME类型"
# as-is
-#: libsvn_fs_base/tree.c:1817 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
-msgid "Conflict at '%s'"
-msgstr "在“%sâ€å†²çª"
-
-#: libsvn_fs_base/tree.c:1867 libsvn_fs_base/tree.c:2570
-#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1753
-msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "错误的åˆå¹¶ï¼›æœ€åˆçš„ï¼ŒåŽŸå§‹ï¼Œç›®æ ‡ä¸æ˜¯å…¨éƒ¨åœ¨åŒä¸€ä¸ªæ–‡ä»¶ç³»ç»Ÿ(fs)"
-
-#: libsvn_fs_base/tree.c:1883 libsvn_fs_fs/tree.c:1280
+#: libsvn_subr/io.c:2477
#, c-format
-msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
+msgid "Can't open file '%s'"
+msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
-#: libsvn_fs_base/tree.c:2377
-#, fuzzy, c-format
-msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
+#: libsvn_subr/io.c:2513
+#, c-format
+msgid "Can't close file '%s'"
+msgstr "æ— æ³•å…³é—æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_base/tree.c:2753 libsvn_fs_fs/tree.c:1892
-#, fuzzy
-msgid "The root directory cannot be deleted"
-msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
+#: libsvn_subr/io.c:2514
+#, c-format
+msgid "Can't close stream"
+msgstr "æ— æ³•å…³é—æµ"
-#: libsvn_fs_base/tree.c:2912 libsvn_fs_fs/tree.c:1939
-msgid "Copy from mutable tree not currently supported"
-msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
+# as-is
+#: libsvn_subr/io.c:2524 libsvn_subr/io.c:2548 libsvn_subr/io.c:2561
+#, c-format
+msgid "Can't read file '%s'"
+msgstr "ä¸èƒ½è¯»å–文件“%sâ€"
-#: libsvn_fs_base/tree.c:3407 libsvn_fs_fs/tree.c:2363
-#, fuzzy, c-format
-msgid ""
-"Base checksum mismatch on '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:2525 libsvn_subr/io.c:2549 libsvn_subr/io.c:2562
+#, c-format
+msgid "Can't read stream"
+msgstr "æ— æ³•è¯»å–æµ"
-#: libsvn_fs_base/tree.c:3660 libsvn_fs_fs/tree.c:2599
-#, fuzzy
-msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
+#: libsvn_subr/io.c:2536
+#, c-format
+msgid "Can't get attribute information from file '%s'"
+msgstr "æ— æ³•ä»Žæ–‡ä»¶â€œ%sâ€èŽ·å–属性信æ¯"
-#: libsvn_fs_base/tree.c:3669 libsvn_fs_base/tree.c:3674
-#: libsvn_fs_fs/tree.c:2608 libsvn_fs_fs/tree.c:2613
-#: libsvn_repos/rev_hunt.c:540
-#, fuzzy, c-format
-msgid "'%s' is not a file"
-msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
+#: libsvn_subr/io.c:2537
+#, c-format
+msgid "Can't get attribute information from stream"
+msgstr "æ— æ³•ä»ŽæµèŽ·å–属性信æ¯"
-#: libsvn_fs_fs/dag.c:436
-#, fuzzy
-msgid "Can't get entries of non-directory"
-msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
+#: libsvn_subr/io.c:2573
+#, c-format
+msgid "Can't set position pointer in file '%s'"
+msgstr "æ— æ³•åœ¨æ–‡ä»¶â€œ%sâ€è®¾ç½®å®šä½æŒ‡é’ˆ"
-#: libsvn_fs_fs/dag.c:952
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, file '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:2574
+#, c-format
+msgid "Can't set position pointer in stream"
+msgstr "æ— æ³•åœ¨æµä¸è®¾ç½®å®šä½æŒ‡é’ˆ"
-#: libsvn_fs_fs/err.c:60
+#: libsvn_subr/io.c:2585 libsvn_subr/io.c:2598
#, c-format
-msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
+msgid "Can't write to file '%s'"
+msgstr "æ— æ³•å†™å…¥æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_fs/err.c:92
+#: libsvn_subr/io.c:2586 libsvn_subr/io.c:2599
#, c-format
-msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+msgid "Can't write to stream"
+msgstr "æ— æ³•å†™å…¥æµ"
-#: libsvn_fs_fs/err.c:168
+# as-is
+#: libsvn_subr/io.c:2639
#, fuzzy, c-format
-msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
-
-#: libsvn_fs_fs/fs.c:98
-msgid "Can't fetch FSFS mutex"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+msgid "Can't read length line in file '%s'"
+msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
-#: libsvn_fs_fs/fs.c:105
+#: libsvn_subr/io.c:2643
#, fuzzy
-msgid "Can't create FSFS mutex"
-msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+msgid "Can't read length line in stream"
+msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
-#: libsvn_fs_fs/fs.c:109
-msgid "Can't store FSFS mutex"
-msgstr "ä¸èƒ½å˜å‚¨æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+#: libsvn_subr/io.c:2690
+#, c-format
+msgid "Can't move '%s' to '%s'"
+msgstr "ä¸èƒ½ç§»åŠ¨â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_fs/fs.c:334
-msgid "Module for working with a plain file (FSFS) repository."
-msgstr "模å—与纯文本文件(FSFS)档案库一起工作。"
+#: libsvn_subr/io.c:2768
+#, c-format
+msgid "Can't create directory '%s'"
+msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs.c:368
+#: libsvn_subr/io.c:2779 libsvn_wc/copy.c:298
#, c-format
-msgid "Unsupported FS loader version (%d) for fsfs"
-msgstr "䏿”¯æŒçš„ fsfs çš„ FS 载入器版本 (%d)"
+msgid "Can't hide directory '%s'"
+msgstr "æ— æ³•éšè—目录“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:455 libsvn_fs_fs/fs_fs.c:469
-msgid "Found malformed header in revision file"
-msgstr "åœ¨ä¿®è®¢ç‰ˆæ–‡ä»¶ä¸æ‰¾åˆ°ç•¸å½¢çš„æ–‡ä»¶å¤´"
+#: libsvn_subr/io.c:2791
+#, c-format
+msgid "Can't stat directory '%s'"
+msgstr "æ— æ³•èŽ·å–目录“%sâ€çš„状æ€"
-#: libsvn_fs_fs/fs_fs.c:571 libsvn_fs_fs/fs_fs.c:585 libsvn_fs_fs/fs_fs.c:592
-#: libsvn_fs_fs/fs_fs.c:599 libsvn_fs_fs/fs_fs.c:607 libsvn_fs_fs/fs_fs.c:615
-msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
+#: libsvn_subr/io.c:2855
+#, c-format
+msgid "Can't remove directory '%s'"
+msgstr "æ— æ³•åˆ é™¤ç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:684
-msgid "Missing kind field in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ kind æ ä½"
+#: libsvn_subr/io.c:2873
+#, c-format
+msgid "Can't read directory"
+msgstr "æ— æ³•è¯»å–目录"
-#: libsvn_fs_fs/fs_fs.c:715
-msgid "Missing cpath in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ cpath"
+#: libsvn_subr/io.c:2942
+#, c-format
+msgid "Can't read directory entry in '%s'"
+msgstr "æ— æ³•åœ¨ç›®å½•â€œ%sâ€è¯»å–内容"
-#: libsvn_fs_fs/fs_fs.c:742 libsvn_fs_fs/fs_fs.c:748
-msgid "Malformed copyroot line in node-rev"
-msgstr "node-rev ä¸çš„ copyroot 行畸形"
+#: libsvn_subr/io.c:3067
+#, c-format
+msgid "Can't check directory '%s'"
+msgstr "æ— æ³•æ£€æŸ¥ç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:766 libsvn_fs_fs/fs_fs.c:772
-msgid "Malformed copyfrom line in node-rev"
-msgstr "node-rev ä¸çš„ copyfrom 行畸形"
+#: libsvn_subr/io.c:3089
+#, c-format
+msgid "Version %d is not non-negative"
+msgstr "版本 %d 未被确认"
-#: libsvn_fs_fs/fs_fs.c:871 libsvn_fs_fs/fs_fs.c:3184
-msgid "Attempted to write to non-transaction"
-msgstr "ä¼å›¾å†™è‡³éžäº‹åŠ¡"
+#: libsvn_subr/io.c:3139
+#, c-format
+msgid "Reading '%s'"
+msgstr "æ£åœ¨è¯»å–“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:955
-msgid "Malformed representation header"
-msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
+#: libsvn_subr/io.c:3155
+#, c-format
+msgid "First line of '%s' contains non-digit"
+msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
-#: libsvn_fs_fs/fs_fs.c:979
-msgid "Missing node-id in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ node-id"
+#: libsvn_subr/nls.c:79
+#, fuzzy, c-format
+msgid "Can't convert string to UCS-2: '%s'"
+msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
-#: libsvn_fs_fs/fs_fs.c:985
-msgid "Corrupt node-id in node-rev"
-msgstr "node-rev ä¸çš„ node-id æŸå"
+#: libsvn_subr/nls.c:86
+#, fuzzy
+msgid "Can't get module file name"
+msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
-#: libsvn_fs_fs/fs_fs.c:1030
-msgid "Revision file lacks trailing newline"
-msgstr "修订版文件缺少结尾æ¢è¡Œç¬¦"
+#: libsvn_subr/nls.c:101
+#, c-format
+msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
+msgstr "ä¸èƒ½æŠŠæ¨¡å—路径从UCS-2转æ¢ä¸ºUTF-8:“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:1042
-msgid "Final line in revision file longer than 64 characters"
-msgstr "修订版文件的最åŽä¸€åˆ—大于 64 个å—符长"
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
+msgid ""
+"\n"
+"Valid options:\n"
+msgstr ""
+"\n"
+"有效选项:\n"
-#: libsvn_fs_fs/fs_fs.c:1055
-msgid "Final line in revision file missing space"
-msgstr "修订版文件的最åŽä¸€åˆ—少掉空白å—符"
+#: libsvn_subr/opt.c:424
+msgid " arg"
+msgstr " 傿•°"
-#: libsvn_fs_fs/fs_fs.c:1085 libsvn_fs_fs/fs_fs.c:3593
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
-msgid "Can't chmod '%s'"
-msgstr "æ— æ³• chmod“%sâ€"
+msgid ""
+"\"%s\": unknown command.\n"
+"\n"
+msgstr ""
+"“%sâ€ï¼šæœªçŸ¥çš„命令。\n"
+"\n"
-#: libsvn_fs_fs/fs_fs.c:1143 libsvn_fs_fs/fs_fs.c:1200 libsvn_repos/log.c:480
-#: libsvn_repos/log.c:484
+#: libsvn_subr/opt.c:740
#, c-format
-msgid "No such revision %ld"
-msgstr "没有这个修订版 %ld"
-
-#: libsvn_fs_fs/fs_fs.c:1275
-msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
-
-# as-is
-#: libsvn_fs_fs/fs_fs.c:1386 libsvn_fs_fs/fs_fs.c:1399
-#: libsvn_fs_fs/fs_fs.c:1430
-msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
+msgid "Syntax error parsing revision '%s'"
+msgstr "剖æžä¿®è®¢ç‰ˆâ€œ%sâ€æ—¶å‘ç”Ÿè¯æ³•错误"
-#: libsvn_fs_fs/fs_fs.c:1543
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff æ•°æ®è¯·æ±‚ä¸å˜åœ¨çš„æ¥æº"
+#: libsvn_subr/opt.c:817
+#, c-format
+msgid "URL '%s' is not properly URI-encoded"
+msgstr "地å€(URL)“%sâ€ä¸æ˜¯æ£ç¡®åœ°ä»¥ URI ç¼–ç "
-#: libsvn_fs_fs/fs_fs.c:1549
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 请求的ä½ç½®è¶…出了æµçš„结尾"
+#: libsvn_subr/opt.c:823
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr "地å€(URL)“%sâ€åŒ…å« '..' å…ƒç´ "
-#: libsvn_fs_fs/fs_fs.c:1572 libsvn_fs_fs/fs_fs.c:1589
-msgid "svndiff window length is corrupt"
-msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
+#: libsvn_subr/opt.c:852
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr "è§£æžâ€œ%sâ€æ—¶å‘生错误"
-#: libsvn_fs_fs/fs_fs.c:1637
-#, fuzzy, c-format
+#: libsvn_subr/opt.c:954
+#, c-format
msgid ""
-"Checksum mismatch while reading representation:\n"
-" expected: %s\n"
-" actual: %s\n"
+"%s, version %s\n"
+" compiled %s, %s\n"
+"\n"
msgstr ""
-"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
-" 预期: %s\n"
-" 实际: %s\n"
-
-#: libsvn_fs_fs/fs_fs.c:1773 libsvn_fs_fs/fs_fs.c:1786
-#: libsvn_fs_fs/fs_fs.c:1792
-msgid "Directory entry corrupt"
-msgstr "目录æ¡ç›®æŸå"
+"%s,版本 %s\n"
+" 编译于 %s,%s\n"
+"\n"
-#: libsvn_fs_fs/fs_fs.c:2128 libsvn_fs_fs/fs_fs.c:2136
-#: libsvn_fs_fs/fs_fs.c:2168 libsvn_fs_fs/fs_fs.c:2188
-#: libsvn_fs_fs/fs_fs.c:2222 libsvn_fs_fs/fs_fs.c:2227
-msgid "Invalid changes line in rev-file"
-msgstr "rev-file 䏿œ‰æ— æ•ˆçš„å˜æ›´è¡Œ"
+# as-is
+#: libsvn_subr/opt.c:957
+#, fuzzy
+msgid ""
+"Copyright (C) 2000-2006 CollabNet.\n"
+"Subversion is open source software, see http://subversion.tigris.org/\n"
+"This product includes software developed by CollabNet (http://www.Collab."
+"Net/).\n"
+"\n"
+msgstr ""
+"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
+"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
+"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
+"\n"
-#: libsvn_fs_fs/fs_fs.c:2161
-msgid "Invalid change kind in rev file"
-msgstr "rev æ–‡ä»¶ä¸æœ‰æ— 效的改å˜ç§ç±»"
+#: libsvn_subr/opt.c:1008 libsvn_subr/opt.c:1049
+#, c-format
+msgid "Type '%s help' for usage.\n"
+msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-#: libsvn_fs_fs/fs_fs.c:2181
-msgid "Invalid text-mod flag in rev-file"
-msgstr "rev-file 䏿œ‰æ— 效的 text-mod æ ‡å¿—"
+#: libsvn_subr/path.c:1054
+#, c-format
+msgid "Couldn't determine absolute path of '%s'"
+msgstr "ä¸èƒ½ç¡®å®šâ€œ%sâ€çš„ç»å¯¹è·¯å¾„"
-#: libsvn_fs_fs/fs_fs.c:2201
-msgid "Invalid prop-mod flag in rev-file"
-msgstr "rev-file 䏿œ‰æ— 效的 prop-mod æ ‡å¿—"
+#: libsvn_subr/path.c:1093
+#, c-format
+msgid "'%s' is neither a file nor a directory name"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-#: libsvn_fs_fs/fs_fs.c:2384
-msgid "Copying from transactions not allowed"
-msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
+#: libsvn_subr/path.c:1199
+#, c-format
+msgid "Can't determine the native path encoding"
+msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
-#: libsvn_fs_fs/fs_fs.c:2440
+#: libsvn_subr/path.c:1253
#, fuzzy, c-format
-msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
-
-#: libsvn_fs_fs/fs_fs.c:2629 libsvn_fs_fs/fs_fs.c:2636
-msgid "next-id file corrupt"
-msgstr "next-id 文件æŸå"
+msgid "Invalid control character '0x%02x' in path '%s'"
+msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
-#: libsvn_fs_fs/fs_fs.c:2721
-#, fuzzy
-msgid "Transaction cleanup failed"
-msgstr "事务清除失败"
+#: libsvn_subr/prompt.c:97 svnserve/main.c:490
+#, c-format
+msgid "Can't open stdin"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å…¥"
-#: libsvn_fs_fs/fs_fs.c:2884
-msgid "Invalid change type"
-msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
+#, c-format
+msgid "Can't read stdin"
+msgstr "æ— æ³•è¯»å–æ ‡å‡†è¾“å…¥"
-#: libsvn_fs_fs/fs_fs.c:3203
-msgid "Can't set text contents of a directory"
-msgstr "æ— æ³•è®¾å®šç›®å½•çš„æ–‡å—内容"
+#: libsvn_subr/prompt.c:178
+#, c-format
+msgid "Authentication realm: %s\n"
+msgstr "认è¯é¢†åŸŸï¼š%s\n"
-#: libsvn_fs_fs/fs_fs.c:3293 libsvn_fs_fs/fs_fs.c:3298
-#: libsvn_fs_fs/fs_fs.c:3305
-msgid "Corrupt current file"
-msgstr "当剿–‡ä»¶æŸå"
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+msgid "Username: "
+msgstr "用户登录å:"
-#: libsvn_fs_fs/fs_fs.c:3731
-msgid "Can't grab FSFS repository mutex"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶(FSFS)档案库互斥体"
+#: libsvn_subr/prompt.c:206
+#, c-format
+msgid "Password for '%s': "
+msgstr "“%sâ€çš„密ç :"
-#: libsvn_fs_fs/fs_fs.c:3745
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "ä¸èƒ½æ˜¯å¦æ–‡ä»¶(FSFS)档案库互斥体"
+#: libsvn_subr/prompt.c:249
+#, c-format
+msgid "Error validating server certificate for '%s':\n"
+msgstr "验è¯â€œ%sâ€çš„æœåŠ¡å™¨å‡è¯æ—¶å‘生错误:\n"
-#: libsvn_fs_fs/fs_fs.c:3861
-msgid "Transaction out of date"
-msgstr "事务过时"
+#: libsvn_subr/prompt.c:255
+msgid ""
+" - The certificate is not issued by a trusted authority. Use the\n"
+" fingerprint to validate the certificate manually!\n"
+msgstr ""
+" - 本å‡è¯å¹¶ä¸æ˜¯ç”±å—信任的æƒå¨æœºæƒæ‰€æ ¸å‘。请手动利用指纹以验è¯\n"
+" å‡è¯çš„æœ‰æ•ˆæ€§ï¼\n"
-#: libsvn_fs_fs/fs_fs.c:4133
-msgid "No such transaction"
-msgstr "æ— æ¤äº‹åŠ¡"
+#: libsvn_subr/prompt.c:262
+msgid " - The certificate hostname does not match.\n"
+msgstr " - 本å‡è¯çš„主机åç§°ä¸ç¬¦ã€‚\n"
-#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
-msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
+#: libsvn_subr/prompt.c:268
+msgid " - The certificate is not yet valid.\n"
+msgstr " - 本å‡è¯å°šæœªè¿›å…¥æœ‰æ•ˆæœŸé—´ã€‚\n"
-#: libsvn_fs_fs/lock.c:286
-#, fuzzy, c-format
-msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
+#: libsvn_subr/prompt.c:274
+msgid " - The certificate has expired.\n"
+msgstr " - 本å‡è¯å·²è¿‡æœŸã€‚\n"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+#: libsvn_subr/prompt.c:280
+msgid " - The certificate has an unknown error.\n"
+msgstr " - 本å‡è¯å‘ç”Ÿä¸æ˜Žçš„错误。\n"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_subr/prompt.c:285
#, c-format
-msgid "Lock failed: newer version of '%s' exists"
-msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
+msgid ""
+"Certificate information:\n"
+" - Hostname: %s\n"
+" - Valid: from %s until %s\n"
+" - Issuer: %s\n"
+" - Fingerprint: %s\n"
+msgstr ""
+"å‡è¯ä¿¡æ¯ï¼š\n"
+" - 主机å称:%s\n"
+" - 有效期间:自 %s 至 %s\n"
+" - å‘行者:%s\n"
+" - 指纹:%s\n"
-#: libsvn_ra/ra_loader.c:212
-#, fuzzy, c-format
-msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
+#: libsvn_subr/prompt.c:300
+msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
+msgstr "(R)æ‹’ç»ï¼Œ(t)æš‚æ—¶æŽ¥å— æˆ– (p)永远接å—?"
-#: libsvn_ra/ra_loader.c:268
-#, fuzzy, c-format
-msgid "Unrecognized URL scheme for '%s'"
-msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+#: libsvn_subr/prompt.c:304
+msgid "(R)eject or accept (t)emporarily? "
+msgstr "(R)æ‹’ç» æˆ– (t)æš‚æ—¶æŽ¥å— ï¼Ÿ"
-# as-is
-#: libsvn_ra/ra_loader.c:582
-#, fuzzy, c-format
-msgid " - handles '%s' scheme\n"
-msgstr " - 处ç†â€œ%sâ€è§„则\n"
+#: libsvn_subr/prompt.c:343
+msgid "Client certificate filename: "
+msgstr "用户å‡è¯æ–‡ä»¶å:"
-#: libsvn_ra/ra_loader.c:668
+#: libsvn_subr/prompt.c:366
#, c-format
-msgid "Unrecognized URL scheme '%s'"
-msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+msgid "Passphrase for '%s': "
+msgstr "“%sâ€çš„密ç :"
+
+#: libsvn_subr/subst.c:1559
+#, fuzzy, c-format
+msgid "'%s' has unsupported special file type '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-#: libsvn_ra_dav/commit.c:193
+#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
#, c-format
-msgid "Could not create a request (%s '%s')"
-msgstr "æ— æ³•å»ºç«‹è¯·æ±‚ (%s“%sâ€)"
+msgid "File '%s' has inconsistent newlines"
+msgstr "文件“%sâ€å†…çš„æ¢è¡Œç¬¦ä¸ä¸€è‡´"
-#: libsvn_ra_dav/commit.c:292
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
-msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
+#: libsvn_subr/utf.c:194
+msgid "Can't lock charset translation mutex"
+msgstr "ä¸èƒ½é”定å—符转æ¢äº’斥体"
-#: libsvn_ra_dav/commit.c:485
-#, fuzzy, c-format
-msgid "Could not create a CHECKOUT request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
+msgid "Can't unlock charset translation mutex"
+msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
-#: libsvn_ra_dav/commit.c:572
+#: libsvn_subr/utf.c:271
#, fuzzy, c-format
-msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
+msgid "Can't create a character converter from native encoding to '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
-#: libsvn_ra_dav/commit.c:580
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
+#: libsvn_subr/utf.c:275
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to native encoding"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
-#: libsvn_ra_dav/commit.c:879
+#: libsvn_subr/utf.c:279
#, fuzzy, c-format
-msgid "Could not create a DELETE request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
+msgid "Can't create a character converter from '%s' to '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
-#: libsvn_ra_dav/commit.c:1310
-msgid "Could not write svndiff to temp file"
-msgstr "æ— æ³•å†™ svndiff 至临时文件"
+#: libsvn_subr/utf.c:285
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%i' to '%i'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
-#: libsvn_ra_dav/commit.c:1400
-#, c-format
-msgid "Could not create a PUT request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåŠ å…¥(PUT)请求 (%s)"
+#: libsvn_subr/utf.c:513
+#, fuzzy, c-format
+msgid "Can't convert string from native encoding to '%s':"
+msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
-#: libsvn_ra_dav/commit.c:1564
-#, c-format
-msgid "applying log message to %s"
-msgstr "应用日志信æ¯è‡³â€œ%sâ€"
+#: libsvn_subr/utf.c:517
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to native encoding:"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
-#: libsvn_ra_dav/fetch.c:277
-msgid "Could not save the URL of the version resource"
-msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
+#: libsvn_subr/utf.c:521
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to '%s':"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
-#: libsvn_ra_dav/fetch.c:398
-msgid "Could not get content-type from response."
-msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
+#: libsvn_subr/utf.c:527
+#, fuzzy, c-format
+msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
-#: libsvn_ra_dav/fetch.c:443
-#, c-format
-msgid "Could not create a GET request for '%s'"
-msgstr "æ— æ³•ä¸ºâ€œ%sâ€åˆ›å»º GET 请求"
+#: libsvn_subr/utf.c:572
+#, fuzzy, c-format
+msgid ""
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
+msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
-#: libsvn_ra_dav/fetch.c:518
+#: libsvn_subr/utf.c:580
#, c-format
-msgid "GET request failed for '%s'"
-msgstr "对“%sâ€çš„ GET 请求失败"
-
-#: libsvn_ra_dav/fetch.c:657
-msgid "Could not save file"
-msgstr "æ— æ³•å‚¨å˜æ–‡ä»¶"
+msgid ""
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr "检测到éžASCIIå—符 (代ç %d),并且ä¸èƒ½è½¬æ¢åˆ°UTF-8(或从UTF-8转æ¢)"
-#: libsvn_ra_dav/fetch.c:898 libsvn_ra_svn/client.c:912
+#: libsvn_subr/utf.c:622
#, c-format
msgid ""
-"Checksum mismatch for '%s':\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+"Valid UTF-8 data\n"
+"(hex:%s)\n"
+"followed by invalid UTF-8 sequence\n"
+"(hex:%s)"
msgstr ""
-"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"有效 UTF-8 æ•°æ®\n"
+"(16进制:%s)\n"
+"åŽæŽ¥æ— æ•ˆ UTF-8 åºåˆ—\n"
+"(16进制:%s)"
-#: libsvn_ra_dav/fetch.c:1163
-msgid "Server does not support date-based operations"
-msgstr "æœåС噍䏿”¯æŒåŸºäºŽæ—¥æœŸçš„æ“ä½œ"
+#: libsvn_subr/validate.c:48
+#, c-format
+msgid "MIME type '%s' has empty media type"
+msgstr "MIME 类别“%sâ€å«æœ‰ç©ºçš„媒体类别"
-#: libsvn_ra_dav/fetch.c:1170
-msgid "Invalid server response to dated-rev request"
-msgstr "对 dated-rev è¯·æ±‚çš„æ— æ•ˆæœåŠ¡å™¨å›žåº”"
+#: libsvn_subr/validate.c:53
+#, c-format
+msgid "MIME type '%s' does not contain '/'"
+msgstr "MIME 类别“%sâ€æ²¡åŒ…å« '/'"
-# as-is
-#: libsvn_ra_dav/fetch.c:1309
-#, fuzzy
-msgid "'get-locations' REPORT not implemented"
-msgstr "get-locations REPORT 未实现"
+#: libsvn_subr/validate.c:58
+#, c-format
+msgid "MIME type '%s' ends with non-alphanumeric character"
+msgstr "MIME 类别“%sâ€ä»¥éžå—æ¯ä¸Žæ•°å—å—符结æŸ"
-#: libsvn_ra_dav/fetch.c:1482 libsvn_ra_dav/session.c:1129
-#: libsvn_ra_dav/session.c:1415
-#, fuzzy
-msgid "Incomplete lock data returned"
-msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
+#: libsvn_subr/version.c:74
+#, c-format
+msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%sâ€çš„版本ä¸ä¸€è‡´ï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
-#: libsvn_ra_dav/fetch.c:1651 libsvn_ra_dav/fetch.c:1659
-#: libsvn_ra_dav/fetch.c:1663
-#, fuzzy
-msgid "Server does not support locking features"
-msgstr "æœåС噍䏿”¯æŒé”定特性"
+#: libsvn_subr/xml.c:400
+#, c-format
+msgid "Malformed XML: %s at line %d"
+msgstr "畸形的XML:%s 在第 %d 行"
-#: libsvn_ra_dav/fetch.c:1740
-msgid ""
-"DAV request failed; it's possible that the repository's pre-revprop-change "
-"hook either failed or is non-existent"
-msgstr ""
-"DAV 请求失败;å¯èƒ½æ˜¯æ¡£æ¡ˆåº“çš„ pre-revprop-change 外挂执行失败;或是ä¸å˜åœ¨"
+#: libsvn_wc/adm_crawler.c:605
+msgid "Error aborting report"
+msgstr "å–æ¶ˆæŠ¥å‘Šæ—¶å‘生错误"
-#: libsvn_ra_dav/fetch.c:2474
-#, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "写入“%sâ€æ—¶å‘生错误:æ„外的 EOF"
+#: libsvn_wc/adm_crawler.c:800
+msgid "Error opening local file"
+msgstr "打开本地文件时å‘生错误"
-#: libsvn_ra_dav/fetch.c:2619
+#: libsvn_wc/adm_crawler.c:865
#, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML ç¼–ç :“%sâ€"
+msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
-# as-is
-#: libsvn_ra_dav/fetch.c:2901
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "报告å“应处ç†å¤±è´¥ä¸èƒ½å®Œæˆç¼–辑驱动"
+#: libsvn_wc/adm_files.c:100
+#, fuzzy, c-format
+msgid "'%s' is not a valid administrative directory name"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-# as-is
-#: libsvn_ra_dav/file_revs.c:360
-#, fuzzy
-msgid "'get-file-revs' REPORT not implemented"
-msgstr "get-file-revs REPORT 未实现"
+# plz leave this as-is
+#: libsvn_wc/adm_files.c:260
+msgid "Bad type indicator"
+msgstr "错误的类型"
-#: libsvn_ra_dav/file_revs.c:376
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs æŠ¥å‘Šä¸æ²¡æœ‰ä»»ä½•修订版"
+#: libsvn_wc/adm_files.c:501
+msgid "APR_APPEND not supported for adm files"
+msgstr "APR_APPEND 䏿”¯æŒç®¡ç†æ–‡ä»¶"
-#: libsvn_ra_dav/merge.c:217
-#, c-format
+#: libsvn_wc/adm_files.c:544
msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr ""
-"通讯å定错误:我们告知æœåС噍ä¸è¦è‡ªåЍåˆå¹¶ä»»ä½•资æºï¼Œä½†æ˜¯å®ƒæŠ¥å‘Šâ€œ%sâ€å·²è¢«åˆå¹¶"
+"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
+"again"
+msgstr "您的 .svn/tmp 目录å¯èƒ½ä¸¢å¤±æˆ–æŸå;请执行“svn cleanupâ€ï¼Œç„¶åŽå†è¯•一次"
-#: libsvn_ra_dav/merge.c:226
+#: libsvn_wc/adm_files.c:687 libsvn_wc/lock.c:592 libsvn_wc/lock.c:855
#, c-format
-msgid ""
-"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
-"element within the MERGE response"
-msgstr "内部错误:在 MERGE 回应ä¸ï¼Œâ€œDAV:responseâ€å…ƒç´ 有个未知的父项目 (%d)"
+msgid "'%s' is not a working copy"
+msgstr "“%sâ€ä¸æ˜¯å·¥ä½œæ‹·è´"
-#: libsvn_ra_dav/merge.c:241
-#, c-format
-msgid ""
-"Protocol error: the MERGE response for the '%s' resource did not return all "
-"of the properties that we asked for (and need to complete the commit)"
-msgstr ""
-"通讯å定错误:对“%sâ€çš„ MERGE 回应并未返回所有我们请求的属性 (è¿™äº›æ˜¯å®Œæˆæäº¤æ“"
-"作所ä¸å¯ç¼ºå°‘çš„)"
+#: libsvn_wc/adm_files.c:694 libsvn_wc/adm_files.c:762
+#: libsvn_wc/adm_files.c:824
+msgid "No such thing as 'base' working copy properties!"
+msgstr "没有 '基础' 工作拷è´å±žæ€§è¿™æ ·çš„东西"
-#: libsvn_ra_dav/merge.c:260
+#: libsvn_wc/adm_files.c:893 libsvn_wc/util.c:51
#, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "对“%sâ€çš„ MERGE å›žåº”å¹¶ä¸æ˜¯ç›®æ ‡ (“%sâ€) çš„å项目"
+msgid "'%s' is not a directory"
+msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_ra_dav/merge.c:481
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 属性回应包å«é”™è¯¯çжæ€"
+#: libsvn_wc/adm_files.c:955
+#, c-format
+msgid "No entry for '%s'"
+msgstr "没有“%sâ€çš„项目"
-#: libsvn_ra_dav/options.c:130
-msgid ""
-"The OPTIONS response did not include the requested activity-collection-set; "
-"this often means that the URL is not WebDAV-enabled"
-msgstr ""
-"OPTIONS 回应并ä¸åŒ…å«è¯·æ±‚çš„ activity-collection-set;通常这表示该地å€(URL)å¹¶ä¸"
-"æ”¯æŒ WebDAV"
+#: libsvn_wc/adm_files.c:968
+#, c-format
+msgid "Revision %ld doesn't match existing revision %ld in '%s'"
+msgstr "修订版 %ld ä¸ç¬¦åˆçŽ°æœ‰çš„ä¿®è®¢ç‰ˆ %ld 于“%sâ€ä¸"
-#: libsvn_ra_dav/props.c:585
+#: libsvn_wc/adm_files.c:976
#, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "æ— æ³•æ‰¾åˆ°æ ‡è®°â€œ%sâ€äºŽåœ°å€(URL)“%sâ€"
+msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
+msgstr "地å€(URL)“%sâ€ä¸ç¬¦åˆçŽ°æœ‰çš„åœ°å€(URL)“%sâ€äºŽâ€œ%sâ€ä¸"
-#: libsvn_ra_dav/props.c:614
+#: libsvn_wc/adm_ops.c:258
#, c-format
-msgid "'%s' was not present on the resource"
-msgstr "“%sâ€ä¸å˜åœ¨äºŽæœ¬èµ„æºä¸Š"
+msgid "Unrecognized node kind: '%s'"
+msgstr "æ— æ³•ç¡®è®¤çš„èŠ‚ç‚¹ç§ç±»ï¼šâ€œ%sâ€"
-#: libsvn_ra_dav/props.c:653
+#: libsvn_wc/adm_ops.c:1082
#, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon ä¸èƒ½åˆ†æžåœ°å€(URL)â€%s“"
+msgid "'%s' not found"
+msgstr "找ä¸åˆ°â€œ%sâ€"
-#: libsvn_ra_dav/props.c:682
-msgid "The path was not part of a repository"
-msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
+#: libsvn_wc/adm_ops.c:1086
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr "路径“%sâ€ä¸ºä¸æ”¯æŒçš„节点ç§ç±»"
-#: libsvn_ra_dav/props.c:693
+#: libsvn_wc/adm_ops.c:1116
#, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
+msgid "'%s' is already under version control"
+msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_dav/props.c:727 libsvn_ra_dav/props.c:782
-msgid "The VCC property was not found on the resource"
-msgstr "æœ¬èµ„æºæ‰¾ä¸åˆ° VCC 属性"
+#: libsvn_wc/adm_ops.c:1128
+#, fuzzy, c-format
+msgid ""
+"Can't replace '%s' with a node of a differing type; the deletion must be "
+"committed and the parent updated before adding '%s'"
+msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
-#: libsvn_ra_dav/props.c:795
-msgid "The relative-path property was not found on the resource"
-msgstr "本资æºä¸Šæ‰¾ä¸åˆ°ç›¸å¯¹è·¯å¾„属性"
+#: libsvn_wc/adm_ops.c:1145
+#, c-format
+msgid "Can't find parent directory's entry while trying to add '%s'"
+msgstr "在å°è¯•新增“%sâ€æ—¶ï¼Œæ— 法找到父目录的项目"
-#: libsvn_ra_dav/props.c:916
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+#: libsvn_wc/adm_ops.c:1150
+#, c-format
+msgid "Can't add '%s' to a parent directory scheduled for deletion"
+msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
-#: libsvn_ra_dav/props.c:935
-msgid "'DAV:version-name' was not present on the baseline resource"
-msgstr "'DAV:version-name' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+#: libsvn_wc/adm_ops.c:1166
+#, fuzzy, c-format
+msgid "The URL '%s' has a different repository root than its parent"
+msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-#: libsvn_ra_dav/props.c:1103
-msgid "At least one property change failed; repository is unchanged"
-msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
+#: libsvn_wc/adm_ops.c:1495
+#, c-format
+msgid "Error restoring text for '%s'"
+msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
-#: libsvn_ra_dav/session.c:442
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)通信端å£ç¼–å·ä¸æœ‰ä¸åˆæ³•çš„å—符"
+#: libsvn_wc/adm_ops.c:1626
+#, c-format
+msgid "Cannot revert: '%s' is not under version control"
+msgstr "æ— æ³•æ¢å¤ï¼šâ€œ%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_dav/session.c:446
-msgid "Invalid URL: negative proxy port number"
-msgstr "æ— æ•ˆçš„åœ°å€(URL):负的代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼"
+#: libsvn_wc/adm_ops.c:1654
+#, c-format
+msgid "Cannot revert '%s': unsupported entry node kind"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šä¸æ”¯æŒçš„项目节点ç§ç±»"
-#: libsvn_ra_dav/session.c:449
-msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr ""
-"æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼å¤§äºŽæœ€å¤§å€¼çš„ TCP é€šä¿¡ç«¯å£æ•°å€¼ 65535"
+#: libsvn_wc/adm_ops.c:1665
+#, c-format
+msgid "Cannot revert '%s': unsupported node kind in working copy"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šå·¥ä½œæ‹·è´ä¸æœ‰ä¸æ”¯æŒçš„节点ç§ç±»"
-#: libsvn_ra_dav/session.c:463
-msgid "Invalid config: illegal character in timeout value"
-msgstr "æ— æ•ˆçš„é…ç½®ï¼šè¶…æ—¶æ•°å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
+#: libsvn_wc/adm_ops.c:1712
+msgid ""
+"Cannot revert addition of current directory; please try again from the "
+"parent directory"
+msgstr "æ— æ³•æ¢å¤ç›®å‰ç›®å½•的新增;请从父目录å†è¯•一次"
-#: libsvn_ra_dav/session.c:467
-msgid "Invalid config: negative timeout value"
-msgstr "æ— æ•ˆçš„é…置:负的超时数值"
+#: libsvn_wc/adm_ops.c:1734
+#, c-format
+msgid "Unknown or unexpected kind for path '%s'"
+msgstr "路径“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ç§ç±»"
-#: libsvn_ra_dav/session.c:480
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "æ— æ•ˆçš„é…置:除错é®ç½©å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
+#: libsvn_wc/adm_ops.c:1896
+#, c-format
+msgid "File '%s' has local modifications"
+msgstr "文件“%sâ€æœ‰æœ¬åœ°çš„修改"
-# as-is
-#: libsvn_ra_dav/session.c:543
-msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
-msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
+#: libsvn_wc/copy.c:141
+#, c-format
+msgid "'%s' already exists and is in the way"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œå˜æˆè·¯ä¸é—´çš„大石头"
-#: libsvn_ra_dav/session.c:593
-msgid "Malformed URL for repository"
-msgstr "档案库的地å€(URL)畸形"
+#: libsvn_wc/copy.c:153
+#, c-format
+msgid "There is already a versioned item '%s'"
+msgstr "已有纳入版本控制项目“%sâ€"
-#: libsvn_ra_dav/session.c:601
-msgid "Network socket initialization failed"
-msgstr "网络 socket å¯å§‹å¤±è´¥"
+#: libsvn_wc/copy.c:163
+#, c-format
+msgid "Cannot copy or move '%s': it's not under version control"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_dav/session.c:618
-msgid "SSL is not supported"
-msgstr "䏿”¯æŒ SSL"
+#: libsvn_wc/copy.c:172
+#, c-format
+msgid ""
+"Cannot copy or move '%s': it's not in the repository yet; try committing "
+"first"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-#: libsvn_ra_dav/session.c:764
+#: libsvn_wc/copy.c:451
#, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "æ— æ•ˆçš„é…ç½®ï¼šæ— æ³•è½½å…¥å‡è¯æ–‡ä»¶â€œ%sâ€"
+msgid ""
+"Cannot copy or move '%s': it is not in the repository yet; try committing "
+"first"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-#: libsvn_ra_dav/session.c:852
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "æ— æ³•åœ¨æœ¬èµ„æºæˆ–ä»»ä½•å…¶çˆ¶é¡¹ç›®ä¸æ‰¾åˆ° UUID 属性"
+#: libsvn_wc/copy.c:578
+#, fuzzy, c-format
+msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-#: libsvn_ra_dav/session.c:860
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
+#: libsvn_wc/copy.c:585
+#, c-format
+msgid "Cannot copy to '%s' as it is scheduled for deletion"
+msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€è‡³å› 为它已预定为è¦åˆ 除"
-#: libsvn_ra_dav/session.c:1101 libsvn_ra_dav/session.c:1238
-#, fuzzy
-msgid "Failed to parse URI"
-msgstr "分æžåœ°å€(URI)失败"
+#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:562
+#: libsvn_wc/entries.c:819
+#, c-format
+msgid "Entry '%s' has invalid '%s' value"
+msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
-#: libsvn_ra_dav/session.c:1124
+#: libsvn_wc/entries.c:111
#, fuzzy
-msgid "Lock request failed"
-msgstr "é”请求失败"
-
-#: libsvn_ra_dav/session.c:1253
-#, fuzzy, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+msgid "Invalid escape sequence"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: libsvn_ra_dav/session.c:1290
+#: libsvn_wc/entries.c:118
#, fuzzy
-msgid "Unlock request failed"
-msgstr "解除é”请求失败"
+msgid "Invalid escaped character"
+msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
-#: libsvn_ra_dav/session.c:1501
+#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
+#: libsvn_wc/entries.c:203
#, fuzzy
-msgid "Failed to fetch lock information"
-msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
-
-#: libsvn_ra_dav/session.c:1572
-#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
-
-#: libsvn_ra_dav/util.c:275
-msgid "authorization failed"
-msgstr "授æƒå¤±è´¥"
-
-#: libsvn_ra_dav/util.c:279
-msgid "could not connect to server"
-msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåС噍"
-
-#: libsvn_ra_dav/util.c:283
-msgid "timed out waiting for server"
-msgstr "ç‰å¾…æœåŠ¡å™¨è¶…æ—¶"
-
-#: libsvn_ra_dav/util.c:489
-msgid "Can't calculate the request body size"
-msgstr "æ— æ³•ç®—å‡ºè¯·æ±‚çš„ä¸»ä½“å¤§å°"
+msgid "Unexpected end of entry"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
-#: libsvn_ra_dav/util.c:725
+#: libsvn_wc/entries.c:225
#, c-format
-msgid "Error spooling the %s request response to disk"
-msgstr "请求 %s çš„å“应脱机ä¿å˜åˆ°ç£ç›˜æ—¶å‡ºçŽ°é”™è¯¯"
+msgid "Invalid value for field '%s'"
+msgstr ""
-#: libsvn_ra_dav/util.c:773
+#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:537
#, c-format
-msgid "'%s' path not found"
-msgstr "找ä¸åˆ°è·¯å¾„“%sâ€"
+msgid "Entry '%s' has invalid node kind"
+msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
-#. We either have a neon error, or some other error
-#. that we didn't expect.
-#: libsvn_ra_dav/util.c:778 libsvn_ra_dav/util.c:1008
-#, c-format
-msgid "%s of '%s'"
-msgstr "%s 的结果 “%sâ€"
+#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:514
+#, fuzzy, c-format
+msgid "Entry for '%s' has invalid repository root"
+msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
-#: libsvn_ra_dav/util.c:796
+#: libsvn_wc/entries.c:944
#, c-format
-msgid "Error reading spooled %s request response"
-msgstr "读å–请求 %s å›žåº”çš„è„±æœºæ•°æ®æ—¶å‡ºçŽ°é”™è¯¯"
+msgid "XML parser failed in '%s'"
+msgstr "XML 剖æžå™¨æ— 法处ç†â€œ%sâ€"
-#: libsvn_ra_dav/util.c:807
-#, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s è¯·æ±‚çš„å›žåº”è¿”å›žæ— æ•ˆçš„ XML:%s (%s)"
+#: libsvn_wc/entries.c:1003
+msgid "Missing default entry"
+msgstr "丢失默认项目"
-#: libsvn_ra_dav/util.c:827
-#, c-format
-msgid "%s request failed on '%s'"
-msgstr "%s 请求“%sâ€å¤±è´¥"
+#: libsvn_wc/entries.c:1008
+msgid "Default entry has no revision number"
+msgstr "默认项目没有修订版编å·"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:576
-#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
-msgstr ""
-"“%sâ€\n"
-"与\n"
-"“%sâ€\n"
-"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
+#: libsvn_wc/entries.c:1013
+msgid "Default entry is missing URL"
+msgstr "默认项目没有地å€(URL)"
-# as-is
-#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
-msgid "Module for accessing a repository on local disk."
-msgstr "访问本地ç£ç›˜çš„æ¡£æ¡ˆåº“模å—。"
+#: libsvn_wc/entries.c:1089
+#, fuzzy, c-format
+msgid "Invalid version line in entries file of '%s'"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-#: libsvn_ra_local/ra_plugin.c:285
-msgid "Unable to open an ra_local session to URL"
-msgstr "æ— æ³•æ‰“å¼€åœ°å€(URL)çš„ ra_local 会è¯"
+#: libsvn_wc/entries.c:1106
+#, fuzzy
+msgid "Missing entry terminator"
+msgstr "丢失默认项目"
-# as-is
-#: libsvn_ra_local/ra_plugin.c:1286
+#: libsvn_wc/entries.c:1109
+#, fuzzy
+msgid "Invalid entry terminator"
+msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+
+#: libsvn_wc/entries.c:1113
#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
+msgid "Error at entry %d in entries file for '%s':"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-#: libsvn_ra_local/split_url.c:44
+#: libsvn_wc/entries.c:1209
#, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
+msgid "Corrupt working copy: '%s' has no default entry"
+msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æ²¡æœ‰é»˜è®¤çš„项目"
-#: libsvn_ra_local/split_url.c:55
+#: libsvn_wc/entries.c:1226
#, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "本地地å€(URL)“%sâ€ä»…å«ä¸»æœºå称,没有路径"
+msgid "Corrupt working copy: directory '%s' has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æœ‰æ— 效的调度"
-#: libsvn_ra_local/split_url.c:74
+#: libsvn_wc/entries.c:1260
#, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "本地地å€(URL)“%sâ€åŒ…嫿œªæ”¯æŒçš„主机åç§°"
+msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸æœ‰æ— 效的调度"
-#: libsvn_ra_local/split_url.c:128 libsvn_ra_local/split_url.c:135
+#: libsvn_wc/entries.c:1269
#, c-format
-msgid "Unable to open repository '%s'"
-msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“â€œ%sâ€"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"addition) is not itself scheduled for addition"
+msgstr ""
+"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ–°å¢žè°ƒåº¦) ä¸ŽåŠ å…¥æ–°å¢žè°ƒåº¦çš„ä¸ä¸€è‡´"
-#: libsvn_ra_svn/client.c:125
+#: libsvn_wc/entries.c:1277
#, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主机å称“%sâ€"
-
-#: libsvn_ra_svn/client.c:137
-msgid "Can't create socket"
-msgstr "æ— æ³•å»ºç«‹ socket"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"deletion) is not itself scheduled for deletion"
+msgstr ""
+"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥åˆ é™¤è°ƒåº¦) ä¸ŽåŠ å…¥åˆ é™¤è°ƒåº¦çš„ä¸ä¸€è‡´"
-#: libsvn_ra_svn/client.c:141
+#: libsvn_wc/entries.c:1285
#, c-format
-msgid "Can't connect to host '%s'"
-msgstr "æ— æ³•è¿žçº¿è‡³ä¸»æœºâ€œ%sâ€"
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"replacement) has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ›¿æ¢è°ƒåº¦) æœ‰æ— æ•ˆçš„è°ƒåº¦"
-# as-is
-#: libsvn_ra_svn/client.c:162
-msgid "Proplist element not a list"
-msgstr "å±žæ€§åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:1915
+#, c-format
+msgid "No default entry in directory '%s'"
+msgstr "在目录“%sâ€ä¸æ²¡æœ‰é»˜è®¤çš„项目"
-# as-is
-#: libsvn_ra_svn/client.c:186
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:1970
+#, c-format
+msgid "Error writing to '%s'"
+msgstr "写至“%sâ€æ—¶å‘生错误"
-#: libsvn_ra_svn/client.c:224
+#: libsvn_wc/entries.c:2283
#, c-format
-msgid "Unrecognized node kind '%s' from server"
-msgstr "æ— æ³•è¾¨è¯†æ¥è‡ªæœåŠ¡å™¨çš„èŠ‚ç‚¹ç§ç±»â€œ%sâ€"
+msgid ""
+"Can't add '%s' to deleted directory; try undeleting its parent directory "
+"first"
+msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²åˆ 除的目录;请先å°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
-#: libsvn_ra_svn/client.c:269 libsvn_ra_svn/client.c:323
+#: libsvn_wc/entries.c:2289
#, c-format
-msgid "Authentication error from server: %s"
-msgstr "æ¥è‡ªæœåŠ¡å™¨çš„è®¤è¯é”™è¯¯ï¼š%s"
+msgid ""
+"Can't replace '%s' in deleted directory; try undeleting its parent directory "
+"first"
+msgstr "æ— æ³•åœ¨å·²åˆ é™¤çš„ç›®å½•ä¸æ›¿æ¢â€œ%sâ€ï¼›è¯·å…ˆå°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
-#: libsvn_ra_svn/client.c:272 libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-msgid "Unexpected server response to authentication"
-msgstr "æ„æƒ³ä¸åˆ°çš„è®¤è¯æ—¶æœåŠ¡å™¨å›žåº”"
+#: libsvn_wc/entries.c:2298
+#, c-format
+msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
+msgstr "“%sâ€è¢«æ ‡è®°ä¸ºä¸å˜åœ¨ï¼Œæ‰€ä»¥æ— æ³•åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_ra_svn/client.c:330
-msgid "Cannot negotiate authentication mechanism"
-msgstr "æ— æ³•å商出认识机制"
+#: libsvn_wc/entries.c:2327
+#, c-format
+msgid "Entry '%s' is already under version control"
+msgstr "项目“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_svn/client.c:461
+#: libsvn_wc/entries.c:2424
#, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "æ— æ³•è¾¨è¯†çš„éš§é“规则“%sâ€"
+msgid "Entry '%s' has illegal schedule"
+msgstr "项目“%sâ€æœ‰ä¸åˆæ³•的调度"
-#: libsvn_ra_svn/client.c:478
+#: libsvn_wc/entries.c:2570
#, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "éš§é“规则 %s 需è¦è®¾å®šçŽ¯å¢ƒå˜æ•° %s"
+msgid "No such entry: '%s'"
+msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
-# as-is
-#: libsvn_ra_svn/client.c:489
+#: libsvn_wc/entries.c:2697
#, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "ä¸èƒ½ tokenize 命令“%sâ€"
+msgid "Error writing entries file for '%s'"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-#: libsvn_ra_svn/client.c:518
+#: libsvn_wc/entries.c:2736
#, c-format
-msgid "Error in child process: %s"
-msgstr "å程åºé”™è¯¯ï¼š%s"
+msgid "Directory '%s' has no THIS_DIR entry"
+msgstr "目录“%sâ€æ²¡æœ‰ THIS_DIR 项目"
-#: libsvn_ra_svn/client.c:541
-msgid "Can't create tunnel"
-msgstr "æ— æ³•å»ºç«‹ tunnel"
+#: libsvn_wc/entries.c:2825
+#, c-format
+msgid "'%s' has an unrecognized node kind"
+msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-# as-is
-#: libsvn_ra_svn/client.c:570
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "使用svn网络å议访问档案库的模å—。"
+#: libsvn_wc/entries.c:2861
+#, c-format
+msgid "Unexpectedly found '%s': path is marked 'missing'"
+msgstr "æ„æƒ³ä¸åˆ°åœ°æ‰¾åˆ°äº†â€œ%sâ€ï¼šè·¯å¾„å·²è¢«æ ‡è®°ä¸º '丢失'"
-#: libsvn_ra_svn/client.c:607
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
#, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "ä¸åˆæ³•çš„ svn 档案库地å€(URL)“%sâ€"
+msgid "Working copy '%s' locked"
+msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
-#: libsvn_ra_svn/client.c:633
+#: libsvn_wc/lock.c:481
#, c-format
-msgid "Server requires minimum version %d"
-msgstr "æœåŠ¡å™¨æœ€ä½Žè¦æ±‚的版å·ä¸º %d"
+msgid "Path '%s' ends in '%s', which is unsupported for this operation"
+msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
-#: libsvn_ra_svn/client.c:683
-msgid "Impossibly long repository root from server"
-msgstr "æœåŠ¡å™¨å›žä¼ çš„æ¡£æ¡ˆåº“æ ¹è·¯å¾„é•¿å¾—å¤ªå¤¸å¼ "
+#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
+#, fuzzy, c-format
+msgid "Unable to check path existence for '%s'"
+msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
-#: libsvn_ra_svn/client.c:750
-msgid "Server did not send repository root"
-msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”å›žæ¡£æ¡ˆåº“æ ¹è·¯å¾„"
+#: libsvn_wc/lock.c:937
+#, c-format
+msgid "Expected '%s' to be a directory but found a file"
+msgstr ""
-#: libsvn_ra_svn/client.c:892
-msgid "Non-string as part of file contents"
-msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+#: libsvn_wc/lock.c:944
+#, fuzzy, c-format
+msgid "Expected '%s' to be a file but found a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
-# as-is
-#: libsvn_ra_svn/client.c:960
-msgid "Dirlist element not a list"
-msgstr "ç›®å½•åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/lock.c:963
+#, fuzzy, c-format
+msgid "Directory '%s' is missing"
+msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
-# as-is
-#: libsvn_ra_svn/client.c:1116
-msgid "Log entry not a list"
-msgstr "日志æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/lock.c:968
+#, c-format
+msgid "Directory '%s' containing working copy admin area is missing"
+msgstr ""
-# as-is
-#: libsvn_ra_svn/client.c:1129
-msgid "Changed-path entry not a list"
-msgstr "已修改路径æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/lock.c:973
+#, fuzzy, c-format
+msgid "Unable to lock '%s'"
+msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
-# as-is
-#: libsvn_ra_svn/client.c:1208
-#, fuzzy
-msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/lock.c:978
+#, fuzzy, c-format
+msgid "Working copy '%s' is not locked"
+msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
-# as-is
-#: libsvn_ra_svn/client.c:1265
-#, fuzzy
-msgid "'get-locations' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/lock.c:1371
+#, c-format
+msgid "Write-lock stolen in '%s'"
+msgstr "“%sâ€ä¸çš„写入é”定被å·èµ°äº†"
-# as-is
-#: libsvn_ra_svn/client.c:1277
-msgid "Location entry not a list"
-msgstr "区域æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/lock.c:1379
+#, c-format
+msgid "No write-lock in '%s'"
+msgstr "“%sâ€ä¸æ²¡æœ‰å†™å…¥é”定"
-# as-is
-#: libsvn_ra_svn/client.c:1327
-#, fuzzy
-msgid "'get-file-revs' not implemented"
-msgstr "get-file-revs 未实现"
+#: libsvn_wc/lock.c:1401
+#, c-format
+msgid "Lock file '%s' is not a regular file"
+msgstr "é”定文件“%sâ€ä¸æ˜¯ä¸€èˆ¬çš„æ–‡ä»¶"
-# as-is
-#: libsvn_ra_svn/client.c:1340
-msgid "Revision entry not a list"
-msgstr "修订版æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/log.c:339
+msgid "Can't move source to dest"
+msgstr "æ— æ³•ç§»åŠ¨æ¥æºè‡³ç›®çš„"
-#: libsvn_ra_svn/client.c:1353 libsvn_ra_svn/client.c:1378
-msgid "Text delta chunk not a string"
-msgstr "æ–‡å—差异区段并éžå—串"
+#: libsvn_wc/log.c:500
+#, c-format
+msgid "In directory '%s'"
+msgstr "在目录“%sâ€ä¸"
-#: libsvn_ra_svn/client.c:1390
-msgid "The get-file-revs command didn't return any revisions"
-msgstr "get-file-revs 命令没有返回任何修订版"
+#: libsvn_wc/log.c:528
+#, c-format
+msgid "Missing 'left' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'left' 属性"
-#: libsvn_ra_svn/client.c:1438
-#, fuzzy
-msgid "Server doesn't support the lock command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+#: libsvn_wc/log.c:535
+#, c-format
+msgid "Missing 'right' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'right' 属性"
-#: libsvn_ra_svn/client.c:1502
-#, fuzzy
-msgid "Server doesn't support the unlock command"
-msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
+#: libsvn_wc/log.c:603
+#, c-format
+msgid "Missing 'dest' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'dest' 属性"
-# as-is
-#: libsvn_ra_svn/client.c:1602 libsvn_ra_svn/client.c:1755
-#, fuzzy
-msgid "Lock element not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/log.c:684
+#, c-format
+msgid "Missing 'timestamp' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤± 'timestamp' 属性"
-#: libsvn_ra_svn/client.c:1607
-#, fuzzy
-msgid "Unable to parse lock data"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+#: libsvn_wc/log.c:780 libsvn_wc/log.c:820
+#, c-format
+msgid "Error getting 'affected time' on '%s'"
+msgstr "å–得“%sâ€çš„“affected timeâ€æ—¶å‘生错误"
-#: libsvn_ra_svn/client.c:1714 libsvn_ra_svn/client.c:1742
-#, fuzzy
-msgid "Server doesn't support the get-lock command"
-msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
+#: libsvn_wc/log.c:831
+#, c-format
+msgid "Error modifying entry for '%s'"
+msgstr "修改“%sâ€çš„项目时å‘生错误"
-#: libsvn_ra_svn/client.c:1814
+#: libsvn_wc/log.c:857
#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
+msgid "Error removing lock from entry for '%s'"
+msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
-# as-is
-#: libsvn_ra_svn/editor.c:383 libsvn_ra_svn/editorp.c:418
-msgid "Invalid file or dir token during edit"
-msgstr "编辑时é‡åˆ°æ— 效的文件或目录"
+#: libsvn_wc/log.c:880
+#, fuzzy, c-format
+msgid "Error removing changelist from entry '%s'"
+msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
-#: libsvn_ra_svn/editor.c:616
-msgid "Non-string as part of text delta"
-msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+#: libsvn_wc/log.c:1010
+#, c-format
+msgid "Missing 'revision' attribute for '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-# as-is
-#: libsvn_ra_svn/editorp.c:128
-msgid "Successful edit status returned too soon"
-msgstr "æˆåŠŸä¿®æ”¹çŠ¶æ€è¿”回太快"
+#: libsvn_wc/log.c:1034
+#, c-format
+msgid "Log command for directory '%s' is mislocated"
+msgstr "对目录“%sâ€çš„æ—¥å¿—命令被错置"
-# as-is
-#: libsvn_ra_svn/editorp.c:609
-msgid "Apply-textdelta already active"
-msgstr "Apply-textdelta å·²ç»æ¿€æ´»"
+#: libsvn_wc/log.c:1209 libsvn_wc/log.c:1285
+#, c-format
+msgid "Error checking existence of '%s'"
+msgstr "检查“%sâ€æ˜¯å¦å˜åœ¨æ—¶å‘生错误"
+
+#: libsvn_wc/log.c:1219 libsvn_wc/log.c:1225
+#, c-format
+msgid "Error getting 'affected time' for '%s'"
+msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
+
+#: libsvn_wc/log.c:1235
+#, c-format
+msgid "Error comparing '%s' and '%s'"
+msgstr "比较“%sâ€ä¸Žâ€œ%sâ€æ—¶å‘生错误"
+
+#: libsvn_wc/log.c:1345
+#, c-format
+msgid "Error replacing text-base of '%s'"
+msgstr "替æ¢â€œ%sâ€çš„æ–‡ä»¶å‚考基础时å‘生错误"
-# as-is
-#: libsvn_ra_svn/editorp.c:631 libsvn_ra_svn/editorp.c:649
-msgid "Apply-textdelta not active"
-msgstr "Apply-textdelta 没有激活"
+#: libsvn_wc/log.c:1354
+#, c-format
+msgid "Error getting 'affected time' of '%s'"
+msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
-#: libsvn_ra_svn/editorp.c:797 libsvn_ra_svn/marshal.c:833
+#: libsvn_wc/log.c:1392 libsvn_wc/log.c:1459
#, c-format
-msgid "Unknown command '%s'"
-msgstr "未知的命令:“%sâ€"
+msgid "Error modifying entry of '%s'"
+msgstr "修改“%sâ€çš„项目时å‘生错误"
-# as-is
-#: libsvn_ra_svn/marshal.c:78
-msgid "Capability entry is not a word"
-msgstr "容釿¡ç›®ä¸æ˜¯ä¸€ä¸ª word"
+#: libsvn_wc/log.c:1514
+#, fuzzy
+msgid "Invalid 'format' attribute"
+msgstr "æ— æ•ˆçš„é…置值"
-#: libsvn_ra_svn/marshal.c:160
-msgid "Can't write to connection"
-msgstr "æ— æ³•å†™å…¥è¿žçº¿"
+#: libsvn_wc/log.c:1549
+#, c-format
+msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
+msgstr "日志文件项目丢失 'name' 属性 (项目“%sâ€å¯¹åº”至目录“%sâ€)"
-#: libsvn_ra_svn/marshal.c:250
-msgid "Can't read from connection"
-msgstr "æ— æ³•è¯»å–连线"
+#: libsvn_wc/log.c:1620
+#, c-format
+msgid "Unrecognized logfile element '%s' in '%s'"
+msgstr "æ— æ³•ç¡®è®¤çš„æ—¥å¿—æ–‡ä»¶å…ƒç´ â€œ%sâ€äºŽâ€œ%sâ€ä¸"
-#: libsvn_ra_svn/marshal.c:253
-msgid "Connection closed unexpectedly"
-msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
+#: libsvn_wc/log.c:1631
+#, c-format
+msgid "Error processing command '%s' in '%s'"
+msgstr "在“%2$sâ€ä¸å¤„ç†å‘½ä»¤â€œ%1$sâ€æ—¶å‘生错误"
-#: libsvn_ra_svn/marshal.c:497
-msgid "String length larger than maximum"
-msgstr "å—串长度超出上é™"
+#: libsvn_wc/log.c:1809
+msgid "Couldn't open log"
+msgstr "æ— æ³•æ‰“å¼€æ—¥å¿—æ–‡ä»¶"
-#: libsvn_ra_svn/marshal.c:534
-msgid "Too many nested items"
-msgstr "太多嵌套的项目"
+#: libsvn_wc/log.c:1820
+#, c-format
+msgid "Error reading administrative log file in '%s'"
+msgstr "于“%sâ€ä¸è¯»å–ç®¡ç†æ—¥å¿—文件时å‘生错误"
-#: libsvn_ra_svn/marshal.c:553
-msgid "Number is larger than maximum"
-msgstr "æ•°å—大å°è¶…过上é™"
+#: libsvn_wc/log.c:2435
+#, c-format
+msgid "Error writing log for '%s'"
+msgstr "为“%sâ€å†™å…¥æ—¥å¿—æ—¶å‘生错误"
-#: libsvn_ra_svn/marshal.c:756
-msgid "Empty error list"
-msgstr "空的错误列表"
+#: libsvn_wc/log.c:2483
+#, c-format
+msgid "'%s' is not a working copy directory"
+msgstr "“%sâ€å¹¶ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
-#: libsvn_ra_svn/marshal.c:765
-msgid "Malformed error list"
-msgstr "畸形的错误列表"
+#: libsvn_wc/props.c:93
+#, c-format
+msgid "Can't parse '%s'"
+msgstr "æ— æ³•å‰–æžâ€œ%sâ€"
-#: libsvn_ra_svn/marshal.c:804
+#: libsvn_wc/props.c:120
#, c-format
-msgid "Unknown status '%s' in command response"
-msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
+msgid "Can't write property hash to '%s'"
+msgstr "æ— æ³•å†™å…¥å±žæ€§é›†åˆ°â€œ%sâ€"
-#: libsvn_repos/commit.c:128
+#: libsvn_wc/props.c:213
#, c-format
-msgid "Out of date: '%s' in transaction '%s'"
-msgstr "过期:â€%s“在事务â€%s“"
+msgid "Can't find entry '%s' in '%s'"
+msgstr "æ— æ³•åœ¨â€œ%2$sâ€ä¸æ‰¾åˆ°é¡¹ç›®â€œ%1$sâ€"
-#: libsvn_repos/commit.c:295 libsvn_repos/commit.c:460
+#: libsvn_wc/props.c:628
#, c-format
-msgid "Got source path but no source revision for '%s'"
-msgstr "获得æºè·¯å¾„,但â€%s“没有æºä¿®è®¢ç‰ˆ"
+msgid ""
+"Trying to add new property '%s' with value '%s',\n"
+"but property already exists with value '%s'."
+msgstr ""
+"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
+"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
-#: libsvn_repos/commit.c:327 libsvn_repos/commit.c:491
+#: libsvn_wc/props.c:651
#, c-format
-msgid "Source url '%s' is from different repository"
-msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“"
+msgid ""
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but the property does not exist."
+msgstr ""
+"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
+"但是属性并ä¸å˜åœ¨ã€‚"
-#: libsvn_repos/commit.c:400
+#: libsvn_wc/props.c:679
#, fuzzy, c-format
-msgid "Path '%s' not present"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+msgid ""
+"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+msgstr ""
+"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
+"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
-#: libsvn_repos/commit.c:616
+#: libsvn_wc/props.c:697
#, c-format
msgid ""
-"Checksum mismatch for resulting fulltext\n"
-"(%s):\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but property already exists with value '%s'."
msgstr ""
-"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
+"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
-#: libsvn_repos/delta.c:180
-msgid "Unable to open root of edit"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+#: libsvn_wc/props.c:880
+#, fuzzy, c-format
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_repos/delta.c:231
-msgid "Invalid target path"
-msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
+#: libsvn_wc/props.c:1626
+msgid "Failed to load properties from disk"
+msgstr "æ— æ³•ä»Žç£ç¢Ÿè£…载属性"
-#: libsvn_repos/delta.c:257
-msgid ""
-"Invalid editor anchoring; at least one of the input paths is not a directory "
-"and there was no source entry"
-msgstr "æ— æ•ˆçš„ç¼–è¾‘å™¨å®šä½ï¼›è‡³å°‘ä¸€ä¸ªè¾“å…¥è·¯å¾„ä¸æ˜¯ç›®å½•并且没有æºå…¥å£"
+#: libsvn_wc/props.c:1128
+#, c-format
+msgid "Cannot write property hash for '%s'"
+msgstr "æ— æ³•å†™å…¥â€œ%sâ€çš„属性æ‚凑"
-# as-is
-#: libsvn_repos/dump.c:416
+#: libsvn_wc/props.c:1362 libsvn_wc/props.c:1498
#, c-format
-msgid ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-msgstr ""
-"è¦å‘Šï¼šä¿®è®¢ç‰ˆ %ld çš„å‚è€ƒæ•°æ®æ¯”æœ€æ—§çš„è½¬å˜æ•°æ®ä¿®è®¢ç‰ˆ (%ld)还旧。\n"
-"è¦å‘Šï¼š 装载这个转å˜åˆ°ç©ºçš„æ¡£æ¡ˆåº“会失败。\n"
-"\n"
+msgid "Property '%s' is an entry property"
+msgstr "属性“%sâ€æ˜¯é¡¹ç›®å±žæ€§"
-#: libsvn_repos/dump.c:934
+#: libsvn_wc/props.c:1407
#, c-format
-msgid "Start revision %ld is greater than end revision %ld"
-msgstr "起始修订版 %ld 比结æŸä¿®è®¢ç‰ˆå· %ld 为大"
+msgid "Cannot set '%s' on a directory ('%s')"
+msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽç›®å½• (“%sâ€)"
-#: libsvn_repos/dump.c:939
+#: libsvn_wc/props.c:1415
#, c-format
-msgid "End revision %ld is invalid (youngest revision is %ld)"
-msgstr "结æŸä¿®è®¢ç‰ˆ %ld æ— æ•ˆ (最新的修订版为 %ld)"
+msgid "Cannot set '%s' on a file ('%s')"
+msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽæ–‡ä»¶ (“%sâ€)"
-# as-is
-#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
-msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+#: libsvn_wc/props.c:1421
+#, c-format
+msgid "'%s' is not a file or directory"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶æˆ–目录"
-# as-is
-#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
-msgid "* Verified revision %ld.\n"
-msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
+#: libsvn_wc/props.c:1445
+#, c-format
+msgid "File '%s' has binary mime type property"
+msgstr "文件“%sâ€æœ‰äºŒè¿›åˆ¶çš„ mime 型别属性"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1218
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘é€æäº¤å¤–æŒ‚(post-commit)失败"
+#: libsvn_wc/props.c:2101
+#, c-format
+msgid "Error parsing %s property on '%s': '%s'"
+msgstr "å‰–æž %s 属性于“%sâ€å‘生错误:“%sâ€"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_wc/props.c:2114
#, c-format
msgid ""
-"Storage of non-regular property '%s' is disallowed through the repository "
-"interface, and could indicate a bug in your client"
-msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
+"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
+"path"
+msgstr "æ— æ•ˆå±žæ€§ %s 于“%sâ€ï¼šç›®å½•牵涉到 '.' 或 '..' 或是ç»å¯¹è·¯å¾„"
-#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
-msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
+#: libsvn_wc/questions.c:120
+#, c-format
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr "“%sâ€çš„å·¥ä½œæ‹·è´æ ¼å¼å·²è¿‡æ—¶(%d)ï¼›è¯·é‡æ–°å–出您的工作拷è´"
-#: libsvn_repos/fs-wrap.c:484
+#: libsvn_wc/questions.c:128
#, c-format
-msgid "Cannot unlock path '%s', no authenticated username available"
-msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
+msgid ""
+"This client is too old to work with working copy '%s'; please get a newer "
+"Subversion client"
+msgstr "æœ¬å®¢æˆ·ç«¯å·²è¿‡æ—¶ï¼Œæ— æ³•å˜å–工作拷è´â€œ%sâ€ï¼›è¯·å–得更新版的 Subversion 客户端"
-#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
-msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
+#: libsvn_wc/questions.c:341
+#, c-format
+msgid ""
+"Checksum mismatch indicates corrupt text base: '%s'\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"总和检查值ä¸ä¸€è‡´ï¼Œè¡¨ç¤ºæ–‡ä»¶å‚考基础æŸå:“%sâ€\n"
+" 预期: %s\n"
+" 实际: %s\n"
+
+#: libsvn_wc/relocate.c:69
+msgid "Relocate can only change the repository part of an URL"
+msgstr ""
-#: libsvn_repos/hooks.c:66
+#: libsvn_wc/update_editor.c:390
#, c-format
-msgid "Can't create pipe for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgid "No '.' entry in: '%s'"
+msgstr "ä¸å˜åœ¨ '.' 项目:“%sâ€"
-#: libsvn_repos/hooks.c:73
+#: libsvn_wc/update_editor.c:896
#, c-format
-msgid "Can't create null stdout for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç©ºçš„æ ‡å‡†è¾“出"
+msgid "Won't delete locally modified directory '%s'"
+msgstr "æ— æ³•åˆ é™¤æœ¬åœ°ä¿®æ”¹çš„ç›®å½•â€œ%sâ€"
-#: libsvn_repos/hooks.c:85
-msgid "Error closing write end of stderr pipe"
-msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
+#: libsvn_wc/update_editor.c:970
+#, c-format
+msgid "Error writing log file for '%s'"
+msgstr "写入“%sâ€çš„æ—¥å¿—文件时å‘生错误"
-#: libsvn_repos/hooks.c:90
+#: libsvn_wc/update_editor.c:1078
#, fuzzy, c-format
-msgid "Failed to start '%s' hook"
-msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
-
-#: libsvn_repos/hooks.c:108
-#, c-format
msgid ""
-"'%s' hook failed with error output:\n"
-"%s"
-msgstr ""
-"外挂“%sâ€å¤±è´¥ï¼Œé”™è¯¯è¾“出:\n"
-"%s"
+"Failed to add directory '%s': a non-directory object of the same name "
+"already exists"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/hooks.c:115
+#: libsvn_wc/update_editor.c:1108
#, fuzzy, c-format
-msgid "'%s' hook failed; no error output available"
-msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
-
-#: libsvn_repos/hooks.c:134
-msgid "Error closing read end of stderr pipe"
-msgstr "å…³é—è¯»æ ‡å‡†é”™è¯¯ç®¡é“æœ«å°¾å‘生错误"
-
-#: libsvn_repos/hooks.c:138
-msgid "Error closing null file"
-msgstr "å…³é—空文件å‘生错误"
+msgid ""
+"Failed to forcibly add directory '%s': a versioned directory of the same "
+"name already exists"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/hooks.c:220
+#: libsvn_wc/update_editor.c:1121
#, c-format
-msgid "Failed to run '%s' hook; broken symlink"
-msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥ï¼›æ— 效的符å·è¿žæŽ¥"
+msgid "Failed to add directory '%s': object of the same name already exists"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/hooks.c:361
+#: libsvn_wc/update_editor.c:1130
+#, c-format
msgid ""
-"Repository has not been enabled to accept revision propchanges;\n"
-"ask the administrator to create a pre-revprop-change hook"
-msgstr ""
-"档案库未激活接å—修订版属性改å˜ï¼›è¯·ç®¡ç†å‘˜åˆ›å»ºä¸€ä¸ª pre-revprop-change 外挂"
-
-#: libsvn_repos/load.c:157 libsvn_repos/load.c:169
-msgid "Found malformed header block in dumpfile stream"
-msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šç‰©ä»¶ä¸Žç®¡ç†ç›®å½•åŒå"
-#: libsvn_repos/load.c:187
-msgid "Premature end of content data in dumpstream"
-msgstr "导出æµä¸å†…容数æ®è¿‡æ—©ç»“æŸ"
+#: libsvn_wc/update_editor.c:1144
+#, c-format
+msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šcopyfrom 傿•°å°šä¸æ”¯æŒ"
-#: libsvn_repos/load.c:194
-msgid "Dumpstream data appears to be malformed"
-msgstr "å¯¼å‡ºæµæ•°æ®ä¸å‡ºçŽ°ç•¸å½¢"
+#: libsvn_wc/update_editor.c:1165
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name is already scheduled "
+"for addition"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/load.c:232
-msgid "Incomplete or unterminated property block"
-msgstr "ä¸å®Œæ•´æˆ–未结æŸçš„属性å—"
+#: libsvn_wc/update_editor.c:1370
+msgid "Couldn't do property merge"
+msgstr "æ— æ³•è¿›è¡Œå±žæ€§åˆå¹¶"
-#: libsvn_repos/load.c:425
-msgid "Unexpected EOF writing contents"
-msgstr "å†™å†…å®¹æ—¶æœ‰æ„æ–™ä¹‹å¤–的结æŸç¬¦"
+#: libsvn_wc/update_editor.c:1434
+#, c-format
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr "æ— æ³•å°†â€œ%sâ€æ ‡è®°ä¸ºä¸å˜åœ¨ï¼šåŒåé¡¹ç›®å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/load.c:454
-msgid "Malformed dumpfile header"
-msgstr "畸形的导出文件头"
+#: libsvn_wc/update_editor.c:1534
+#, fuzzy, c-format
+msgid ""
+"Failed to add file '%s': a non-file object of the same name already exists"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/load.c:460 libsvn_repos/load.c:502
+#: libsvn_wc/update_editor.c:1545
#, c-format
-msgid "Unsupported dumpfile version: %d"
-msgstr "䏿”¯æŒçš„导出文件版本:%d"
+msgid "Failed to add file '%s': object of the same name already exists"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/load.c:600
-msgid "Unrecognized record type in stream"
-msgstr "æµä¸æœ‰æ— 法辨识的记录类型"
+#: libsvn_wc/update_editor.c:1567
+#, c-format
+msgid ""
+"Failed to add file '%s': object of the same name is already scheduled for "
+"addition"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/load.c:712
-msgid "Sum of subblock sizes larger than total block content length"
-msgstr "åå—大尿€»æ•°å¤§äºŽå—内容长度总数"
+#: libsvn_wc/update_editor.c:1575
+#, c-format
+msgid "File '%s' in directory '%s' is not a versioned resource"
+msgstr "文件“%sâ€äºŽç›®å½•“%sâ€ä¸çš„并䏿˜¯çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„资æº"
-# as-is
-#: libsvn_repos/load.c:891
+#: libsvn_wc/update_editor.c:1687
#, c-format
-msgid "<<< Started new transaction, based on original revision %ld\n"
-msgstr "<<< 开始新的事务,基于最åˆçš„修订版 %ld\n"
+msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›è®°å½•:“%sâ€ï¼Œå®žé™…:“%sâ€"
-#: libsvn_repos/load.c:936
+#: libsvn_wc/update_editor.c:2851
#, c-format
-msgid "Relative source revision %ld is not available in current repository"
-msgstr "ç›¸å¯¹æ¥æºä¿®è®¢ç‰ˆ %ld ä¸å˜åœ¨äºŽç›®å‰æ¡£æ¡ˆåº“之ä¸"
+msgid "'%s' has no ancestry information"
+msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
-#: libsvn_repos/load.c:985
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "畸形的导出æµï¼šä¿®è®¢ç‰ˆ 0 ä¸èƒ½åŒ…å«èŠ‚ç‚¹è®°å½•"
+#: libsvn_wc/update_editor.c:3014
+#, fuzzy, c-format
+msgid "Copyfrom-url '%s' has different repository root than '%s'"
+msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-#: libsvn_repos/load.c:995
-#, c-format
-msgid " * editing path : %s ..."
-msgstr " * æ£åœ¨ä¿®æ”¹è·¯å¾„:%s ..."
+#: libsvn_wc/util.c:83
+msgid "Unable to make any directories"
+msgstr "æ— æ³•å»ºç«‹ä»»ä½•ç›®å½•"
+
+#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+msgid "'verbose' option invalid in XML mode"
+msgstr "在XML模å¼ä¸â€œè¯¦ç»†â€é€‰é¡¹æ— 效"
-#: libsvn_repos/load.c:1002
+#: svn/blame-cmd.c:246 svn/info-cmd.c:507 svn/list-cmd.c:264
+#: svn/status-cmd.c:268
+msgid "'incremental' option only valid in XML mode"
+msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
+
+#: svn/blame-cmd.c:313
#, c-format
-msgid " * deleting path : %s ..."
-msgstr " * æ£åœ¨åˆ 除路径:%s ..."
+msgid "Skipping binary file: '%s'\n"
+msgstr "跳过二进制文件:“%sâ€\n"
-#: libsvn_repos/load.c:1010
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
#, c-format
-msgid " * adding path : %s ..."
-msgstr " * æ£åœ¨æ·»åŠ è·¯å¾„ï¼š%s ..."
+msgid "'%s' does not appear to be a URL"
+msgstr "“%sâ€ä¸åƒæ˜¯åœ°å€(URL)"
+
+#: svn/copy-cmd.c:108 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
+msgid "Local, non-commit operations do not take a log message"
+msgstr "本地æ“ä½œï¼Œéžæäº¤çš„æ“作ä¸èƒ½èŽ·å–æ—¥å¿—ä¿¡æ¯"
-#: libsvn_repos/load.c:1019
+#: svn/diff-cmd.c:117 svnserve/main.c:499
#, c-format
-msgid " * replacing path : %s ..."
-msgstr " * æ£åœ¨æ›¿æ¢è·¯å¾„:%s ..."
+msgid "Can't open stdout"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å‡º (stdout)"
-#: libsvn_repos/load.c:1029
+#: svn/diff-cmd.c:119
#, c-format
-msgid "Unrecognized node-action on node '%s'"
-msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
+msgid "Can't open stderr"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
-#: libsvn_repos/load.c:1165
+#: svn/diff-cmd.c:184
#, fuzzy
-msgid " done.\n"
-msgstr "完æˆã€‚\n"
+msgid "'--new' option only valid with '--old' option"
+msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
-# as-is
-#: libsvn_repos/load.c:1240
+#: svn/diff-cmd.c:214
#, c-format
+msgid "Target lists to diff may not contain both working copy paths and URLs"
+msgstr "å·®å¼‚æ¯”è¾ƒç›®æ ‡ä¸å¯åŒæ—¶åŒ…å«å·¥ä½œæ‹·è´è·¯å¾„与地å€(URL)"
+
+#: svn/export-cmd.c:84
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
+
+#: svn/help-cmd.c:45
+#, fuzzy, c-format
msgid ""
+"usage: svn <subcommand> [options] [args]\n"
+"Subversion command-line client, version %s.\n"
+"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svn --version' to see the program version and RA modules\n"
+" or 'svn --version --quiet' to see just the version number.\n"
"\n"
-"------- Committed revision %ld >>>\n"
+"Most subcommands take file and/or directory arguments, recursing\n"
+"on the directories. If no arguments are supplied to such a\n"
+"command, it recurses on the current directory (inclusive) by default.\n"
"\n"
+"Available subcommands:\n"
msgstr ""
+"用法:svn <subcommand> [options] [args]\n"
+"Subversion 命令行客户端,版本 %s。\n"
+"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
+"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
+"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
+"行递归å˜å–。\n"
"\n"
-"------- æäº¤åŽçš„修订版 %ld >>>\n"
-"\n"
+"å¯ç”¨çš„å命令:\n"
-# as-is
-#: libsvn_repos/load.c:1246
-#, c-format
+#: svn/help-cmd.c:58
msgid ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
+"Subversion is a tool for version control.\n"
+"For additional information, see http://subversion.tigris.org/\n"
msgstr ""
+"Subversion 是个版本控制系统的工具。\n"
+"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+
+#: svn/help-cmd.c:65 svnsync/main.c:1246
+msgid ""
+"The following repository access (RA) modules are available:\n"
"\n"
-"------- æäº¤æ–°ä¿®è®¢ç‰ˆ %ld (从原始修订版 %ld 装载) >>>\n"
+msgstr ""
+"å¯ä½¿ç”¨ä»¥ä¸‹çš„æ¡£æ¡ˆåº“å˜å– (RA) 模å—:\n"
"\n"
-#: libsvn_repos/node_tree.c:238
-#, c-format
-msgid "'%s' not found in filesystem"
-msgstr "åœ¨æ–‡ä»¶ç³»ç»Ÿä¸æ‰¾ä¸åˆ°â€œ%sâ€"
+#: svn/import-cmd.c:82
+msgid "Repository URL required when importing"
+msgstr "导入时必须æä¾›æ¡£æ¡ˆåº“的地å€(URL)"
-#: libsvn_repos/replay.c:159
-#, c-format
-msgid "Filesystem path '%s' is neither a file nor a directory"
-msgstr "文件系统ä¸è·¯å¾„“%sâ€æ—¢ä¸æ˜¯æ–‡ä»¶ä¹Ÿä¸æ˜¯ç›®å½•"
+#: svn/import-cmd.c:86
+msgid "Too many arguments to import command"
+msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
-#: libsvn_repos/reporter.c:603
+#: svn/import-cmd.c:101
#, c-format
-msgid "Working copy path '%s' does not exist in repository"
-msgstr "工作拷è´è·¯å¾„“%sâ€ä¸å˜åœ¨æ¡£æ¡ˆåº“ä¸"
-
-#: libsvn_repos/reporter.c:824
-msgid "Not authorized to open root of edit operation"
-msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
+msgid "Invalid URL '%s'"
+msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
-#: libsvn_repos/reporter.c:845
-msgid "Cannot replace a directory from within"
-msgstr "ä¸èƒ½åœ¨ç›®å½•䏿›¿æ¢"
+#: svn/info-cmd.c:111
+#, fuzzy, c-format
+msgid "'%s' has invalid revision"
+msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
-#: libsvn_repos/reporter.c:888
-msgid "Invalid report for top level of working copy"
-msgstr "æ— æ•ˆçš„æœ€ä¸Šå±‚å·¥ä½œæ‹·è´æŠ¥å‘Š"
+#: svn/info-cmd.c:267 svnadmin/main.c:1046
+#, c-format
+msgid "Path: %s\n"
+msgstr "路径:%s\n"
-#: libsvn_repos/reporter.c:903
-msgid "Two top-level reports with no target"
-msgstr "ä¸¤ä¸ªæœ€ä¸Šå±‚æŠ¥å‘Šæ²¡æœ‰ç›®æ ‡"
+# this points to filename according to sunny256
+#: svn/info-cmd.c:273 svnlook/main.c:734
+#, c-format
+msgid "Name: %s\n"
+msgstr "文件å:%s\n"
-#: libsvn_repos/repos.c:176
+#: svn/info-cmd.c:277
#, c-format
-msgid "'%s' exists and is non-empty"
-msgstr "“%sâ€å·²å˜åœ¨å¹¶ä¸”éžç©º"
+msgid "URL: %s\n"
+msgstr "地å€(URL):%s\n"
-#: libsvn_repos/repos.c:200
-msgid "Creating db logs lock file"
-msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“æ—¥å€¼é”æ–‡ä»¶"
+#: svn/info-cmd.c:280
+#, fuzzy, c-format
+msgid "Repository Root: %s\n"
+msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
-#: libsvn_repos/repos.c:225
-msgid "Creating db lock file"
-msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“锿–‡ä»¶"
+#: svn/info-cmd.c:284
+#, c-format
+msgid "Repository UUID: %s\n"
+msgstr "档案库 UUID:%s\n"
-#: libsvn_repos/repos.c:235
-msgid "Creating lock dir"
-msgstr "æ£åœ¨åˆ›å»ºé”文件目录"
+#: svn/info-cmd.c:288
+#, c-format
+msgid "Revision: %ld\n"
+msgstr "修订版:%ld\n"
-#: libsvn_repos/repos.c:276
-msgid "Creating hook directory"
-msgstr "æ£åœ¨åˆ›å»ºå¤–挂目录"
+#: svn/info-cmd.c:293
+#, c-format
+msgid "Node Kind: file\n"
+msgstr "节点ç§ç±»ï¼šæ–‡ä»¶\n"
-#: libsvn_repos/repos.c:382
-msgid "Creating start-commit hook"
-msgstr "æ£åœ¨åˆ›å»º start-commit 外挂时å‘生错误"
+#: svn/info-cmd.c:297
+#, c-format
+msgid "Node Kind: directory\n"
+msgstr "节点ç§ç±»ï¼šç›®å½•\n"
-#: libsvn_repos/repos.c:519
-msgid "Creating pre-commit hook"
-msgstr "æ£åœ¨åˆ›å»º pre-commit 外挂"
+#: svn/info-cmd.c:301
+#, c-format
+msgid "Node Kind: none\n"
+msgstr "节点ç§ç±»ï¼šæ— \n"
-#: libsvn_repos/repos.c:651
-msgid "Creating pre-revprop-change hook"
-msgstr "æ£åœ¨åˆ›å»º pre-revprop-change 外挂"
+#: svn/info-cmd.c:306
+#, c-format
+msgid "Node Kind: unknown\n"
+msgstr "节点ç§ç±»ï¼šæœªçŸ¥\n"
-#: libsvn_repos/repos.c:1026
-msgid "Creating post-commit hook"
-msgstr "æ£åœ¨åˆ›å»º post-commit 外挂"
+#: svn/info-cmd.c:315
+#, c-format
+msgid "Schedule: normal\n"
+msgstr "调度:æ£å¸¸\n"
-#: libsvn_repos/repos.c:1346
-msgid "Creating post-revprop-change hook"
-msgstr "æ£åœ¨åˆ›å»º post-revprop-change 外挂"
+#: svn/info-cmd.c:319
+#, c-format
+msgid "Schedule: add\n"
+msgstr "调度:新增\n"
-#: libsvn_repos/repos.c:1356
-msgid "Creating conf directory"
-msgstr "æ£åœ¨åˆ›å»º conf 目录"
+#: svn/info-cmd.c:323
+#, c-format
+msgid "Schedule: delete\n"
+msgstr "è°ƒåº¦ï¼šåˆ é™¤\n"
-#: libsvn_repos/repos.c:1408
-msgid "Creating svnserve.conf file"
-msgstr "æ£åœ¨åˆ›å»º svnserve.conf 文件"
+#: svn/info-cmd.c:327
+#, c-format
+msgid "Schedule: replace\n"
+msgstr "调度:替æ¢\n"
-#: libsvn_repos/repos.c:1433
-msgid "Creating passwd file"
-msgstr "æ£åœ¨åˆ›å»º passwd 文件"
+#: svn/info-cmd.c:335
+#, c-format
+msgid "Copied From URL: %s\n"
+msgstr "å¤åˆ¶è‡ªåœ°å€(URL):%s\n"
-#: libsvn_repos/repos.c:1459
-msgid "Could not create top-level directory"
-msgstr "æ— æ³•åˆ›å»ºæœ€ä¸Šå±‚ç›®å½•"
+#: svn/info-cmd.c:339
+#, c-format
+msgid "Copied From Rev: %ld\n"
+msgstr "å¤åˆ¶è‡ªä¿®è®¢ç‰ˆï¼š%ld\n"
-#: libsvn_repos/repos.c:1463
-msgid "Creating DAV sandbox dir"
-msgstr "æ£åœ¨åˆ›å»º DAV sandbox 目录"
+#: svn/info-cmd.c:344
+#, c-format
+msgid "Last Changed Author: %s\n"
+msgstr "最åŽä¿®æ”¹çš„作者:%s\n"
-# as-is
-#: libsvn_repos/repos.c:1506
-msgid "Creating readme file"
-msgstr "æ£åœ¨åˆ›å»º readme 文件"
+#: svn/info-cmd.c:348
+#, c-format
+msgid "Last Changed Rev: %ld\n"
+msgstr "最åŽä¿®æ”¹çš„修订版:%ld\n"
-#: libsvn_repos/repos.c:1538
-msgid "Repository creation failed"
-msgstr "档案库创建失败"
+#: svn/info-cmd.c:353
+msgid "Last Changed Date"
+msgstr "最åŽä¿®æ”¹çš„æ—¶é—´"
-#: libsvn_repos/repos.c:1610
-#, fuzzy, c-format
-msgid "Expected format '%d' of repository; found format '%d'"
-msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+#: svn/info-cmd.c:359
+msgid "Text Last Updated"
+msgstr "æ–‡æœ¬æœ€åŽæ›´æ–°"
-#: libsvn_repos/repos.c:1658
-msgid "Error opening db lockfile"
-msgstr "打开数æ®åº“锿–‡ä»¶é”™è¯¯"
+#: svn/info-cmd.c:363
+msgid "Properties Last Updated"
+msgstr "å±žæ€§æœ€åŽæ›´æ–°"
-#: libsvn_repos/rev_hunt.c:63
+#: svn/info-cmd.c:366
#, c-format
-msgid "Failed to find time on revision %ld"
-msgstr "æ— æ³•æ‰¾åˆ°ä¿®è®¢ç‰ˆ %ld 的时间"
+msgid "Checksum: %s\n"
+msgstr "æ ¡éªŒå’Œï¼š%s\n"
-#: libsvn_repos/rev_hunt.c:218
+#: svn/info-cmd.c:371
#, c-format
-msgid "Invalid start revision %ld"
-msgstr "æ— æ•ˆçš„èµ·å§‹ä¿®è®¢ç‰ˆ %ld"
+msgid "Conflict Previous Base File: %s\n"
+msgstr "冲çªä¹‹å‰çš„æ–‡ä»¶ï¼š%s\n"
-#: libsvn_repos/rev_hunt.c:222
+#: svn/info-cmd.c:377
#, c-format
-msgid "Invalid end revision %ld"
-msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
-
-#: libsvn_repos/rev_hunt.c:314
-#, fuzzy
-msgid "Unreadable path encountered; access denied"
-msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
+msgid "Conflict Previous Working File: %s\n"
+msgstr "冲çªä¹‹å‰çš„工作文件:%s\n"
-#: libsvn_subr/config.c:632
+#: svn/info-cmd.c:382
#, c-format
-msgid "Config error: invalid boolean value '%s'"
-msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„å¸ƒå°”å€¼â€œ%sâ€"
+msgid "Conflict Current Base File: %s\n"
+msgstr "冲çªä¹‹å‰çš„当剿–‡ä»¶ï¼š%s\n"
-#: libsvn_subr/config.c:882
+#: svn/info-cmd.c:387
#, c-format
-msgid "Config error: invalid integer value '%s'"
-msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„æ•´æ•°å€¼â€œ%sâ€"
+msgid "Conflict Properties File: %s\n"
+msgstr "冲çªçš„属性文件:%s\n"
-#: libsvn_subr/config_auth.c:94
-msgid "Unable to open auth file for reading"
-msgstr "ä¸èƒ½æ‰“å¼€è®¤è¯æ–‡ä»¶è¯»å–æ•°æ®"
+#: svn/info-cmd.c:395
+#, c-format
+msgid "Lock Token: %s\n"
+msgstr "é”定记å·ï¼š%s\n"
-#: libsvn_subr/config_auth.c:99
+#: svn/info-cmd.c:399
#, c-format
-msgid "Error parsing '%s'"
-msgstr "分解“%sâ€æ—¶å‘生错误"
+msgid "Lock Owner: %s\n"
+msgstr "é”定所有者:%s\n"
-#: libsvn_subr/config_auth.c:123
-msgid "Unable to locate auth file"
-msgstr "æ— æ³•å®šä½è®¤è¯æ–‡ä»¶æ–‡ä»¶"
+#: svn/info-cmd.c:404
+msgid "Lock Created"
+msgstr "é”定已创建的"
-#: libsvn_subr/config_auth.c:134
-msgid "Unable to open auth file for writing"
-msgstr "æ— æ³•æ‰“å¼€è®¤è¯æ–‡ä»¶å†™å…¥æ•°æ®"
+#: svn/info-cmd.c:408
+msgid "Lock Expires"
+msgstr "é”定过期的"
-#: libsvn_subr/config_auth.c:137
+#: svn/info-cmd.c:417
#, c-format
-msgid "Error writing hash to '%s'"
-msgstr "写哈希数æ®è‡³â€œ%sâ€æ—¶å‘生错误"
+msgid ""
+"Lock Comment (%i lines):\n"
+"%s\n"
+msgstr ""
+"é”定注释(%i 行):\n"
+"%s\n"
-# as-is
-#: libsvn_subr/config_file.c:393
+#: svn/info-cmd.c:418
#, c-format
-msgid "Can't open config file '%s'"
-msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
+msgid ""
+"Lock Comment (%i line):\n"
+"%s\n"
+msgstr ""
+"é”定注释(%i line):\n"
+"%s\n"
-# as-is
-#: libsvn_subr/config_file.c:397
+#: svn/info-cmd.c:425
+#, fuzzy, c-format
+msgid "Changelist: %s\n"
+msgstr "æ ¡éªŒå’Œï¼š%s\n"
+
+#: svn/info-cmd.c:477 svn/revert-cmd.c:59
+#, fuzzy, c-format
+msgid "no such changelist '%s'"
+msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
+
+#: svn/info-cmd.c:539
#, c-format
-msgid "Can't find config file '%s'"
-msgstr "找ä¸åˆ°é…置文件“%sâ€"
+msgid ""
+"%s: (Not a versioned resource)\n"
+"\n"
+msgstr ""
+"%s:(䏿˜¯å—版本控制的资æº)\n"
+"\n"
-#: libsvn_subr/date.c:204
-msgid "Can't manipulate current date"
-msgstr "ä¸èƒ½è޷得当剿—¥æœŸ"
+#: svn/info-cmd.c:548
+#, fuzzy, c-format
+msgid ""
+"%s: (Not a valid URL)\n"
+"\n"
+msgstr ""
+"%s:(䏿˜¯æœ‰æ•ˆçš„地å€(URL))\n"
+"\n"
-#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
-msgid "Can't calculate requested date"
-msgstr "æ— æ³•è®¡ç®—è¢«è¯·æ±‚çš„æ—¥æœŸ"
+#: svn/lock-cmd.c:52
+#, fuzzy
+msgid "Lock comment contains a zero byte"
+msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
-#: libsvn_subr/date.c:281
-msgid "Can't expand time"
-msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
+#: svn/log-cmd.c:162
+msgid "(no author)"
+msgstr "(没有作者信æ¯)"
-#: libsvn_subr/error.c:326
-msgid "Can't recode error string from APR"
-msgstr "æ— æ³•è‡ª APR 将错误信æ¯é‡æ–°ç¼–ç "
+#: svn/log-cmd.c:173
+msgid "(no date)"
+msgstr "(没有时间)"
-#: libsvn_subr/error.c:414
+#: svn/log-cmd.c:203
#, c-format
-msgid "%swarning: %s\n"
-msgstr "%sè¦å‘Šï¼š%s\n"
+msgid "Changed paths:\n"
+msgstr "改å˜çš„路径:\n"
-#: libsvn_subr/io.c:129
+#: svn/log-cmd.c:218
#, c-format
-msgid "Can't check path '%s'"
-msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€"
+msgid " (from %s:%ld)"
+msgstr " (从 %s:%ld)"
-#: libsvn_subr/io.c:248 libsvn_subr/io.c:337
-#, c-format
-msgid "Can't open '%s'"
-msgstr "ä¸èƒ½æ‰“开“%sâ€"
+#: svn/log-cmd.c:450
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "当指定工作拷è´è·¯å¾„ï¼Œåªæœ‰ä¸€ä¸ªç›®æ ‡ä¼šè¢«æŒ‡å®š"
-#: libsvn_subr/io.c:262 libsvn_subr/io.c:350
-#, c-format
-msgid "Unable to make name for '%s'"
-msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
+#: svn/log-cmd.c:462
+msgid "Only relative paths can be specified after a URL"
+msgstr "地å€(URL)åŽåªèƒ½æŒ‡å®šç›¸å¯¹è·¯å¾„"
-#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418
-msgid "Symbolic links are not supported on this platform"
-msgstr "æ¤å¹³å°ä¸æ”¯æŒç¬¦å·é“¾æŽ¥"
+#: svn/main.c:60
+msgid "force operation to run"
+msgstr "强制æ“作è¿è¡Œ"
-#: libsvn_subr/io.c:377
-msgid "Can't read contents of link"
-msgstr "ä¸èƒ½è¯»å–连接的内容"
+#: svn/main.c:62
+msgid "force validity of log message source"
+msgstr "å¼ºåˆ¶æ ¡éªŒæ—¥å¿—ä¿¡æ¯èµ„æº"
-#: libsvn_subr/io.c:519 libsvn_subr/io.c:529
-msgid "Can't find a temporary directory"
-msgstr "æ— æ³•æ‰¾åˆ°ä¸´æ—¶ç›®å½•"
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:227 svnadmin/main.c:230
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+msgid "show help on a subcommand"
+msgstr "显示å命令帮助"
-#: libsvn_subr/io.c:566
-#, c-format
-msgid "Can't copy '%s' to '%s'"
-msgstr "ä¸èƒ½å¤åˆ¶â€œ%sâ€åˆ°â€œ%sâ€"
+#: svn/main.c:65
+#, fuzzy
+msgid "specify log message ARG"
+msgstr "指定æäº¤ä¿¡æ¯ARG"
-# as-is
-#: libsvn_subr/io.c:599
-#, c-format
-msgid "Can't set permissions on '%s'"
-msgstr "ä¸èƒ½åœ¨â€œ%sâ€è®¾ç½®è®¸å¯æƒé™"
+#: svn/main.c:66
+msgid "print as little as possible"
+msgstr "打å°å°½å¯èƒ½å°‘"
-#: libsvn_subr/io.c:621
-#, c-format
-msgid "Can't append '%s' to '%s'"
-msgstr "ä¸èƒ½é™„åŠ â€œ%sâ€åˆ°â€œ%sâ€"
+#: svn/main.c:67
+msgid "descend recursively"
+msgstr "å‘下递归"
-#: libsvn_subr/io.c:655
-#, c-format
-msgid "Source '%s' is not a directory"
-msgstr "æºâ€œ%sâ€ä¸æ˜¯ç›®å½•"
+#: svn/main.c:68
+msgid "operate on single directory only"
+msgstr "åªåœ¨å•个目录æ“作"
-#: libsvn_subr/io.c:661
-#, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目的“%sâ€ä¸æ˜¯ç›®å½•"
+#: svn/main.c:70
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+" If ARG is negative this is like -r ARG:ARG-1"
+msgstr ""
-#: libsvn_subr/io.c:667
-#, c-format
-msgid "Destination '%s' already exists"
-msgstr "目的“%sâ€å·²å˜åœ¨"
+#: svn/main.c:74
+#, fuzzy
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" '{' DATE '}' revision at start of the date\n"
+" 'HEAD' latest in repository\n"
+" 'BASE' base rev of item's working "
+"copy\n"
+" 'COMMITTED' last commit at or before BASE\n"
+" 'PREV' revision just before COMMITTED"
+msgstr ""
+"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
+" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
+" æ•°å— ä¿®è®¢ç‰ˆå·\n"
+" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
+" \"HEAD\" 最近的档案库\n"
+" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
+" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
+" \"PREV\" 修订版æäº¤ä¹‹å‰"
-#: libsvn_subr/io.c:736 libsvn_subr/io.c:1636 libsvn_subr/io.c:1707
-#, c-format
-msgid "Can't read directory '%s'"
-msgstr "æ— æ³•è¯»å–目录“%sâ€"
+#: svn/main.c:84
+#, fuzzy
+msgid "read log message from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
-#: libsvn_subr/io.c:741 libsvn_subr/io.c:1641 libsvn_subr/io.c:1712
-#: libsvn_subr/io.c:2695
-#, c-format
-msgid "Error closing directory '%s'"
-msgstr "å…³é—目录“%sâ€æ—¶å‘生错误"
+#: svn/main.c:86
+msgid "give output suitable for concatenation"
+msgstr "给予适åˆè¾“出的"
-#: libsvn_subr/io.c:767
-#, c-format
-msgid "Can't make directory '%s'"
-msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
+#: svn/main.c:89
+msgid "treat value as being in charset encoding ARG"
+msgstr "指定的值 ARG 为å—符编ç "
-# as-is
-#: libsvn_subr/io.c:835
-#, c-format
-msgid "Can't set access time of '%s'"
-msgstr "ä¸èƒ½è®¾ç½®â€œ%sâ€çš„å˜å–æ—¶é—´"
+#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
+#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
+#: svnversion/main.c:125
+#, fuzzy
+msgid "show program version information"
+msgstr "显示版本信æ¯"
-#: libsvn_subr/io.c:950
-#, c-format
-msgid "Can't set file '%s' read-only"
-msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€åªè¯»"
+#: svn/main.c:93
+msgid "print extra information"
+msgstr "打å°é™„åŠ ä¿¡æ¯"
-#: libsvn_subr/io.c:975
-#, c-format
-msgid "Can't set file '%s' read-write"
-msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€å¯è¯»å†™"
+#: svn/main.c:94
+msgid "display update information"
+msgstr "显示更新信æ¯"
-#: libsvn_subr/io.c:1025
-#, c-format
-msgid "Can't get default file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+#: svn/main.c:96 svnsync/main.c:96
+msgid "specify a username ARG"
+msgstr "指定用户 ARG"
-# as-is
-#: libsvn_subr/io.c:1035
-#, fuzzy, c-format
-msgid "Can't open file at '%s'"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
+#: svn/main.c:98 svnsync/main.c:98
+msgid "specify a password ARG"
+msgstr "指定密ç ARG"
-#: libsvn_subr/io.c:1039
-#, fuzzy, c-format
-msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+#: svn/main.c:101
+msgid ""
+"Default: '-u'. When Subversion is invoking an\n"
+" external diff program, ARG is simply passed "
+"along\n"
+" to the program. But when Subversion is using "
+"its\n"
+" default internal diff implementation, or when\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
+" could be any of the following:\n"
+" -u (--unified):\n"
+" Output 3 lines of unified context.\n"
+" -b (--ignore-space-change):\n"
+" Ignore changes in the amount of white "
+"space.\n"
+" -w (--ignore-all-space):\n"
+" Ignore all white space.\n"
+" --ignore-eol-style:\n"
+" Ignore changes in EOL style"
+msgstr ""
-#: libsvn_subr/io.c:1072 libsvn_subr/io.c:1132
-#, fuzzy, c-format
-msgid "Can't change read-write perms of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
+#: svn/main.c:130
+msgid "pass contents of file ARG as additional args"
+msgstr "ä¼ é€’æ–‡ä»¶ ARG å†…å®¹ä¸ºé™„ä»¶å‚æ•°"
-#: libsvn_subr/io.c:1171 libsvn_subr/io.c:1215 libsvn_subr/io.c:1239
-#, c-format
-msgid "Can't change executability of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
+#: svn/main.c:131
+msgid "output in XML"
+msgstr "输出为 XML"
-#: libsvn_subr/io.c:1266
-msgid "Error getting UID of process"
-msgstr "获å–进程用户ID(UID)时å‘生错误"
+#: svn/main.c:132
+msgid "use strict semantics"
+msgstr "ä½¿ç”¨ä¸¥æ ¼çš„è¯æ³•"
-#: libsvn_subr/io.c:1347
-#, c-format
-msgid "Can't get shared lock on file '%s'"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%s“的共享é”"
+#: svn/main.c:134
+msgid "do not cross copies while traversing history"
+msgstr "查看历å²ä¸è¦è·¨è¶Šä¸åŒçš„æ‹·è´"
-#: libsvn_subr/io.c:1351
-#, c-format
-msgid "Can't get exclusive lock on file '%s'"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%sâ€çš„æŽ’ä»–é”"
+#: svn/main.c:136
+msgid "disregard default and svn:ignore property ignores"
+msgstr "忽略默认值和 svn:ignore 属性"
-# as-is
-#: libsvn_subr/io.c:1382
-#, c-format
-msgid "Can't flush file '%s'"
-msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶â€œ%sâ€"
+#: svn/main.c:138 svnsync/main.c:94
+msgid "do not cache authentication tokens"
+msgstr "ä¸è¦ç¼“冲用户验è¯"
-#: libsvn_subr/io.c:1383
-msgid "Can't flush stream"
-msgstr "ä¸èƒ½å†™å…¥æµ"
+#: svn/main.c:140 svnsync/main.c:92
+msgid "do no interactive prompting"
+msgstr "ä¸è¦äº¤äº’æç¤º"
-#: libsvn_subr/io.c:1395 libsvn_subr/io.c:1412
-msgid "Can't flush file to disk"
-msgstr "ä¸èƒ½æŠŠæ–‡ä»¶å†™å…¥ç£ç›˜"
+#: svn/main.c:142
+msgid "try operation but make no changes"
+msgstr "å°è¯•æ“作但ä¸ä¿®æ”¹"
-#: libsvn_subr/io.c:1433
-msgid "Reading from stdin is currently broken, so disabled"
-msgstr "ä»Žæ ‡å‡†è¾“å…¥è®¾å¤‡è¯»å–æ•°æ®æ—¶è¢«ä¸æ–ï¼Œæ‰€ä»¥æŠŠå®ƒç¦æ¢"
+#: svn/main.c:144 svnlook/main.c:111
+msgid "do not print differences for deleted files"
+msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
-#: libsvn_subr/io.c:1454
-msgid "Can't get file name"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+#: svn/main.c:146
+msgid "notice ancestry when calculating differences"
+msgstr "比较差异时æç¤ºåŽŸå§‹ä¿¡æ¯"
-# as-is
-#: libsvn_subr/io.c:1522
-#, c-format
-msgid "Can't remove file '%s'"
-msgstr "ä¸èƒ½ç§»åŠ¨æ–‡ä»¶â€œ%sâ€"
+#: svn/main.c:148
+msgid "ignore ancestry when calculating merges"
+msgstr "åˆå¹¶æ—¶å¿½ç•¥åŽŸå§‹ä¿¡æ¯"
-#: libsvn_subr/io.c:1551
-#, c-format
-msgid "Can't rewind directory '%s'"
-msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
+#: svn/main.c:150
+msgid "ignore externals definitions"
+msgstr "忽略外部定义"
-#: libsvn_subr/io.c:1586 libsvn_subr/io.c:2544 libsvn_subr/io.c:2632
-#, c-format
-msgid "Can't open directory '%s'"
-msgstr "æ— æ³•æ‰“å¼€ç›®å½•â€œ%sâ€"
+#: svn/main.c:153
+msgid "use ARG as diff command"
+msgstr "使用 ARG 作为差异比较命令"
-#: libsvn_subr/io.c:1625 libsvn_subr/io.c:1647
-#, c-format
-msgid "Can't remove '%s'"
-msgstr "æ— æ³•åˆ é™¤â€œ%sâ€"
+#: svn/main.c:155
+msgid "use ARG as merge command"
+msgstr "使用 ARG 作为åˆå¹¶å‘½ä»¤"
-#: libsvn_subr/io.c:1751
-#, c-format
-msgid "Can't create process '%s' attributes"
-msgstr "æ— æ³•å»ºç«‹è¿›ç¨‹â€œ%sâ€çš„属性"
+#: svn/main.c:157
+msgid "use ARG as external editor"
+msgstr "使用 ARG 作为外部编辑器"
-#: libsvn_subr/io.c:1757
-#, c-format
-msgid "Can't set process '%s' cmdtype"
-msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„命令类型"
+#: svn/main.c:160
+msgid "use ARG as the older target"
+msgstr "使用 ARG ä½œä¸ºæ—§ç›®æ ‡"
-#: libsvn_subr/io.c:1769
-#, c-format
-msgid "Can't set process '%s' directory"
-msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
+#: svn/main.c:162
+msgid "use ARG as the newer target"
+msgstr "使用 ARG ä½œä¸ºæ–°ç›®æ ‡"
-#: libsvn_subr/io.c:1782
-#, c-format
-msgid "Can't set process '%s' child input"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
+#: svn/main.c:164
+msgid "operate on a revision property (use with -r)"
+msgstr "在修订版属性上作æ“作(使用-r傿•°)"
-#: libsvn_subr/io.c:1789
-#, c-format
-msgid "Can't set process '%s' child outfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
+#: svn/main.c:166
+msgid "relocate via URL-rewriting"
+msgstr "通过URLæ”¹å†™é‡æ–°éƒ¨ç½²"
-#: libsvn_subr/io.c:1796
-#, c-format
-msgid "Can't set process '%s' child errfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+#: svn/main.c:168 svnadmin/main.c:269 svnsync/main.c:100
+msgid "read user configuration files from directory ARG"
+msgstr "从目录 ARG 读å–用户é…置文件"
-# as-is
-#: libsvn_subr/io.c:1820
-#, c-format
-msgid "Can't start process '%s'"
-msgstr "ä¸èƒ½å–得进程“%sâ€çжæ€"
+#: svn/main.c:170
+msgid "enable automatic properties"
+msgstr "使自动属性有效"
-#: libsvn_subr/io.c:1842
-#, c-format
-msgid "Error waiting for process '%s'"
-msgstr "为进程“%sâ€å†™å…¥æ—¶å‘生错误"
+#: svn/main.c:172
+msgid "disable automatic properties"
+msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
-#: libsvn_subr/io.c:1850
-#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "进程“%sâ€å¤±è´¥(返回 %d)"
+#: svn/main.c:174
+#, fuzzy
+msgid ""
+"use a different EOL marker than the standard\n"
+" system marker for files with the svn:eol-style\n"
+" property set to 'native'.\n"
+" ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
+" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属性为 'native'。\n"
+" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
-#: libsvn_subr/io.c:1857
-#, c-format
-msgid "Process '%s' returned error exitcode %d"
-msgstr "进程“%sâ€è¿”回错误退出ç %d"
+#: svn/main.c:182
+msgid "maximum number of log entries"
+msgstr "日值项最大值"
-#: libsvn_subr/io.c:1968
-#, c-format
-msgid "'%s' returned %d"
-msgstr "“%s†返回 %d"
+#: svn/main.c:184
+msgid "don't unlock the targets"
+msgstr "ä¸è¦é”å®šç›®æ ‡"
-#: libsvn_subr/io.c:2071
-#, c-format
-msgid ""
-"Error running '%s': exitcode was %d, args were:\n"
-"in directory '%s', basenames:\n"
-"%s\n"
-"%s\n"
-"%s"
+#: svn/main.c:186
+msgid "show a summary of the results"
msgstr ""
-"è¿è¡Œâ€œ%sâ€æ—¶å‘ç”Ÿé”™è¯¯ï¼šé€€å‡ºç æ˜¯ %dï¼Œå‚æ•°æ˜¯ï¼š\n"
-"在目录“%sâ€ï¼Œåå—:\n"
-"%s\n"
-"%s\n"
-"%s"
-#: libsvn_subr/io.c:2107
-#, c-format
-msgid "Can't detect MIME type of non-file '%s'"
-msgstr "ä¸èƒ½æ£€æµ‹éžæ–‡ä»¶çš„“%sâ€çš„MIME类型"
+#: svn/main.c:188
+msgid "remove changelist association"
+msgstr ""
-# as-is
-#: libsvn_subr/io.c:2174
-#, c-format
-msgid "Can't open file '%s'"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
+#: svn/main.c:190
+msgid "operate only on members of changelist ARG"
+msgstr ""
-#: libsvn_subr/io.c:2211
-msgid "Can't close stream"
-msgstr "æ— æ³•å…³é—æµ"
+#: svn/main.c:192
+msgid "don't delete changelist after commit"
+msgstr ""
-# as-is
-#: libsvn_subr/io.c:2221 libsvn_subr/io.c:2245 libsvn_subr/io.c:2258
-#, c-format
-msgid "Can't read file '%s'"
-msgstr "ä¸èƒ½è¯»å–文件“%sâ€"
+#: svn/main.c:231
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository. They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+"把文件和目录放入版本控制ä¸ï¼Œ\n"
+"é€šè¿‡è°ƒåº¦åŠ åˆ°æ¡£æ¡ˆåº“ã€‚å®ƒä»¬ä¼šåœ¨ä¸‹ä¸€æ¬¡æäº¤æ—¶åŠ å…¥ã€‚\n"
+"用法:add 路径...\n"
-#: libsvn_subr/io.c:2222 libsvn_subr/io.c:2246 libsvn_subr/io.c:2259
-msgid "Can't read stream"
-msgstr "æ— æ³•è¯»å–æµ"
+#: svn/main.c:239
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地å€(URL)的内容,æ¯è¡ŒåŒ…å«ä¿®è®¢ç‰ˆå’Œä½œè€…ä¿¡æ¯ã€‚\n"
+"\n"
+"用法:blame ç›®æ ‡[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
-#: libsvn_subr/io.c:2233
-#, c-format
-msgid "Can't get attribute information from file '%s'"
-msgstr "æ— æ³•ä»Žæ–‡ä»¶â€œ%sâ€èŽ·å–属性信æ¯"
+#: svn/main.c:249
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地å€(URL)的内容。\n"
+"用法:cat ç›®æ ‡[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
-#: libsvn_subr/io.c:2234
-msgid "Can't get attribute information from stream"
-msgstr "æ— æ³•ä»ŽæµèŽ·å–属性信æ¯"
+#: svn/main.c:257
+msgid ""
+"Associate (or deassociate) local paths with changelist CLNAME.\n"
+"usage: 1. changelist CLNAME TARGET...\n"
+" 2. changelist --clear TARGET...\n"
+msgstr ""
-#: libsvn_subr/io.c:2270
-#, c-format
-msgid "Can't set position pointer in file '%s'"
-msgstr "æ— æ³•åœ¨æ–‡ä»¶â€œ%sâ€è®¾ç½®å®šä½æŒ‡é’ˆ"
+#: svn/main.c:263
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
+"\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up.\n"
+"\n"
+" If PATH is omitted, the basename of the URL will be used as\n"
+" the destination. If multiple URLs are given each will be checked\n"
+" out into a sub-directory of PATH, with the name of the sub-directory\n"
+" being the basename of the URL.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy destination do not automatically cause the check out to fail.\n"
+" If the obstructing path is the same type (file or directory) as the\n"
+" corresponding path in the repository it becomes versioned but its\n"
+" contents are left 'as-is' in the working copy. This means that an\n"
+" obstructing directory's unversioned children may also obstruct and\n"
+" become versioned. For files, any content differences between the\n"
+" obstruction and the repository are treated like a local modification\n"
+" to the working copy. All properties from the repository are applied\n"
+" to the obstructing path.\n"
+msgstr ""
-#: libsvn_subr/io.c:2271
-msgid "Can't set position pointer in stream"
-msgstr "æ— æ³•åœ¨æµä¸è®¾ç½®å®šä½æŒ‡é’ˆ"
+#: svn/main.c:288
+msgid ""
+"Recursively clean up the working copy, removing locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [PATH...]\n"
+msgstr ""
+"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
+"\n"
+"用法:cleanup [路径...]\n"
-#: libsvn_subr/io.c:2282 libsvn_subr/io.c:2295
-#, c-format
-msgid "Can't write to file '%s'"
-msgstr "æ— æ³•å†™å…¥æ–‡ä»¶â€œ%sâ€"
+#: svn/main.c:295
+#, fuzzy
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
+"\n"
+" A log message must be provided, but it can be empty. If it is not\n"
+" given by a --message or --file option, an editor will be started.\n"
+" If any targets are (or contain) locked items, those will be\n"
+" unlocked after a successful commit.\n"
+msgstr ""
+"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"用法:commit [路径...]\n"
+"\n"
+" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
+" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
+" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
+" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
-#: libsvn_subr/io.c:2283 libsvn_subr/io.c:2296
-msgid "Can't write to stream"
-msgstr "æ— æ³•å†™å…¥æµ"
+#: svn/main.c:303
+#, fuzzy
+msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
+"\n"
+" A log message must be provided, but it can be empty.\n"
+" OS400 does not support the starting of an editor,\n"
+" so --message or --file must be used. If any targets are\n"
+" (or contain) locked items, those will be unlocked after a\n"
+" successful commit.\n"
+msgstr ""
+"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"用法:commit [路径...]\n"
+"\n"
+" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
+" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
+" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
+" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
-# as-is
-#: libsvn_subr/io.c:2336
-#, fuzzy, c-format
-msgid "Can't read length line in file '%s'"
-msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
+#: svn/main.c:318
+msgid ""
+"Duplicate something in working copy or repository, remembering history.\n"
+"usage: copy SRC DST\n"
+"\n"
+" SRC and DST can each be either a working copy (WC) path or URL:\n"
+" WC -> WC: copy and schedule for addition (with history)\n"
+" WC -> URL: immediately commit a copy of WC to URL\n"
+" URL -> WC: check out URL into WC, schedule for addition\n"
+" URL -> URL: complete server-side copy; used to branch & tag\n"
+msgstr ""
+"åœ¨å·¥ä½œæ‹·è´æˆ–档案库ä¸å¤åˆ¶æ•°æ®ï¼Œæ¢å¤åކå²ã€‚\n"
+"用法:copy èµ·æº ç›®çš„\n"
+"\n"
+" èµ·æº å’Œ 目的 å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€(URL):\n"
+" å·¥ä½œæ‹·è´ -> å·¥ä½œæ‹·è´ ï¼š å¤åˆ¶å’Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ (包å«åކå²)\n"
+" å·¥ä½œæ‹·è´ -> 地å€(URL) : 马上æäº¤ä¸€ä¸ªå·¥ä½œæ‹·è´åˆ°åœ°å€(URL)\n"
+" 地å€(URL) -> å·¥ä½œæ‹·è´ ï¼š ç¾å‡ºåœ°å€(URL)åˆ°å·¥ä½œç›®å½•ï¼Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ \n"
+" 地å€(URL) -> 地å€(URL) : 完全æœåŠ¡å™¨ç«¯å¤åˆ¶ï¼›ä¸€èˆ¬ç”¨äºŽåˆ†æ”¯å’Œæ ‡ç¾\n"
+
+#: svn/main.c:330
+msgid ""
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+" 2. delete URL...\n"
+"\n"
+" 1. Each item specified by a PATH is scheduled for deletion upon\n"
+" the next commit. Files, and directories that have not been\n"
+" committed, are immediately removed from the working copy.\n"
+" PATHs that are, or contain, unversioned or modified items will\n"
+" not be removed unless the --force option is given.\n"
+"\n"
+" 2. Each item specified by a URL is deleted from the repository\n"
+" via an immediate commit.\n"
+msgstr ""
+"从版本控制ä¸åˆ 除文件和目录。\n"
+"用法:1ã€delete 路径...\n"
+" 2ã€delete 地å€...\n"
+"\n"
+" 1ã€æ¯ä¸€ä¸ªé€šè¿‡è·¯å¾„æŒ‡å®šçš„é¡¹ç›®ä¼šè¢«è¿›è¡Œè°ƒåº¦åˆ é™¤ï¼Œä¸‹æ¬¡æäº¤æ—¶è¢«çœŸæ£åˆ 除。\n"
+" 文件和目录若未改å˜å°†é©¬ä¸Šä»Žå·¥ä½œæ‹·è´ä¸åˆ 除。\n"
+" 路径本身或包å«ä¸å—版本控制或已修改项目,\n"
+" ä¸ä¼šè¢«åˆ é™¤ï¼Œé™¤éžæŒ‡å®šäº† --force 选项。\n"
+" \n"
+"\n"
+" 2ã€æ¯ä¸€ä¸ªåœ°å€(URL)指定的项目会被马上从档案库ä¸åˆ 除,并æäº¤ã€‚\n"
+" \n"
-#: libsvn_subr/io.c:2340
+#: svn/main.c:346
#, fuzzy
-msgid "Can't read length line in stream"
-msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
-
-#: libsvn_subr/io.c:2415
-#, c-format
-msgid "Can't move '%s' to '%s'"
-msgstr "ä¸èƒ½ç§»åŠ¨â€œ%sâ€åˆ°â€œ%sâ€"
-
-#: libsvn_subr/io.c:2460
-#, c-format
-msgid "Can't create directory '%s'"
-msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
-
-#: libsvn_subr/io.c:2471 libsvn_wc/copy.c:303
-#, c-format
-msgid "Can't hide directory '%s'"
-msgstr "æ— æ³•éšè—目录“%sâ€"
-
-#: libsvn_subr/io.c:2484
-#, c-format
-msgid "Can't stat directory '%s'"
-msgstr "æ— æ³•èŽ·å–目录“%sâ€çš„状æ€"
+msgid ""
+"Display the differences between two revisions or paths.\n"
+"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
+" [PATH...]\n"
+" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+"\n"
+" 1. Display the changes made to TARGETs as they are seen in REV between\n"
+" two revisions. TARGETs may be all working copy paths or all URLs.\n"
+" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
+" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
+" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+"\n"
+" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
+"\n"
+" Use just 'svn diff' to display local modifications in a working copy.\n"
+msgstr ""
+"显示两个路径ä¸çš„差异。\n"
+"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
+" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
+" [PATH...]\n"
+" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
+"\n"
+" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
+" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
+"\n"
+" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
+" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
+" HEAD。\n"
+"\n"
+" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
+" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
+" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
+" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
+" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
+" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
+"法。\n"
+"\n"
+" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
-#: libsvn_subr/io.c:2500
-#, c-format
-msgid "Can't stat new directory '%s'"
-msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
+#: svn/main.c:376
+#, fuzzy
+msgid ""
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1. Exports a clean directory tree from the repository specified by\n"
+" URL, at revision REV if it is given, otherwise at HEAD, into\n"
+" PATH. If PATH is omitted, the last component of the URL is used\n"
+" for the local directory name.\n"
+"\n"
+" 2. Exports a clean directory tree from the working copy specified by\n"
+" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
+" for the local directory name. If REV is not specified, all local\n"
+" changes will be preserved. Files not under version control will\n"
+" not be copied.\n"
+"\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
+"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
+" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
+" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
+"\n"
+" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
+" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
+" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
+" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
+" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
+"\n"
+" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+"\n"
-#: libsvn_subr/io.c:2562
-#, c-format
-msgid "Can't remove directory '%s'"
-msgstr "æ— æ³•åˆ é™¤ç›®å½•â€œ%sâ€"
+#: svn/main.c:399
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
+"用法:help [å命令...]\n"
-#: libsvn_subr/io.c:2580
-msgid "Can't read directory"
-msgstr "æ— æ³•è¯»å–目录"
+#: svn/main.c:405
+#, fuzzy
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
+"\n"
+" Recursively commit a copy of PATH to URL.\n"
+" If PATH is omitted '.' is assumed.\n"
+" Parent directories are created as necessary in the repository.\n"
+" If PATH is a directory, the contents of the directory are added\n"
+" directly under URL.\n"
+msgstr ""
+"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
+"用法:import [PATH] URL\n"
+"\n"
+" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
+" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
-#: libsvn_subr/io.c:2651
-#, c-format
-msgid "Can't read directory entry in '%s'"
-msgstr "æ— æ³•åœ¨ç›®å½•â€œ%sâ€è¯»å–内容"
+#: svn/main.c:418
+#, fuzzy
+msgid ""
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
+"\n"
+" Print information about each TARGET (default: '.')\n"
+" TARGET may be either a working-copy path or URL. If specified, REV\n"
+" determines in which revision the target is first looked up.\n"
+msgstr ""
+"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
+"用法:info [TARGET...]\n"
+"\n"
+" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
+" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
-#: libsvn_subr/io.c:2776
-#, c-format
-msgid "Can't check directory '%s'"
-msgstr "æ— æ³•æ£€æŸ¥ç›®å½•â€œ%sâ€"
+#: svn/main.c:428
+#, fuzzy
+msgid ""
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
+"\n"
+" List each TARGET file and the contents of each TARGET directory as\n"
+" they exist in the repository. If TARGET is a working copy path, the\n"
+" corresponding repository URL will be used. If specified, REV determines\n"
+" in which revision the target is first looked up.\n"
+"\n"
+" The default TARGET is '.', meaning the repository URL of the current\n"
+" working directory.\n"
+"\n"
+" With --verbose, the following fields will be shown for each item:\n"
+"\n"
+" Revision number of the last commit\n"
+" Author of the last commit\n"
+" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
+" Size (in bytes)\n"
+" Date and time of the last commit\n"
+msgstr ""
+"列出档案库ä¸çš„目录项目。\n"
+"用法:list [TARGET[@REV]...]\n"
+"\n"
+" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
+" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+"\n"
+" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
+"\n"
+" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
+"\n"
+" 剿¬¡æäº¤çš„修订版å·ç \n"
+" 剿¬¡æäº¤çš„作者\n"
+" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
+" å¤§å° (以å—节为å•ä½)\n"
+" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
-#: libsvn_subr/io.c:2798
-#, c-format
-msgid "Version %d is not non-negative"
-msgstr "版本 %d 未被确认"
+#: svn/main.c:450
+#, fuzzy
+msgid ""
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
+"\n"
+" Use --force to steal the lock from another user or working copy.\n"
+msgstr ""
+"在档案库ä¸é”定工作目录或地å€(URL),\n"
+"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
+"用法:lock TARGET...\n"
+"\n"
+" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
-#: libsvn_subr/io.c:2845
-#, c-format
-msgid "Reading '%s'"
-msgstr "æ£åœ¨è¯»å–“%sâ€"
+#: svn/main.c:458
+#, fuzzy
+msgid "read lock comment from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
-#: libsvn_subr/io.c:2861
-#, c-format
-msgid "First line of '%s' contains non-digit"
-msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
+#: svn/main.c:459
+#, fuzzy
+msgid "specify lock comment ARG"
+msgstr "指定æäº¤ä¿¡æ¯ARG"
-#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
-msgid "Can't convert string to UCS-2: '%s'"
-msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
+#: svn/main.c:462
+#, fuzzy
+msgid ""
+"Show the log messages for a set of revision(s) and/or file(s).\n"
+"usage: 1. log [PATH]\n"
+" 2. log URL[@REV] [PATH...]\n"
+"\n"
+" 1. Print the log messages for a local PATH (default: '.').\n"
+" The default revision range is BASE:1.\n"
+"\n"
+" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up. The default revision range is HEAD:1.\n"
+"\n"
+" With -v, also print all affected paths with each log message.\n"
+" With -q, don't print the log message body itself (note that this is\n"
+" compatible with -v).\n"
+"\n"
+" Each log message is printed just once, even if more than one of the\n"
+" affected paths for that revision were explicitly requested. Logs\n"
+" follow copy history by default. Use --stop-on-copy to disable this\n"
+" behavior, which can be useful for determining branchpoints.\n"
+"\n"
+" Examples:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
+msgstr ""
+"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
+"用法:1ã€log [PATH]\n"
+" 2ã€log URL [PATH...]\n"
+"\n"
+" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
+" BASE:1。\n"
+"\n"
+" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
+" HEAD:1。\n"
+"\n"
+" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
+" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
+"\n"
+" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
+" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
+" 个功能,这在找出分支点的很方便。\n"
+"\n"
+" 范例:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: libsvn_subr/nls.c:86
+#: svn/main.c:492
#, fuzzy
-msgid "Can't get module file name"
-msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
-
-#: libsvn_subr/nls.c:101
-#, c-format
-msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
-msgstr "ä¸èƒ½æŠŠæ¨¡å—路径从UCS-2转æ¢ä¸ºUTF-8:“%sâ€"
-
-#: libsvn_subr/opt.c:146
msgid ""
+"Apply the differences between two sources to a working copy path.\n"
+"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
"\n"
-"Valid options:\n"
+" 1. In the first form, the source URLs are specified at revisions\n"
+" N and M. These are the two sources to be compared. The revisions\n"
+" default to HEAD if omitted.\n"
+"\n"
+" 2. In the second form, the URLs corresponding to the source working\n"
+" copy paths define the sources to be compared. The revisions must\n"
+" be specified.\n"
+"\n"
+" 3. In the third form, SOURCE can be a URL, or working copy item\n"
+" in which case the corresponding URL is used. This URL in\n"
+" revision REV is compared as it existed between revisions N and \n"
+" M. If REV is not specified, HEAD is assumed.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" WCPATH is the working copy path that will receive the changes.\n"
+" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
+" the sources have identical basenames that match a file within '.':\n"
+" in which case, the differences will be applied to that file.\n"
msgstr ""
+"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
+"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
"\n"
-"有效选项:\n"
+" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
+" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
+"\n"
+" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
+" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
+"\n"
+" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
+" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
+"作\n"
+" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
+"\n"
+" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
+" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
+" 差异将会直接应用至该文件去。\n"
-#: libsvn_subr/opt.c:236
-msgid " arg"
-msgstr " 傿•°"
+#: svn/main.c:521
+msgid ""
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+" 2. mkdir URL...\n"
+"\n"
+" Create version controlled directories.\n"
+"\n"
+" 1. Each directory specified by a working copy PATH is created locally\n"
+" and scheduled for addition upon the next commit.\n"
+"\n"
+" 2. Each directory specified by a URL is created in the repository via\n"
+" an immediate commit.\n"
+"\n"
+" In both cases, all the intermediate directories must already exist.\n"
+msgstr ""
+"建立纳入版本控制下的新目录。\n"
+"用法:1ã€mkdir PATH...\n"
+" 2ã€mkdir URL...\n"
+"\n"
+" 建立版本控制的目录。\n"
+"\n"
+" 1ã€æ¯ä¸€ä¸ªä»¥å·¥ä½œæ‹·è´ PATH æŒ‡å®šçš„ç›®å½•ï¼Œéƒ½ä¼šå»ºç«‹åœ¨æœ¬åœ°ç«¯ï¼Œå¹¶ä¸”åŠ å…¥æ–°å¢ž\n"
+" 调度,以待下一次的æäº¤ã€‚\n"
+"\n"
+" 2ã€æ¯ä¸ªä»¥åœ°å€(URL)指定的目录,都会é€è¿‡ç«‹å³æäº¤äºŽæ¡£æ¡ˆåº“ä¸å»ºç«‹ã€‚\n"
+"\n"
+" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
-#: libsvn_subr/opt.c:259
-#, c-format
+#: svn/main.c:538
+#, fuzzy
msgid ""
-"\"%s\": unknown command.\n"
+"Move and/or rename something in working copy or repository.\n"
+"usage: move SRC DST\n"
+"\n"
+" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
+" Note: the --revision option has no use and is deprecated.\n"
"\n"
+" SRC and DST can both be working copy (WC) paths or URLs:\n"
+" WC -> WC: move and schedule for addition (with history)\n"
+" URL -> URL: complete server-side rename.\n"
msgstr ""
-"“%sâ€ï¼šæœªçŸ¥çš„命令。\n"
+"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
+"用法:move SRC DST\n"
+"\n"
+" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
"\n"
+" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
+" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
+" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
-#: libsvn_subr/opt.c:449
-msgid "Too few arguments"
-msgstr "傿•°å¤ªå°‘"
+#: svn/main.c:551
+#, fuzzy
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Removes versioned props in working copy.\n"
+" 2. Removes unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"移除目录,文件,或修订版的属性。\n"
+"用法:1ã€propdel PROPNAME [PATH...]\n"
+" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
+" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
-#: libsvn_subr/opt.c:530
-#, c-format
-msgid "Syntax error parsing revision '%s'"
-msgstr "剖æžä¿®è®¢ç‰ˆâ€œ%sâ€æ—¶å‘ç”Ÿè¯æ³•错误"
+#: svn/main.c:563
+#, fuzzy
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME PATH...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Edits versioned props in working copy.\n"
+" 2. Edits unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
+"用法:1ã€propedit PROPNAME PATH...\n"
+" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
+" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
-#: libsvn_subr/opt.c:607
-#, c-format
-msgid "URL '%s' is not properly URI-encoded"
-msgstr "地å€(URL)“%sâ€ä¸æ˜¯æ£ç¡®åœ°ä»¥ URI ç¼–ç "
+#: svn/main.c:576
+#, fuzzy
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Prints versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Prints unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" By default, this subcommand will add an extra newline to the end\n"
+" of the property values so that the output looks pretty. Also,\n"
+" whenever there are multiple paths involved, each property value\n"
+" is prefixed with the path with which it is associated. Use\n"
+" the --strict option to disable these beautifications (useful,\n"
+" for example, when redirecting binary property values to a file).\n"
+msgstr ""
+"显示目录,文件,或修订版的属性内容。\n"
+"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
+" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
+"\n"
+" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
+" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
+" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
+" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
-#: libsvn_subr/opt.c:613
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "地å€(URL)“%sâ€åŒ…å« '..' å…ƒç´ "
+#: svn/main.c:595
+#, fuzzy
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+" 2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Lists versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Lists unversioned remote props on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"列出所有目录,文件,或修订版的属性。\n"
+"用法:1ã€proplist [TARGET[@REV]...]\n"
+" 2ã€proplist --revprop -r REV [URL]\n"
+"\n"
+" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
-#: libsvn_subr/opt.c:642
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "è§£æžâ€œ%sâ€æ—¶å‘生错误"
+#: svn/main.c:607
+#, fuzzy
+msgid ""
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1. Creates a versioned, local propchange in working copy.\n"
+" 2. Creates an unversioned, remote propchange on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+" Note: svn recognizes the following special versioned properties\n"
+" but will store any arbitrary properties set:\n"
+" svn:ignore - A newline separated list of file patterns to ignore.\n"
+" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
+" URL, HeadURL - The URL for the head version of the "
+"object.\n"
+" Author, LastChangedBy - The last person to modify the file.\n"
+" Date, LastChangedDate - The date/time the object was last "
+"modified.\n"
+" Rev, Revision, - The last revision the object changed.\n"
+" LastChangedRevision\n"
+" Id - A compressed summary of the previous\n"
+" 4 keywords.\n"
+" svn:executable - If present, make the file executable.\n"
+" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+" svn:mime-type - The mimetype of the file. Used to determine\n"
+" whether to merge the file, and how to serve it from Apache.\n"
+" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+" treated as text. Anything else is treated as binary.\n"
+" svn:externals - A newline separated list of module specifiers,\n"
+" each of which consists of a relative directory path, optional\n"
+" revision flags, and an URL. For example\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - If present, indicates that the file should be locked\n"
+" before it is modified. Makes the working copy file read-only\n"
+" when it is not locked.\n"
+" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
+" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
+" attempt will fail, and a recursive attempt will set the property\n"
+" only on the file children of the directory.\n"
+msgstr ""
+"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
+"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
+" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
+"\n"
+" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
+" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
+"\n"
+" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
+" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
+" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
+" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
+" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
+" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
+" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
+" LastChangedRevision\n"
+" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
+" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
+" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
+" 下的文件å项目。\n"
+" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
+" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
+" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
+" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
+" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
+"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
+"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
+"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
-#: libsvn_subr/opt.c:738
-#, c-format
+#: svn/main.c:649
+#, fuzzy
+msgid "read property value from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
+
+#: svn/main.c:652
msgid ""
-"%s, version %s\n"
-" compiled %s, %s\n"
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
"\n"
+" Note: this subcommand does not semantically resolve conflicts or\n"
+" remove conflict markers; it merely removes the conflict-related\n"
+" artifact files and allows PATH to be committed again.\n"
msgstr ""
-"%s,版本 %s\n"
-" 编译于 %s,%s\n"
+"移除工作拷è´çš„目录或文件的 '冲çª' 状æ€ã€‚\n"
+"用法:resolved PATH...\n"
"\n"
+" 注æ„:本å命令ä¸ä¼šä¾è¯æ³•æ¥è§£å†³å†²çªæˆ–æ˜¯ç§»é™¤å†²çªæ ‡è®°ï¼›å®ƒåªæ˜¯ç§»é™¤å†²çªçš„\n"
+" 相关文件,然åŽè®© PATH å¯ä»¥å†æ¬¡æäº¤ã€‚\n"
-# as-is
-#: libsvn_subr/opt.c:741
-#, fuzzy
+#: svn/main.c:661
msgid ""
-"Copyright (C) 2000-2005 CollabNet.\n"
-"Subversion is open source software, see http://subversion.tigris.org/\n"
-"This product includes software developed by CollabNet (http://www.Collab."
-"Net/).\n"
+"Restore pristine working copy file (undo most local edits).\n"
+"usage: revert PATH...\n"
"\n"
+" Note: this subcommand does not require network access, and resolves\n"
+" any conflicted states. However, it does not restore removed directories.\n"
msgstr ""
-"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
-"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
+"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
+"用法:revert PATH...\n"
"\n"
+" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
+" è¢«åˆ é™¤çš„ç›®å½•\n"
-#: libsvn_subr/opt.c:794
-#, c-format
-msgid "Type '%s help' for usage.\n"
-msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-
-#: libsvn_subr/path.c:1059
-#, c-format
-msgid "Couldn't determine absolute path of '%s'"
-msgstr "ä¸èƒ½ç¡®å®šâ€œ%sâ€çš„ç»å¯¹è·¯å¾„"
-
-#: libsvn_subr/path.c:1098
-#, c-format
-msgid "'%s' is neither a file nor a directory name"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-
-#: libsvn_subr/path.c:1204
-msgid "Can't determine the native path encoding"
-msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
-
-#: libsvn_subr/path.c:1258
-#, fuzzy, c-format
-msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
-
-#: libsvn_subr/subst.c:1013 libsvn_wc/props.c:1441
-#, c-format
-msgid "File '%s' has inconsistent newlines"
-msgstr "文件“%sâ€å†…çš„æ¢è¡Œç¬¦ä¸ä¸€è‡´"
-
-#: libsvn_subr/utf.c:157
-msgid "Can't lock charset translation mutex"
-msgstr "ä¸èƒ½é”定å—符转æ¢äº’斥体"
-
-#: libsvn_subr/utf.c:175 libsvn_subr/utf.c:263
-msgid "Can't unlock charset translation mutex"
-msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
-
-#: libsvn_subr/utf.c:222
-#, fuzzy, c-format
-msgid "Can't create a character converter from native encoding to '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:226
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to native encoding"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:230
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:454
-#, fuzzy, c-format
-msgid "Can't convert string from native encoding to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
-
-#: libsvn_subr/utf.c:458
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to native encoding:"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
-
-#: libsvn_subr/utf.c:462
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
-
-#: libsvn_subr/utf.c:506
-#, fuzzy, c-format
-msgid ""
-"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
-"UTF-8"
-msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
-
-#: libsvn_subr/utf.c:514
-#, c-format
-msgid ""
-"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "检测到éžASCIIå—符 (代ç %d),并且ä¸èƒ½è½¬æ¢åˆ°UTF-8(或从UTF-8转æ¢)"
-
-#: libsvn_subr/utf.c:556
-#, c-format
-msgid ""
-"Valid UTF-8 data\n"
-"(hex:%s)\n"
-"followed by invalid UTF-8 sequence\n"
-"(hex:%s)"
-msgstr ""
-"有效 UTF-8 æ•°æ®\n"
-"(16进制:%s)\n"
-"åŽæŽ¥æ— æ•ˆ UTF-8 åºåˆ—\n"
-"(16进制:%s)"
-
-#: libsvn_subr/validate.c:48
-#, c-format
-msgid "MIME type '%s' has empty media type"
-msgstr "MIME 类别“%sâ€å«æœ‰ç©ºçš„媒体类别"
-
-#: libsvn_subr/validate.c:53
-#, c-format
-msgid "MIME type '%s' does not contain '/'"
-msgstr "MIME 类别“%sâ€æ²¡åŒ…å« '/'"
-
-#: libsvn_subr/validate.c:58
-#, c-format
-msgid "MIME type '%s' ends with non-alphanumeric character"
-msgstr "MIME 类别“%sâ€ä»¥éžå—æ¯ä¸Žæ•°å—å—符结æŸ"
-
-#: libsvn_subr/version.c:74
-#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„版本ä¸ä¸€è‡´ï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
-
-#: libsvn_subr/xml.c:400
-#, c-format
-msgid "Malformed XML: %s at line %d"
-msgstr "畸形的XML:%s 在第 %d 行"
-
-#: libsvn_wc/adm_crawler.c:379
-#, c-format
-msgid ""
-"The entry '%s' is no longer a directory; remove the entry before updating"
-msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-
-#: libsvn_wc/adm_crawler.c:633
-msgid "Error aborting report"
-msgstr "å–æ¶ˆæŠ¥å‘Šæ—¶å‘生错误"
-
-#: libsvn_wc/adm_crawler.c:823
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
-
-#: libsvn_wc/adm_crawler.c:849
-msgid "Error opening local file"
-msgstr "打开本地文件时å‘生错误"
-
-# plz leave this as-is
-#: libsvn_wc/adm_files.c:202
-msgid "Bad type indicator"
-msgstr "错误的类型"
-
-#: libsvn_wc/adm_files.c:394
-msgid "APR_APPEND not supported for adm files"
-msgstr "APR_APPEND 䏿”¯æŒç®¡ç†æ–‡ä»¶"
-
-#: libsvn_wc/adm_files.c:437
+#: svn/main.c:670
+#, fuzzy
msgid ""
-"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
-"again"
-msgstr "您的 .svn/tmp 目录å¯èƒ½ä¸¢å¤±æˆ–æŸå;请执行“svn cleanupâ€ï¼Œç„¶åŽå†è¯•一次"
-
-#: libsvn_wc/adm_files.c:612 libsvn_wc/lock.c:378 libsvn_wc/lock.c:631
-#, c-format
-msgid "'%s' is not a working copy"
-msgstr "“%sâ€ä¸æ˜¯å·¥ä½œæ‹·è´"
-
-#: libsvn_wc/adm_files.c:619 libsvn_wc/adm_files.c:687
-#: libsvn_wc/adm_files.c:749
-msgid "No such thing as 'base' working copy properties!"
-msgstr "没有 '基础' 工作拷è´å±žæ€§è¿™æ ·çš„东西"
-
-#: libsvn_wc/adm_files.c:818 libsvn_wc/util.c:51
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
-
-#: libsvn_wc/adm_files.c:872
-#, c-format
-msgid "No entry for '%s'"
-msgstr "没有“%sâ€çš„项目"
-
-#: libsvn_wc/adm_files.c:884
-#, c-format
-msgid "Revision %ld doesn't match existing revision %ld in '%s'"
-msgstr "修订版 %ld ä¸ç¬¦åˆçŽ°æœ‰çš„ä¿®è®¢ç‰ˆ %ld 于“%sâ€ä¸"
-
-#: libsvn_wc/adm_files.c:893
-#, c-format
-msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
-msgstr "地å€(URL)“%sâ€ä¸ç¬¦åˆçŽ°æœ‰çš„åœ°å€(URL)“%sâ€äºŽâ€œ%sâ€ä¸"
-
-#: libsvn_wc/adm_ops.c:223
-#, c-format
-msgid "Unrecognized node kind: '%s'"
-msgstr "æ— æ³•ç¡®è®¤çš„èŠ‚ç‚¹ç§ç±»ï¼šâ€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:443 libsvn_wc/update_editor.c:946
-#: libsvn_wc/update_editor.c:1347
-#, c-format
-msgid "Error writing log file for '%s'"
-msgstr "写入“%sâ€çš„æ—¥å¿—文件时å‘生错误"
-
-#: libsvn_wc/adm_ops.c:977
-#, c-format
-msgid "'%s' not found"
-msgstr "找ä¸åˆ°â€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:981
-#, c-format
-msgid "Unsupported node kind for path '%s'"
-msgstr "路径“%sâ€ä¸ºä¸æ”¯æŒçš„节点ç§ç±»"
-
-#: libsvn_wc/adm_ops.c:1011
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+" With no args, print only locally modified items (no network access).\n"
+" With -u, add working revision and server out-of-date information.\n"
+" With -v, print full revision information on every item.\n"
+"\n"
+" The first six columns in the output are each one character wide:\n"
+" First column: Says if item was added, deleted, or otherwise changed\n"
+" ' ' no modifications\n"
+" 'A' Added\n"
+" 'C' Conflicted\n"
+" 'D' Deleted\n"
+" 'I' Ignored\n"
+" 'M' Modified\n"
+" 'R' Replaced\n"
+" 'X' item is unversioned, but is used by an externals definition\n"
+" '?' item is not under version control\n"
+" '!' item is missing (removed by non-svn command) or incomplete\n"
+" '~' versioned item obstructed by some item of a different kind\n"
+" Second column: Modifications of a file's or directory's properties\n"
+" ' ' no modifications\n"
+" 'C' Conflicted\n"
+" 'M' Modified\n"
+" Third column: Whether the working copy directory is locked\n"
+" ' ' not locked\n"
+" 'L' locked\n"
+" Fourth column: Scheduled commit will contain addition-with-history\n"
+" ' ' no history scheduled with commit\n"
+" '+' history scheduled with commit\n"
+" Fifth column: Whether the item is switched relative to its parent\n"
+" ' ' normal\n"
+" 'S' switched\n"
+" Sixth column: Repository lock token\n"
+" (without -u)\n"
+" ' ' no lock token\n"
+" 'K' lock token present\n"
+" (with -u)\n"
+" ' ' not locked in repository, no lock token\n"
+" 'K' locked in repository, lock toKen present\n"
+" 'O' locked in repository, lock token in some Other working copy\n"
+" 'T' locked in repository, lock token present but sTolen\n"
+" 'B' not locked in repository, lock token present but Broken\n"
+"\n"
+" The out-of-date information appears in the eighth column (with -u):\n"
+" '*' a newer revision exists on the server\n"
+" ' ' the working copy is up to date\n"
+"\n"
+" Remaining fields are variable width and delimited by spaces:\n"
+" The working revision (with -u or -v)\n"
+" The last committed revision and last committed author (with -v)\n"
+" The working copy path is always the final field, so it can\n"
+" include spaces.\n"
+"\n"
+" Example output:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
+msgstr ""
+"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
+"用法:status [PATH...]\n"
+"\n"
+" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
+" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
+" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
+"\n"
+" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
+" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
+" ' ' æ— ä¿®æ”¹\n"
+" 'A' 新增\n"
+" 'C' 冲çª\n"
+" 'D' åˆ é™¤\n"
+" 'G' åˆå¹¶\n"
+" 'I' 忽略\n"
+" 'M' 改å˜\n"
+" 'R' 替æ¢\n"
+" 'X' 未纳入版本控制,但被外部定义所用\n"
+" '?' 该项目未纳入版本控制\n"
+" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
+" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
+" 第二æ :显示目录或文件的属性状æ€\n"
+" ' ' æ— ä¿®æ”¹\n"
+" 'C' 冲çª\n"
+" 'M' 改å˜\n"
+" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
+" ' ' 未é”定\n"
+" 'L' é”定\n"
+" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
+" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
+" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
+" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
+" ' ' æ£å¸¸\n"
+" 'S' 被切æ¢\n"
+" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
+" ' ' 没有é”å®šæ ‡è®°\n"
+" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
+" (有 -u)\n"
+" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
+" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
+" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
+" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
+" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
+"\n"
+" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
+" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
+" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
+"\n"
+" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
+" 工作修订版 (与 -u 或 -v 并用时)\n"
+" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
+" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
+"\n"
+" 范例输出:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
-#: libsvn_wc/adm_ops.c:1023
-#, c-format
+#: svn/main.c:746
+#, fuzzy
msgid ""
-"Can't replace '%s' with a node of a differing type; commit the deletion, "
-"update the parent, and then add '%s'"
-msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:1039
-#, c-format
-msgid "Can't find parent directory's entry while trying to add '%s'"
-msgstr "在å°è¯•新增“%sâ€æ—¶ï¼Œæ— 法找到父目录的项目"
-
-#: libsvn_wc/adm_ops.c:1044
-#, c-format
-msgid "Can't add '%s' to a parent directory scheduled for deletion"
-msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
-
-#: libsvn_wc/adm_ops.c:1060
-#, fuzzy, c-format
-msgid "The URL '%s' has different repository root than its parent"
-msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-
-#: libsvn_wc/adm_ops.c:1334 libsvn_wc/adm_ops.c:1339 libsvn_wc/adm_ops.c:1375
-#, c-format
-msgid "Error restoring props for '%s'"
-msgstr "还原“%sâ€çš„属性时å‘生错误"
-
-#: libsvn_wc/adm_ops.c:1349
-#, c-format
-msgid "Error removing props for '%s'"
-msgstr "移除“%sâ€çš„属性时å‘生错误"
-
-#: libsvn_wc/adm_ops.c:1421
-#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
-
-#: libsvn_wc/adm_ops.c:1522
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "æ— æ³•æ¢å¤ï¼šâ€œ%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-
-#: libsvn_wc/adm_ops.c:1550
-#, c-format
-msgid "Cannot revert '%s': unsupported entry node kind"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šä¸æ”¯æŒçš„项目节点ç§ç±»"
-
-#: libsvn_wc/adm_ops.c:1561
-#, c-format
-msgid "Cannot revert '%s': unsupported node kind in working copy"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šå·¥ä½œæ‹·è´ä¸æœ‰ä¸æ”¯æŒçš„节点ç§ç±»"
+"Update the working copy to a different URL.\n"
+"usage: 1. switch URL [PATH]\n"
+" 2. switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1. Update the working copy to mirror a new URL within the repository.\n"
+" This behaviour is similar to 'svn update', and is the way to\n"
+" move a working copy to a branch or tag within the same repository.\n"
+"\n"
+" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+" This is used when repository's root URL changes (such as a scheme\n"
+" or hostname change) but your working copy still reflects the same\n"
+" directory within the same repository.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the switch attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path.\n"
+msgstr ""
+"更新工作拷è´è‡³ä¸åŒçš„地å€(URL)。\n"
+"用法:1ã€switch URL [PATH]\n"
+" 2ã€switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
+" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
+"\n"
+" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
+" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
+" 档案库的åŒä¸€ç›®å½•时用之。\n"
-#: libsvn_wc/adm_ops.c:1609
+#: svn/main.c:773
+#, fuzzy
msgid ""
-"Cannot revert addition of current directory; please try again from the "
-"parent directory"
-msgstr "æ— æ³•æ¢å¤ç›®å‰ç›®å½•的新增;请从父目录å†è¯•一次"
-
-#: libsvn_wc/adm_ops.c:1631
-#, c-format
-msgid "Unknown or unexpected kind for path '%s'"
-msgstr "路径“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ç§ç±»"
-
-#: libsvn_wc/adm_ops.c:1834
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "文件“%sâ€æœ‰æœ¬åœ°çš„修改"
-
-#: libsvn_wc/copy.c:148
-#, c-format
-msgid "'%s' already exists and is in the way"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œå˜æˆè·¯ä¸é—´çš„大石头"
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+" Use --force to break the lock.\n"
+msgstr ""
+"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
+"用法:unlock TARGET...\n"
+"\n"
+" 使用 -force 䏿¢é”定。\n"
-#: libsvn_wc/copy.c:160
-#, c-format
+#: svn/main.c:781
+#, fuzzy
msgid ""
-"'%s' is scheduled for deletion; it must be committed before being overwritten"
-msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+" If no revision given, bring working copy up-to-date with HEAD rev.\n"
+" Else synchronize working copy to revision given by -r.\n"
+"\n"
+" For each updated item a line will start with a character reporting the\n"
+" action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+" E Existed\n"
+"\n"
+" A character in the first column signifies an update to the actual file,\n"
+" while updates to the file's properties are shown in the second column.\n"
+" A 'B' in the third column signifies that the lock for the file has\n"
+" been broken or stolen.\n"
+"\n"
+" If --force is used, unversioned obstructing paths in the working\n"
+" copy do not automatically cause a failure if the update attempts to\n"
+" add the same path. If the obstructing path is the same type (file\n"
+" or directory) as the corresponding path in the repository it becomes\n"
+" versioned but its contents are left 'as-is' in the working copy.\n"
+" This means that an obstructing directory's unversioned children may\n"
+" also obstruct and become versioned. For files, any content differences\n"
+" between the obstruction and the repository are treated like a local\n"
+" modification to the working copy. All properties from the repository\n"
+" are applied to the obstructing path. Obstructing paths are reported\n"
+" in the first column with code 'E'.\n"
+msgstr ""
+"将档案库的改å˜å应至工作拷è´ã€‚\n"
+"用法:update [PATH...]\n"
+"\n"
+" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
+" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
+"\n"
+" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
+" 这些å—符代表如下:\n"
+"\n"
+" A 新增\n"
+" D åˆ é™¤\n"
+" U æ›´æ–°\n"
+" C 冲çª\n"
+" G åˆå¹¶\n"
+"\n"
+" 第一æ çš„å—符表示实际文件的更新,\n"
+" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
+" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
-#: libsvn_wc/copy.c:165
-#, c-format
-msgid "There is already a versioned item '%s'"
-msgstr "已有纳入版本控制项目“%sâ€"
+#: svn/main.c:857 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+msgid "Caught signal"
+msgstr "æ•æ‰åˆ°ä¿¡å·(䏿–)"
-#: libsvn_wc/copy.c:176
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+#: svn/main.c:969
+msgid "Non-numeric limit argument given"
+msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
-#: libsvn_wc/copy.c:183
-#, c-format
-msgid ""
-"Cannot copy or move '%s': it's not in the repository yet; try committing "
-"first"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
+#: svn/main.c:975
+msgid "Argument to --limit must be positive"
+msgstr ""
-#: libsvn_wc/copy.c:455
-#, c-format
+#: svn/main.c:995
+#, fuzzy
msgid ""
-"Cannot copy or move '%s': it is not in the repository yet; try committing "
-"first"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-
-#: libsvn_wc/copy.c:525
-#, c-format
-msgid "Cannot copy to '%s' as it is scheduled for deletion"
-msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€è‡³å› 为它已预定为è¦åˆ 除"
-
-#: libsvn_wc/entries.c:127
-#, c-format
-msgid "Error writing entries file for '%s'"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-
-#: libsvn_wc/entries.c:222
-#, fuzzy, c-format
-msgid "Entry for '%s' has invalid repository root"
-msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
-
-#: libsvn_wc/entries.c:244
-#, c-format
-msgid "Entry '%s' has invalid node kind"
-msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
-#: libsvn_wc/entries.c:269 libsvn_wc/entries.c:319 libsvn_wc/entries.c:359
-#: libsvn_wc/entries.c:386 libsvn_wc/entries.c:413
-#, c-format
-msgid "Entry '%s' has invalid '%s' value"
-msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
+#: svn/main.c:1003 svn/main.c:1194
+msgid "Can't specify -c with --old"
+msgstr ""
-#: libsvn_wc/entries.c:627
-msgid "Missing default entry"
-msgstr "丢失默认项目"
+#: svn/main.c:1010
+#, fuzzy
+msgid "Non-numeric change argument given to -c"
+msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
-#: libsvn_wc/entries.c:632
-msgid "Default entry has no revision number"
-msgstr "默认项目没有修订版编å·"
+#: svn/main.c:1016
+#, fuzzy
+msgid "There is no change 0"
+msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
-#: libsvn_wc/entries.c:637
-msgid "Default entry is missing URL"
-msgstr "默认项目没有地å€(URL)"
+#: svn/main.c:1043
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
+"N:M' instead of '-r N -r M'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
-#: libsvn_wc/entries.c:725
+#: svn/main.c:1056 svnadmin/main.c:1244
#, c-format
-msgid "XML parser failed in '%s'"
-msgstr "XML 剖æžå™¨æ— 法处ç†â€œ%sâ€"
+msgid "Syntax error in revision argument '%s'"
+msgstr "ä¿®è®¢ç‰ˆå‚æ•°â€œ%sâ€ä¸æœ‰è¯æ³•错误"
+
+#: svn/main.c:1210 svn/main.c:1220
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
-#: libsvn_wc/entries.c:813
+#: svn/main.c:1236
#, c-format
-msgid "Corrupt working copy: '%s' has no default entry"
-msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æ²¡æœ‰é»˜è®¤çš„项目"
+msgid "Syntax error in native-eol argument '%s'"
+msgstr "原生æ¢åˆ—符å·å‚数“%sâ€ä¸æœ‰è¯æ³•错误"
-#: libsvn_wc/entries.c:830
+#: svn/main.c:1309 svndumpfilter/main.c:1207 svnlook/main.c:2037
#, c-format
-msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æœ‰æ— 效的调度"
+msgid "Subcommand argument required\n"
+msgstr "å¿…é¡»æä¾›å命令傿•°\n"
-#: libsvn_wc/entries.c:864
+#: svn/main.c:1328 svnadmin/main.c:1367 svndumpfilter/main.c:1226
+#: svnlook/main.c:2056
#, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸æœ‰æ— 效的调度"
+msgid "Unknown command: '%s'\n"
+msgstr "未知的命令:“%sâ€\n"
-#: libsvn_wc/entries.c:873
+#: svn/main.c:1361
#, c-format
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"addition) is not itself scheduled for addition"
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
msgstr ""
-"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ–°å¢žè°ƒåº¦) ä¸ŽåŠ å…¥æ–°å¢žè°ƒåº¦çš„ä¸ä¸€è‡´"
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
+"请输入“svn help %sâ€ä»¥å–得用法。\n"
-#: libsvn_wc/entries.c:881
-#, c-format
+#: svn/main.c:1398
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
+
+#: svn/main.c:1405
+#, fuzzy
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+
+#: svn/main.c:1426
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"deletion) is not itself scheduled for deletion"
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
msgstr ""
-"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥åˆ é™¤è°ƒåº¦) ä¸ŽåŠ å…¥åˆ é™¤è°ƒåº¦çš„ä¸ä¸€è‡´"
+"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
-#: libsvn_wc/entries.c:889
-#, c-format
+#: svn/main.c:1433
+#, fuzzy
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"replacement) has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ›¿æ¢è°ƒåº¦) æœ‰æ— æ•ˆçš„è°ƒåº¦"
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
-#: libsvn_wc/entries.c:1204
-#, c-format
-msgid "No default entry in directory '%s'"
-msgstr "在目录“%sâ€ä¸æ²¡æœ‰é»˜è®¤çš„项目"
+#: svn/main.c:1558
+msgid ""
+"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
+"details)\n"
+msgstr ""
+"svn:请执行“svn cleanupâ€ä»¥ç§»åŽ»é”定 (输入“svn help cleanupâ€ä»¥å–得详细说明)\n"
-#: libsvn_wc/entries.c:1259
-#, c-format
-msgid "Error writing to '%s'"
-msgstr "写至“%sâ€æ—¶å‘生错误"
+#: svn/merge-cmd.c:59
+msgid "Second revision required"
+msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
-#: libsvn_wc/entries.c:1525
-#, c-format
-msgid ""
-"Can't add '%s' to deleted directory; try undeleting its parent directory "
-"first"
-msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²åˆ 除的目录;请先å°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
+#, fuzzy
+msgid "Too many arguments given"
+msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
-#: libsvn_wc/entries.c:1531
+#: svn/merge-cmd.c:117
+msgid "A working copy merge source needs an explicit revision"
+msgstr "工作拷è´çš„åˆå¹¶æ¥æºéœ€ç‰¹åˆ«æŒ‡å®šä¿®è®¢ç‰ˆ"
+
+#: svn/mkdir-cmd.c:84
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr "å°è¯•用 “svn addâ€æˆ– “svn add --non-recursiveâ€ä»£æ›¿ï¼Ÿ"
+
+#: svn/notify.c:69
#, c-format
-msgid ""
-"Can't replace '%s' in deleted directory; try undeleting its parent directory "
-"first"
-msgstr "æ— æ³•åœ¨å·²åˆ é™¤çš„ç›®å½•ä¸æ›¿æ¢â€œ%sâ€ï¼›è¯·å…ˆå°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
+msgid "Skipped missing target: '%s'\n"
+msgstr "跳过找ä¸åˆ°çš„ç›®æ ‡ï¼šâ€œ%sâ€\n"
-#: libsvn_wc/entries.c:1540
+#: svn/notify.c:76
#, c-format
-msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
-msgstr "“%sâ€è¢«æ ‡è®°ä¸ºä¸å˜åœ¨ï¼Œæ‰€ä»¥æ— æ³•åŠ å…¥æ–°å¢žè°ƒåº¦"
+msgid "Skipped '%s'\n"
+msgstr "跳过“%sâ€\n"
-#: libsvn_wc/entries.c:1569
+#: svn/notify.c:100
#, c-format
-msgid "Entry '%s' is already under version control"
-msgstr "项目“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+msgid "Restored '%s'\n"
+msgstr "已还原“%sâ€\n"
-#: libsvn_wc/entries.c:1661
+#: svn/notify.c:106
#, c-format
-msgid "Entry '%s' has illegal schedule"
-msgstr "项目“%sâ€æœ‰ä¸åˆæ³•的调度"
+msgid "Reverted '%s'\n"
+msgstr "å·²æ¢å¤â€œ%sâ€\n"
-#: libsvn_wc/entries.c:1802
+#: svn/notify.c:112
#, c-format
-msgid "No such entry: '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€-- 请改用更新试试。\n"
-#: libsvn_wc/entries.c:1913
+#: svn/notify.c:120
#, c-format
-msgid "Directory '%s' has no THIS_DIR entry"
-msgstr "目录“%sâ€æ²¡æœ‰ THIS_DIR 项目"
+msgid "Resolved conflicted state of '%s'\n"
+msgstr "“%sâ€çš„已解决的冲çªçжæ€\n"
-#: libsvn_wc/entries.c:2002
+#: svn/notify.c:201
#, c-format
-msgid "'%s' has an unrecognized node kind"
-msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
+msgid ""
+"\n"
+"Fetching external item into '%s'\n"
+msgstr ""
+"\n"
+"æ£åœ¨å–得外部项目至“%sâ€\n"
-#: libsvn_wc/entries.c:2038
+#: svn/notify.c:216
#, c-format
-msgid "Unexpectedly found '%s': path is marked 'missing'"
-msgstr "æ„æƒ³ä¸åˆ°åœ°æ‰¾åˆ°äº†â€œ%sâ€ï¼šè·¯å¾„å·²è¢«æ ‡è®°ä¸º '丢失'"
+msgid "Exported external at revision %ld.\n"
+msgstr "导出修订版 %ld 的外部定义。\n"
-#: libsvn_wc/lock.c:159 libsvn_wc/lock.c:360
+#: svn/notify.c:217
#, c-format
-msgid "Working copy '%s' locked"
-msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
+msgid "Exported revision %ld.\n"
+msgstr "导出修订版 %ld。\n"
-#: libsvn_wc/lock.c:280
+#: svn/notify.c:225
#, c-format
-msgid "Path '%s' ends in '%s', which is unsupported for this operation"
-msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
+msgid "Checked out external at revision %ld.\n"
+msgstr "å–出修订版 %ld 的外部定义。\n"
-#: libsvn_wc/lock.c:679
-#, fuzzy, c-format
-msgid "Working copy '%s' is missing or not locked"
-msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
+#: svn/notify.c:226
+#, c-format
+msgid "Checked out revision %ld.\n"
+msgstr "å–出修订版 %ld。\n"
-#: libsvn_wc/lock.c:1079
+#: svn/notify.c:236
#, c-format
-msgid "Write-lock stolen in '%s'"
-msgstr "“%sâ€ä¸çš„写入é”定被å·èµ°äº†"
+msgid "Updated external to revision %ld.\n"
+msgstr "更新外部定义至修订版 %ld。\n"
-#: libsvn_wc/lock.c:1087
+#: svn/notify.c:237
#, c-format
-msgid "No write-lock in '%s'"
-msgstr "“%sâ€ä¸æ²¡æœ‰å†™å…¥é”定"
+msgid "Updated to revision %ld.\n"
+msgstr "更新至修订版 %ld。\n"
-#: libsvn_wc/lock.c:1109
+#: svn/notify.c:245
#, c-format
-msgid "Lock file '%s' is not a regular file"
-msgstr "é”定文件“%sâ€ä¸æ˜¯ä¸€èˆ¬çš„æ–‡ä»¶"
+msgid "External at revision %ld.\n"
+msgstr "于修订版 %ld 的外部定义。\n"
-#: libsvn_wc/log.c:183
-msgid "Can't move source to dest"
-msgstr "æ— æ³•ç§»åŠ¨æ¥æºè‡³ç›®çš„"
+#: svn/notify.c:246
+#, c-format
+msgid "At revision %ld.\n"
+msgstr "于修订版 %ld。\n"
-#: libsvn_wc/log.c:339
+#: svn/notify.c:258
#, c-format
-msgid "In directory '%s'"
-msgstr "在目录“%sâ€ä¸"
+msgid "External export complete.\n"
+msgstr "外部定义导出完æˆã€‚\n"
-#: libsvn_wc/log.c:365
+#: svn/notify.c:259
#, c-format
-msgid "Missing 'left' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'left' 属性"
+msgid "Export complete.\n"
+msgstr "导出完æˆã€‚\n"
-#: libsvn_wc/log.c:372
+#: svn/notify.c:266
#, c-format
-msgid "Missing 'right' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'right' 属性"
+msgid "External checkout complete.\n"
+msgstr "外部定义å–出完æˆã€‚\n"
-#: libsvn_wc/log.c:415
+#: svn/notify.c:267
#, c-format
-msgid "Missing 'dest' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'dest' 属性"
+msgid "Checkout complete.\n"
+msgstr "å–出完æˆã€‚\n"
-#: libsvn_wc/log.c:475
+#: svn/notify.c:274
#, c-format
-msgid "Missing 'timestamp' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤± 'timestamp' 属性"
+msgid "External update complete.\n"
+msgstr "外部定义更新完æˆã€‚\n"
-#: libsvn_wc/log.c:551 libsvn_wc/log.c:584
+#: svn/notify.c:275
#, c-format
-msgid "Error checking path '%s'"
-msgstr "检查路径“%sâ€æ—¶å‘生错误"
+msgid "Update complete.\n"
+msgstr "更新完æˆã€‚\n"
-#: libsvn_wc/log.c:558 libsvn_wc/log.c:591
+#: svn/notify.c:291
#, c-format
-msgid "Error getting 'affected time' on '%s'"
-msgstr "å–得“%sâ€çš„“affected timeâ€æ—¶å‘生错误"
+msgid ""
+"\n"
+"Performing status on external item at '%s'\n"
+msgstr ""
+"\n"
+"对外部项目“%sâ€è¿›è¡ŒçŠ¶æ€æ£€æŸ¥\n"
-#: libsvn_wc/log.c:602
+#: svn/notify.c:299
#, c-format
-msgid "Error modifying entry for '%s'"
-msgstr "修改“%sâ€çš„项目时å‘生错误"
+msgid "Status against revision: %6ld\n"
+msgstr "状æ€äºŽä¿®è®¢ç‰ˆï¼š%6ld\n"
-#: libsvn_wc/log.c:628
-#, fuzzy, c-format
-msgid "Error removing lock from entry for '%s'"
-msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
+#: svn/notify.c:307
+#, c-format
+msgid "Sending %s\n"
+msgstr "æ£åœ¨å‘é€ %s\n"
-#: libsvn_wc/log.c:759
+#: svn/notify.c:316
#, c-format
-msgid "Missing 'revision' attribute for '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgid "Adding (bin) %s\n"
+msgstr "新增 (二进制) %s\n"
-#: libsvn_wc/log.c:773
+#: svn/notify.c:323
#, c-format
-msgid "Log command for directory '%s' is mislocated"
-msgstr "对目录“%sâ€çš„æ—¥å¿—命令被错置"
+msgid "Adding %s\n"
+msgstr "新增 %s\n"
-#: libsvn_wc/log.c:940 libsvn_wc/log.c:1012
+#: svn/notify.c:330
#, c-format
-msgid "Error checking existence of '%s'"
-msgstr "检查“%sâ€æ˜¯å¦å˜åœ¨æ—¶å‘生错误"
+msgid "Deleting %s\n"
+msgstr "åˆ é™¤ %s\n"
-#: libsvn_wc/log.c:951 libsvn_wc/log.c:1023
+#: svn/notify.c:337
#, c-format
-msgid "Error comparing '%s' and '%s'"
-msgstr "比较“%sâ€ä¸Žâ€œ%sâ€æ—¶å‘生错误"
+msgid "Replacing %s\n"
+msgstr "æ›¿æ¢ %s\n"
-#: libsvn_wc/log.c:963
+#: svn/notify.c:347
#, c-format
-msgid "Error getting 'affected time' for '%s'"
-msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
+msgid "Transmitting file data "
+msgstr "ä¼ è¾“æ–‡ä»¶æ•°æ®"
-#: libsvn_wc/log.c:1034 libsvn_wc/log.c:1121
+#: svn/notify.c:356
#, c-format
-msgid "Error getting 'affected time' of '%s'"
-msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
+msgid "'%s' locked by user '%s'.\n"
+msgstr "“%sâ€è¢«ç”¨æˆ·â€œ%sâ€é”定。\n"
-#: libsvn_wc/log.c:1092
+#: svn/notify.c:362
#, c-format
-msgid "Error replacing text-base of '%s'"
-msgstr "替æ¢â€œ%sâ€çš„æ–‡ä»¶å‚考基础时å‘生错误"
+msgid "'%s' unlocked.\n"
+msgstr "“%sâ€è¢«è§£é™¤é”定。\n"
-#: libsvn_wc/log.c:1161 libsvn_wc/log.c:1210
+#: svn/propdel-cmd.c:77
#, c-format
-msgid "Error modifying entry of '%s'"
-msgstr "修改“%sâ€çš„项目时å‘生错误"
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr "属性“%sâ€è‡ªæ¡£æ¡ˆåº“修订版 %ld ä¸åˆ 除\n"
-#: libsvn_wc/log.c:1269
+#: svn/propdel-cmd.c:86
#, c-format
-msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
-msgstr "日志文件项目丢失 'name' 属性 (项目“%sâ€å¯¹åº”至目录“%sâ€)"
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr "åˆ é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„å±žæ€§â€œ%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: libsvn_wc/log.c:1331
+#: svn/propdel-cmd.c:116
#, c-format
-msgid "Unrecognized logfile element '%s' in '%s'"
-msgstr "æ— æ³•ç¡®è®¤çš„æ—¥å¿—æ–‡ä»¶å…ƒç´ â€œ%sâ€äºŽâ€œ%sâ€ä¸"
+msgid "property '%s' deleted (recursively) from '%s'.\n"
+msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除 (递归)。\n"
-#: libsvn_wc/log.c:1342
+#: svn/propdel-cmd.c:117
#, c-format
-msgid "Error processing command '%s' in '%s'"
-msgstr "在“%2$sâ€ä¸å¤„ç†å‘½ä»¤â€œ%1$sâ€æ—¶å‘生错误"
+msgid "property '%s' deleted from '%s'.\n"
+msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除。\n"
-#: libsvn_wc/log.c:1464
-msgid "Couldn't open log"
-msgstr "æ— æ³•æ‰“å¼€æ—¥å¿—æ–‡ä»¶"
+#: svn/propedit-cmd.c:60
+#, fuzzy, c-format
+msgid "'%s' is not a valid Subversion property name"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
-#: libsvn_wc/log.c:1475
-#, c-format
-msgid "Error reading administrative log file in '%s'"
-msgstr "于“%sâ€ä¸è¯»å–ç®¡ç†æ—¥å¿—文件时å‘生错误"
+#: svn/propedit-cmd.c:105 svn/propedit-cmd.c:229 svn/propset-cmd.c:85
+msgid "Bad encoding option: prop value not stored as UTF8"
+msgstr "有问题的编ç 选项:属性内容未以 UTF8 储å˜"
-#: libsvn_wc/log.c:1569
+#: svn/propedit-cmd.c:114
#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "“%sâ€å¹¶ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
-
-#: libsvn_wc/merge.c:306 libsvn_wc/merge.c:308 libsvn_wc/merge.c:310
-#: libsvn_wc/merge.c:312
-msgid "Unable to delete temporary file"
-msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 设为新值\n"
-#: libsvn_wc/props.c:100
+#: svn/propedit-cmd.c:120
#, c-format
-msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 没有改å˜\n"
-#: libsvn_wc/props.c:109
+#: svn/propedit-cmd.c:128
#, c-format
-msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr "编辑纳入版本控制的属性“%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: libsvn_wc/props.c:125
-#, c-format
-msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
+#: svn/propedit-cmd.c:154 svn/propset-cmd.c:158
+msgid "Explicit target argument required"
+msgstr "必须明确地æä¾›ç›®æ ‡"
-#: libsvn_wc/props.c:172
+#: svn/propedit-cmd.c:177
#, c-format
-msgid "Can't parse '%s'"
-msgstr "æ— æ³•å‰–æžâ€œ%sâ€"
+msgid "Editing property on non-local target '%s' not yet supported"
+msgstr "å°šä¸æ”¯æŒç¼–è¾‘éžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„属性"
-#: libsvn_wc/props.c:198
+#: svn/propedit-cmd.c:204 svn/switch-cmd.c:140
#, c-format
-msgid "Can't write property hash to '%s'"
-msgstr "æ— æ³•å†™å…¥å±žæ€§é›†åˆ°â€œ%sâ€"
+msgid "'%s' does not appear to be a working copy path"
+msgstr "“%sâ€ä¸åƒæ˜¯å·¥ä½œæ‹·è´è·¯å¾„"
-#: libsvn_wc/props.c:251
+#: svn/propedit-cmd.c:236
#, c-format
-msgid "Can't find entry '%s' in '%s'"
-msgstr "æ— æ³•åœ¨â€œ%2$sâ€ä¸æ‰¾åˆ°é¡¹ç›®â€œ%1$sâ€"
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§è¢«è®¾ä¸ºæ–°å€¼\n"
-#: libsvn_wc/props.c:323 libsvn_wc/props.c:1161 libsvn_wc/update_editor.c:2342
+#: svn/propedit-cmd.c:243
#, c-format
-msgid "Error writing log for '%s'"
-msgstr "为“%sâ€å†™å…¥æ—¥å¿—æ—¶å‘生错误"
+msgid "No changes to property '%s' on '%s'\n"
+msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§æ²¡æœ‰æ”¹å˜\n"
-#: libsvn_wc/props.c:459
+#: svn/proplist-cmd.c:71
#, c-format
-msgid ""
-"Trying to add new property '%s' with value '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
-"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
-#: libsvn_wc/props.c:481
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
-msgstr ""
-"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
-"但是属性并ä¸å˜åœ¨ã€‚"
+#: svn/proplist-cmd.c:119
+#, fuzzy, c-format
+msgid "Properties on '%s':\n"
+msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
-#: libsvn_wc/props.c:510
-#, c-format
+#: svn/props.c:51
+#, fuzzy
msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
-"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
-#: libsvn_wc/props.c:1202
-#, c-format
-msgid "Unknown node kind: '%s'"
-msgstr "未知的节点类型:“%sâ€"
+#: svn/props.c:58
+#, fuzzy
+msgid "Wrong number of targets specified"
+msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
-#: libsvn_wc/props.c:1238 libsvn_wc/props.c:1260 libsvn_wc/props.c:1344
-#: libsvn_wc/props.c:1582
-msgid "Failed to load properties from disk"
-msgstr "æ— æ³•ä»Žç£ç¢Ÿè£…载属性"
+#: svn/props.c:67
+msgid "Either a URL or versioned item is required"
+msgstr "å¿…é¡»æä¾›åœ°å€(URL)或纳入版本控制的项目"
-#: libsvn_wc/props.c:1276 libsvn_wc/props.c:1612
+#: svn/propset-cmd.c:111
#, c-format
-msgid "Cannot write property hash for '%s'"
-msgstr "æ— æ³•å†™å…¥â€œ%sâ€çš„属性æ‚凑"
+msgid "property '%s' set on repository revision %ld\n"
+msgstr "设定属性“%sâ€äºŽæ¡£æ¡ˆåº“修订版 %ld\n"
-#: libsvn_wc/props.c:1336 libsvn_wc/props.c:1474
+#: svn/propset-cmd.c:119
#, c-format
-msgid "Property '%s' is an entry property"
-msgstr "属性“%sâ€æ˜¯é¡¹ç›®å±žæ€§"
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr "æ— æ³•æŒ‡å®šä¿®è®¢ç‰ˆä»¥è®¾å®šç‰ˆæœ¬æŽ§åˆ¶ä¸‹çš„å±žæ€§â€œ%sâ€"
-#: libsvn_wc/props.c:1381
+#: svn/propset-cmd.c:151
#, c-format
-msgid "Cannot set '%s' on a directory ('%s')"
-msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽç›®å½• (“%sâ€)"
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr "必须明确地æä¾›ç›®çš„ (“%sâ€è§£é‡Šä¸ºå±žæ€§å†…容)"
-#: libsvn_wc/props.c:1389
+#: svn/propset-cmd.c:184
#, c-format
-msgid "Cannot set '%s' on a file ('%s')"
-msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽæ–‡ä»¶ (“%sâ€)"
+msgid "property '%s' set (recursively) on '%s'\n"
+msgstr "属性“%sâ€è®¾å®š (递归) 于“%sâ€\n"
-#: libsvn_wc/props.c:1395
+#: svn/propset-cmd.c:185
#, c-format
-msgid "'%s' is not a file or directory"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶æˆ–目录"
+msgid "property '%s' set on '%s'\n"
+msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
+
+#: svn/revert-cmd.c:86
+#, fuzzy
+msgid "Try 'svn revert --recursive' instead?"
+msgstr "å°è¯•用 “svn revert -recursive†代替?"
-#: libsvn_wc/props.c:1419
+#: svn/status-cmd.c:317
#, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "文件“%sâ€æœ‰äºŒè¿›åˆ¶çš„ mime 型别属性"
+msgid ""
+"\n"
+"--- Changelist '%s':\n"
+msgstr ""
-#: libsvn_wc/props.c:2038
+#: svn/status.c:263
#, c-format
-msgid "Error parsing %s property on '%s': '%s'"
-msgstr "å‰–æž %s 属性于“%sâ€å‘生错误:“%sâ€"
+msgid "'%s' has lock token, but no lock owner"
+msgstr "‘%s’é”被盗å–,但没有é”的所有者"
-#: libsvn_wc/props.c:2051
+#: svn/switch-cmd.c:58
#, c-format
-msgid ""
-"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
-"path"
-msgstr "æ— æ•ˆå±žæ€§ %s 于“%sâ€ï¼šç›®å½•牵涉到 '.' 或 '..' 或是ç»å¯¹è·¯å¾„"
+msgid "'%s' to '%s' is not a valid relocation"
+msgstr "“%sâ€åˆ°â€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„é‡å®šä½"
-#: libsvn_wc/questions.c:104
+#: svn/util.c:60
#, c-format
msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
-msgstr "“%sâ€çš„å·¥ä½œæ‹·è´æ ¼å¼å·²è¿‡æ—¶(%d)ï¼›è¯·é‡æ–°å–出您的工作拷è´"
+"\n"
+"Committed revision %ld.\n"
+msgstr ""
+"\n"
+"æäº¤åŽçš„修订版为 %ld。\n"
-#: libsvn_wc/questions.c:112
-#, c-format
+#: svn/util.c:68
+#, fuzzy, c-format
msgid ""
-"This client is too old to work with working copy '%s'; please get a newer "
-"Subversion client"
-msgstr "æœ¬å®¢æˆ·ç«¯å·²è¿‡æ—¶ï¼Œæ— æ³•å˜å–工作拷è´â€œ%sâ€ï¼›è¯·å–得更新版的 Subversion 客户端"
+"\n"
+"Warning: %s\n"
+msgstr "%sè¦å‘Šï¼š%s\n"
-#: libsvn_wc/questions.c:352
-#, c-format
+#: svn/util.c:136
msgid ""
-"Checksum mismatch indicates corrupt text base: '%s'\n"
-" expected: %s\n"
-" actual: %s\n"
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
+"no 'editor-cmd' run-time configuration option was found"
msgstr ""
-"总和检查值ä¸ä¸€è‡´ï¼Œè¡¨ç¤ºæ–‡ä»¶å‚考基础æŸå:“%sâ€\n"
-" 预期: %s\n"
-" 实际: %s\n"
+"没有一个 SVN_EDITOR,VISUAL 或 EDITOR çŽ¯å¢ƒå˜æ•°è¢«è®¾å®šï¼Œæ‰§è¡Œæ—¶æœŸçš„设定ä¸ä¹Ÿæ²¡æœ‰ "
+"'editor-cmd' 选项"
-#: libsvn_wc/translate.c:124
+#: svn/util.c:162
#, c-format
-msgid "'%s' has unknown value for svn:eol-style property"
-msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
+msgid "Can't get working directory"
+msgstr "æ— æ³•å–得工作目录"
-#: libsvn_wc/update_editor.c:387
+#: svn/util.c:173 svn/util.c:196
#, c-format
-msgid "No '.' entry in: '%s'"
-msgstr "ä¸å˜åœ¨ '.' 项目:“%sâ€"
+msgid "Can't change working directory to '%s'"
+msgstr "æ— æ³•æ›´æ”¹å·¥ä½œæ‹·è´è‡³â€œ%sâ€"
-#: libsvn_wc/update_editor.c:863
+#: svn/util.c:221
#, c-format
-msgid "Won't delete locally modified directory '%s'"
-msgstr "æ— æ³•åˆ é™¤æœ¬åœ°ä¿®æ”¹çš„ç›®å½•â€œ%sâ€"
+msgid "Can't write to '%s'"
+msgstr "æ— æ³•å†™å…¥è‡³â€œ%sâ€"
-#: libsvn_wc/update_editor.c:1049
+#: svn/util.c:251
#, c-format
-msgid "Failed to add directory '%s': object of the same name already exists"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+msgid "system('%s') returned %d"
+msgstr "系统(“%sâ€) 返回 %d"
-#: libsvn_wc/update_editor.c:1057
+#: svn/util.c:318
#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šç‰©ä»¶ä¸Žç®¡ç†ç›®å½•åŒå"
+msgid "Can't restore working directory"
+msgstr "æ— æ³•è¿˜åŽŸå·¥ä½œç›®å½•"
-#: libsvn_wc/update_editor.c:1071
-#, c-format
-msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šcopyfrom 傿•°å°šä¸æ”¯æŒ"
+#: svn/util.c:358
+msgid "Log message contains a zero byte"
+msgstr "日志信æ¯ä¸æœ‰ä¸€ä¸ªé›¶å—节"
-#: libsvn_wc/update_editor.c:1092
-#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name is already scheduled "
-"for addition"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
+#: svn/util.c:418
+msgid "Your commit message was left in a temporary file:"
+msgstr "您的æäº¤ä¿¡æ¯ä¿ç•™åœ¨ä¸´æ—¶æ–‡ä»¶ä¸ï¼š"
-#: libsvn_wc/update_editor.c:1315
-msgid "Couldn't do property merge"
-msgstr "æ— æ³•è¿›è¡Œå±žæ€§åˆå¹¶"
+# as-is
+#: svn/util.c:470
+msgid "--This line, and those below, will be ignored--"
+msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
-#: libsvn_wc/update_editor.c:1409
-#, c-format
+#: svn/util.c:510
+#, fuzzy
msgid ""
-"Failed to mark '%s' absent: item of the same name is already scheduled for "
-"addition"
-msgstr "æ— æ³•å°†â€œ%sâ€æ ‡è®°ä¸ºä¸å˜åœ¨ï¼šåŒåé¡¹ç›®å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
+"Use of an external editor to fetch log message is not supported on OS400; "
+"consider using the --message (-m) or --file (-F) options"
+msgstr ""
+"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
+"message (-m) 或 --file (-F) 选项"
-#: libsvn_wc/update_editor.c:1501
-#, c-format
-msgid "Failed to add file '%s': object of the same name already exists"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+#: svn/util.c:592
+msgid "Cannot invoke editor to get log message when non-interactive"
+msgstr "在éžäº¤äº’å¼çš„æƒ…况下ä¸èƒ½è°ƒç”¨ç¼–è¾‘å™¨èŽ·å–æ—¥å¿—ä¿¡æ¯"
-#: libsvn_wc/update_editor.c:1522
-#, c-format
+#: svn/util.c:605
msgid ""
-"Failed to add file '%s': object of the same name is already scheduled for "
-"addition"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-
-#: libsvn_wc/update_editor.c:1530
-#, c-format
-msgid "File '%s' in directory '%s' is not a versioned resource"
-msgstr "文件“%sâ€äºŽç›®å½•“%sâ€ä¸çš„并䏿˜¯çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„资æº"
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
+"message (-m) 或 --file (-F) 选项"
-#: libsvn_wc/update_editor.c:1651
-#, c-format
-msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›è®°å½•:“%sâ€ï¼Œå®žé™…:“%sâ€"
+#: svn/util.c:641
+msgid ""
+"\n"
+"Log message unchanged or not specified\n"
+"a)bort, c)ontinue, e)dit\n"
+msgstr ""
+"\n"
+"æ—¥å¿—ä¿¡æ¯æœªæ”¹å˜ï¼Œæˆ–是未指定\n"
+"a)䏿–,c)ç»§ç»ï¼Œe)编辑\n"
-#: libsvn_wc/update_editor.c:1957
-msgid "Move failed"
-msgstr "移动失败"
+#: svn/util.c:694
+msgid "Use --force to override this restriction"
+msgstr "请用 --force æ¥æ’¤é”€é™åˆ¶"
-#: libsvn_wc/update_editor.c:2884
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
#, c-format
-msgid "'%s' has no ancestry information"
-msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
-
-#: libsvn_wc/update_editor.c:2972
-#, fuzzy, c-format
-msgid "Copyfrom-url '%s' has different repository root than '%s'"
-msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-
-#: libsvn_wc/util.c:83
-msgid "Unable to make any directories"
-msgstr "æ— æ³•å»ºç«‹ä»»ä½•ç›®å½•"
-
-#: svnadmin/main.c:94 svndumpfilter/main.c:62
msgid "Can't open stdio file"
msgstr "æ— æ³•å¯åŠ¨æ ‡å‡†è¾“å‡ºå…¥æ–‡ä»¶"
-#: svnadmin/main.c:123
+#: svnadmin/main.c:124
msgid "Repository argument required"
msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
-#: svnadmin/main.c:128
+#: svnadmin/main.c:129
#, c-format
msgid "'%s' is an URL when it should be a path"
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径"
-#: svnadmin/main.c:233 svndumpfilter/main.c:762 svnlook/main.c:98
-#: svnserve/main.c:111 svnversion/main.c:182
-msgid "show version information"
-msgstr "显示版本信æ¯"
-
#: svnadmin/main.c:236
msgid "specify revision number ARG (or X:Y range)"
msgstr "æŒ‡å®šä¿®è®¢ç‰ˆç¼–å· ARG (或 X:Y 范围)"
@@ -6808,18 +7415,21 @@
msgstr "关闿—¥å¿—文件自动移除 [Berkeley DB]"
#: svnadmin/main.c:272
-msgid "remove redundant log files from source repository"
+#, fuzzy
+msgid ""
+"remove redundant Berkeley DB log files\n"
+" from source repository [Berkeley DB]"
msgstr "è‡ªæ¥æºæ¡£æ¡ˆåº“移除多余的日志文件"
-#: svnadmin/main.c:275
+#: svnadmin/main.c:276
msgid "call pre-commit hook before committing revisions"
msgstr "æäº¤ä¿®è®¢ç‰ˆç¾è°ƒç”¨ pre-commit 外挂"
-#: svnadmin/main.c:278
+#: svnadmin/main.c:279
msgid "call post-commit hook after committing revisions"
msgstr "æäº¤ä¿®è®¢ç‰ˆåŽè°ƒç”¨ post-commit 外挂"
-#: svnadmin/main.c:281
+#: svnadmin/main.c:282
msgid ""
"wait instead of exit if the repository is in\n"
" use by another process"
@@ -6827,7 +7437,21 @@
"如果档案库被其他进程å 用,ç‰å¾…而ä¸ç›´æŽ¥é€€å‡º\n"
" "
-#: svnadmin/main.c:294
+#: svnadmin/main.c:286
+msgid ""
+"disallow use of SVNDIFF1 in on-disk storage,\n"
+" for backwards compatibility"
+msgstr ""
+
+#: svnadmin/main.c:299
+msgid ""
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"
+"Open the repository at REPOS_PATH, then abort, thus simulating\n"
+"a process that crashes while holding an open repository handle.\n"
+msgstr ""
+
+#: svnadmin/main.c:305
msgid ""
"usage: svnadmin create REPOS_PATH\n"
"\n"
@@ -6837,7 +7461,7 @@
"\n"
"于 REPOS_PATH 建立一个新的,空的 Subversion 档案库。\n"
-#: svnadmin/main.c:300
+#: svnadmin/main.c:311
msgid ""
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
@@ -6853,7 +7477,7 @@
"与å‰ä¸€ä¿®è®¢ç‰ˆçš„差异,deltification 本质上å¯åŽ‹ç¼©æ¡£æ¡ˆåº“ã€‚å¦‚æžœæ²¡æœ‰æŒ‡å®š\n"
"修订版的è¯ï¼Œåˆ™ç›´æŽ¥å¯¹ HEAD 修订版进行。\n"
-#: svnadmin/main.c:309
+#: svnadmin/main.c:320
msgid ""
"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
"\n"
@@ -6872,7 +7496,7 @@
"ä¸€ä¸ªä¿®è®¢ç‰ˆæ ‘ã€‚å¦‚æžœä½¿ç”¨äº† --incremental 选项,那么第一个转å˜çš„修订版会\n"
"是与å‰ä¸€ä¸ªä¿®è®¢ç‰ˆçš„差异,而éžå¹³å¸¸çš„全文输出。\n"
-#: svnadmin/main.c:320
+#: svnadmin/main.c:330
msgid ""
"usage: svnadmin help [SUBCOMMAND...]\n"
"\n"
@@ -6882,7 +7506,7 @@
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-#: svnadmin/main.c:325
+#: svnadmin/main.c:335
msgid ""
"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
"\n"
@@ -6892,7 +7516,7 @@
"\n"
"äº§ç”Ÿæ¡£æ¡ˆåº“çš„å³æ—¶æ‹·è´ã€‚\n"
-#: svnadmin/main.c:330
+#: svnadmin/main.c:340
msgid ""
"usage: svnadmin list-dblogs REPOS_PATH\n"
"\n"
@@ -6907,7 +7531,7 @@
"\n"
"è¦å‘Šï¼šä¿®æ”¹æˆ–åˆ é™¤ä»åœ¨ä½¿ç”¨ä¸çš„记录文件将导致档案库æŸå。\n"
-#: svnadmin/main.c:337
+#: svnadmin/main.c:347
msgid ""
"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
"\n"
@@ -6919,7 +7543,7 @@
"åˆ—å‡ºæ— ç”¨çš„ Berkeley DB 日志文件。\n"
"\n"
-#: svnadmin/main.c:342
+#: svnadmin/main.c:352
msgid ""
"usage: svnadmin load REPOS_PATH\n"
"\n"
@@ -6934,7 +7558,7 @@
"系统ä¸ã€‚如果档案库原先是空的,默认会将其 UUID 以æµä¸çš„æ•°å€¼ä»£ä¹‹ã€‚\n"
"进度报告会é€è‡³æ ‡å‡†è¾“出。\n"
-#: svnadmin/main.c:353
+#: svnadmin/main.c:362
#, fuzzy
msgid ""
"usage: svnadmin lslocks REPOS_PATH\n"
@@ -6945,7 +7569,7 @@
"\n"
"显示所有é”的相信信æ¯ã€‚\n"
-#: svnadmin/main.c:358
+#: svnadmin/main.c:367
msgid ""
"usage: svnadmin lstxns REPOS_PATH\n"
"\n"
@@ -6955,7 +7579,7 @@
"\n"
"显示所有未处ç†äº‹åŠ¡çš„å称。\n"
-#: svnadmin/main.c:363
+#: svnadmin/main.c:372
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
@@ -6974,7 +7598,7 @@
"上结æŸã€‚\n"
"\n"
-#: svnadmin/main.c:371
+#: svnadmin/main.c:380
msgid ""
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
"\n"
@@ -6984,7 +7608,7 @@
"\n"
"æ— æ¡ä»¶åœ°ä»Žæ¯ä¸€ä¸ª LOCKED_PATH åˆ é™¤é”。\n"
-#: svnadmin/main.c:376
+#: svnadmin/main.c:385
msgid ""
"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
"\n"
@@ -6994,7 +7618,7 @@
"\n"
"ä»Žæ¡£æ¡ˆåº“åˆ é™¤å‘½å事务。\n"
-#: svnadmin/main.c:381
+#: svnadmin/main.c:390
msgid ""
"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
"\n"
@@ -7018,7 +7642,7 @@
"注æ„:修订版属性并未纳入版本控管,所以这个命令会永远盖写掉先å‰çš„\n"
"日志信æ¯ã€‚\n"
-#: svnadmin/main.c:395
+#: svnadmin/main.c:402
msgid ""
"usage: svnadmin verify REPOS_PATH\n"
"\n"
@@ -7028,33 +7652,36 @@
"\n"
"æ ¡éªŒå‚¨å˜äºŽæ¡£æ¡ˆåº“的数æ®ã€‚\n"
-#: svnadmin/main.c:448
+#: svnadmin/main.c:456
#, fuzzy
msgid "Invalid revision specifier"
msgstr "æŒ‡å®šäº†æ— æ•ˆçš„ä¿®è®¢ç‰ˆæœ¬"
-#: svnadmin/main.c:453
+#: svnadmin/main.c:461
#, fuzzy, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "修订版必须ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
-#: svnadmin/main.c:521 svnadmin/main.c:603
+#: svnadmin/main.c:534 svnadmin/main.c:629
msgid "First revision cannot be higher than second"
msgstr "第一个修订版ä¸å¯é«˜äºŽç¬¬äºŒä¸ª"
-#: svnadmin/main.c:530
+#: svnadmin/main.c:543
#, c-format
msgid "Deltifying revision %ld..."
msgstr "æ£åœ¨ deltify 修订版 %ld..."
-#: svnadmin/main.c:534
+#: svnadmin/main.c:547
+#, c-format
msgid "done.\n"
msgstr "完æˆã€‚\n"
-#: svnadmin/main.c:634
+#: svnadmin/main.c:654
+#, fuzzy
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnadmin --version' to see the program version and FS modules.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7063,7 +7690,7 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svnadmin/main.c:641 svnlook/main.c:1765 svnserve/main.c:158
+#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
#, fuzzy
msgid ""
"The following repository back-end (FS) modules are available:\n"
@@ -7072,7 +7699,8 @@
"以下的档案库åŽå°(FS) 模å—å¯ç”¨ï¼š\n"
"\n"
-#: svnadmin/main.c:724
+#: svnadmin/main.c:738
+#, c-format
msgid ""
"Repository lock acquired.\n"
"Please wait; recovering the repository may take some time...\n"
@@ -7080,7 +7708,7 @@
"å·²å–得档案库é”定。\n"
"请ç¨å€™ï¼›ä¿®å¤æ¡£æ¡ˆåº“也许得花费一些时间...\n"
-#: svnadmin/main.c:759
+#: svnadmin/main.c:773
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -7088,11 +7716,13 @@
"æ— æ³•å–得独å å˜å–æƒé™ï¼›å¯èƒ½æ˜¯å…¶ä»–如 httpd,svnserve 或 svn 的进程æ£åœ¨æ‰“开它\n"
"并没有释放æƒé™ï¼Ÿ"
-#: svnadmin/main.c:764
+#: svnadmin/main.c:778
+#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "ç‰å¾…档案库é”定ä¸ï¼›ä¹Ÿè®¸å…¶å®ƒçš„进程把它打开了?\n"
-#: svnadmin/main.c:771
+#: svnadmin/main.c:785
+#, c-format
msgid ""
"\n"
"Recovery completed.\n"
@@ -7100,50 +7730,53 @@
"\n"
"ä¿®å¤å®Œæˆã€‚\n"
-#: svnadmin/main.c:778
+#: svnadmin/main.c:792
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "最新的档案库修订版为 %ld。\n"
-#: svnadmin/main.c:888
+#: svnadmin/main.c:902
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "事务“%sâ€è¢«ç§»é™¤ã€‚\n"
-#: svnadmin/main.c:912
+#: svnadmin/main.c:926
+#, c-format
msgid "Missing revision"
msgstr "丢失修订版"
-#: svnadmin/main.c:915
+#: svnadmin/main.c:929
+#, c-format
msgid "Only one revision allowed"
msgstr "ä»…å…许一个修订版"
-#: svnadmin/main.c:921
+#: svnadmin/main.c:935
+#, c-format
msgid "Exactly one file argument required"
msgstr "å¿…é¡»æä¾›æ°å¥½ä¸€ä¸ªçš„æ–‡ä»¶å‚æ•°"
-#: svnadmin/main.c:1029 svnlook/main.c:1830
+#: svnadmin/main.c:1047 svnlook/main.c:1728
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID æ ‡è¯†ï¼š%s\n"
# this points to filename according to sunny256
-#: svnadmin/main.c:1030 svnlook/main.c:1831
+#: svnadmin/main.c:1048 svnlook/main.c:1729
#, fuzzy, c-format
msgid "Owner: %s\n"
msgstr "所有者:%s\n"
-#: svnadmin/main.c:1031 svnlook/main.c:1832
+#: svnadmin/main.c:1049 svnlook/main.c:1730
#, fuzzy, c-format
msgid "Created: %s\n"
msgstr "创建于:%s\n"
-#: svnadmin/main.c:1032 svnlook/main.c:1833
+#: svnadmin/main.c:1050 svnlook/main.c:1731
#, c-format
msgid "Expires: %s\n"
msgstr "过期:%s\n"
-#: svnadmin/main.c:1034
+#: svnadmin/main.c:1052
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -7154,7 +7787,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1035
+#: svnadmin/main.c:1053
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -7165,21 +7798,28 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1102
+#: svnadmin/main.c:1110
#, fuzzy, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "路径“%sâ€æ²¡æœ‰è¢«é”定。\n"
-#: svnadmin/main.c:1114
+#: svnadmin/main.c:1122
#, fuzzy, c-format
msgid "Removed lock on '%s'.\n"
msgstr "åˆ é™¤â€œ%sâ€ä¸Šçš„é”。\n"
-#: svnadmin/main.c:1324
+#: svnadmin/main.c:1230
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+
+#: svnadmin/main.c:1349
+#, c-format
msgid "subcommand argument required\n"
msgstr "å¿…é¡»æä¾›å命令傿•°\n"
-#: svnadmin/main.c:1409
+#: svnadmin/main.c:1434
#, c-format
msgid ""
"subcommand '%s' doesn't accept option '%s'\n"
@@ -7189,50 +7829,51 @@
"请使用“svnadmin help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
# as-is
-#: svndumpfilter/main.c:325
+#: svndumpfilter/main.c:319
msgid "This is an empty revision for padding."
msgstr "This is an empty revision for padding."
-#: svndumpfilter/main.c:378
+#: svndumpfilter/main.c:389
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "修订版 %ld æäº¤ä¸º %ld。\n"
-#: svndumpfilter/main.c:386
+#: svndumpfilter/main.c:412
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "跳过修订版 %ld。\n"
-#: svndumpfilter/main.c:489
+#: svndumpfilter/main.c:514
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "æ— æ•ˆçš„å¤åˆ¶æ¥æºè·¯å¾„“%sâ€"
-#: svndumpfilter/main.c:532
-msgid "Node with dropped parent sneaked in"
-msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
+#: svndumpfilter/main.c:558
+#, c-format
+msgid "No valid copyfrom revision in filtered stream"
+msgstr ""
-#: svndumpfilter/main.c:638
+#: svndumpfilter/main.c:663
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr "Delta 属性å—被检测到 - svndumpfilter 䏿”¯æŒ"
-#: svndumpfilter/main.c:764
+#: svndumpfilter/main.c:788
msgid "Do not display filtering statistics."
msgstr "䏿˜¾ç¤ºè¿‡æ»¤çš„统计数æ®ã€‚"
-#: svndumpfilter/main.c:766
+#: svndumpfilter/main.c:790
msgid "Remove revisions emptied by filtering."
msgstr "ç§»é™¤å› è¿‡æ»¤è€Œäº§ç”Ÿçš„ç©ºä¿®è®¢ç‰ˆã€‚"
-#: svndumpfilter/main.c:768
+#: svndumpfilter/main.c:792
msgid "Renumber revisions left after filtering."
msgstr "过滤åŽé‡ç¼–余下的修订版。"
-#: svndumpfilter/main.c:770
+#: svndumpfilter/main.c:794
msgid "Don't filter revision properties."
msgstr "ä¸è¿‡æ»¤ä¿®è®¢ç‰ˆå±žæ€§ã€‚"
-#: svndumpfilter/main.c:781
+#: svndumpfilter/main.c:805
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -7240,7 +7881,7 @@
"è‡ªè½¬å˜æµç§»é™¤ç¬¦åˆæŒ‡å®šå—首的节点。\n"
"用法:svndumpfilter exclude PATH_PREFIX...\n"
-#: svndumpfilter/main.c:787
+#: svndumpfilter/main.c:811
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -7248,7 +7889,7 @@
"自转å˜ä¸²æµç§»é™¤æœªåŒ…嫿Œ‡å®šå—首的节点。\n"
"用法:svndumpfilter include PATH_PREFIX...\n"
-#: svndumpfilter/main.c:793
+#: svndumpfilter/main.c:817
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -7256,10 +7897,12 @@
"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
"用法:svndumpfilter help [SUBCOMMAND...]\n"
-#: svndumpfilter/main.c:863
+#: svndumpfilter/main.c:888
+#, fuzzy
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svndumpfilter --version' to see the program version number.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7268,23 +7911,27 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svndumpfilter/main.c:917
+#: svndumpfilter/main.c:943
+#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "排除 (以åŠä¸¢å¼ƒç©ºä¿®è®¢ç‰ˆ) çš„å—首:\n"
-#: svndumpfilter/main.c:919
+#: svndumpfilter/main.c:945
+#, c-format
msgid "Excluding prefixes:\n"
msgstr "排除å—首:\n"
-#: svndumpfilter/main.c:921
+#: svndumpfilter/main.c:947
+#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "涵盖 (以åŠä¸¢å¼ƒç©ºä¿®è®¢ç‰ˆ) çš„å—首:\n"
-#: svndumpfilter/main.c:923
+#: svndumpfilter/main.c:949
+#, c-format
msgid "Including prefixes:\n"
msgstr "包å«çš„å—首:\n"
-#: svndumpfilter/main.c:950
+#: svndumpfilter/main.c:976
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -7293,21 +7940,22 @@
"丢弃 %d 修订版。\n"
"\n"
-#: svndumpfilter/main.c:956
+#: svndumpfilter/main.c:982
msgid "Revisions renumbered as follows:\n"
msgstr "ä¿®è®¢ç‰ˆè¢«é‡æ–°ç¼–å·ï¼Œå¦‚下:\n"
-#: svndumpfilter/main.c:984
+#: svndumpfilter/main.c:1009
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (丢弃)\n"
-#: svndumpfilter/main.c:999
+#: svndumpfilter/main.c:1024
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "丢弃 %d 节点:\n"
-#: svndumpfilter/main.c:1204
+#: svndumpfilter/main.c:1245
+#, c-format
msgid ""
"\n"
"Error: no prefixes supplied.\n"
@@ -7315,7 +7963,7 @@
"\n"
"错误:没有æä¾›å‰ç½®å—首,\n"
-#: svndumpfilter/main.c:1247
+#: svndumpfilter/main.c:1289
#, fuzzy, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7324,40 +7972,44 @@
"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svndumpfilter help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
-#: svnlook/main.c:101
+#: svnlook/main.c:99
msgid "specify revision number ARG"
msgstr "æŒ‡å®šä¿®è®¢ç‰ˆç¼–å· ARG"
-#: svnlook/main.c:104
+#: svnlook/main.c:102
msgid "specify transaction name ARG"
msgstr "指定事务åç§° ARG"
-#: svnlook/main.c:107
+#: svnlook/main.c:105
msgid "be verbose"
msgstr "详细"
-#: svnlook/main.c:110
+#: svnlook/main.c:108
msgid "show node revision ids for each path"
msgstr "为æ¯ä¸ªè·¯å¾„显示节点修订版编å·"
-#: svnlook/main.c:116
+#: svnlook/main.c:114
#, fuzzy
msgid "do not print differences for added files"
msgstr "ä¸è¦æ‰“å°å·²æ–°åŠ æ–‡ä»¶çš„ä¸åŒå¤„"
-#: svnlook/main.c:119
+#: svnlook/main.c:117
msgid "print differences against the copy source"
msgstr "显示差异并对照原始内容"
-#: svnlook/main.c:122
+#: svnlook/main.c:120
#, fuzzy
msgid "operate on a revision property (use with -r or -t)"
msgstr "在修订版属性上作æ“作(使用-r傿•°)"
-#: svnlook/main.c:125
+#: svnlook/main.c:123
msgid "show full paths instead of indenting them"
msgstr "显示完整路径代替缩略形å¼"
+#: svnlook/main.c:126
+msgid "show details for copies"
+msgstr ""
+
#: svnlook/main.c:138
msgid ""
"usage: svnlook author REPOS_PATH\n"
@@ -7378,7 +8030,7 @@
"\n"
"显示文件的内容。FILE_PATH å‰çš„ '/' å¯çœç•¥ã€‚\n"
-#: svnlook/main.c:149
+#: svnlook/main.c:148
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -7388,7 +8040,7 @@
"\n"
"显示已改å˜çš„路径。\n"
-#: svnlook/main.c:154
+#: svnlook/main.c:153
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -7398,7 +8050,7 @@
"\n"
"显示日期。\n"
-#: svnlook/main.c:159
+#: svnlook/main.c:158
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -7408,7 +8060,7 @@
"\n"
"以 GNU æ ·å¼ï¼Œæ˜¾ç¤ºæ¡£æ¡ˆåº“䏿”¹å˜çš„æ–‡ä»¶ä¸Žå±žæ€§å·®å¼‚。\n"
-#: svnlook/main.c:165
+#: svnlook/main.c:164
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -7419,7 +8071,7 @@
"\n"
"æ˜¾ç¤ºæœ¬èº«æ›¾æ”¹å˜ (或属性编辑) 过的目录,或是其下的文件更曾动过目录。\n"
-#: svnlook/main.c:171
+#: svnlook/main.c:170
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -7429,7 +8081,7 @@
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-#: svnlook/main.c:176
+#: svnlook/main.c:175
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -7440,7 +8092,7 @@
"\n"
"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的历å²è®°å½•ä¿¡æ¯ (å¦‚æžœæ²¡æœ‰æŒ‡å®šè·¯å¾„ï¼Œåˆ™ä¸ºæ ¹ç›®å½•)。\n"
-#: svnlook/main.c:182
+#: svnlook/main.c:181
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -7450,7 +8102,7 @@
"\n"
"显示作者,日期戳,日志信æ¯å¤§å°ï¼Œä»¥åŠæ—¥å¿—ä¿¡æ¯ã€‚\n"
-#: svnlook/main.c:187
+#: svnlook/main.c:186
#, fuzzy
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
@@ -7461,7 +8113,7 @@
"\n"
"如果档案库路径已ç»å˜åœ¨é”,æè¿°å®ƒã€‚\n"
-#: svnlook/main.c:192
+#: svnlook/main.c:191
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -7471,7 +8123,7 @@
"\n"
"显示日志信æ¯ã€‚\n"
-#: svnlook/main.c:197
+#: svnlook/main.c:196
#, fuzzy
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
@@ -7484,7 +8136,7 @@
"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性的原始内容。\n"
"åŠ ä¸Š --revprop, 显示修订版属性的原始值。\n"
-#: svnlook/main.c:203
+#: svnlook/main.c:202
#, fuzzy
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
@@ -7499,7 +8151,7 @@
"åŠ ä¸Š --revprop 选项, 修订版属性。\n"
"åŠ ä¸Š -v çš„è¯ï¼Œä¸€å¹¶æ˜¾ç¤ºå±žæ€§å†…容。\n"
-#: svnlook/main.c:210
+#: svnlook/main.c:209
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -7511,7 +8163,7 @@
"æ˜¾ç¤ºç›®å½•æ ‘ï¼Œè‡ª PATH_IN_REPOS 开始 (如果有æä¾›çš„è¯ï¼Œä¸ç„¶å°±ä»Žç›®å½•æ ‘çš„\n"
"æ ¹ç›®å½•å¼€å§‹),å¯é€‰æ‹©æ€§åœ°æ˜¾ç¤ºèŠ‚ç‚¹ä¿®è®¢ç‰ˆ id。\n"
-#: svnlook/main.c:216
+#: svnlook/main.c:215
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -7521,7 +8173,7 @@
"\n"
"显示档案库的 UUID。\n"
-#: svnlook/main.c:221
+#: svnlook/main.c:220
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -7531,60 +8183,53 @@
"\n"
"显示最新的修订版å·ã€‚\n"
-#: svnlook/main.c:589
-#, fuzzy, c-format
-msgid "Error creating dir '%s' (path exists)"
-msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
-
-#: svnlook/main.c:863
+#: svnlook/main.c:815
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "å·²å¤åˆ¶ï¼š%s (æ¥è‡ªä¿®è®¢ç‰ˆ %ld,%s)\n"
-#: svnlook/main.c:941
+#: svnlook/main.c:884
msgid "Added"
msgstr "å·²åŠ å…¥"
-#: svnlook/main.c:942
+#: svnlook/main.c:885
msgid "Deleted"
msgstr "å·²åˆ é™¤"
-#: svnlook/main.c:943
+#: svnlook/main.c:886
msgid "Modified"
msgstr "已修改"
-#: svnlook/main.c:944
+#: svnlook/main.c:887
msgid "Index"
msgstr "索引"
-#: svnlook/main.c:956
+#: svnlook/main.c:899
+#, c-format
msgid "(Binary files differ)\n"
msgstr "(二进制文件差异)\n"
-#: svnlook/main.c:1085
+#: svnlook/main.c:1028
msgid "unknown"
msgstr "未知"
-#: svnlook/main.c:1230 svnlook/main.c:1323 svnlook/main.c:1393
+#: svnlook/main.c:1173 svnlook/main.c:1266 svnlook/main.c:1295
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "事务“%sâ€å¹¶éžæ ¹åŸºäºŽæŸä¸ªä¿®è®¢ç‰ˆï¼›å¤šç¥žç§˜å•Š"
-#: svnlook/main.c:1260
+#: svnlook/main.c:1203
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "“%sâ€æ˜¯åœ°å€(URL),也许该是路径。"
-#: svnlook/main.c:1287
+#: svnlook/main.c:1230
#, c-format
msgid "Path '%s' is not a file"
msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
-#: svnlook/main.c:1373
-msgid "Can't create temporary directory"
-msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
-
-#: svnlook/main.c:1473
+#: svnlook/main.c:1369
+#, c-format
msgid ""
"REVISION PATH <ID>\n"
"-------- ---------\n"
@@ -7592,7 +8237,8 @@
"修 订 版 路径 <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1478
+#: svnlook/main.c:1374
+#, c-format
msgid ""
"REVISION PATH\n"
"-------- ----\n"
@@ -7600,27 +8246,30 @@
"修 订 版 路径\n"
"-------- ----\n"
-#: svnlook/main.c:1523
+#: svnlook/main.c:1419
#, fuzzy, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "属性“%sâ€åœ¨ä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
-#: svnlook/main.c:1527
+#: svnlook/main.c:1423
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸æ‰¾ä¸åˆ°"
-#: svnlook/main.c:1695 svnlook/main.c:1909
+#: svnlook/main.c:1592 svnlook/main.c:1807
+#, c-format
msgid "Missing repository path argument"
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1756
+#: svnlook/main.c:1653
+#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
" options will, if invoked without one of those options, act on\n"
" the repository's youngest revision.\n"
"Type 'svnlook help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnlook --version' to see the program version and FS modules.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7631,12 +8280,12 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svnlook/main.c:1811
+#: svnlook/main.c:1709
#, fuzzy
msgid "Missing path argument"
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1836
+#: svnlook/main.c:1734
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -7645,7 +8294,7 @@
"注释 (%i 行):\n"
"%s\n"
-#: svnlook/main.c:1837
+#: svnlook/main.c:1735
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -7654,39 +8303,40 @@
"注释 (%i 行):\n"
"%s\n"
-#: svnlook/main.c:1883
-#, fuzzy
+#: svnlook/main.c:1781
+#, fuzzy, c-format
msgid "Missing propname argument"
msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: svnlook/main.c:1884
+#: svnlook/main.c:1782
+#, c-format
msgid "Missing propname and repository path arguments"
msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1890
+#: svnlook/main.c:1788
msgid "Missing propname or repository path argument"
msgstr "未æä¾›å±žæ€§åç§°æˆ–æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:2045
+#: svnlook/main.c:1946
msgid "Invalid revision number supplied"
msgstr "æä¾›äº†æ— 效的版本å·ç "
-#: svnlook/main.c:2103
+#: svnlook/main.c:2007
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "'--transaction' (-t) 与 '--revision' (-r) 傿•°ä¸èƒ½åŒæ—¶å˜åœ¨"
-#: svnlook/main.c:2172
-#, fuzzy
+#: svnlook/main.c:2089
+#, fuzzy, c-format
msgid "Repository argument required\n"
msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
-#: svnlook/main.c:2181
+#: svnlook/main.c:2098
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径\n"
-#: svnlook/main.c:2229
+#: svnlook/main.c:2149
#, fuzzy, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7695,62 +8345,72 @@
"å命令“%sâ€å¹¶ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svnlook help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
-#: svnserve/main.c:102
+#: svnserve/main.c:140
msgid "daemon mode"
msgstr "åŽå°æ¨¡å¼"
-#: svnserve/main.c:104
+#: svnserve/main.c:142
msgid "listen port (for daemon mode)"
msgstr "监å¬ç«¯å£ï¼ˆåŽå°æ¨¡å¼ï¼‰"
-#: svnserve/main.c:106
+#: svnserve/main.c:144
msgid "listen hostname or IP address (for daemon mode)"
msgstr "监å¬ä¸»æœºå或IP地å€ï¼ˆåŽå°æ¨¡å¼ï¼‰"
-#: svnserve/main.c:108
+#: svnserve/main.c:146
msgid "run in foreground (useful for debugging)"
msgstr "在å‰å°è¿è¡Œï¼ˆè°ƒè¯•时有用)"
-#: svnserve/main.c:109 svnversion/main.c:181
+#: svnserve/main.c:147 svnversion/main.c:123
msgid "display this help"
msgstr "显示这个帮助"
-#: svnserve/main.c:112
+#: svnserve/main.c:150
msgid "inetd mode"
msgstr "inetd 模å¼"
-#: svnserve/main.c:113
+#: svnserve/main.c:151
msgid "root of directory to serve"
msgstr "æœåŠ¡æ ¹ç›®å½•"
-#: svnserve/main.c:114
-msgid "deprecated; use repository config file"
+#: svnserve/main.c:153
+#, fuzzy
+msgid "force read only, overriding repository config file"
msgstr "ä¸èµžæˆï¼›ä½¿ç”¨æ¡£æ¡ˆåº“é…置文件"
-#: svnserve/main.c:115
+#: svnserve/main.c:154
msgid "tunnel mode"
msgstr "éš§é“æ¨¡å¼"
-#: svnserve/main.c:117
+#: svnserve/main.c:156
msgid "tunnel username (default is current uid's name)"
msgstr "éš§é“用户åï¼ˆæ¨¡å¼æ˜¯å½“å‰ç”¨æˆ·UIDçš„åå—)"
-#: svnserve/main.c:119
+#: svnserve/main.c:158
msgid "use threads instead of fork"
msgstr "使用线程代替进程"
-#: svnserve/main.c:121
+#: svnserve/main.c:160
msgid "listen once (useful for debugging)"
msgstr "监å¬ä¸€æ¬¡ï¼ˆè°ƒè¯•时有用)"
-#: svnserve/main.c:132
+#: svnserve/main.c:162
+msgid "write server process ID to file arg"
+msgstr ""
+
+#: svnserve/main.c:165
+msgid "run as a windows service (SCM only)"
+msgstr ""
+
+#: svnserve/main.c:177
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-#: svnserve/main.c:141
+#: svnserve/main.c:186
+#, fuzzy
msgid ""
-"Usage: svnserve [options]\n"
+"usage: svnserve [options]\n"
"\n"
"Valid options:\n"
msgstr ""
@@ -7758,76 +8418,243 @@
"\n"
"有效选项:\n"
-#: svnserve/main.c:359
-msgid ""
-"Warning: -R is deprecated.\n"
-"Anonymous access is now read-only by default.\n"
-"To change, use conf/svnserve.conf in repos:\n"
-" [general]\n"
-" anon-access = read|write|none (default read)\n"
-" auth-access = read|write|none (default write)\n"
-"Forcing all access to read-only for now\n"
-msgstr ""
-"è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
-"匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
-"修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
-" [general]\n"
-" anon-access = read|write|none (默认 read)\n"
-" auth-access = read|write|none (默认 write)\n"
-"强制所有访问为åªè¯»\n"
-
-#: svnserve/main.c:381
-msgid "Option --tunnel-user is only valid in tunnel mode.\n"
-msgstr "选项 --tunnel-user åªæœ‰éš§é“æ¨¡å¼æ—¶æœ‰æ•ˆã€‚\n"
-
-#: svnserve/main.c:388
+#: svnserve/main.c:468
#, fuzzy
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "您必须指定 -d, -i, -t 或 -X ä¸çš„一个。\n"
-#: svnserve/main.c:429
+#: svnserve/main.c:478
#, c-format
-msgid "Can't get address info: %s\n"
-msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+msgid "Option --tunnel-user is only valid in tunnel mode.\n"
+msgstr "选项 --tunnel-user åªæœ‰éš§é“æ¨¡å¼æ—¶æœ‰æ•ˆã€‚\n"
-#: svnserve/main.c:446
+#: svnserve/main.c:547
#, c-format
-msgid "Can't create server socket: %s\n"
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+
+#: svnserve/main.c:583
+#, fuzzy, c-format
+msgid "Can't get address info"
+msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+
+#: svnserve/main.c:599
+#, fuzzy, c-format
+msgid "Can't create server socket"
msgstr "æ— æ³•åˆ›å»ºæœåŠ¡å™¨å¥—æŽ¥å—:%s\n"
-#: svnserve/main.c:460
-#, c-format
-msgid "Can't bind server socket: %s\n"
+#: svnserve/main.c:612
+#, fuzzy, c-format
+msgid "Can't bind server socket"
msgstr "ä¸èƒ½ç»‘定æœåŠ¡å™¨å¥—æŽ¥å—:“%sâ€\n"
-#: svnserve/main.c:503
+#: svnserve/main.c:680
#, fuzzy, c-format
-msgid "Can't accept client connection: %s\n"
+msgid "Can't accept client connection"
msgstr "æ— æ³•æŽ¥å—客户连接:%s\n"
-#: svnserve/main.c:558
+#: svnserve/main.c:734
#, fuzzy, c-format
-msgid "Can't create threadattr: %s\n"
+msgid "Can't create threadattr"
msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§ï¼šâ€œ%sâ€\n"
# as-is
-#: svnserve/main.c:567
+#: svnserve/main.c:742
#, fuzzy, c-format
-msgid "Can't set detached state: %s\n"
+msgid "Can't set detached state"
msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çš„状æ€ï¼šâ€œ%sâ€\n"
-#: svnserve/main.c:581
+#: svnserve/main.c:755
#, fuzzy, c-format
-msgid "Can't create thread: %s\n"
+msgid "Can't create thread"
msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s\n"
-#: svnversion/main.c:90
+#: svnserve/winservice.c:341
+#, c-format
+msgid "Failed to create winservice_start_event"
+msgstr ""
+
+#: svnserve/winservice.c:352
+#, c-format
+msgid "The service failed to start"
+msgstr ""
+
+#: svnserve/winservice.c:400
+#, c-format
+msgid "Failed to connect to Service Control Manager"
+msgstr ""
+
+#: svnserve/winservice.c:411
+#, c-format
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+
+#: svnsync/main.c:56
+msgid ""
+"usage: svnsync initialize DEST_URL SOURCE_URL\n"
+"\n"
+"Initialize a destination repository for synchronization from\n"
+"another repository.\n"
+"\n"
+"The destination URL must point to the root of a repository with\n"
+"no committed revisions. The destination repository must allow\n"
+"revision property changes.\n"
+"\n"
+"You should not commit to, or make revision property changes in,\n"
+"the destination repository by any method other than 'svnsync'.\n"
+"In other words, the destination repository should be a read-only\n"
+"mirror of the source repository.\n"
+msgstr ""
+
+#: svnsync/main.c:71
+msgid ""
+"usage: svnsync synchronize DEST_URL\n"
+"\n"
+"Transfer all pending revisions from source to destination.\n"
+msgstr ""
+
+#: svnsync/main.c:76
+msgid ""
+"usage: svnsync copy-revprops DEST_URL REV\n"
+"\n"
+"Copy all revision properties for revision REV from source to\n"
+"destination.\n"
+msgstr ""
+
+#: svnsync/main.c:82
+#, fuzzy
+msgid ""
+"usage: svnsync help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+"用法:svnadmin help [SUBCOMMAND...]\n"
+"\n"
+"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
+
+#: svnsync/main.c:184
+#, fuzzy, c-format
+msgid "Can't get local hostname"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+
+#: svnsync/main.c:206
+#, c-format
+msgid "Failed to get lock on destination repos, currently held by '%s'\n"
+msgstr ""
+
+#: svnsync/main.c:301
+#, c-format
+msgid "Session is rooted at '%s' but the repos root is '%s'"
+msgstr ""
+
+#: svnsync/main.c:341
+#, c-format
+msgid "Copied properties for revision %ld (%s* properties skipped).\n"
+msgstr ""
+
+#: svnsync/main.c:346
+#, fuzzy, c-format
+msgid "Copied properties for revision %ld.\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+
+#: svnsync/main.c:387
+msgid "Cannot initialize a repository with content in it"
+msgstr ""
+
+#: svnsync/main.c:398
+#, c-format
+msgid "Destination repository is already synchronizing from '%s'"
+msgstr ""
+
+#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
+#: svnsync/main.c:1200
+#, fuzzy, c-format
+msgid "Path '%s' is not a URL"
+msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
+
+#: svnsync/main.c:838
+#, fuzzy, c-format
+msgid "Committed revision %ld.\n"
+msgstr ""
+"\n"
+"æäº¤åŽçš„修订版为 %ld。\n"
+
+#: svnsync/main.c:877
+msgid "Destination repository has not been initialized"
+msgstr ""
+
+#: svnsync/main.c:892
+#, c-format
+msgid "UUID of source repository (%s) does not match expected UUID (%s)"
+msgstr ""
+
+#: svnsync/main.c:954
+#, c-format
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:992
+#, c-format
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:1069
+#, c-format
+msgid "Commit created rev %ld but should have created %ld"
+msgstr ""
+
+#: svnsync/main.c:1171
+msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+msgstr ""
+
+#: svnsync/main.c:1203
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "æä¾›äº†æ— 效的版本å·ç "
+
+#: svnsync/main.c:1239
#, fuzzy
+msgid ""
+"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnsync --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"\n"
+"å¯ç”¨çš„å命令:\n"
+
+#: svnsync/main.c:1429
+#, fuzzy, c-format
+msgid ""
+"subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnsync help %s' for usage.\n"
+msgstr ""
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
+"请输入“svn help %sâ€ä»¥å–得用法。\n"
+
+#: svnsync/main.c:1490
+msgid "Not enough arguments provided; try 'svnsync help' for more info"
+msgstr ""
+
+#: svnversion/main.c:39
+#, fuzzy, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "请使用“svnversion --helpâ€ä»¥å¾—到用法和帮助。\n"
-#: svnversion/main.c:101
-#, fuzzy
+#: svnversion/main.c:50
+#, fuzzy, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
@@ -7880,81 +8707,254 @@
" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•° WC_PATH 会使用当å‰ç›®å½•。\n"
"有效选项:\n"
-#: svnversion/main.c:179
+#: svnversion/main.c:121
msgid "do not output the trailing newline"
msgstr "ä¸è¾“出其åŽçš„æ¢è¡Œç¬¦"
-#: svnversion/main.c:180
+#: svnversion/main.c:122
msgid "last changed rather than current revisions"
msgstr "最近一次改å˜çš„ï¼Œè€Œä¸æ˜¯ç›®å‰çš„修订版"
-#: svnversion/main.c:272
+#: svnversion/main.c:229
#, c-format
msgid "exported%s"
msgstr "已导出%s"
-#: svnversion/main.c:281
+#: svnversion/main.c:238
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "“%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œå¹¶æœªå¯¼å‡º\n"
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
+#~ msgid "Finished"
+#~ msgstr "完æˆ"
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
+#~ msgid "Can't get default file perms for file at '%s' (file close error)"
+#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
-#~ msgid "'svn info' only works on working copy paths, not URLs"
-#~ msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+#, fuzzy
+#~ msgid ""
+#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
+#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
+#~ msgid "'%s' is already a file/something else"
+#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信æ¯\n"
+#~ msgid "No URL target available"
+#~ msgstr "没有æä¾› URL ç›®æ ‡"
-#~ msgid "Working copy not locked"
-#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
+#~ msgid "repository argument required\n"
+#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
+#~ msgid "unknown command: '%s'\n"
+#~ msgstr "未知的命令:“%sâ€\n"
+
+#~ msgid "Can't recode string"
+#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
+
+#~ msgid "native"
+#~ msgstr "本地"
+
+# as-is
+#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
+#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
# as-is
#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
#~ msgstr "䏿”¯æŒra_davçš„ RA æ’ä»¶ ABI 版本 (%d)"
+#~ msgid "No get_dir() available for URL schema"
+#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
+
+#~ msgid "Working copy not locked"
+#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
+
+#~ msgid "Print client version info\n"
+#~ msgstr "输出客户端版本信æ¯\n"
+
+#~ msgid "No commit for revision 0.\n"
+#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
+
+#~ msgid "Cannot cleanup '%s': not a directory"
+#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
+
+#~ msgid " %ld => %ld\n"
+#~ msgstr " %ld => %ld\n"
+
+#~ msgid "print client version info"
+#~ msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
+
+#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
+#~ msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
+
+#, fuzzy
+#~ msgid ""
+#~ "Check out a working copy from a repository.\n"
+#~ "usage: checkout URL[@REV]... [PATH]\n"
+#~ "\n"
+#~ " If specified, REV determines in which revision the URL is first\n"
+#~ " looked up.\n"
+#~ "\n"
+#~ " If PATH is omitted, the basename of the URL will be used as\n"
+#~ " the destination. If multiple URLs are given each will be checked\n"
+#~ " out into a sub-directory of PATH, with the name of the sub-directory\n"
+#~ " being the basename of the URL.\n"
+#~ msgstr ""
+#~ "从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
+#~ "用法:checkout 地å€[@版本]... [路径]\n"
+#~ "\n"
+#~ " 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
+#~ " 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
+#~ " 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
+#~ "\n"
+
+#~ msgid "Wrong number of paths given"
+#~ msgstr "指定了错误数目的路径"
+
+#~ msgid "Not enough args provided"
+#~ msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
+
# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
+#~ msgid "Can't seek in '%s'"
+#~ msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
-#~ msgid "native"
-#~ msgstr "本地"
+#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
+#~ msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
-#~ msgid "Can't recode string"
-#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
+#~ msgid "Unrecognized node kind of '%s'"
+#~ msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%sâ€\n"
+#~ msgid "'%s' is in the way"
+#~ msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
-#~ msgid "repository argument required\n"
-#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
+#~ msgid "'%s' is not supported"
+#~ msgstr "“%sâ€ä¸æ”¯æŒ"
-#~ msgid "No URL target available"
-#~ msgstr "没有æä¾› URL ç›®æ ‡"
+#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
+#~ msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
+#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
+#~ msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
+
+#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
+#~ msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+
+#~ msgid "Search for malformed path '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for reading"
+#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for writing"
+#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
+
+#, fuzzy
+#~ msgid "Error reading file '%s'"
+#~ msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
#, fuzzy
+#~ msgid "Error writing file '%s'"
+#~ msgstr "写入文件“%sâ€æ—¶å‘生错误"
+
+#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
+
+#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
+#~ msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+
+#~ msgid "Found malformed header block in dumpfile stream"
+#~ msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
+
+# as-is
+#~ msgid "Creating readme file"
+#~ msgstr "æ£åœ¨åˆ›å»º readme 文件"
+
+# as-is
+#~ msgid "Can't open config file '%s'"
+#~ msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
+
+# as-is
+#~ msgid "Can't find config file '%s'"
+#~ msgstr "找ä¸åˆ°é…置文件“%sâ€"
+
+#~ msgid "Can't change executability of file '%s'"
+#~ msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
+
+#~ msgid "Can't stat new directory '%s'"
+#~ msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
+
+#~ msgid "Too few arguments"
+#~ msgstr "傿•°å¤ªå°‘"
+
#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
+#~ "The entry '%s' is no longer a directory; remove the entry before updating"
+#~ msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-#~ msgid "Error writing to stream: unexpected EOF"
-#~ msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
+#~ msgid "Error restoring props for '%s'"
+#~ msgstr "还原“%sâ€çš„属性时å‘生错误"
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
+#~ msgid "Error removing props for '%s'"
+#~ msgstr "移除“%sâ€çš„属性时å‘生错误"
-#~ msgid "Finished"
-#~ msgstr "完æˆ"
+#~ msgid ""
+#~ "'%s' is scheduled for deletion; it must be committed before being "
+#~ "overwritten"
+#~ msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
+
+#, fuzzy
+#~ msgid "Working copy '%s' is missing or not locked"
+#~ msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
+
+#~ msgid "Error checking path '%s'"
+#~ msgstr "检查路径“%sâ€æ—¶å‘生错误"
+
+#~ msgid "Unable to delete temporary file"
+#~ msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
+
+#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
+
+#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
+
+#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
+
+#~ msgid "Unknown node kind: '%s'"
+#~ msgstr "未知的节点类型:“%sâ€"
+
+#~ msgid "'%s' has unknown value for svn:eol-style property"
+#~ msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
+
+#~ msgid "Move failed"
+#~ msgstr "移动失败"
+
+#~ msgid "Node with dropped parent sneaked in"
+#~ msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
+
+#, fuzzy
+#~ msgid "Error creating dir '%s' (path exists)"
+#~ msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
+
+#~ msgid "Can't create temporary directory"
+#~ msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
+
+#~ msgid ""
+#~ "Warning: -R is deprecated.\n"
+#~ "Anonymous access is now read-only by default.\n"
+#~ "To change, use conf/svnserve.conf in repos:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (default read)\n"
+#~ " auth-access = read|write|none (default write)\n"
+#~ "Forcing all access to read-only for now\n"
+#~ msgstr ""
+#~ "è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
+#~ "匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
+#~ "修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (默认 read)\n"
+#~ " auth-access = read|write|none (默认 write)\n"
+#~ "强制所有访问为åªè¯»\n"
[[[
* subversion/po/zh_CN.po: msgmerge with latest subversion.pot in 1.4.x branch,
untranslated yet.
]]]
diff -u origin\zh_CN.po msgmerged\zh_CN.po
--- origin\zh_CN.po Wed Aug 23 11:00:35 2006
+++ msgmerged\zh_CN.po Wed Aug 23 11:00:59 2006
@@ -5,6763 +5,7265 @@
msgid ""
msgstr ""
"Project-Id-Version: subversion 1.2.0\n"
-"POT-Creation-Date: 2005-08-16 16:28+0800\n"
+"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
+"POT-Creation-Date: 2006-08-21 10:21-0400\n"
"PO-Revision-Date: 2004-09-12 22:05+0800\n"
"Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
"Language-Team: Simplified Chinese <dev@subversion.tigris.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: dev@subversion.tigris.org\n"
-#: clients/cmdline/blame-cmd.c:236 clients/cmdline/ls-cmd.c:316
-msgid "'verbose' option invalid in XML mode"
-msgstr "在XML模å¼ä¸â€œè¯¦ç»†â€é€‰é¡¹æ— 效"
+# as-is
+#: include/svn_error_codes.h:154
+msgid "Bad parent pool passed to svn_make_pool()"
+msgstr "æ— æ•ˆçš„å†…å˜æ± (pool)ä¼ é€’åˆ° svn_make_pool()"
-#: clients/cmdline/blame-cmd.c:248 clients/cmdline/ls-cmd.c:328
-#: clients/cmdline/status-cmd.c:192
-msgid "'incremental' option only valid in XML mode"
-msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
+#: include/svn_error_codes.h:158
+msgid "Bogus filename"
+msgstr "有问题的文件å"
-#: clients/cmdline/blame-cmd.c:307
-#, c-format
-msgid "Skipping binary file: '%s'\n"
-msgstr "跳过二进制文件:“%sâ€\n"
+#: include/svn_error_codes.h:162
+msgid "Bogus URL"
+msgstr "有问题的地å€(URL)"
-#: clients/cmdline/checkout-cmd.c:124 clients/cmdline/switch-cmd.c:125
-#, c-format
-msgid "'%s' does not appear to be a URL"
-msgstr "“%sâ€ä¸åƒæ˜¯åœ°å€(URL)"
+#: include/svn_error_codes.h:166
+msgid "Bogus date"
+msgstr "有问题的日期"
-#: clients/cmdline/copy-cmd.c:106 clients/cmdline/delete-cmd.c:64
-#: clients/cmdline/mkdir-cmd.c:66
-msgid "Local, non-commit operations do not take a log message"
-msgstr "本地æ“ä½œï¼Œéžæäº¤çš„æ“作ä¸èƒ½èŽ·å–æ—¥å¿—ä¿¡æ¯"
+#: include/svn_error_codes.h:170
+msgid "Bogus mime-type"
+msgstr "有问题的 mime-type"
-#: clients/cmdline/diff-cmd.c:65
-msgid "Can't open stdout"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å‡º (stdout)"
+#: include/svn_error_codes.h:176
+msgid "Version file format not correct"
+msgstr "ç‰ˆæœ¬æ–‡ä»¶æ ¼å¼ä¸æ£ç¡®"
-#: clients/cmdline/diff-cmd.c:67
-msgid "Can't open stderr"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
+#: include/svn_error_codes.h:182
+msgid "No such XML tag attribute"
+msgstr "æ²¡æœ‰è¿™æ ·çš„ XML æ ‡ç¾å±žæ€§"
-#: clients/cmdline/diff-cmd.c:156
-msgid "Target lists to diff may not contain both working copy paths and URLs"
-msgstr "å·®å¼‚æ¯”è¾ƒç›®æ ‡ä¸å¯åŒæ—¶åŒ…å«å·¥ä½œæ‹·è´è·¯å¾„与地å€(URL)"
+#: include/svn_error_codes.h:186
+msgid "<delta-pkg> is missing ancestry"
+msgstr "<delta-pkg> 没有演进历程"
-#: clients/cmdline/export-cmd.c:82
-msgid ""
-"Destination directory exists; please remove the directory or use --force to "
-"overwrite"
-msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
+#: include/svn_error_codes.h:190
+msgid "Unrecognized binary data encoding; can't decode"
+msgstr "æ— æ³•è¾¨è¯†çš„äºŒè¿›åˆ¶æ•°æ®ç¼–ç ï¼šæ— æ³•è§£è¯‘"
-#: clients/cmdline/help-cmd.c:45
-#, c-format
-msgid ""
-"usage: svn <subcommand> [options] [args]\n"
-"Subversion command-line client, version %s.\n"
-"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
-"\n"
-"Most subcommands take file and/or directory arguments, recursing\n"
-"on the directories. If no arguments are supplied to such a\n"
-"command, it recurses on the current directory (inclusive) by default.\n"
-"\n"
-"Available subcommands:\n"
-msgstr ""
-"用法:svn <subcommand> [options] [args]\n"
-"Subversion 命令行客户端,版本 %s。\n"
-"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
-"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
-"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
-"行递归å˜å–。\n"
-"\n"
-"å¯ç”¨çš„å命令:\n"
+#: include/svn_error_codes.h:194
+msgid "XML data was not well-formed"
+msgstr "XML 的数æ®ä¸åˆè¯æ³•"
-#: clients/cmdline/help-cmd.c:56
-msgid ""
-"Subversion is a tool for version control.\n"
-"For additional information, see http://subversion.tigris.org/\n"
-msgstr ""
-"Subversion 是个版本控制系统的工具。\n"
-"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
+#: include/svn_error_codes.h:198
+msgid "Data cannot be safely XML-escaped"
+msgstr "XML æ•°æ®ä¸èƒ½æ£ç¡®åœ°è§£ç "
-#: clients/cmdline/help-cmd.c:63
-msgid ""
-"The following repository access (RA) modules are available:\n"
-"\n"
-msgstr ""
-"å¯ä½¿ç”¨ä»¥ä¸‹çš„æ¡£æ¡ˆåº“å˜å– (RA) 模å—:\n"
-"\n"
+#: include/svn_error_codes.h:204
+msgid "Inconsistent line ending style"
+msgstr "ä¸ä¸€è‡´çš„è¡Œç»“æŸæ ·å¼"
-#: clients/cmdline/import-cmd.c:82
-msgid "Repository URL required when importing"
-msgstr "导入时必须æä¾›æ¡£æ¡ˆåº“的地å€(URL)"
+#: include/svn_error_codes.h:208
+msgid "Unrecognized line ending style"
+msgstr "æ— æ³•è¾¨è¯†çš„è¡Œç»“æŸæ ·å¼"
-#: clients/cmdline/import-cmd.c:86
-msgid "Too many arguments to import command"
-msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
+#: include/svn_error_codes.h:213
+msgid "Line endings other than expected"
+msgstr "ä¸€è¡Œä»¥æ„æ–™ä¹‹å¤–的方å¼ç»“æŸ"
-#: clients/cmdline/import-cmd.c:101
-#, c-format
-msgid "Invalid URL '%s'"
-msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
+#: include/svn_error_codes.h:217
+msgid "Ran out of unique names"
+msgstr "已用完ä¸é‡å¤çš„åç§°"
-#: clients/cmdline/info-cmd.c:56 svnadmin/main.c:1028
-#, c-format
-msgid "Path: %s\n"
-msgstr "路径:%s\n"
+# as-is
+#: include/svn_error_codes.h:222
+msgid "Framing error in pipe protocol"
+msgstr "管é“å议帧错误"
-# this points to filename according to sunny256
-#: clients/cmdline/info-cmd.c:62 svnlook/main.c:782
-#, c-format
-msgid "Name: %s\n"
-msgstr "文件å:%s\n"
+#: include/svn_error_codes.h:227
+msgid "Read error in pipe"
+msgstr "管é“å‘生读å–错误"
-#: clients/cmdline/info-cmd.c:66
+#: include/svn_error_codes.h:231 libsvn_subr/cmdline.c:291
+#: libsvn_subr/cmdline.c:308 svn/util.c:716
#, c-format
-msgid "URL: %s\n"
-msgstr "地å€(URL):%s\n"
+msgid "Write error"
+msgstr "写入错误"
-#: clients/cmdline/info-cmd.c:69
-#, fuzzy, c-format
-msgid "Repository Root: %s\n"
-msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
+#: include/svn_error_codes.h:237
+msgid "Unexpected EOF on stream"
+msgstr "æµä¸æœ‰æ„料之外的结æŸç¬¦"
-#: clients/cmdline/info-cmd.c:73
-#, c-format
-msgid "Repository UUID: %s\n"
-msgstr "档案库 UUID:%s\n"
+#: include/svn_error_codes.h:241
+msgid "Malformed stream data"
+msgstr "ç•¸å½¢çš„æµæ•°æ®"
-#: clients/cmdline/info-cmd.c:77
-#, c-format
-msgid "Revision: %ld\n"
-msgstr "修订版:%ld\n"
+#: include/svn_error_codes.h:245
+msgid "Unrecognized stream data"
+msgstr "æ— æ³•è¾¨è¯†çš„æµæ•°æ®"
-#: clients/cmdline/info-cmd.c:82
-msgid "Node Kind: file\n"
-msgstr "节点ç§ç±»ï¼šæ–‡ä»¶\n"
+#: include/svn_error_codes.h:251
+msgid "Unknown svn_node_kind"
+msgstr "未知的 svn_node_kind"
-#: clients/cmdline/info-cmd.c:86
-msgid "Node Kind: directory\n"
-msgstr "节点ç§ç±»ï¼šç›®å½•\n"
+#: include/svn_error_codes.h:255
+msgid "Unexpected node kind found"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
-#: clients/cmdline/info-cmd.c:90
-msgid "Node Kind: none\n"
-msgstr "节点ç§ç±»ï¼šæ— \n"
+#: include/svn_error_codes.h:261
+msgid "Can't find an entry"
+msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªé¡¹ç›®"
-#: clients/cmdline/info-cmd.c:95
-msgid "Node Kind: unknown\n"
-msgstr "节点ç§ç±»ï¼šæœªçŸ¥\n"
+#: include/svn_error_codes.h:267
+msgid "Entry already exists"
+msgstr "项目已å˜åœ¨"
-#: clients/cmdline/info-cmd.c:104
-msgid "Schedule: normal\n"
-msgstr "调度:æ£å¸¸\n"
+#: include/svn_error_codes.h:271
+msgid "Entry has no revision"
+msgstr "项目没有修订版"
-#: clients/cmdline/info-cmd.c:108
-msgid "Schedule: add\n"
-msgstr "调度:新增\n"
+#: include/svn_error_codes.h:275
+msgid "Entry has no URL"
+msgstr "项目没有地å€(URL)"
-#: clients/cmdline/info-cmd.c:112
-msgid "Schedule: delete\n"
-msgstr "è°ƒåº¦ï¼šåˆ é™¤\n"
+#: include/svn_error_codes.h:279
+msgid "Entry has an invalid attribute"
+msgstr "é¡¹ç›®æœ‰æ— æ•ˆçš„å±žæ€§"
-#: clients/cmdline/info-cmd.c:116
-msgid "Schedule: replace\n"
-msgstr "调度:替æ¢\n"
+#: include/svn_error_codes.h:285
+msgid "Obstructed update"
+msgstr "塞ä½çš„æ›´æ–°"
-#: clients/cmdline/info-cmd.c:124
-#, c-format
-msgid "Copied From URL: %s\n"
-msgstr "å¤åˆ¶è‡ªåœ°å€(URL):%s\n"
+# as-is
+#: include/svn_error_codes.h:290
+msgid "Mismatch popping the WC unwind stack"
+msgstr "ä¸åŒ¹é…的弹出工作拷è´(WC)å±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:128
-#, c-format
-msgid "Copied From Rev: %ld\n"
-msgstr "å¤åˆ¶è‡ªä¿®è®¢ç‰ˆï¼š%ld\n"
+# as-is
+#: include/svn_error_codes.h:295
+msgid "Attempt to pop empty WC unwind stack"
+msgstr "å°è¯•弹出空的工作拷è´(WC)å±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:133
-#, c-format
-msgid "Last Changed Author: %s\n"
-msgstr "最åŽä¿®æ”¹çš„作者:%s\n"
+# as-is
+#: include/svn_error_codes.h:300
+msgid "Attempt to unlock with non-empty unwind stack"
+msgstr "å°è¯•è§£é”éžç©ºå±•å¼€å †æ ˆ"
-#: clients/cmdline/info-cmd.c:137
-#, c-format
-msgid "Last Changed Rev: %ld\n"
-msgstr "最åŽä¿®æ”¹çš„修订版:%ld\n"
+#: include/svn_error_codes.h:304
+msgid "Attempted to lock an already-locked dir"
+msgstr "å°è¯•è¦é”定一个已é”定的目录"
-#: clients/cmdline/info-cmd.c:142
-msgid "Last Changed Date"
-msgstr "最åŽä¿®æ”¹çš„æ—¶é—´"
+#: include/svn_error_codes.h:308
+msgid "Working copy not locked; this is probably a bug, please report"
+msgstr "工作目录没有被é”定;这å¯èƒ½æ˜¯ä¸€ä¸ªæ¼æ´žï¼Œè¯·æŠ¥å‘Šå¼€å‘者"
-#: clients/cmdline/info-cmd.c:148
-msgid "Text Last Updated"
-msgstr "æ–‡æœ¬æœ€åŽæ›´æ–°"
+#: include/svn_error_codes.h:313
+msgid "Invalid lock"
+msgstr "æ— æ•ˆçš„é”定"
-#: clients/cmdline/info-cmd.c:152
-msgid "Properties Last Updated"
-msgstr "å±žæ€§æœ€åŽæ›´æ–°"
+#: include/svn_error_codes.h:317
+msgid "Path is not a working copy directory"
+msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
-#: clients/cmdline/info-cmd.c:155
-#, c-format
-msgid "Checksum: %s\n"
-msgstr "æ ¡éªŒå’Œï¼š%s\n"
+#: include/svn_error_codes.h:321
+msgid "Path is not a working copy file"
+msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´æ–‡ä»¶"
-#: clients/cmdline/info-cmd.c:160
-#, c-format
-msgid "Conflict Previous Base File: %s\n"
-msgstr "冲çªä¹‹å‰çš„æ–‡ä»¶ï¼š%s\n"
+#: include/svn_error_codes.h:325
+msgid "Problem running log"
+msgstr "æ— æ³•æ‰§è¡Œæ—¥å¿—"
-#: clients/cmdline/info-cmd.c:166
-#, c-format
-msgid "Conflict Previous Working File: %s\n"
-msgstr "冲çªä¹‹å‰çš„工作文件:%s\n"
+#: include/svn_error_codes.h:329
+msgid "Can't find a working copy path"
+msgstr "找ä¸åˆ°å·¥ä½œæ‹·è´è·¯å¾„"
-#: clients/cmdline/info-cmd.c:171
-#, c-format
-msgid "Conflict Current Base File: %s\n"
-msgstr "冲çªä¹‹å‰çš„当剿–‡ä»¶ï¼š%s\n"
+#: include/svn_error_codes.h:333
+msgid "Working copy is not up-to-date"
+msgstr "å·¥ä½œæ‹·è´æœªæ›´æ–°è‡³æœ€æ–°ç‰ˆ"
-#: clients/cmdline/info-cmd.c:176
-#, c-format
-msgid "Conflict Properties File: %s\n"
-msgstr "冲çªçš„属性文件:%s\n"
+#: include/svn_error_codes.h:337
+msgid "Left locally modified or unversioned files"
+msgstr "ä¿ç•™æœ¬åœ°ä¿®æ”¹æˆ–未纳入版本管ç†çš„æ–‡ä»¶"
-#: clients/cmdline/info-cmd.c:184
-#, c-format
-msgid "Lock Token: %s\n"
-msgstr "é”定记å·ï¼š%s\n"
+#: include/svn_error_codes.h:341
+msgid "Unmergeable scheduling requested on an entry"
+msgstr "è¯¥é¡¹ç›®æœ‰ä¸€ä¸ªæ— æ³•åˆå¹¶çš„调度请求"
-#: clients/cmdline/info-cmd.c:188
-#, c-format
-msgid "Lock Owner: %s\n"
-msgstr "é”定所有者:%s\n"
+#: include/svn_error_codes.h:345
+msgid "Found a working copy path"
+msgstr "找到一个工作拷è´è·¯å¾„"
-#: clients/cmdline/info-cmd.c:193
-msgid "Lock Created"
-msgstr "é”定已创建的"
+#: include/svn_error_codes.h:349
+msgid "A conflict in the working copy obstructs the current operation"
+msgstr "工作拷è´ä¸çš„冲çªé˜»ç¢äº†ç›®å‰çš„æ“ä½œ"
-#: clients/cmdline/info-cmd.c:197
-msgid "Lock Expires"
-msgstr "é”定过期的"
+#: include/svn_error_codes.h:353
+msgid "Working copy is corrupt"
+msgstr "工作拷è´å·²æŸå"
-#: clients/cmdline/info-cmd.c:206
-#, c-format
-msgid ""
-"Lock Comment (%i lines):\n"
-"%s\n"
-msgstr ""
-"é”定注释(%i 行):\n"
-"%s\n"
+#: include/svn_error_codes.h:357
+msgid "Working copy text base is corrupt"
+msgstr "工作拷è´çš„æ–‡ä»¶å‚考基础已æŸå"
-#: clients/cmdline/info-cmd.c:207
-#, c-format
-msgid ""
-"Lock Comment (%i line):\n"
-"%s\n"
-msgstr ""
-"é”定注释(%i line):\n"
-"%s\n"
+#: include/svn_error_codes.h:361
+msgid "Cannot change node kind"
+msgstr "æ— æ³•æ›´æ”¹èŠ‚ç‚¹ç§ç±»"
-#: clients/cmdline/info-cmd.c:281
-#, c-format
-msgid ""
-"%s: (Not a versioned resource)\n"
-"\n"
-msgstr ""
-"%s:(䏿˜¯å—版本控制的资æº)\n"
-"\n"
-
-#: clients/cmdline/info-cmd.c:290
-#, fuzzy, c-format
-msgid ""
-"%s: (Not a valid URL)\n"
-"\n"
-msgstr ""
-"%s:(䏿˜¯æœ‰æ•ˆçš„地å€(URL))\n"
-"\n"
+#: include/svn_error_codes.h:365
+msgid "Invalid operation on the current working directory"
+msgstr "这个æ“作对目å‰çš„工作拷è´ç›®å½•æ— æ•ˆ"
-#: clients/cmdline/lock-cmd.c:52
-#, fuzzy
-msgid "Lock comment contains a zero byte"
-msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
+#: include/svn_error_codes.h:369
+msgid "Problem on first log entry in a working copy"
+msgstr "æ“作于工作拷è´çš„第一个日志项目时å‘生问题"
-#: clients/cmdline/log-cmd.c:162
-msgid "(no author)"
-msgstr "(没有作者信æ¯)"
+#: include/svn_error_codes.h:373
+msgid "Unsupported working copy format"
+msgstr "䏿”¯æŒçš„å·¥ä½œæ‹·è´æ ¼å¼"
-#: clients/cmdline/log-cmd.c:173
-msgid "(no date)"
-msgstr "(没有时间)"
+#: include/svn_error_codes.h:377
+msgid "Path syntax not supported in this context"
+msgstr "è·¯å¾„è¯æ³•在æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸æ”¯æŒ"
-#: clients/cmdline/log-cmd.c:203
-msgid "Changed paths:\n"
-msgstr "改å˜çš„路径:\n"
+#: include/svn_error_codes.h:382
+msgid "Invalid schedule"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: clients/cmdline/log-cmd.c:218
-#, c-format
-msgid " (from %s:%ld)"
-msgstr " (从 %s:%ld)"
+#: include/svn_error_codes.h:387
+#, fuzzy
+msgid "Invalid relocation"
+msgstr "æ— æ•ˆçš„é”定"
-#: clients/cmdline/log-cmd.c:437
-msgid "When specifying working copy paths, only one target may be given"
-msgstr "当指定工作拷è´è·¯å¾„ï¼Œåªæœ‰ä¸€ä¸ªç›®æ ‡ä¼šè¢«æŒ‡å®š"
+#: include/svn_error_codes.h:392
+#, fuzzy
+msgid "Invalid switch"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: clients/cmdline/log-cmd.c:449
-msgid "Only relative paths can be specified after a URL"
-msgstr "地å€(URL)åŽåªèƒ½æŒ‡å®šç›¸å¯¹è·¯å¾„"
+#: include/svn_error_codes.h:398
+msgid "General filesystem error"
+msgstr "一般性文件系统错误"
-#: clients/cmdline/main.c:63
-msgid "force operation to run"
-msgstr "强制æ“作è¿è¡Œ"
+#: include/svn_error_codes.h:402
+msgid "Error closing filesystem"
+msgstr "关闿–‡ä»¶ç³»ç»Ÿå‘生错误"
-#: clients/cmdline/main.c:65
-msgid "force validity of log message source"
-msgstr "å¼ºåˆ¶æ ¡éªŒæ—¥å¿—ä¿¡æ¯èµ„æº"
+#: include/svn_error_codes.h:406
+msgid "Filesystem is already open"
+msgstr "文件系统已打开"
-#: clients/cmdline/main.c:66 clients/cmdline/main.c:67 svnadmin/main.c:227
-#: svnadmin/main.c:230 svndumpfilter/main.c:756 svndumpfilter/main.c:759
-#: svnlook/main.c:92 svnlook/main.c:95
-msgid "show help on a subcommand"
-msgstr "显示å命令帮助"
+#: include/svn_error_codes.h:410
+msgid "Filesystem is not open"
+msgstr "文件系档未打开"
-#: clients/cmdline/main.c:68
-msgid "specify commit message ARG"
-msgstr "指定æäº¤ä¿¡æ¯ARG"
+#: include/svn_error_codes.h:414
+msgid "Filesystem is corrupt"
+msgstr "文件系统æŸå"
-#: clients/cmdline/main.c:69
-msgid "print as little as possible"
-msgstr "打å°å°½å¯èƒ½å°‘"
+#: include/svn_error_codes.h:418
+msgid "Invalid filesystem path syntax"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿè·¯å¾„è¯æ³•"
-#: clients/cmdline/main.c:70
-msgid "descend recursively"
-msgstr "å‘下递归"
+#: include/svn_error_codes.h:422
+msgid "Invalid filesystem revision number"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆå·"
-#: clients/cmdline/main.c:71
-msgid "operate on single directory only"
-msgstr "åªåœ¨å•个目录æ“作"
+#: include/svn_error_codes.h:426
+msgid "Invalid filesystem transaction name"
+msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿäº‹åŠ¡åç§°"
-#: clients/cmdline/main.c:73
-msgid ""
-"ARG (some commands also take ARG1:ARG2 range)\n"
-" A revision argument can be one of:\n"
-" NUMBER revision number\n"
-" \"{\" DATE \"}\" revision at start of the "
-"date\n"
-" \"HEAD\" latest in repository\n"
-" \"BASE\" base rev of item's working "
-"copy\n"
-" \"COMMITTED\" last commit at or before "
-"BASE\n"
-" \"PREV\" revision just before COMMITTED"
-msgstr ""
-"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
-" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
-" æ•°å— ä¿®è®¢ç‰ˆå·\n"
-" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
-" \"HEAD\" 最近的档案库\n"
-" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
-" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
-" \"PREV\" 修订版æäº¤ä¹‹å‰"
+#: include/svn_error_codes.h:430
+msgid "Filesystem directory has no such entry"
+msgstr "æ–‡ä»¶ç³»ç»Ÿç›®å½•æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®"
-#: clients/cmdline/main.c:87
-msgid "read data from file ARG"
-msgstr "从文件 ARG è¯»å–æ•°æ®"
+#: include/svn_error_codes.h:434
+msgid "Filesystem has no such representation"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
-#: clients/cmdline/main.c:89
-msgid "give output suitable for concatenation"
-msgstr "给予适åˆè¾“出的"
+#: include/svn_error_codes.h:438
+msgid "Filesystem has no such string"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„å—串"
-#: clients/cmdline/main.c:91
-msgid "treat value as being in charset encoding ARG"
-msgstr "指定的值 ARG 为å—符编ç "
+#: include/svn_error_codes.h:442
+msgid "Filesystem has no such copy"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„æ‹·è´"
-#: clients/cmdline/main.c:92
-msgid "print client version info"
-msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
+#: include/svn_error_codes.h:446
+msgid "The specified transaction is not mutable"
+msgstr "指定的事务ä¸å¯æ”¹å˜"
-#: clients/cmdline/main.c:93
-msgid "print extra information"
-msgstr "打å°é™„åŠ ä¿¡æ¯"
+#: include/svn_error_codes.h:450
+msgid "Filesystem has no item"
+msgstr "文件系统没有项目"
-#: clients/cmdline/main.c:94
-msgid "display update information"
-msgstr "显示更新信æ¯"
+#: include/svn_error_codes.h:454
+msgid "Filesystem has no such node-rev-id"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„ node-rev-id"
-#: clients/cmdline/main.c:96
-msgid "specify a username ARG"
-msgstr "指定用户 ARG"
+#: include/svn_error_codes.h:458
+msgid "String does not represent a node or node-rev-id"
+msgstr "å—串并未表示一个节点或 node-rev-id"
-#: clients/cmdline/main.c:98
-msgid "specify a password ARG"
-msgstr "指定密ç ARG"
+#: include/svn_error_codes.h:462
+msgid "Name does not refer to a filesystem directory"
+msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿç›®å½•"
-#: clients/cmdline/main.c:99
-msgid "pass ARG to --diff-cmd as options (default: '-u')"
-msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
+#: include/svn_error_codes.h:466
+msgid "Name does not refer to a filesystem file"
+msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿæ–‡ä»¶"
-#: clients/cmdline/main.c:101
-msgid "pass contents of file ARG as additional args"
-msgstr "ä¼ é€’æ–‡ä»¶ ARG å†…å®¹ä¸ºé™„ä»¶å‚æ•°"
+#: include/svn_error_codes.h:470
+msgid "Name is not a single path component"
+msgstr "åç§°ä¸æ˜¯ä¸€ä¸ªå•一路径"
-#: clients/cmdline/main.c:102
-msgid "output in XML"
-msgstr "输出为 XML"
+#: include/svn_error_codes.h:474
+msgid "Attempt to change immutable filesystem node"
+msgstr "å°è¯•è¦ä¿®æ”¹ä¸å¯æ”¹å˜çš„æ–‡ä»¶ç³»ç»ŸèŠ‚ç‚¹"
-#: clients/cmdline/main.c:103
-msgid "use strict semantics"
-msgstr "ä½¿ç”¨ä¸¥æ ¼çš„è¯æ³•"
+#: include/svn_error_codes.h:478
+msgid "Item already exists in filesystem"
+msgstr "该项目已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿä¸"
-#: clients/cmdline/main.c:105
-msgid "do not cross copies while traversing history"
-msgstr "查看历å²ä¸è¦è·¨è¶Šä¸åŒçš„æ‹·è´"
+#: include/svn_error_codes.h:482
+msgid "Attempt to remove or recreate fs root dir"
+msgstr "å°è¯•è¦ç§»é™¤æˆ–冿¬¡å»ºç«‹æ–‡ä»¶ç³»ç»Ÿçš„æ ¹ç›®å½•"
-#: clients/cmdline/main.c:107
-msgid "disregard default and svn:ignore property ignores"
-msgstr "忽略默认值和 svn:ignore 属性"
+#: include/svn_error_codes.h:486
+msgid "Object is not a transaction root"
+msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹ç‰©ä»¶"
-#: clients/cmdline/main.c:109
-msgid "do not cache authentication tokens"
-msgstr "ä¸è¦ç¼“冲用户验è¯"
+#: include/svn_error_codes.h:490
+msgid "Object is not a revision root"
+msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªä¿®è®¢ç‰ˆçš„æ ¹ç‰©ä»¶"
-#: clients/cmdline/main.c:111
-msgid "do no interactive prompting"
-msgstr "ä¸è¦äº¤äº’æç¤º"
+#: include/svn_error_codes.h:494
+msgid "Merge conflict during commit"
+msgstr "æäº¤æ—¶å‘生åˆå¹¶å†²çª"
-#: clients/cmdline/main.c:113
-msgid "try operation but make no changes"
-msgstr "å°è¯•æ“作但ä¸ä¿®æ”¹"
+# as-is
+#: include/svn_error_codes.h:498
+msgid "A representation vanished or changed between reads"
+msgstr "表现消失或读时被改å˜"
-#: clients/cmdline/main.c:115 svnlook/main.c:113
-msgid "do not print differences for deleted files"
-msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
+#: include/svn_error_codes.h:502
+msgid "Tried to change an immutable representation"
+msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
-#: clients/cmdline/main.c:117
-msgid "notice ancestry when calculating differences"
-msgstr "比较差异时æç¤ºåŽŸå§‹ä¿¡æ¯"
+#: include/svn_error_codes.h:506
+msgid "Malformed skeleton data"
+msgstr "畸形的框架数æ®"
-#: clients/cmdline/main.c:119
-msgid "ignore ancestry when calculating merges"
-msgstr "åˆå¹¶æ—¶å¿½ç•¥åŽŸå§‹ä¿¡æ¯"
+#: include/svn_error_codes.h:510
+msgid "Transaction is out of date"
+msgstr "事务已过时"
-#: clients/cmdline/main.c:121
-msgid "ignore externals definitions"
-msgstr "忽略外部定义"
+#: include/svn_error_codes.h:514
+msgid "Berkeley DB error"
+msgstr "Berkeley DB 错误"
-#: clients/cmdline/main.c:123
-msgid "use ARG as diff command"
-msgstr "使用 ARG 作为差异比较命令"
+#: include/svn_error_codes.h:518
+msgid "Berkeley DB deadlock error"
+msgstr "Berkeley DB å‘生æ»é”错误"
-#: clients/cmdline/main.c:125
-msgid "use ARG as merge command"
-msgstr "使用 ARG 作为åˆå¹¶å‘½ä»¤"
+#: include/svn_error_codes.h:522
+msgid "Transaction is dead"
+msgstr "事务已结æŸ"
-#: clients/cmdline/main.c:127
-msgid "use ARG as external editor"
-msgstr "使用 ARG 作为外部编辑器"
+#: include/svn_error_codes.h:526
+msgid "Transaction is not dead"
+msgstr "事务未结æŸ"
-#: clients/cmdline/main.c:129
-msgid "use ARG as the older target"
-msgstr "使用 ARG ä½œä¸ºæ—§ç›®æ ‡"
+#: include/svn_error_codes.h:531
+msgid "Unknown FS type"
+msgstr "未知的 FS 类别"
-#: clients/cmdline/main.c:131
-msgid "use ARG as the newer target"
-msgstr "使用 ARG ä½œä¸ºæ–°ç›®æ ‡"
+#: include/svn_error_codes.h:536
+#, fuzzy
+msgid "No user associated with filesystem"
+msgstr "没有用户与文件系统关è”"
-#: clients/cmdline/main.c:133
-msgid "operate on a revision property (use with -r)"
-msgstr "在修订版属性上作æ“作(使用-r傿•°)"
+#: include/svn_error_codes.h:541
+#, fuzzy
+msgid "Path is already locked"
+msgstr "路径“%sâ€å·²ç»è¢«é”定"
-#: clients/cmdline/main.c:135
-msgid "relocate via URL-rewriting"
-msgstr "通过URLæ”¹å†™é‡æ–°éƒ¨ç½²"
+#: include/svn_error_codes.h:546 include/svn_error_codes.h:673
+#, fuzzy
+msgid "Path is not locked"
+msgstr "路径没有被é”定"
-#: clients/cmdline/main.c:137 svnadmin/main.c:269
-msgid "read user configuration files from directory ARG"
-msgstr "从目录 ARG 读å–用户é…置文件"
+#: include/svn_error_codes.h:551
+msgid "Lock token is incorrect"
+msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
-#: clients/cmdline/main.c:139
-msgid "enable automatic properties"
-msgstr "使自动属性有效"
+#: include/svn_error_codes.h:556
+#, fuzzy
+msgid "No lock token provided"
+msgstr "没有æä¾›é”å®šæ ‡è®°"
-#: clients/cmdline/main.c:141
-msgid "disable automatic properties"
-msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
+#: include/svn_error_codes.h:561
+msgid "Username does not match lock owner"
+msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
-#: clients/cmdline/main.c:143
+#: include/svn_error_codes.h:566
#, fuzzy
-msgid ""
-"use a different EOL marker than the standard\n"
-" system marker for files with the svn:eol-style\n"
-" property set to 'native'.\n"
-" ARG may be one of 'LF', 'CR', 'CRLF'"
-msgstr ""
-"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
-" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属"
-"性为 'native'。\n"
-" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
+msgid "Filesystem has no such lock"
+msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
-#: clients/cmdline/main.c:151
-msgid "maximum number of log entries"
-msgstr "日值项最大值"
+#: include/svn_error_codes.h:571
+msgid "Lock has expired"
+msgstr "é”过期"
-#: clients/cmdline/main.c:153
-msgid "don't unlock the targets"
-msgstr "ä¸è¦é”å®šç›®æ ‡"
+#: include/svn_error_codes.h:576
+#, fuzzy
+msgid "Item is out of date"
+msgstr "æ¡ç›®å·²è¿‡æ—¶"
-#: clients/cmdline/main.c:192
-msgid ""
-"Put files and directories under version control, scheduling\n"
-"them for addition to repository. They will be added in next commit.\n"
-"usage: add PATH...\n"
-msgstr ""
-"把文件和目录放入版本控制ä¸ï¼Œ\n"
-"é€šè¿‡è°ƒåº¦åŠ åˆ°æ¡£æ¡ˆåº“ã€‚å®ƒä»¬ä¼šåœ¨ä¸‹ä¸€æ¬¡æäº¤æ—¶åŠ å…¥ã€‚\n"
-"用法:add 路径...\n"
+#: include/svn_error_codes.h:588
+#, fuzzy
+msgid "Unsupported FS format"
+msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
-#: clients/cmdline/main.c:200
-msgid ""
-"Output the content of specified files or\n"
-"URLs with revision and author information in-line.\n"
-"usage: blame TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地å€(URL)的内容,æ¯è¡ŒåŒ…å«ä¿®è®¢ç‰ˆå’Œä½œè€…ä¿¡æ¯ã€‚\n"
-"\n"
-"用法:blame ç›®æ ‡[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:594
+msgid "The repository is locked, perhaps for db recovery"
+msgstr "档案库被é”定,也许æ£åœ¨ä½œæ•°æ®åº“ä¿®å¤"
-#: clients/cmdline/main.c:210
-msgid ""
-"Output the content of specified files or URLs.\n"
-"usage: cat TARGET[@REV]...\n"
-"\n"
-" If specified, REV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"输出指定文件或地å€(URL)的内容。\n"
-"用法:cat ç›®æ ‡[@修订版]...\n"
-"\n"
-" 如果指定了修订版,将从指定的修订版开始查找。\n"
-" \n"
+#: include/svn_error_codes.h:598
+msgid "A repository hook failed"
+msgstr "档案库外挂错误"
-#: clients/cmdline/main.c:218
-#, fuzzy
-msgid ""
-"Check out a working copy from a repository.\n"
-"usage: checkout URL[@REV]... [PATH]\n"
-"\n"
-" If specified, REV determines in which revision the URL is first\n"
-" looked up.\n"
-"\n"
-" If PATH is omitted, the basename of the URL will be used as\n"
-" the destination. If multiple URLs are given each will be checked\n"
-" out into a sub-directory of PATH, with the name of the sub-directory\n"
-" being the basename of the URL.\n"
-msgstr ""
-"从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
-"用法:checkout 地å€[@版本]... [路径]\n"
-"\n"
-" 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
-" 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
-" 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
-"\n"
+#: include/svn_error_codes.h:602
+msgid "Incorrect arguments supplied"
+msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
-#: clients/cmdline/main.c:232
-msgid ""
-"Recursively clean up the working copy, removing locks, resuming\n"
-"unfinished operations, etc.\n"
-"usage: cleanup [PATH...]\n"
-msgstr ""
-"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
-"\n"
-"用法:cleanup [路径...]\n"
+#: include/svn_error_codes.h:606
+msgid "A report cannot be generated because no data was supplied"
+msgstr "æ— æ³•äº§ç”ŸæŠ¥å‘Šï¼Œå› ä¸ºæ²¡æœ‰æä¾›ä»»ä½•æ•°æ®"
-#: clients/cmdline/main.c:238
-#, fuzzy
-msgid ""
-"Send changes from your working copy to the repository.\n"
-"usage: commit [PATH...]\n"
-"\n"
-" A log message must be provided, but it can be empty. If it is not\n"
-" given by a --message or --file option, an editor will be started.\n"
-" If any targets are (or contain) locked items, those will be\n"
-" unlocked after a successful commit.\n"
-msgstr ""
-"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
-"用法:commit [路径...]\n"
-"\n"
-" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
-" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
-" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
-" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
+#: include/svn_error_codes.h:610
+msgid "Bogus revision report"
+msgstr "有问题的修订版报告"
-#: clients/cmdline/main.c:249
-msgid ""
-"Duplicate something in working copy or repository, remembering history.\n"
-"usage: copy SRC DST\n"
-"\n"
-" SRC and DST can each be either a working copy (WC) path or URL:\n"
-" WC -> WC: copy and schedule for addition (with history)\n"
-" WC -> URL: immediately commit a copy of WC to URL\n"
-" URL -> WC: check out URL into WC, schedule for addition\n"
-" URL -> URL: complete server-side copy; used to branch & tag\n"
-msgstr ""
-"åœ¨å·¥ä½œæ‹·è´æˆ–档案库ä¸å¤åˆ¶æ•°æ®ï¼Œæ¢å¤åކå²ã€‚\n"
-"用法:copy èµ·æº ç›®çš„\n"
-"\n"
-" èµ·æº å’Œ 目的 å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€(URL):\n"
-" å·¥ä½œæ‹·è´ -> å·¥ä½œæ‹·è´ ï¼š å¤åˆ¶å’Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ (包å«åކå²)\n"
-" å·¥ä½œæ‹·è´ -> 地å€(URL) : 马上æäº¤ä¸€ä¸ªå·¥ä½œæ‹·è´åˆ°åœ°å€(URL)\n"
-" 地å€(URL) -> å·¥ä½œæ‹·è´ ï¼š ç¾å‡ºåœ°å€(URL)åˆ°å·¥ä½œç›®å½•ï¼Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ \n"
-" 地å€(URL) -> 地å€(URL) : 完全æœåŠ¡å™¨ç«¯å¤åˆ¶ï¼›ä¸€èˆ¬ç”¨äºŽåˆ†æ”¯å’Œæ ‡ç¾\n"
+#: include/svn_error_codes.h:619
+msgid "Unsupported repository version"
+msgstr "䏿”¯æŒçš„æ¡£æ¡ˆåº“版本"
-#: clients/cmdline/main.c:262
-msgid ""
-"Remove files and directories from version control.\n"
-"usage: 1. delete PATH...\n"
-" 2. delete URL...\n"
-"\n"
-" 1. Each item specified by a PATH is scheduled for deletion upon\n"
-" the next commit. Files, and directories that have not been\n"
-" committed, are immediately removed from the working copy.\n"
-" PATHs that are, or contain, unversioned or modified items will\n"
-" not be removed unless the --force option is given.\n"
-"\n"
-" 2. Each item specified by a URL is deleted from the repository\n"
-" via an immediate commit.\n"
-msgstr ""
-"从版本控制ä¸åˆ 除文件和目录。\n"
-"用法:1ã€delete 路径...\n"
-" 2ã€delete 地å€...\n"
-"\n"
-" 1ã€æ¯ä¸€ä¸ªé€šè¿‡è·¯å¾„æŒ‡å®šçš„é¡¹ç›®ä¼šè¢«è¿›è¡Œè°ƒåº¦åˆ é™¤ï¼Œä¸‹æ¬¡æäº¤æ—¶è¢«çœŸæ£åˆ 除。\n"
-" 文件和目录若未改å˜å°†é©¬ä¸Šä»Žå·¥ä½œæ‹·è´ä¸åˆ 除。\n"
-" 路径本身或包å«ä¸å—版本控制或已修改项目,\n"
-" ä¸ä¼šè¢«åˆ é™¤ï¼Œé™¤éžæŒ‡å®šäº† --force 选项。\n"
-" \n"
-"\n"
-" 2ã€æ¯ä¸€ä¸ªåœ°å€(URL)指定的项目会被马上从档案库ä¸åˆ 除,并æäº¤ã€‚\n"
-" \n"
+#: include/svn_error_codes.h:623
+msgid "Disabled repository feature"
+msgstr "å…³é—了的档案库功能"
-#: clients/cmdline/main.c:278
-msgid ""
-"Display the differences between two paths.\n"
-"usage: 1. diff [-r N[:M]] [TARGET[@REV]...]\n"
-" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
-"\\\n"
-" [PATH...]\n"
-" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
-"\n"
-" 1. Display the changes made to TARGETs as they are seen in REV between\n"
-" two revisions. TARGETs may be working copy paths or URLs.\n"
-"\n"
-" N defaults to BASE if any TARGET is a working copy path, otherwise it\n"
-" must be specified. M defaults to the current working version if any\n"
-" TARGET is a working copy path, otherwise it defaults to HEAD.\n"
-"\n"
-" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
-" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
-" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
-" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
-" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
-"default\n"
-" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
-"\n"
-" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
-"\n"
-" Use just 'svn diff' to display local modifications in a working copy.\n"
-msgstr ""
-"显示两个路径ä¸çš„差异。\n"
-"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
-" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
-" [PATH...]\n"
-" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
-" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
-"\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
-" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
-" HEAD。\n"
-"\n"
-" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
-" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
-" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
-" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
-" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
-" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
-"法。\n"
-"\n"
-" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
+#: include/svn_error_codes.h:627
+msgid "Error running post-commit hook"
+msgstr "执行 post-commit 外挂时å‘生错误"
-#: clients/cmdline/main.c:318
+#: include/svn_error_codes.h:632
#, fuzzy
-msgid ""
-"Create an unversioned copy of a tree.\n"
-"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1. Exports a clean directory tree from the repository specified by\n"
-" URL, at revision REV if it is given, otherwise at HEAD, into\n"
-" PATH. If PATH is omitted, the last component of the URL is used\n"
-" for the local directory name.\n"
-"\n"
-" 2. Exports a clean directory tree from the working copy specified by\n"
-" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
-" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
-" for the local directory name. If REV is not specified, all local\n"
-" changes will be preserved. Files not under version control will\n"
-" not be copied.\n"
-"\n"
-" If specified, PEGREV determines in which revision the target is first\n"
-" looked up.\n"
-msgstr ""
-"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
-"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
-" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
-"\n"
-" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
-" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
-" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-"\n"
-" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
-" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
-" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
-" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
-" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
-"\n"
-" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
-"\n"
-
-#: clients/cmdline/main.c:347
-msgid ""
-"Describe the usage of this program or its subcommands.\n"
-"usage: help [SUBCOMMAND...]\n"
-msgstr ""
-"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-"用法:help [å命令...]\n"
+msgid "Error running post-lock hook"
+msgstr "执行 post-lock 外挂时å‘生错误"
-#: clients/cmdline/main.c:356
+#: include/svn_error_codes.h:637
#, fuzzy
-msgid ""
-"Commit an unversioned file or tree into the repository.\n"
-"usage: import [PATH] URL\n"
-"\n"
-" Recursively commit a copy of PATH to URL.\n"
-" If PATH is omitted '.' is assumed.\n"
-" Parent directories are created as necessary in the repository.\n"
-" If PATH is a directory, the contents of the directory are added\n"
-" directly under URL.\n"
-msgstr ""
-"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
-"用法:import [PATH] URL\n"
-"\n"
-" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
-" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
+msgid "Error running post-unlock hook"
+msgstr "执行 post-unlock 外挂时å‘生错误"
-#: clients/cmdline/main.c:369
-#, fuzzy
-msgid ""
-"Display information about a local or remote item.\n"
-"usage: info [TARGET...]\n"
-"\n"
-" Print information about each TARGET (default: '.')\n"
-" TARGET may be either a working-copy path or URL.\n"
-msgstr ""
-"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
-"用法:info [TARGET...]\n"
-"\n"
-" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
-" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
+#: include/svn_error_codes.h:644
+msgid "Bad URL passed to RA layer"
+msgstr "ä¼ é€’è‡³ RA 层的地å€(URL)有问题"
-#: clients/cmdline/main.c:378
-#, fuzzy
-msgid ""
-"List directory entries in the repository.\n"
-"usage: list [TARGET[@REV]...]\n"
-"\n"
-" List each TARGET file and the contents of each TARGET directory as\n"
-" they exist in the repository. If TARGET is a working copy path, the\n"
-" corresponding repository URL will be used. If specified, REV determines\n"
-" in which revision the target is first looked up.\n"
-"\n"
-" The default TARGET is '.', meaning the repository URL of the current\n"
-" working directory.\n"
-"\n"
-" With --verbose, the following fields will be shown for each item:\n"
-"\n"
-" Revision number of the last commit\n"
-" Author of the last commit\n"
-" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
-" Size (in bytes)\n"
-" Date and time of the last commit\n"
-msgstr ""
-"列出档案库ä¸çš„目录项目。\n"
-"用法:list [TARGET[@REV]...]\n"
-"\n"
-" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
-" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-"\n"
-" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
-"\n"
-" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
-"\n"
-" 剿¬¡æäº¤çš„修订版å·ç \n"
-" 剿¬¡æäº¤çš„作者\n"
-" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
-" å¤§å° (以å—节为å•ä½)\n"
-" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
+#: include/svn_error_codes.h:648
+msgid "Authorization failed"
+msgstr "授æƒå¤±è´¥"
-#: clients/cmdline/main.c:403
-#, fuzzy
-msgid ""
-"Lock working copy paths or URLs in the repository, so that\n"
-"no other user can commit changes to them.\n"
-"usage: lock TARGET...\n"
-"\n"
-" Use --force to steal the lock from another user or working copy.\n"
-msgstr ""
-"在档案库ä¸é”定工作目录或地å€(URL),\n"
-"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
-"用法:lock TARGET...\n"
-"\n"
-" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
+#: include/svn_error_codes.h:652
+msgid "Unknown authorization method"
+msgstr "æœªçŸ¥çš„æŽˆæƒæ–¹æ³•"
-#: clients/cmdline/main.c:412
-msgid ""
-"Show the log messages for a set of revision(s) and/or file(s).\n"
-"usage: 1. log [PATH]\n"
-" 2. log URL [PATH...]\n"
-"\n"
-" 1. Print the log messages for a local PATH (default: '.').\n"
-" The default revision range is BASE:1.\n"
-"\n"
-" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
-" The default revision range is HEAD:1.\n"
-"\n"
-" With -v, also print all affected paths with each log message.\n"
-" With -q, don't print the log message body itself (note that this is\n"
-" compatible with -v).\n"
-"\n"
-" Each log message is printed just once, even if more than one of the\n"
-" affected paths for that revision were explicitly requested. Logs\n"
-" follow copy history by default. Use --stop-on-copy to disable this\n"
-" behavior, which can be useful for determining branchpoints.\n"
-"\n"
-" Examples:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
-msgstr ""
-"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
-"用法:1ã€log [PATH]\n"
-" 2ã€log URL [PATH...]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" BASE:1。\n"
-"\n"
-" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
-" HEAD:1。\n"
-"\n"
-" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
-" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
-"\n"
-" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
-" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
-" 个功能,这在找出分支点的很方便。\n"
-"\n"
-" 范例:\n"
-" svn log\n"
-" svn log foo.c\n"
-" svn log http://www.example.com/repo/project/foo.c\n"
-" svn log http://www.example.com/repo/project foo.c bar.c\n"
+#: include/svn_error_codes.h:656
+msgid "Repository access method not implemented"
+msgstr "该档案库å˜å–方法未实作"
-#: clients/cmdline/main.c:444
-msgid ""
-"Apply the differences between two sources to a working copy path.\n"
-"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3. merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1. In the first form, the source URLs are specified at revisions\n"
-" N and M. These are the two sources to be compared. The revisions\n"
-" default to HEAD if omitted.\n"
-"\n"
-" 2. In the second form, the URLs corresponding to the source working\n"
-" copy paths define the sources to be compared. The revisions must\n"
-" be specified.\n"
-"\n"
-" 3. In the third form, SOURCE can be a URL, or working copy item\n"
-" in which case the corresponding URL is used. This URL in\n"
-" revision REV is compared as it existed between revisions N and \n"
-" M. If REV is not specified, HEAD is assumed.\n"
-"\n"
-" WCPATH is the working copy path that will receive the changes.\n"
-" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
-" the sources have identical basenames that match a file within '.':\n"
-" in which case, the differences will be applied to that file.\n"
-msgstr ""
-"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
-"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
-" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
-" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
-"\n"
-" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
-" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
-"\n"
-" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
-" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
-"\n"
-" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
-" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
-"作\n"
-" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
-"\n"
-" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
-" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
-" 差异将会直接应用至该文件去。\n"
+#: include/svn_error_codes.h:660
+msgid "Item is out-of-date"
+msgstr "项目已过时"
-#: clients/cmdline/main.c:474
-msgid ""
-"Create a new directory under version control.\n"
-"usage: 1. mkdir PATH...\n"
-" 2. mkdir URL...\n"
-"\n"
-" Create version controlled directories.\n"
-"\n"
-" 1. Each directory specified by a working copy PATH is created locally\n"
-" and scheduled for addition upon the next commit.\n"
-"\n"
-" 2. Each directory specified by a URL is created in the repository via\n"
-" an immediate commit.\n"
-"\n"
-" In both cases, all the intermediate directories must already exist.\n"
-msgstr ""
-"建立纳入版本控制下的新目录。\n"
-"用法:1ã€mkdir PATH...\n"
-" 2ã€mkdir URL...\n"
-"\n"
-" 建立版本控制的目录。\n"
-"\n"
-" 1ã€æ¯ä¸€ä¸ªä»¥å·¥ä½œæ‹·è´ PATH æŒ‡å®šçš„ç›®å½•ï¼Œéƒ½ä¼šå»ºç«‹åœ¨æœ¬åœ°ç«¯ï¼Œå¹¶ä¸”åŠ å…¥æ–°å¢ž\n"
-" 调度,以待下一次的æäº¤ã€‚\n"
-"\n"
-" 2ã€æ¯ä¸ªä»¥åœ°å€(URL)指定的目录,都会é€è¿‡ç«‹å³æäº¤äºŽæ¡£æ¡ˆåº“ä¸å»ºç«‹ã€‚\n"
-"\n"
-" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
+#: include/svn_error_codes.h:664
+msgid "Repository has no UUID"
+msgstr "档案库没有 UUID"
-#: clients/cmdline/main.c:494
-msgid ""
-"Move and/or rename something in working copy or repository.\n"
-"usage: move SRC DST\n"
-"\n"
-" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
-"\n"
-" SRC and DST can both be working copy (WC) paths or URLs:\n"
-" WC -> WC: move and schedule for addition (with history)\n"
-" URL -> URL: complete server-side rename.\n"
-msgstr ""
-"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
-"用法:move SRC DST\n"
-"\n"
-" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
-"\n"
-" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
-" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
-" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
+#: include/svn_error_codes.h:668
+msgid "Unsupported RA plugin ABI version"
+msgstr "䏿”¯æŒçš„ RA 外挂 ABI 版本"
-#: clients/cmdline/main.c:506
-msgid ""
-"Remove PROPNAME from files, dirs, or revisions.\n"
-"usage: 1. propdel PROPNAME [PATH...]\n"
-" 2. propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Removes versioned props in working copy.\n"
-" 2. Removes unversioned remote prop on repos revision.\n"
-msgstr ""
-"移除目录,文件,或修订版的属性。\n"
-"用法:1ã€propdel PROPNAME [PATH...]\n"
-" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
+#: include/svn_error_codes.h:680
+msgid "RA layer failed to init socket layer"
+msgstr "RA å±‚æ— æ³•èµ·å§‹ socket 层"
-#: clients/cmdline/main.c:516
-msgid ""
-"Edit property PROPNAME with an external editor on targets.\n"
-"usage: 1. propedit PROPNAME PATH...\n"
-" 2. propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Edits versioned props in working copy.\n"
-" 2. Edits unversioned remote prop on repos revision.\n"
-msgstr ""
-"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
-"用法:1ã€propedit PROPNAME PATH...\n"
-" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
-" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+#: include/svn_error_codes.h:684
+msgid "RA layer failed to create HTTP request"
+msgstr "RA 层建立 HTTP 请求失败"
-#: clients/cmdline/main.c:527
-msgid ""
-"Print value of PROPNAME on files, dirs, or revisions.\n"
-"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
-" 2. propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1. Prints versioned prop. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Prints unversioned remote prop on repos revision.\n"
-"\n"
-" By default, this subcommand will add an extra newline to the end\n"
-" of the property values so that the output looks pretty. Also,\n"
-" whenever there are multiple paths involved, each property value\n"
-" is prefixed with the path with which it is associated. Use\n"
-" the --strict option to disable these beautifications (useful,\n"
-" for example, when redirecting binary property values to a file).\n"
-msgstr ""
-"显示目录,文件,或修订版的属性内容。\n"
-"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
-" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
-"\n"
-" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
-"\n"
-" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
-" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
-" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
-" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
+#: include/svn_error_codes.h:688
+msgid "RA layer request failed"
+msgstr "RA 层请求失败"
-#: clients/cmdline/main.c:545
-msgid ""
-"List all properties on files, dirs, or revisions.\n"
-"usage: 1. proplist [TARGET[@REV]...]\n"
-" 2. proplist --revprop -r REV [URL]\n"
-"\n"
-" 1. Lists versioned props. If specified, REV determines in which\n"
-" revision the target is first looked up.\n"
-" 2. Lists unversioned remote props on repos revision.\n"
-msgstr ""
-"列出所有目录,文件,或修订版的属性。\n"
-"用法:1ã€proplist [TARGET[@REV]...]\n"
-" 2ã€proplist --revprop -r REV [URL]\n"
-"\n"
-" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
-" 如果指定了 REV,将从指定的修订版开始查找。\n"
-" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
+#: include/svn_error_codes.h:692
+msgid "RA layer didn't receive requested OPTIONS info"
+msgstr "RA å±‚æ— æ³•å–得请求的 OPTIONS ä¿¡æ¯"
+
+#: include/svn_error_codes.h:696
+msgid "RA layer failed to fetch properties"
+msgstr "RA å±‚æ— æ³•å–得属性"
+
+#: include/svn_error_codes.h:700
+msgid "RA layer file already exists"
+msgstr "RA 层文件已å˜åœ¨"
+
+#: include/svn_error_codes.h:704
+msgid "Invalid configuration value"
+msgstr "æ— æ•ˆçš„é…置值"
+
+#: include/svn_error_codes.h:708
+msgid "HTTP Path Not Found"
+msgstr "找ä¸åˆ° HTTP 路径"
-#: clients/cmdline/main.c:556
+#: include/svn_error_codes.h:712
#, fuzzy
-msgid ""
-"Set PROPNAME to PROPVAL on files, dirs, or revisions.\n"
-"usage: 1. propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2. propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1. Creates a versioned, local propchange in working copy.\n"
-" 2. Creates an unversioned, remote propchange on repos revision.\n"
-"\n"
-" Note: svn recognizes the following special versioned properties\n"
-" but will store any arbitrary properties set:\n"
-" svn:ignore - A newline separated list of file patterns to ignore.\n"
-" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
-" URL, HeadURL - The URL for the head version of the "
-"object.\n"
-" Author, LastChangedBy - The last person to modify the file.\n"
-" Date, LastChangedDate - The date/time the object was last "
-"modified.\n"
-" Rev, Revision, - The last revision the object changed.\n"
-" LastChangedRevision\n"
-" Id - A compressed summary of the previous\n"
-" 4 keywords.\n"
-" svn:executable - If present, make the file executable.\n"
-" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
-" svn:mime-type - The mimetype of the file. Used to determine\n"
-" whether to merge the file, and how to serve it from Apache.\n"
-" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
-" treated as text. Anything else is treated as binary.\n"
-" svn:externals - A newline separated list of module specifiers,\n"
-" each of which consists of a relative directory path, optional\n"
-" revision flags, and an URL. For example\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - If present, indicates that the file should be locked\n"
-" before it is modified. Makes the working copy file read-only\n"
-" when it is not locked.\n"
-" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
-" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
-" attempt will fail, and a recursive attempt will set the property\n"
-" only on the file children of the directory.\n"
-msgstr ""
-"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
-"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
-" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
-"\n"
-" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
-" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
-"\n"
-" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
-" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
-" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
-" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
-" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
-" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
-" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
-" LastChangedRevision\n"
-" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
-" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
-" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
-" 下的文件å项目。\n"
-" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
-" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
-" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
-" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
-" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
-" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
-" foo http://example.com/repos/zig\n"
-" foo/bar -r 1234 http://example.com/repos/zag\n"
-" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
-"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
-" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
-"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
-"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
+msgid "Failed to execute WebDAV PROPPATCH"
+msgstr "执行 WebDAV PROPPATCH 失败"
-#: clients/cmdline/main.c:606
-msgid ""
-"Remove 'conflicted' state on working copy files or directories.\n"
-"usage: resolved PATH...\n"
-"\n"
-" Note: this subcommand does not semantically resolve conflicts or\n"
-" remove conflict markers; it merely removes the conflict-related\n"
-" artifact files and allows PATH to be committed again.\n"
-msgstr ""
-"移除工作拷è´çš„目录或文件的 '冲çª' 状æ€ã€‚\n"
-"用法:resolved PATH...\n"
-"\n"
-" 注æ„:本å命令ä¸ä¼šä¾è¯æ³•æ¥è§£å†³å†²çªæˆ–æ˜¯ç§»é™¤å†²çªæ ‡è®°ï¼›å®ƒåªæ˜¯ç§»é™¤å†²çªçš„\n"
-" 相关文件,然åŽè®© PATH å¯ä»¥å†æ¬¡æäº¤ã€‚\n"
+#: include/svn_error_codes.h:717 include/svn_error_codes.h:753
+#: libsvn_ra_svn/marshal.c:609 libsvn_ra_svn/marshal.c:717
+#: libsvn_ra_svn/marshal.c:744
+msgid "Malformed network data"
+msgstr "畸形的网络数æ®"
-#: clients/cmdline/main.c:615
-msgid ""
-"Restore pristine working copy file (undo most local edits).\n"
-"usage: revert PATH...\n"
-"\n"
-" Note: this subcommand does not require network access, and resolves\n"
-" any conflicted states. However, it does not restore removed directories.\n"
-msgstr ""
-"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
-"用法:revert PATH...\n"
-"\n"
-" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
-" è¢«åˆ é™¤çš„ç›®å½•\n"
+#: include/svn_error_codes.h:722
+msgid "Unable to extract data from response header"
+msgstr "ä¸èƒ½ä»Žå›žåº”的头信æ¯ä¸èŽ·å–æ•°æ®"
+
+#: include/svn_error_codes.h:728 include/svn_error_codes.h:757
+msgid "Couldn't find a repository"
+msgstr "æ— æ³•æ‰¾åˆ°æ¡£æ¡ˆåº“"
-#: clients/cmdline/main.c:625
+#: include/svn_error_codes.h:732
+msgid "Couldn't open a repository"
+msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“"
+
+# as-is
+#: include/svn_error_codes.h:737
+msgid "Special code for wrapping server errors to report to client"
+msgstr "指定的代ç å°è£…æœåŠ¡å™¨é”™è¯¯ä»¥ä¾¿æŠ¥å‘Šå®¢æˆ·ç«¯"
+
+#: include/svn_error_codes.h:741
+msgid "Unknown svn protocol command"
+msgstr "未知的 svn 通讯å定命令"
+
+#: include/svn_error_codes.h:745
+msgid "Network connection closed unexpectedly"
+msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
+
+#: include/svn_error_codes.h:749
+msgid "Network read/write error"
+msgstr "网络读写错误"
+
+#: include/svn_error_codes.h:761
+msgid "Client/server version mismatch"
+msgstr "客户端/æœåŠ¡å™¨ç‰ˆæœ¬ä¸åŒ¹é…"
+
+#: include/svn_error_codes.h:769
+msgid "Credential data unavailable"
+msgstr "æ— æ³•å–å¾—å‡è¯æ•°æ®"
+
+#: include/svn_error_codes.h:773
+msgid "No authentication provider available"
+msgstr "æ— å¯ç”¨çš„è®¤è¯æä¾›è€…"
+
+#: include/svn_error_codes.h:777 include/svn_error_codes.h:781
+msgid "All authentication providers exhausted"
+msgstr "æ‰€æœ‰çš„è®¤è¯æä¾›è€…å·²è€—å°½"
+
+#: include/svn_error_codes.h:787
+msgid "Read access denied for root of edit"
+msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
+
+#: include/svn_error_codes.h:792
#, fuzzy
-msgid ""
-"Print the status of working copy files and directories.\n"
-"usage: status [PATH...]\n"
-"\n"
-" With no args, print only locally modified items (no network access).\n"
-" With -u, add working revision and server out-of-date information.\n"
-" With -v, print full revision information on every item.\n"
-"\n"
-" The first six columns in the output are each one character wide:\n"
-" First column: Says if item was added, deleted, or otherwise changed\n"
-" ' ' no modifications\n"
-" 'A' Added\n"
-" 'C' Conflicted\n"
-" 'D' Deleted\n"
-" 'I' Ignored\n"
-" 'M' Modified\n"
-" 'R' Replaced\n"
-" 'X' item is unversioned, but is used by an externals definition\n"
-" '?' item is not under version control\n"
-" '!' item is missing (removed by non-svn command) or incomplete\n"
-" '~' versioned item obstructed by some item of a different kind\n"
-" Second column: Modifications of a file's or directory's properties\n"
-" ' ' no modifications\n"
-" 'C' Conflicted\n"
-" 'M' Modified\n"
-" Third column: Whether the working copy directory is locked\n"
-" ' ' not locked\n"
-" 'L' locked\n"
-" Fourth column: Scheduled commit will contain addition-with-history\n"
-" ' ' no history scheduled with commit\n"
-" '+' history scheduled with commit\n"
-" Fifth column: Whether the item is switched relative to its parent\n"
-" ' ' normal\n"
-" 'S' switched\n"
-" Sixth column: Repository lock token\n"
-" (without -u)\n"
-" ' ' no lock token\n"
-" 'K' lock token present\n"
-" (with -u)\n"
-" ' ' not locked in repository, no lock token\n"
-" 'K' locked in repository, lock toKen present\n"
-" 'O' locked in repository, lock token in some Other working copy\n"
-" 'T' locked in repository, lock token present but sTolen\n"
-" 'B' not locked in repository, lock token present but Broken\n"
-"\n"
-" The out-of-date information appears in the eighth column (with -u):\n"
-" '*' a newer revision exists on the server\n"
-" ' ' the working copy is up to date\n"
-"\n"
-" Remaining fields are variable width and delimited by spaces:\n"
-" The working revision (with -u or -v)\n"
-" The last committed revision and last committed author (with -v)\n"
-" The working copy path is always the final field, so it can\n"
-" include spaces.\n"
-"\n"
-" Example output:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
-msgstr ""
-"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
-"用法:status [PATH...]\n"
-"\n"
-" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
-" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
-" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
-"\n"
-" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
-" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
-" ' ' æ— ä¿®æ”¹\n"
-" 'A' 新增\n"
-" 'C' 冲çª\n"
-" 'D' åˆ é™¤\n"
-" 'G' åˆå¹¶\n"
-" 'I' 忽略\n"
-" 'M' 改å˜\n"
-" 'R' 替æ¢\n"
-" 'X' 未纳入版本控制,但被外部定义所用\n"
-" '?' 该项目未纳入版本控制\n"
-" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
-" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
-" 第二æ :显示目录或文件的属性状æ€\n"
-" ' ' æ— ä¿®æ”¹\n"
-" 'C' 冲çª\n"
-" 'M' 改å˜\n"
-" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
-" ' ' 未é”定\n"
-" 'L' é”定\n"
-" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
-" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
-" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
-" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
-" ' ' æ£å¸¸\n"
-" 'S' 被切æ¢\n"
-" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
-" ' ' 没有é”å®šæ ‡è®°\n"
-" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
-" (有 -u)\n"
-" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
-" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
-" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
-" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
-" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
-"\n"
-" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
-" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
-" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
-"\n"
-" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
-" 工作修订版 (与 -u 或 -v 并用时)\n"
-" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
-" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
-"\n"
-" 范例输出:\n"
-" svn status wc\n"
-" M wc/bar.c\n"
-" A + wc/qax.c\n"
-"\n"
-" svn status -u wc\n"
-" M 965 wc/bar.c\n"
-" * 965 wc/foo.c\n"
-" A + 965 wc/qax.c\n"
-" Status against revision: 981\n"
-"\n"
-" svn status --show-updates --verbose wc\n"
-" M 965 938 kfogel wc/bar.c\n"
-" * 965 922 sussman wc/foo.c\n"
-" A + 965 687 joe wc/qax.c\n"
-" 965 687 joe wc/zig.c\n"
-" Status against revision: 981\n"
+msgid "Item is not readable"
+msgstr "项目ä¸èƒ½è¯»ã€‚"
+
+#: include/svn_error_codes.h:797
+#, fuzzy
+msgid "Item is partially readable"
+msgstr "项目部分å¯è¯»ã€‚"
+
+#: include/svn_error_codes.h:801
+#, fuzzy
+msgid "Invalid authz configuration"
+msgstr "æ— æ•ˆçš„é…置值"
+
+#: include/svn_error_codes.h:806
+#, fuzzy
+msgid "Item is not writable"
+msgstr "项目ä¸èƒ½å†™ã€‚"
+
+#: include/svn_error_codes.h:812
+msgid "Svndiff data has invalid header"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+
+# as-is
+#: include/svn_error_codes.h:816
+msgid "Svndiff data contains corrupt window"
+msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+
+# as-is
+#: include/svn_error_codes.h:820
+msgid "Svndiff data contains backward-sliding source view"
+msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+
+#: include/svn_error_codes.h:824
+msgid "Svndiff data contains invalid instruction"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的指令"
+
+#: include/svn_error_codes.h:828
+msgid "Svndiff data ends unexpectedly"
+msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+
+#: include/svn_error_codes.h:832
+#, fuzzy
+msgid "Svndiff compressed data is invalid"
+msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+
+#: include/svn_error_codes.h:838
+#, fuzzy
+msgid "Diff data source modified unexpectedly"
+msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+
+#: include/svn_error_codes.h:844
+msgid "Apache has no path to an SVN filesystem"
+msgstr "Apache æ²¡æœ‰æŒ‡å‘ SVN 文件系统的路径"
+
+#: include/svn_error_codes.h:848
+msgid "Apache got a malformed URI"
+msgstr "Apache 得到一个畸形的 URI"
+
+# as-is
+#: include/svn_error_codes.h:852
+msgid "Activity not found"
+msgstr "没有找到活动项"
+
+#: include/svn_error_codes.h:856
+msgid "Baseline incorrect"
+msgstr "åŸºçº¿ä¸æ£ç¡®"
+
+#: include/svn_error_codes.h:860
+msgid "Input/output error"
+msgstr "输出入错误"
+
+#: include/svn_error_codes.h:866
+msgid "A path under version control is needed for this operation"
+msgstr "本æ“作仅能作用于纳入版本控制的路径"
+
+#: include/svn_error_codes.h:870
+msgid "Repository access is needed for this operation"
+msgstr "本æ“作需è¦å¯¹æ¡£æ¡ˆåº“进行å˜å–"
+
+#: include/svn_error_codes.h:874
+msgid "Bogus revision information given"
+msgstr "使用了有问题的修订版信æ¯"
+
+#: include/svn_error_codes.h:878
+msgid "Attempting to commit to a URL more than once"
+msgstr "å°è¯•对地å€(URL)进行一次以上的æäº¤"
+
+#: include/svn_error_codes.h:882
+msgid "Operation does not apply to binary file"
+msgstr "本æ“作ä¸é€‚用于二进制文件"
+
+#: include/svn_error_codes.h:888
+msgid "Format of an svn:externals property was invalid"
+msgstr "svn:externals å±žæ€§çš„æ ¼å¼æ˜¯æ— 效的"
+
+#: include/svn_error_codes.h:892
+msgid "Attempting restricted operation for modified resource"
+msgstr "å°è¯•对已修改的资æºè¿›è¡Œå—é™çš„æ“ä½œ"
+
+#: include/svn_error_codes.h:896
+msgid "Operation does not apply to directory"
+msgstr "本æ“作ä¸é€‚用于目录"
+
+#: include/svn_error_codes.h:900
+msgid "Revision range is not allowed"
+msgstr "ä¸å…许的修订版范围"
+
+#: include/svn_error_codes.h:904
+msgid "Inter-repository relocation not allowed"
+msgstr "䏿”¯æŒä¸åŒæ¡£æ¡ˆåº“ä¹‹é—´çš„é‡æ–°å®‰ç½® (relocation)"
+
+#: include/svn_error_codes.h:908
+msgid "Author name cannot contain a newline"
+msgstr "作者åç§°ä¸å¯åŒ…嫿¢è¡Œç¬¦"
+
+#: include/svn_error_codes.h:912
+msgid "Bad property name"
+msgstr "有问题的属性åç§°"
+
+#: include/svn_error_codes.h:917
+msgid "Two versioned resources are unrelated"
+msgstr "ä¸¤ä¸ªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„èµ„æºæ²¡æœ‰ç›¸å…³æ€§"
+
+#: include/svn_error_codes.h:922
+msgid "Path has no lock token"
+msgstr "路径没有é”å®šæ ‡è®°"
+
+#: include/svn_error_codes.h:928
+msgid "A problem occurred; see later errors for details"
+msgstr "有问题å‘生;请å‚阅éšé™„的细节"
+
+#: include/svn_error_codes.h:932
+msgid "Failure loading plugin"
+msgstr "载入外挂失败"
+
+#: include/svn_error_codes.h:936
+msgid "Malformed file"
+msgstr "畸形的文件"
+
+#: include/svn_error_codes.h:940
+msgid "Incomplete data"
+msgstr "ä¸å®Œå…¨çš„æ•°æ®"
+
+#: include/svn_error_codes.h:944
+msgid "Incorrect parameters given"
+msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+
+#: include/svn_error_codes.h:948
+msgid "Tried a versioning operation on an unversioned resource"
+msgstr "å°è¯•对未纳入版本控制的资æºè¿›è¡Œç‰ˆæœ¬æŽ§åˆ¶æ“作"
+
+#: include/svn_error_codes.h:952
+msgid "Test failed"
+msgstr "测试失败"
+
+#: include/svn_error_codes.h:956
+msgid "Trying to use an unsupported feature"
+msgstr "å°è¯•è¦ä½¿ç”¨ä¸æ”¯æŒçš„功能"
+
+#: include/svn_error_codes.h:960
+msgid "Unexpected or unknown property kind"
+msgstr "æ„æƒ³ä¸åˆ°æˆ–未知的属性ç§ç±»"
+
+#: include/svn_error_codes.h:964
+msgid "Illegal target for the requested operation"
+msgstr "对请求的æ“作æ¥è¯´æ˜¯ä¸åˆæ³•çš„ç›®æ ‡"
+
+#: include/svn_error_codes.h:968
+msgid "MD5 checksum is missing"
+msgstr "没有 MD5 指纹检查值"
+
+#: include/svn_error_codes.h:972
+msgid "Directory needs to be empty but is not"
+msgstr "目录必须为空的,但是结果并éžå¦‚æ¤"
+
+#: include/svn_error_codes.h:976
+msgid "Error calling external program"
+msgstr "呼å«å¤–éƒ¨ç¨‹åºæ—¶å‘生错误"
-#: clients/cmdline/main.c:702
-#, fuzzy
-msgid ""
-"Update the working copy to a different URL.\n"
-"usage: 1. switch URL [PATH]\n"
-" 2. switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1. Update the working copy to mirror a new URL within the repository.\n"
-" This behaviour is similar to 'svn update', and is the way to\n"
-" move a working copy to a branch or tag within the same repository.\n"
-"\n"
-" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
-" This is used when repository's root URL changes (such as a scheme\n"
-" or hostname change) but your working copy still reflects the same\n"
-" directory within the same repository.\n"
-msgstr ""
-"更新工作拷è´è‡³ä¸åŒçš„地å€(URL)。\n"
-"用法:1ã€switch URL [PATH]\n"
-" 2ã€switch --relocate FROM TO [PATH...]\n"
-"\n"
-" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
-" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
-"\n"
-" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
-" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
-" 档案库的åŒä¸€ç›®å½•时用之。\n"
+#: include/svn_error_codes.h:980
+msgid "Python exception has been set with the error"
+msgstr "Python 异常已被设定为错误"
-#: clients/cmdline/main.c:723
-#, fuzzy
-msgid ""
-"Unlock working copy paths or URLs.\n"
-"usage: unlock TARGET...\n"
-"\n"
-" Use --force to break the lock.\n"
-msgstr ""
-"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
-"用法:unlock TARGET...\n"
-"\n"
-" 使用 -force 䏿¢é”定。\n"
+#: include/svn_error_codes.h:984
+msgid "A checksum mismatch occurred"
+msgstr "总和检查值ä¸ç¬¦"
-#: clients/cmdline/main.c:731
-#, fuzzy
-msgid ""
-"Bring changes from the repository into the working copy.\n"
-"usage: update [PATH...]\n"
-"\n"
-" If no revision given, bring working copy up-to-date with HEAD rev.\n"
-" Else synchronize working copy to revision given by -r.\n"
-"\n"
-" For each updated item a line will start with a character reporting the\n"
-" action taken. These characters have the following meaning:\n"
-"\n"
-" A Added\n"
-" D Deleted\n"
-" U Updated\n"
-" C Conflict\n"
-" G Merged\n"
-"\n"
-" A character in the first column signifies an update to the actual file,\n"
-" while updates to the file's properties are shown in the second column.\n"
-" A 'B' in the third column signifies that the lock for the file has\n"
-" been broken or stolen.\n"
+#: include/svn_error_codes.h:988
+msgid "The operation was interrupted"
+msgstr "æ“ä½œè¢«ä¸æ–"
+
+#: include/svn_error_codes.h:992
+msgid "The specified diff option is not supported"
+msgstr "指定的 diff 选项䏿”¯æŒ"
+
+#: include/svn_error_codes.h:996
+msgid "Property not found"
+msgstr "找ä¸åˆ°å±žæ€§"
+
+#: include/svn_error_codes.h:1000
+msgid "No auth file path available"
+msgstr "未æä¾› auth 文件路径"
+
+#: include/svn_error_codes.h:1005
+msgid "Incompatible library version"
+msgstr "ä¸ç›¸å®¹çš„程åºåº“版本"
+
+#: include/svn_error_codes.h:1011
+msgid "Client error in parsing arguments"
+msgstr "客户端于剖æžå‚æ•°æ—¶å‘生错误"
+
+#: include/svn_error_codes.h:1015
+msgid "Not enough arguments provided; try 'svn help' for more info"
msgstr ""
-"将档案库的改å˜å应至工作拷è´ã€‚\n"
-"用法:update [PATH...]\n"
-"\n"
-" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
-" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
-"\n"
-" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
-" 这些å—符代表如下:\n"
-"\n"
-" A 新增\n"
-" D åˆ é™¤\n"
-" U æ›´æ–°\n"
-" C 冲çª\n"
-" G åˆå¹¶\n"
-"\n"
-" 第一æ çš„å—符表示实际文件的更新,\n"
-" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
-" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
-#: clients/cmdline/main.c:797 svnadmin/main.c:77 svnlook/main.c:284
-msgid "Caught signal"
-msgstr "æ•æ‰åˆ°ä¿¡å·(䏿–)"
+#: include/svn_error_codes.h:1019
+msgid "Mutually exclusive arguments specified"
+msgstr "æŒ‡å®šäº†äº’æ–¥çš„å‚æ•°"
-#: clients/cmdline/main.c:895
-msgid "Non-numeric limit argument given"
-msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
+#: include/svn_error_codes.h:1023
+msgid "Attempted command in administrative dir"
+msgstr "å°è¯•于管ç†ç›®å½•䏿‰§è¡Œå‘½ä»¤"
-#: clients/cmdline/main.c:912 svnadmin/main.c:1219
-msgid ""
-"Multiple revision arguments encountered; try '-r M:N' instead of '-r M -r N'"
-msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+#: include/svn_error_codes.h:1027
+msgid "The log message file is under version control"
+msgstr "æ—¥å¿—ä¿¡æ¯æ–‡ä»¶äºŽç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹"
+
+#: include/svn_error_codes.h:1031
+msgid "The log message is a pathname"
+msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯è·¯å¾„å"
+
+#: include/svn_error_codes.h:1035
+msgid "Committing in directory scheduled for addition"
+msgstr "于预计新增的目录ä¸è¿›è¡Œæäº¤"
+
+#: include/svn_error_codes.h:1039
+msgid "No external editor available"
+msgstr "æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨"
+
+#: include/svn_error_codes.h:1043
+msgid "Something is wrong with the log message's contents"
+msgstr "日志信æ¯çš„内容有ä¸å¦¥çš„地方"
+
+#: include/svn_error_codes.h:1047
+msgid "A log message was given where none was necessary"
+msgstr "在没有需è¦çš„地方给出一个日志信æ¯"
-#: clients/cmdline/main.c:924 svnadmin/main.c:1233
+#: libsvn_client/add.c:376
#, c-format
-msgid "Syntax error in revision argument '%s'"
-msgstr "ä¿®è®¢ç‰ˆå‚æ•°â€œ%sâ€ä¸æœ‰è¯æ³•错误"
+msgid "Error during recursive add of '%s'"
+msgstr "进行“%sâ€çš„递归新增时å‘生错误"
-#: clients/cmdline/main.c:1072 clients/cmdline/main.c:1082
-msgid "--auto-props and --no-auto-props are mutually exclusive"
-msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+#: libsvn_client/add.c:387
+#, c-format
+msgid "Can't close directory '%s'"
+msgstr "æ— æ³•å…³é—目录“%sâ€"
-#: clients/cmdline/main.c:1098
+#: libsvn_client/blame.c:368 libsvn_client/blame.c:838
#, c-format
-msgid "Syntax error in native-eol argument '%s'"
-msgstr "原生æ¢åˆ—符å·å‚数“%sâ€ä¸æœ‰è¯æ³•错误"
+msgid "Cannot calculate blame information for binary file '%s'"
+msgstr "æ— æ³•ä¸ºäºŒè¿›åˆ¶æ–‡ä»¶â€œ%sâ€è®¡ç®—谴责信æ¯"
-#: clients/cmdline/main.c:1144 svndumpfilter/main.c:1167 svnlook/main.c:2121
-msgid "Subcommand argument required\n"
-msgstr "å¿…é¡»æä¾›å命令傿•°\n"
+#: libsvn_client/blame.c:522
+msgid "blame of the WORKING revision is not supported"
+msgstr ""
+
+#: libsvn_client/blame.c:535
+msgid "Start revision must precede end revision"
+msgstr "起始修订版必须大于结æŸä¿®è®¢ç‰ˆ"
-#: clients/cmdline/main.c:1162 svnadmin/main.c:1341 svndumpfilter/main.c:1185
-#: svnlook/main.c:2139
+#: libsvn_client/blame.c:725 libsvn_client/cat.c:208
#, c-format
-msgid "Unknown command: '%s'\n"
-msgstr "未知的命令:“%sâ€\n"
+msgid "URL '%s' refers to a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个目录"
-#: clients/cmdline/main.c:1195
+#: libsvn_client/blame.c:798
#, c-format
-msgid ""
-"Subcommand '%s' doesn't accept option '%s'\n"
-"Type 'svn help %s' for usage.\n"
-msgstr ""
-"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
-"请输入“svn help %sâ€ä»¥å–得用法。\n"
+msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
+msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
-#: clients/cmdline/main.c:1232
-msgid "Log message file is a versioned file; use '--force-log' to override"
-msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
+#: libsvn_client/cat.c:73 libsvn_client/export.c:241
+#, fuzzy, c-format
+msgid "'%s' is not under version control or doesn't exist"
+msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
-#: clients/cmdline/main.c:1239
-#, fuzzy
-msgid "Lock comment file is a versioned file; use '--force-log' to override"
-msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+#: libsvn_client/cat.c:79
+#, fuzzy, c-format
+msgid "'%s' refers to a directory"
+msgstr "“%sâ€å¼•用一个目录"
-#: clients/cmdline/main.c:1260
-msgid ""
-"The log message is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
+# as-is
+#: libsvn_client/cat.c:131 libsvn_client/export.c:183
+msgid "(local)"
+msgstr "(本地)"
+
+#: libsvn_client/checkout.c:91
+#, c-format
+msgid "URL '%s' doesn't exist"
+msgstr "地å€(URL)“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_client/checkout.c:95
+#, c-format
+msgid "URL '%s' refers to a file, not a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+
+#: libsvn_client/checkout.c:163
+#, c-format
+msgid "'%s' is already a working copy for a different URL"
+msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
-#: clients/cmdline/main.c:1267
+#: libsvn_client/checkout.c:167
#, fuzzy
-msgid ""
-"The lock comment is a pathname (was -F intended?); use '--force-log' to "
-"override"
-msgstr ""
-"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
+msgid "; run 'svn update' to complete it"
+msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
-#: clients/cmdline/main.c:1480
-msgid ""
-"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
-"details)\n"
-msgstr ""
-"svn:请执行“svn cleanupâ€ä»¥ç§»åŽ»é”定 (输入“svn help cleanupâ€ä»¥å–得详细说明)\n"
+#: libsvn_client/checkout.c:177
+#, fuzzy, c-format
+msgid "'%s' already exists and is not a directory"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
-#: clients/cmdline/merge-cmd.c:61
-msgid "Second revision required"
-msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
+#: libsvn_client/commit.c:198
+#, c-format
+msgid "Unknown or unversionable type for '%s'"
+msgstr "类型“%sâ€æœªçŸ¥æˆ–ä¸å¯ç‰ˆæœ¬æŽ§åˆ¶"
-#: clients/cmdline/merge-cmd.c:81 clients/cmdline/merge-cmd.c:106
-msgid "Wrong number of paths given"
-msgstr "指定了错误数目的路径"
+#: libsvn_client/commit.c:511
+msgid "New entry name required when importing a file"
+msgstr "导入文件时,需è¦ä¸€ä¸ªæ–°çš„项目åç§°"
-#: clients/cmdline/merge-cmd.c:128
-msgid "A working copy merge source needs an explicit revision"
-msgstr "工作拷è´çš„åˆå¹¶æ¥æºéœ€ç‰¹åˆ«æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_client/commit.c:545 libsvn_wc/adm_ops.c:687 libsvn_wc/questions.c:91
+#, c-format
+msgid "'%s' does not exist"
+msgstr "“%sâ€ä¸å˜åœ¨"
-#: clients/cmdline/mkdir-cmd.c:84
-msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
-msgstr "å°è¯•用 “svn addâ€æˆ– “svn add --non-recursiveâ€ä»£æ›¿ï¼Ÿ"
+#: libsvn_client/commit.c:605 libsvn_client/copy.c:76 svnlook/main.c:1206
+#, c-format
+msgid "Path '%s' does not exist"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_client/commit.c:735 libsvn_client/copy.c:85 libsvn_client/copy.c:399
+#: libsvn_client/copy.c:608 libsvn_client/copy.c:758
+#, c-format
+msgid "Path '%s' already exists"
+msgstr "路径“%sâ€å·²å˜åœ¨"
+
+#: libsvn_client/commit.c:750
+#, c-format
+msgid "'%s' is a reserved name and cannot be imported"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªä¿ç•™çš„åç§°ï¼Œæ— æ³•è¢«å¯¼å…¥"
+
+#: libsvn_client/commit.c:866 libsvn_client/copy.c:524
+msgid "Commit failed (details follow):"
+msgstr "æäº¤å¤±è´¥(细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:874 libsvn_client/copy.c:532
+msgid "Commit succeeded, but other errors follow:"
+msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘生了其它的错误,如åŽï¼š"
+
+#: libsvn_client/commit.c:881 libsvn_client/copy.c:539
+msgid "Error unlocking locked dirs (details follow):"
+msgstr "解除é”定目录时å‘生错误(细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:892
+msgid "Error bumping revisions post-commit (details follow):"
+msgstr "post-commit å¢žåŠ ä¿®è®¢ç‰ˆæ—¶å‘生错误 (细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:903 libsvn_client/copy.c:550
+msgid "Error in post-commit clean-up (details follow):"
+msgstr "post-commit 清除时å‘生错误 (细节è§ä¸‹):"
+
+#: libsvn_client/commit.c:1206
+#, c-format
+msgid "'%s' is a URL, but URLs cannot be commit targets"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªåœ°å€(URL),但是地å€(URL)ä¸å¯ä¸ºä½œæäº¤çš„ç›®æ ‡"
+
+#: libsvn_client/commit.c:1404
+msgid "Are all the targets part of the same working copy?"
+msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+
+#: libsvn_client/commit.c:1419
+msgid "Cannot non-recursively commit a directory deletion"
+msgstr "æ— æ³•ä»¥éžé€’å½’æäº¤ç›®å½•åˆ é™¤"
+
+#: libsvn_client/commit_util.c:246 libsvn_client/commit_util.c:257
+#, c-format
+msgid "Unknown entry kind for '%s'"
+msgstr "未知的项目类型“%sâ€"
-#: clients/cmdline/move-cmd.c:69 libsvn_client/copy.c:1215
-msgid "Cannot specify revisions (except HEAD) with move operations"
-msgstr "移动æ“作ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_client/commit_util.c:274
+#, c-format
+msgid "Entry '%s' has unexpectedly changed special status"
+msgstr "项目“%sâ€æ„想ä¸åˆ°åœ°å˜æ¢ç‰¹æ®Šçжæ€"
-#: clients/cmdline/notify.c:69
+#: libsvn_client/commit_util.c:325
#, c-format
-msgid "Skipped missing target: '%s'\n"
-msgstr "跳过找ä¸åˆ°çš„ç›®æ ‡ï¼šâ€œ%sâ€\n"
+msgid "Aborting commit: '%s' remains in conflict"
+msgstr "䏿¢æäº¤ï¼šâ€œ%sâ€ä»å¤„于冲çªçжæ€"
-#: clients/cmdline/notify.c:76
+#: libsvn_client/commit_util.c:391
#, c-format
-msgid "Skipped '%s'\n"
-msgstr "跳过“%sâ€\n"
+msgid "Did not expect '%s' to be a working copy root"
+msgstr "并未预期“%sâ€æ˜¯å·¥ä½œæ‹·è´çš„æ ¹ç›®å½•"
-#: clients/cmdline/notify.c:94
+#: libsvn_client/commit_util.c:409 libsvn_client/commit_util.c:1010
#, c-format
-msgid "Restored '%s'\n"
-msgstr "已还原“%sâ€\n"
+msgid "Commit item '%s' has copy flag but no copyfrom URL"
+msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶åœ°å€åœ°å€(copyfrom URL)"
-#: clients/cmdline/notify.c:100
+#: libsvn_client/commit_util.c:686 libsvn_client/commit_util.c:816
+#: libsvn_client/copy.c:1002 libsvn_client/delete.c:67
+#: libsvn_client/diff.c:1409 libsvn_client/diff.c:2141
+#: libsvn_client/diff.c:2736 libsvn_client/diff.c:2865
+#: libsvn_client/locking_commands.c:259 libsvn_client/log.c:133
+#: libsvn_client/prop_commands.c:213 libsvn_client/prop_commands.c:446
+#: libsvn_client/prop_commands.c:609 libsvn_client/prop_commands.c:958
+#: libsvn_client/ra.c:181 libsvn_client/revisions.c:89
+#: libsvn_client/status.c:256 libsvn_client/switch.c:106
+#: libsvn_wc/adm_crawler.c:471 libsvn_wc/adm_crawler.c:764
+#: libsvn_wc/adm_ops.c:1021 libsvn_wc/adm_ops.c:2306 libsvn_wc/adm_ops.c:2332
+#: libsvn_wc/adm_ops.c:2368 libsvn_wc/copy.c:349 libsvn_wc/copy.c:430
+#: libsvn_wc/copy.c:437 libsvn_wc/diff.c:1787 libsvn_wc/entries.c:2225
+#: libsvn_wc/entries.c:2780 libsvn_wc/props.c:479 libsvn_wc/props.c:1088
+#: libsvn_wc/props.c:1506 libsvn_wc/questions.c:182 libsvn_wc/questions.c:291
+#: libsvn_wc/status.c:726 libsvn_wc/translate.c:199
+#: libsvn_wc/update_editor.c:2065 libsvn_wc/update_editor.c:2841
#, c-format
-msgid "Reverted '%s'\n"
-msgstr "å·²æ¢å¤â€œ%sâ€\n"
+msgid "'%s' is not under version control"
+msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: clients/cmdline/notify.c:106
+#: libsvn_client/commit_util.c:689
#, c-format
-msgid "Failed to revert '%s' -- try updating instead.\n"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€-- 请改用更新试试。\n"
+msgid "Entry for '%s' has no URL"
+msgstr "“%sâ€çš„项目没有地å€(URL)"
-#: clients/cmdline/notify.c:114
+#: libsvn_client/commit_util.c:722
#, c-format
-msgid "Resolved conflicted state of '%s'\n"
-msgstr "“%sâ€çš„已解决的冲çªçжæ€\n"
+msgid "'%s' is scheduled for addition within unversioned parent"
+msgstr "“%sâ€äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„父路径ä¸è¢«åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: clients/cmdline/notify.c:195
+#: libsvn_client/commit_util.c:742
#, c-format
msgid ""
-"\n"
-"Fetching external item into '%s'\n"
+"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
+"for addition. Perhaps you're committing a target that is\n"
+"inside an unversioned (or not-yet-versioned) directory?"
msgstr ""
-"\n"
-"æ£åœ¨å–得外部项目至“%sâ€\n"
+"“%sâ€é¡¹ç›®è¢«æ ‡è®°ä¸ºâ€œå·²å¤åˆ¶â€ï¼Œä½†æ˜¯æœ¬èº«å°šæœªåŠ å…¥æ–°å¢žè°ƒåº¦ã€‚ä¹Ÿè®¸æ‚¨æäº¤çš„\n"
+"ç›®æ ‡æ˜¯ä½äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ (或尚未纳入) 的目录ä¸ï¼Ÿ"
-#: clients/cmdline/notify.c:210
+#: libsvn_client/commit_util.c:782
#, c-format
-msgid "Exported external at revision %ld.\n"
-msgstr "导出修订版 %ld 的外部定义。\n"
+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â€æ˜¯æäº¤çš„一部份"
-#: clients/cmdline/notify.c:211
+#: libsvn_client/commit_util.c:865
#, c-format
-msgid "Exported revision %ld.\n"
-msgstr "导出修订版 %ld。\n"
+msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
+msgstr "æ— æ³•æäº¤â€œ%sâ€ä¸Žâ€œ%sâ€ï¼Œå› 为它们都指å‘åŒä¸€ä¸ªåœ°å€(URL)"
-#: clients/cmdline/notify.c:219
+#: libsvn_client/commit_util.c:1015
#, c-format
-msgid "Checked out external at revision %ld.\n"
-msgstr "å–出修订版 %ld 的外部定义。\n"
+msgid "Commit item '%s' has copy flag but an invalid revision"
+msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
-#: clients/cmdline/notify.c:220
-#, c-format
-msgid "Checked out revision %ld.\n"
-msgstr "å–出修订版 %ld。\n"
+#: libsvn_client/copy.c:95 libsvn_client/copy.c:769
+#, fuzzy, c-format
+msgid "Path '%s' is not a directory"
+msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
+
+#: libsvn_client/copy.c:138
+msgid "Move will not be attempted unless forced"
+msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
-#: clients/cmdline/notify.c:230
+#: libsvn_client/copy.c:334
#, c-format
-msgid "Updated external to revision %ld.\n"
-msgstr "更新外部定义至修订版 %ld。\n"
+msgid ""
+"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
+"s')"
+msgstr "æ¥æºä¸Žç›®çš„似乎ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸ (æ¥æºï¼šâ€œ%sâ€ï¼›ç›®çš„:“%sâ€)"
-#: clients/cmdline/notify.c:231
+#: libsvn_client/copy.c:370
#, c-format
-msgid "Updated to revision %ld.\n"
-msgstr "更新至修订版 %ld。\n"
+msgid "Cannot move URL '%s' into itself"
+msgstr "æ— æ³•ç§»åŠ¨åœ°å€(URL)“%sâ€è‡³æœ¬èº«"
-#: clients/cmdline/notify.c:239
+#: libsvn_client/copy.c:390
#, c-format
-msgid "External at revision %ld.\n"
-msgstr "于修订版 %ld 的外部定义。\n"
+msgid "Path '%s' does not exist in revision %ld"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
-#: clients/cmdline/notify.c:240
+#: libsvn_client/copy.c:745
#, c-format
-msgid "At revision %ld.\n"
-msgstr "于修订版 %ld。\n"
+msgid "Path '%s' not found in revision %ld"
+msgstr "路径“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
-#: clients/cmdline/notify.c:252
-msgid "External export complete.\n"
-msgstr "外部定义导出完æˆã€‚\n"
+#: libsvn_client/copy.c:750
+#, c-format
+msgid "Path '%s' not found in head revision"
+msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
-#: clients/cmdline/notify.c:253
-msgid "Export complete.\n"
-msgstr "导出完æˆã€‚\n"
+#: libsvn_client/copy.c:787
+#, c-format
+msgid "Entry for '%s' exists (though the working file is missing)"
+msgstr "å˜åœ¨â€œ%sâ€çš„项目 (ä¸è¿‡å·¥ä½œæ–‡ä»¶å·²ä¸¢å¤±)"
-#: clients/cmdline/notify.c:260
-msgid "External checkout complete.\n"
-msgstr "外部定义å–出完æˆã€‚\n"
+#: libsvn_client/copy.c:878
+#, c-format
+msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
+msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“;把它当作是脱离的工作拷è´(WC)"
-#: clients/cmdline/notify.c:261
-msgid "Checkout complete.\n"
-msgstr "å–出完æˆã€‚\n"
+#: libsvn_client/copy.c:957
+#, c-format
+msgid "Cannot copy path '%s' into its own child '%s'"
+msgstr "æ— æ³•å¤åˆ¶è·¯å¾„“%sâ€è‡³å…¶å目录“%sâ€ä¸"
-#: clients/cmdline/notify.c:268
-msgid "External update complete.\n"
-msgstr "外部定义更新完æˆã€‚\n"
+#: libsvn_client/copy.c:968
+#, c-format
+msgid "Cannot move path '%s' into itself"
+msgstr "æ— æ³•ç§»åŠ¨è·¯å¾„â€œ%sâ€è‡³å…¶æœ¬èº«"
-#: clients/cmdline/notify.c:269
-msgid "Update complete.\n"
-msgstr "更新完æˆã€‚\n"
+#: libsvn_client/copy.c:976
+msgid "No support for repos <--> working copy moves"
+msgstr "䏿”¯æŒæ¡£æ¡ˆåº“ <--> 工作拷è´ç§»åЍ"
-#: clients/cmdline/notify.c:285
+#: libsvn_client/copy.c:1008
#, c-format
-msgid ""
-"\n"
-"Performing status on external item at '%s'\n"
-msgstr ""
-"\n"
-"对外部项目“%sâ€è¿›è¡ŒçŠ¶æ€æ£€æŸ¥\n"
+msgid "'%s' does not seem to have a URL associated with it"
+msgstr "“%sâ€ä¼¼ä¹Žæ²¡æœ‰å…³è”的地å€(URL)"
-#: clients/cmdline/notify.c:293
-#, c-format
-msgid "Status against revision: %6ld\n"
-msgstr "状æ€äºŽä¿®è®¢ç‰ˆï¼š%6ld\n"
+#: libsvn_client/copy.c:1205 svn/move-cmd.c:72
+msgid "Cannot specify revisions (except HEAD) with move operations"
+msgstr "移动æ“作ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: clients/cmdline/notify.c:301
+#: libsvn_client/delete.c:62
#, c-format
-msgid "Sending %s\n"
-msgstr "æ£åœ¨å‘é€ %s\n"
+msgid "'%s' is in the way of the resource actually under version control"
+msgstr "“%sâ€æŒ¡äº†å®žé™…纳入版本控制资æºçš„è·¯"
-#: clients/cmdline/notify.c:310
+#: libsvn_client/delete.c:77
#, c-format
-msgid "Adding (bin) %s\n"
-msgstr "新增 (二进制) %s\n"
+msgid "'%s' has local modifications"
+msgstr "“%sâ€å·²æœ‰æœ¬åœ°ä¿®æ”¹"
-#: clients/cmdline/notify.c:317
+# as-is
+#: libsvn_client/diff.c:99
#, c-format
-msgid "Adding %s\n"
-msgstr "新增 %s\n"
+msgid "%sProperty changes on: %s%s"
+msgstr "%s 属性改å˜äºŽï¼š%s%s"
-#: clients/cmdline/notify.c:324
+# as-is
+#: libsvn_client/diff.c:127
#, c-format
-msgid "Deleting %s\n"
-msgstr "åˆ é™¤ %s\n"
+msgid "Name: %s%s"
+msgstr "åå—:%s%s"
-#: clients/cmdline/notify.c:331
-#, c-format
-msgid "Replacing %s\n"
-msgstr "æ›¿æ¢ %s\n"
+#: libsvn_client/diff.c:203
+#, fuzzy, c-format
+msgid "URLs have no scheme ('%s' and '%s')"
+msgstr ""
+"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
+"sâ€ä¸Žâ€œ%sâ€)"
-#: clients/cmdline/notify.c:341
-msgid "Transmitting file data "
-msgstr "ä¼ è¾“æ–‡ä»¶æ•°æ®"
+#: libsvn_client/diff.c:209 libsvn_client/diff.c:215
+#, fuzzy, c-format
+msgid "URL has no scheme: '%s'"
+msgstr ""
+"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
+"sâ€"
-#: clients/cmdline/notify.c:351
-#, c-format
-msgid "'%s' locked by user '%s'.\n"
-msgstr "“%sâ€è¢«ç”¨æˆ·â€œ%sâ€é”定。\n"
+#: libsvn_client/diff.c:222
+#, fuzzy, c-format
+msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
+msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
-#: clients/cmdline/notify.c:357
+# as-is
+#: libsvn_client/diff.c:287
#, c-format
-msgid "'%s' unlocked.\n"
-msgstr "“%sâ€è¢«è§£é™¤é”定。\n"
-
-#: clients/cmdline/prompt.c:94
-msgid "Can't open stdin"
-msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å…¥"
-
-#: clients/cmdline/prompt.c:112 clients/cmdline/prompt.c:116
-msgid "Can't read stdin"
-msgstr "æ— æ³•è¯»å–æ ‡å‡†è¾“å…¥"
+msgid "%s\t(revision %ld)"
+msgstr "%s\t(修订版 %ld)"
-#: clients/cmdline/prompt.c:153 libsvn_ra_svn/client.c:310
-msgid "Can't get password"
-msgstr "æ— æ³•å–得密ç "
+# as-is
+#: libsvn_client/diff.c:289
+#, c-format
+msgid "%s\t(working copy)"
+msgstr "%s\t(工作拷è´ï¼‰"
-#: clients/cmdline/prompt.c:175
+#: libsvn_client/diff.c:433
#, c-format
-msgid "Authentication realm: %s\n"
-msgstr "认è¯é¢†åŸŸï¼š%s\n"
+msgid "Cannot display: file marked as a binary type.%s"
+msgstr "æ— æ³•æ˜¾ç¤ºï¼šæ–‡ä»¶æ ‡è®°ä¸ºäºŒè¿›åˆ¶ç±»åž‹ã€‚%s"
-#: clients/cmdline/prompt.c:201 clients/cmdline/prompt.c:224
-msgid "Username: "
-msgstr "用户登录å:"
+# as-is
+#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
+#. strings are used to tag onto a filename in case of a merge conflict
+#: libsvn_client/diff.c:772
+msgid ".working"
+msgstr ".working"
-#: clients/cmdline/prompt.c:203
+# as-is
+#: libsvn_client/diff.c:774
#, c-format
-msgid "Password for '%s': "
-msgstr "“%sâ€çš„密ç :"
+msgid ".merge-left.r%ld"
+msgstr ".merge-left.r%ld"
-#: clients/cmdline/prompt.c:246
+# as-is
+#: libsvn_client/diff.c:777
#, c-format
-msgid "Error validating server certificate for '%s':\n"
-msgstr "验è¯â€œ%sâ€çš„æœåŠ¡å™¨å‡è¯æ—¶å‘生错误:\n"
+msgid ".merge-right.r%ld"
+msgstr ".merge-right.r%ld"
-#: clients/cmdline/prompt.c:252
-msgid ""
-" - The certificate is not issued by a trusted authority. Use the\n"
-" fingerprint to validate the certificate manually!\n"
-msgstr ""
-" - 本å‡è¯å¹¶ä¸æ˜¯ç”±å—信任的æƒå¨æœºæƒæ‰€æ ¸å‘。请手动利用指纹以验è¯\n"
-" å‡è¯çš„æœ‰æ•ˆæ€§ï¼\n"
+#: libsvn_client/diff.c:1474 libsvn_client/diff.c:1680
+msgid "Not all required revisions are specified"
+msgstr "并未æä¾›å…¨éƒ¨æ‰€éœ€çš„修订版"
-#: clients/cmdline/prompt.c:259
-msgid " - The certificate hostname does not match.\n"
-msgstr " - 本å‡è¯çš„主机åç§°ä¸ç¬¦ã€‚\n"
+#: libsvn_client/diff.c:1489
+msgid "At least one revision must be non-local for a pegged diff"
+msgstr "对于 peg å·®å¼‚ï¼Œå¿…é¡»è‡³å°‘æœ‰ä¸€ä¸ªéžæœ¬åœ°ç«¯çš„修订版"
-#: clients/cmdline/prompt.c:265
-msgid " - The certificate is not yet valid.\n"
-msgstr " - 本å‡è¯å°šæœªè¿›å…¥æœ‰æ•ˆæœŸé—´ã€‚\n"
+#: libsvn_client/diff.c:1601 libsvn_client/diff.c:1613
+#, c-format
+msgid "'%s' was not found in the repository at revision %ld"
+msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
-#: clients/cmdline/prompt.c:271
-msgid " - The certificate has expired.\n"
-msgstr " - 本å‡è¯å·²è¿‡æœŸã€‚\n"
+#: libsvn_client/diff.c:1961
+#, fuzzy
+msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
+msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
-#: clients/cmdline/prompt.c:277
-msgid " - The certificate has an unknown error.\n"
-msgstr " - 本å‡è¯å‘ç”Ÿä¸æ˜Žçš„错误。\n"
+#: libsvn_client/diff.c:2000
+msgid ""
+"Only diffs between a path's text-base and its working files are supported at "
+"this time"
+msgstr "ç›®å‰åªæ”¯æŒè·¯å¾„的文件å‚考基础与其工作文件之间的文件差异"
-#: clients/cmdline/prompt.c:282
+#: libsvn_client/diff.c:2145 libsvn_client/switch.c:110
#, c-format
-msgid ""
-"Certificate information:\n"
-" - Hostname: %s\n"
-" - Valid: from %s until %s\n"
-" - Issuer: %s\n"
-" - Fingerprint: %s\n"
+msgid "Directory '%s' has no URL"
+msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
+
+#: libsvn_client/diff.c:2352
+msgid "Summarizing diff can only compare repository to repository"
msgstr ""
-"å‡è¯ä¿¡æ¯ï¼š\n"
-" - 主机å称:%s\n"
-" - 有效期间:自 %s 至 %s\n"
-" - å‘行者:%s\n"
-" - 指纹:%s\n"
-#: clients/cmdline/prompt.c:297
-msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
-msgstr "(R)æ‹’ç»ï¼Œ(t)æš‚æ—¶æŽ¥å— æˆ– (p)永远接å—?"
+#: libsvn_client/diff.c:2709 libsvn_client/diff.c:2715
+#: libsvn_client/diff.c:2850 libsvn_client/locking_commands.c:263
+#: libsvn_client/ra.c:372 libsvn_client/ra.c:738 libsvn_client/ra.c:875
+#, c-format
+msgid "'%s' has no URL"
+msgstr "“%sâ€æ²¡æœ‰åœ°å€(URL)"
-#: clients/cmdline/prompt.c:301
-msgid "(R)eject or accept (t)emporarily? "
-msgstr "(R)æ‹’ç» æˆ– (t)æš‚æ—¶æŽ¥å— ï¼Ÿ"
+#: libsvn_client/export.c:87
+#, c-format
+msgid "'%s' is not a valid EOL value"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
-#: clients/cmdline/prompt.c:339
-msgid "Client certificate filename: "
-msgstr "用户å‡è¯æ–‡ä»¶å:"
+#: libsvn_client/export.c:271
+msgid "Destination directory exists, and will not be overwritten unless forced"
+msgstr "目的目录已å˜åœ¨ï¼Œé™¤éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™ä¸ä¼šè¦†ç›–"
-#: clients/cmdline/prompt.c:362
+#: libsvn_client/export.c:369 libsvn_client/export.c:512
#, c-format
-msgid "Passphrase for '%s': "
-msgstr "“%sâ€çš„密ç :"
+msgid "'%s' exists and is not a directory"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
-#: clients/cmdline/propdel-cmd.c:77
+#: libsvn_client/export.c:373 libsvn_client/export.c:516
#, c-format
-msgid "property '%s' deleted from repository revision %ld\n"
-msgstr "属性“%sâ€è‡ªæ¡£æ¡ˆåº“修订版 %ld ä¸åˆ 除\n"
+msgid "'%s' already exists"
+msgstr "“%sâ€å·²å˜åœ¨"
-#: clients/cmdline/propdel-cmd.c:86
+#: libsvn_client/export.c:687 libsvn_wc/update_editor.c:1601
+#: libsvn_wc/update_editor.c:2194
#, c-format
-msgid "Cannot specify revision for deleting versioned property '%s'"
-msgstr "åˆ é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„å±žæ€§â€œ%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
-#: clients/cmdline/propdel-cmd.c:116
-#, c-format
-msgid "property '%s' deleted (recursively) from '%s'.\n"
-msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除 (递归)。\n"
+#: libsvn_client/info.c:243
+#, fuzzy, c-format
+msgid "Cannot read entry for '%s'"
+msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
+
+#: libsvn_client/info.c:379 libsvn_client/info.c:404 libsvn_client/info.c:414
+#, fuzzy, c-format
+msgid "URL '%s' non-existent in revision '%ld'"
+msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
-#: clients/cmdline/propdel-cmd.c:117
+#: libsvn_client/list.c:225
#, c-format
-msgid "property '%s' deleted from '%s'.\n"
-msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除。\n"
+msgid "URL '%s' non-existent in that revision"
+msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽè¯¥ä¿®è®¢ç‰ˆä¸"
-#: clients/cmdline/propedit-cmd.c:101 clients/cmdline/propedit-cmd.c:225
-#: clients/cmdline/propset-cmd.c:85
-msgid "Bad encoding option: prop value not stored as UTF8"
-msgstr "有问题的编ç 选项:属性内容未以 UTF8 储å˜"
+#: libsvn_client/locking_commands.c:198
+msgid "No common parent found, unable to operate on disjoint arguments"
+msgstr "没有找到公共父节点,ä¸èƒ½åœ¨åˆ†ç¦»çš„傿•°ä¸Šæ“作"
-#: clients/cmdline/propedit-cmd.c:110
-#, c-format
-msgid "Set new value for property '%s' on revision %ld\n"
-msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 设为新值\n"
+#: libsvn_client/locking_commands.c:287
+msgid "Unable to lock/unlock across multiple repositories"
+msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
-#: clients/cmdline/propedit-cmd.c:116
-#, c-format
-msgid "No changes to property '%s' on revision %ld\n"
-msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 没有改å˜\n"
+#: libsvn_client/locking_commands.c:328
+#, fuzzy, c-format
+msgid "'%s' is not locked in this working copy"
+msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
-#: clients/cmdline/propedit-cmd.c:124
-#, c-format
-msgid "Cannot specify revision for editing versioned property '%s'"
-msgstr "编辑纳入版本控制的属性“%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
+#: libsvn_client/locking_commands.c:376
+#, fuzzy, c-format
+msgid "'%s' is not locked"
+msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
-#: clients/cmdline/propedit-cmd.c:150 clients/cmdline/propset-cmd.c:158
-msgid "Explicit target argument required"
-msgstr "必须明确地æä¾›ç›®æ ‡"
+#: libsvn_client/locking_commands.c:409 libsvn_fs/fs-loader.c:895
+#: libsvn_ra/ra_loader.c:625
+msgid "Lock comment has illegal characters"
+msgstr "é”定注释å˜åœ¨éžæ³•å—符"
-#: clients/cmdline/propedit-cmd.c:173
-#, c-format
-msgid "Editing property on non-local target '%s' not yet supported"
-msgstr "å°šä¸æ”¯æŒç¼–è¾‘éžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„属性"
+#: libsvn_client/log.c:73
+msgid "Missing required revision specification"
+msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
-#: clients/cmdline/propedit-cmd.c:200 clients/cmdline/switch-cmd.c:138
+#: libsvn_client/log.c:86
+#, fuzzy
+msgid "Revision type requires a working copy path, not a URL"
+msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+
+#: libsvn_client/log.c:139 libsvn_client/status.c:261
+#: libsvn_client/update.c:86
#, c-format
-msgid "'%s' does not appear to be a working copy path"
-msgstr "“%sâ€ä¸åƒæ˜¯å·¥ä½œæ‹·è´è·¯å¾„"
+msgid "Entry '%s' has no URL"
+msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
+
+#: libsvn_client/log.c:370
+#, fuzzy
+msgid "No commits in repository"
+msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
-#: clients/cmdline/propedit-cmd.c:232
+#: libsvn_client/prop_commands.c:104
#, c-format
-msgid "Set new value for property '%s' on '%s'\n"
-msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§è¢«è®¾ä¸ºæ–°å€¼\n"
+msgid "'%s' is a wcprop, thus not accessible to clients"
+msgstr "“%sâ€æ˜¯ä¸€ä¸ªå·¥ä½œæ‹·è´å±žæ€§(wcprop),应æ¤ä¸èƒ½è¢«å®¢æˆ·ç«¯å˜å–"
-#: clients/cmdline/propedit-cmd.c:239
+#: libsvn_client/prop_commands.c:183
#, c-format
-msgid "No changes to property '%s' on '%s'\n"
-msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§æ²¡æœ‰æ”¹å˜\n"
+msgid "Revision property '%s' not allowed in this context"
+msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
+
+#: libsvn_client/prop_commands.c:199
+#, fuzzy, c-format
+msgid "Setting property on non-local target '%s' is not supported"
+msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
-#: clients/cmdline/proplist-cmd.c:71
+#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
#, c-format
-msgid "Unversioned properties on revision %ld:\n"
-msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+msgid "Bad property name: '%s'"
+msgstr "有问题的属性å称:“%sâ€"
-#: clients/cmdline/props.c:51
-#, fuzzy
-msgid ""
-"Must specify the revision as a number, a date or 'HEAD' when operating on a "
-"revision property"
-msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
+#: libsvn_client/prop_commands.c:276
+msgid "Value will not be set unless forced"
+msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
-#: clients/cmdline/props.c:58
-#, fuzzy
-msgid "Wrong number of targets specified"
-msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
+#: libsvn_client/prop_commands.c:499
+#, fuzzy, c-format
+msgid "'%s' does not exist in revision '%ld'"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
-#: clients/cmdline/props.c:67
-msgid "Either a URL or versioned item is required"
-msgstr "å¿…é¡»æä¾›åœ°å€(URL)或纳入版本控制的项目"
+#: libsvn_client/prop_commands.c:506 libsvn_client/prop_commands.c:765
+#, c-format
+msgid "Unknown node kind for '%s'"
+msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
-#: clients/cmdline/propset-cmd.c:111
+#: libsvn_client/ra.c:132
#, c-format
-msgid "property '%s' set on repository revision %ld\n"
-msgstr "设定属性“%sâ€äºŽæ¡£æ¡ˆåº“修订版 %ld\n"
+msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
+msgstr "è¯•å›¾åœ¨éžæäº¤æ“作ä¸ï¼Œè®¾å®šå·¥ä½œæ‹·è´å±žæ€§â€œ%sâ€äºŽâ€œ%sâ€"
-#: clients/cmdline/propset-cmd.c:119
+#: libsvn_client/ra.c:349
#, c-format
-msgid "Cannot specify revision for setting versioned property '%s'"
-msgstr "æ— æ³•æŒ‡å®šä¿®è®¢ç‰ˆä»¥è®¾å®šç‰ˆæœ¬æŽ§åˆ¶ä¸‹çš„å±žæ€§â€œ%sâ€"
+msgid "Can't find entry for '%s'"
+msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„项目"
-#: clients/cmdline/propset-cmd.c:151
+#: libsvn_client/ra.c:493
#, c-format
-msgid "Explicit target required ('%s' interpreted as prop value)"
-msgstr "必须明确地æä¾›ç›®çš„ (“%sâ€è§£é‡Šä¸ºå±žæ€§å†…容)"
+msgid "Missing changed-path information for '%s' in revision %ld"
+msgstr "未æä¾›â€œ%sâ€äºŽä¿®è®¢ç‰ˆ %ld çš„ changed-path ä¿¡æ¯"
-#: clients/cmdline/propset-cmd.c:184
+#: libsvn_client/ra.c:613
#, c-format
-msgid "property '%s' set (recursively) on '%s'\n"
-msgstr "属性“%sâ€è®¾å®š (递归) 于“%sâ€\n"
+msgid "path '%s' doesn't exist in revision %ld"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld ä¸"
-#: clients/cmdline/propset-cmd.c:185
+#: libsvn_client/ra.c:660 libsvn_client/ra.c:823
#, c-format
-msgid "property '%s' set on '%s'\n"
-msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
+msgid "Unable to find repository location for '%s' in revision %ld"
+msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„æ¡£æ¡ˆåº“ä½ç½®äºŽä¿®è®¢ç‰ˆ %ld"
-#: clients/cmdline/revert-cmd.c:61
-#, fuzzy
-msgid "Try 'svn revert --recursive' instead?"
-msgstr "å°è¯•用 “svn revert -recursive†代替?"
+#: libsvn_client/ra.c:671
+#, c-format
+msgid "'%s' in revision %ld is an unrelated object"
+msgstr "“%sâ€äºŽä¿®è®¢ç‰ˆ %ld æ˜¯ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
-#: clients/cmdline/status.c:261
+#: libsvn_client/ra.c:828
#, c-format
-msgid "'%s' has lock token, but no lock owner"
-msgstr "‘%s’é”被盗å–,但没有é”的所有者"
+msgid ""
+"The location for '%s' for revision %ld does not exist in the repository or "
+"refers to an unrelated object"
+msgstr ""
+"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
+
+#: libsvn_client/relocate.c:101
+#, fuzzy, c-format
+msgid "'%s' is not the root of the repository"
+msgstr "â€%s“没有在档案库ä¸è¢«é”定"
-#: clients/cmdline/switch-cmd.c:58
+#: libsvn_client/relocate.c:108
#, c-format
-msgid "'%s' to '%s' is not a valid relocation"
-msgstr "“%sâ€åˆ°â€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„é‡å®šä½"
+msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
+msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
+
+#: libsvn_client/revisions.c:99
+#, fuzzy, c-format
+msgid "Path '%s' has no committed revision"
+msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
-#: clients/cmdline/util.c:58
+#: libsvn_client/revisions.c:109
#, c-format
-msgid ""
-"\n"
-"Committed revision %ld.\n"
+msgid "Unrecognized revision type requested for '%s'"
+msgstr "æ— æ³•è¾¨è¯†è¯·æ±‚çš„â€œ%sâ€çš„修订版类别"
+
+#: libsvn_delta/svndiff.c:144
+msgid "Compression of svndiff data failed"
msgstr ""
-"\n"
-"æäº¤åŽçš„修订版为 %ld。\n"
-#: clients/cmdline/util.c:126
-msgid ""
-"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
-"no 'editor-cmd' run-time configuration option was found"
+#: libsvn_delta/svndiff.c:407
+msgid "Decompression of svndiff data failed"
msgstr ""
-"没有一个 SVN_EDITOR,VISUAL 或 EDITOR çŽ¯å¢ƒå˜æ•°è¢«è®¾å®šï¼Œæ‰§è¡Œæ—¶æœŸçš„设定ä¸ä¹Ÿæ²¡æœ‰ "
-"'editor-cmd' 选项"
-#: clients/cmdline/util.c:153
-msgid "Can't get working directory"
-msgstr "æ— æ³•å–得工作目录"
+#: libsvn_delta/svndiff.c:414
+msgid "Size of uncompressed data does not match stored original length"
+msgstr ""
-#: clients/cmdline/util.c:164
+#: libsvn_delta/svndiff.c:484
#, c-format
-msgid "Can't change working directory to '%s'"
-msgstr "æ— æ³•æ›´æ”¹å·¥ä½œæ‹·è´è‡³â€œ%sâ€"
+msgid "Invalid diff stream: insn %d cannot be decoded"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d ä¸èƒ½è§£ç "
-#: clients/cmdline/util.c:190
+#: libsvn_delta/svndiff.c:488
#, c-format
-msgid "Can't write to '%s'"
-msgstr "æ— æ³•å†™å…¥è‡³â€œ%sâ€"
+msgid "Invalid diff stream: insn %d has non-positive length"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d å‡ºçŽ°éžæ£çš„长度"
-# as-is
-#: clients/cmdline/util.c:205 clients/cmdline/util.c:229
-#: libsvn_fs_fs/fs_fs.c:1082 libsvn_fs_fs/fs_fs.c:3590 libsvn_subr/io.c:2359
+#: libsvn_delta/svndiff.c:492
#, c-format
-msgid "Can't stat '%s'"
-msgstr "ä¸èƒ½å–得“%sâ€çжæ€"
+msgid "Invalid diff stream: insn %d overflows the target view"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d æº¢å‡ºç›®æ ‡è§†å›¾"
-#: clients/cmdline/util.c:220
+#: libsvn_delta/svndiff.c:501
#, c-format
-msgid "system('%s') returned %d"
-msgstr "系统(“%sâ€) 返回 %d"
+msgid "Invalid diff stream: [src] insn %d overflows the source view"
+msgstr "æ— æ•ˆçš„è¯§å¼‚æµï¼š[src] insn %d 溢出æºè§†å›¾"
-#: clients/cmdline/util.c:285
-msgid "Can't restore working directory"
-msgstr "æ— æ³•è¿˜åŽŸå·¥ä½œç›®å½•"
+#: libsvn_delta/svndiff.c:508
+#, c-format
+msgid ""
+"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[tgt] insn %d èµ·ç‚¹è¶…è¿‡ç›®æ ‡è§†å›¾ä½ç½®"
-#: clients/cmdline/util.c:325
-msgid "Log message contains a zero byte"
-msgstr "日志信æ¯ä¸æœ‰ä¸€ä¸ªé›¶å—节"
+#: libsvn_delta/svndiff.c:515
+#, c-format
+msgid "Invalid diff stream: [new] insn %d overflows the new data section"
+msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[new] insn %d 溢出新数æ®åŒºåŸŸ"
-#: clients/cmdline/util.c:385
-msgid "Your commit message was left in a temporary file:"
-msgstr "您的æäº¤ä¿¡æ¯ä¿ç•™åœ¨ä¸´æ—¶æ–‡ä»¶ä¸ï¼š"
+#: libsvn_delta/svndiff.c:525
+msgid "Delta does not fill the target window"
+msgstr "Delta ä¸èƒ½å¡«å……ç›®æ ‡çª—å£"
+
+#: libsvn_delta/svndiff.c:528
+msgid "Delta does not contain enough new data"
+msgstr "Deltaä¸èƒ½åŒ…å«è¶³å¤Ÿçš„æ–°æ•°æ®"
+
+#: libsvn_delta/svndiff.c:634
+msgid "Svndiff has invalid header"
+msgstr "Svndiff æ•°æ®åŒ…å«äº†æ— 效的数æ®å¤´"
# as-is
-#: clients/cmdline/util.c:437
-msgid "--This line, and those below, will be ignored--"
-msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
+#: libsvn_delta/svndiff.c:689 libsvn_delta/svndiff.c:845
+msgid "Svndiff contains corrupt window header"
+msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
-#: clients/cmdline/util.c:550
-msgid "Cannot invoke editor to get log message when non-interactive"
-msgstr "在éžäº¤äº’å¼çš„æƒ…况下ä¸èƒ½è°ƒç”¨ç¼–è¾‘å™¨èŽ·å–æ—¥å¿—ä¿¡æ¯"
+# as-is
+#: libsvn_delta/svndiff.c:698
+msgid "Svndiff has backwards-sliding source views"
+msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
-#: clients/cmdline/util.c:563
-msgid ""
-"Could not use external editor to fetch log message; consider setting the "
-"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
-"options"
+#: libsvn_delta/svndiff.c:747 libsvn_delta/svndiff.c:794
+#: libsvn_delta/svndiff.c:867
+msgid "Unexpected end of svndiff input"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+
+#: libsvn_diff/diff_file.c:593
+#, c-format
+msgid "The file '%s' changed unexpectedly during diff"
msgstr ""
-"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
-"message (-m) 或 --file (-F) 选项"
-#: clients/cmdline/util.c:598
-msgid ""
-"\n"
-"Log message unchanged or not specified\n"
-"a)bort, c)ontinue, e)dit\n"
+#: libsvn_diff/diff_file.c:714
+#, fuzzy, c-format
+msgid "Error parsing diff options"
+msgstr "分解“%sâ€æ—¶å‘生错误"
+
+#: libsvn_diff/diff_file.c:737
+#, c-format
+msgid "Invalid argument '%s' in diff options"
msgstr ""
-"\n"
-"æ—¥å¿—ä¿¡æ¯æœªæ”¹å˜ï¼Œæˆ–是未指定\n"
-"a)䏿–,c)ç»§ç»ï¼Œe)编辑\n"
-#: clients/cmdline/util.c:651
-msgid "Use --force to override this restriction"
-msgstr "请用 --force æ¥æ’¤é”€é™åˆ¶"
+#: libsvn_diff/diff_file.c:1019
+#, c-format
+msgid "%s\\ No newline at end of file%s"
+msgstr "%s\\ 在文件 %s 末尾没有新行"
-#: clients/cmdline/util.c:673 include/svn_error_codes.h:229
-#: libsvn_subr/cmdline.c:278 libsvn_subr/cmdline.c:295
-msgid "Write error"
-msgstr "写入错误"
+#: libsvn_diff/diff_file.c:1608
+#, c-format
+msgid "Failed to delete mmap '%s'"
+msgstr "åˆ é™¤mmap â€%s“失败"
-# as-is
-#: include/svn_error_codes.h:152
-msgid "Bad parent pool passed to svn_make_pool()"
-msgstr "æ— æ•ˆçš„å†…å˜æ± (pool)ä¼ é€’åˆ° svn_make_pool()"
+#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:158
+#: libsvn_ra/ra_loader.c:171
+#, c-format
+msgid "'%s' does not define '%s()'"
+msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
-#: include/svn_error_codes.h:156
-msgid "Bogus filename"
-msgstr "有问题的文件å"
+#: libsvn_fs/fs-loader.c:131
+#, fuzzy, c-format
+msgid "Failed to load module for FS type '%s'"
+msgstr "装载FS类别“%sâ€æ¨¡å—失败"
-#: include/svn_error_codes.h:160
-msgid "Bogus URL"
-msgstr "有问题的地å€(URL)"
+#: libsvn_fs/fs-loader.c:138
+#, c-format
+msgid ""
+"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "对“%sâ€æœ‰ä¸ç¬¦åˆçš„ FS 模å—版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
-#: include/svn_error_codes.h:164
-msgid "Bogus date"
-msgstr "有问题的日期"
+#: libsvn_fs/fs-loader.c:163
+#, c-format
+msgid "Unknown FS type '%s'"
+msgstr "未知的文件系统(FS)类别“%sâ€"
-#: include/svn_error_codes.h:168
-msgid "Bogus mime-type"
-msgstr "有问题的 mime-type"
+#: libsvn_fs/fs-loader.c:253
+#, fuzzy, c-format
+msgid "Can't allocate FS mutex"
+msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
-#: include/svn_error_codes.h:174
-msgid "Version file format not correct"
-msgstr "ç‰ˆæœ¬æ–‡ä»¶æ ¼å¼ä¸æ£ç¡®"
+#: libsvn_fs/fs-loader.c:289
+#, fuzzy, c-format
+msgid "Can't grab FS mutex"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: include/svn_error_codes.h:180
-msgid "No such XML tag attribute"
-msgstr "æ²¡æœ‰è¿™æ ·çš„ XML æ ‡ç¾å±žæ€§"
+#: libsvn_fs/fs-loader.c:295
+#, c-format
+msgid "Can't ungrab FS mutex"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: include/svn_error_codes.h:184
-msgid "<delta-pkg> is missing ancestry"
-msgstr "<delta-pkg> 没有演进历程"
+#: libsvn_fs/fs-loader.c:901
+msgid "Negative expiration date passed to svn_fs_lock"
+msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
-#: include/svn_error_codes.h:188
-msgid "Unrecognized binary data encoding; can't decode"
-msgstr "æ— æ³•è¾¨è¯†çš„äºŒè¿›åˆ¶æ•°æ®ç¼–ç ï¼šæ— æ³•è§£è¯‘"
+#: libsvn_fs_base/bdb/bdb-err.c:101
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while %s:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: include/svn_error_codes.h:192
-msgid "XML data was not well-formed"
-msgstr "XML 的数æ®ä¸åˆè¯æ³•"
+#: libsvn_fs_base/bdb/changes-table.c:87
+msgid "creating change"
+msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
-#: include/svn_error_codes.h:196
-msgid "Data cannot be safely XML-escaped"
-msgstr "XML æ•°æ®ä¸èƒ½æ£ç¡®åœ°è§£ç "
+#: libsvn_fs_base/bdb/changes-table.c:113
+msgid "deleting changes"
+msgstr "æ£åœ¨åˆ 除更改"
-#: include/svn_error_codes.h:202
-msgid "Inconsistent line ending style"
-msgstr "ä¸ä¸€è‡´çš„è¡Œç»“æŸæ ·å¼"
+#: libsvn_fs_base/bdb/changes-table.c:145 libsvn_fs_fs/fs_fs.c:2017
+msgid "Missing required node revision ID"
+msgstr "未æä¾›å¿…须的节点修订版 ID"
-#: include/svn_error_codes.h:206
-msgid "Unrecognized line ending style"
-msgstr "æ— æ³•è¾¨è¯†çš„è¡Œç»“æŸæ ·å¼"
+#: libsvn_fs_base/bdb/changes-table.c:156 libsvn_fs_fs/fs_fs.c:2027
+msgid "Invalid change ordering: new node revision ID without delete"
+msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šæœ‰æ–°çš„节点修订版 ID è€Œæ²¡åˆ é™¤"
-#: include/svn_error_codes.h:211
-msgid "Line endings other than expected"
-msgstr "ä¸€è¡Œä»¥æ„æ–™ä¹‹å¤–的方å¼ç»“æŸ"
+#: libsvn_fs_base/bdb/changes-table.c:166 libsvn_fs_fs/fs_fs.c:2038
+msgid "Invalid change ordering: non-add change on deleted path"
+msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šå¯¹åˆ é™¤è·¯å¾„è¿›è¡Œéžæ–°å¢žçš„æ”¹å˜"
-#: include/svn_error_codes.h:215
-msgid "Ran out of unique names"
-msgstr "已用完ä¸é‡å¤çš„åç§°"
+#: libsvn_fs_base/bdb/changes-table.c:256
+#: libsvn_fs_base/bdb/changes-table.c:380
+msgid "creating cursor for reading changes"
+msgstr "æ£åœ¨ä¸ºè¯»å–更改创建指针"
-# as-is
-#: include/svn_error_codes.h:220
-msgid "Framing error in pipe protocol"
-msgstr "管é“å议帧错误"
+#: libsvn_fs_base/bdb/changes-table.c:282
+#: libsvn_fs_base/bdb/changes-table.c:401
+#, fuzzy, c-format
+msgid "Error reading changes for key '%s'"
+msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
-#: include/svn_error_codes.h:225
-msgid "Read error in pipe"
-msgstr "管é“å‘生读å–错误"
+#: libsvn_fs_base/bdb/changes-table.c:341
+#: libsvn_fs_base/bdb/changes-table.c:424
+msgid "fetching changes"
+msgstr "æ£åœ¨èŽ·å–æ›´æ”¹"
-#: include/svn_error_codes.h:235
-msgid "Unexpected EOF on stream"
-msgstr "æµä¸æœ‰æ„料之外的结æŸç¬¦"
+#: libsvn_fs_base/bdb/changes-table.c:354
+#: libsvn_fs_base/bdb/changes-table.c:437
+msgid "closing changes cursor"
+msgstr "æ£åœ¨å…³é—更改指针"
-#: include/svn_error_codes.h:239
-msgid "Malformed stream data"
-msgstr "ç•¸å½¢çš„æµæ•°æ®"
+#: libsvn_fs_base/bdb/copies-table.c:85
+#, fuzzy
+msgid "storing copy record"
+msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
-#: include/svn_error_codes.h:243
-msgid "Unrecognized stream data"
-msgstr "æ— æ³•è¾¨è¯†çš„æµæ•°æ®"
+#: libsvn_fs_base/bdb/copies-table.c:110
+msgid "allocating new copy ID (getting 'next-key')"
+msgstr "æ£åœ¨åˆ†é…æ–°æ‹·è´ID (æ£åœ¨èŽ·å–'next-key')"
-#: include/svn_error_codes.h:249
-msgid "Unknown svn_node_kind"
-msgstr "未知的 svn_node_kind"
+#: libsvn_fs_base/bdb/copies-table.c:128
+msgid "bumping next copy key"
+msgstr "æ£åœ¨æå–下一个拷è´å…³é”®å—"
-#: include/svn_error_codes.h:253
-msgid "Unexpected node kind found"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+#: libsvn_fs_base/bdb/copies-table.c:167
+msgid "deleting entry from 'copies' table"
+msgstr "æ£åœ¨ä»Ž 'copies' 表ä¸åˆ 除æ¡ç›®"
-#: include/svn_error_codes.h:259
-msgid "Can't find an entry"
-msgstr "æ— æ³•æ‰¾åˆ°ä¸€ä¸ªé¡¹ç›®"
+# as-is
+#: libsvn_fs_base/bdb/copies-table.c:195
+#, fuzzy
+msgid "reading copy"
+msgstr "æ£åœ¨è¯»å–æ‹·è´"
-#: include/svn_error_codes.h:265
-msgid "Entry already exists"
-msgstr "项目已å˜åœ¨"
+#: libsvn_fs_base/bdb/nodes-table.c:97
+msgid "allocating new node ID (getting 'next-key')"
+msgstr "æ£åœ¨åˆ†é…新的节点 ID (æ£åœ¨èŽ·å– 'next-key')"
-#: include/svn_error_codes.h:269
-msgid "Entry has no revision"
-msgstr "项目没有修订版"
+#: libsvn_fs_base/bdb/nodes-table.c:115
+msgid "bumping next node ID key"
+msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
-#: include/svn_error_codes.h:273
-msgid "Entry has no URL"
-msgstr "项目没有地å€(URL)"
+#: libsvn_fs_base/bdb/nodes-table.c:152
+#, fuzzy, c-format
+msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
+msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
-#: include/svn_error_codes.h:277
-msgid "Entry has an invalid attribute"
-msgstr "é¡¹ç›®æœ‰æ— æ•ˆçš„å±žæ€§"
+#: libsvn_fs_base/bdb/nodes-table.c:178
+msgid "deleting entry from 'nodes' table"
+msgstr "æ£åœ¨ä»Ž 'nodes' è¡¨åˆ é™¤æ¡ç›®"
-#: include/svn_error_codes.h:283
-msgid "Obstructed update"
-msgstr "塞ä½çš„æ›´æ–°"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/nodes-table.c:218
+#, fuzzy
+msgid "reading node revision"
+msgstr "æ£åœ¨è¯»å–节点修订版"
-# as-is
-#: include/svn_error_codes.h:288
-msgid "Mismatch popping the WC unwind stack"
-msgstr "ä¸åŒ¹é…的弹出工作拷è´(WC)å±•å¼€å †æ ˆ"
+#: libsvn_fs_base/bdb/nodes-table.c:250
+#, fuzzy
+msgid "storing node revision"
+msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
-# as-is
-#: include/svn_error_codes.h:293
-msgid "Attempt to pop empty WC unwind stack"
-msgstr "å°è¯•弹出空的工作拷è´(WC)å±•å¼€å †æ ˆ"
+#: libsvn_fs_base/bdb/reps-table.c:93 libsvn_fs_base/bdb/reps-table.c:200
+#, fuzzy, c-format
+msgid "No such representation '%s'"
+msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
-# as-is
-#: include/svn_error_codes.h:298
-msgid "Attempt to unlock with non-empty unwind stack"
-msgstr "å°è¯•è§£é”éžç©ºå±•å¼€å †æ ˆ"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:96
+#, fuzzy
+msgid "reading representation"
+msgstr "æ£åœ¨è¯»å–请求"
-#: include/svn_error_codes.h:302
-msgid "Attempted to lock an already-locked dir"
-msgstr "å°è¯•è¦é”定一个已é”定的目录"
+#: libsvn_fs_base/bdb/reps-table.c:124
+#, fuzzy
+msgid "storing representation"
+msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
-#: include/svn_error_codes.h:306
-msgid "Working copy not locked; this is probably a bug, please report"
-msgstr "工作目录没有被é”定;这å¯èƒ½æ˜¯ä¸€ä¸ªæ¼æ´žï¼Œè¯·æŠ¥å‘Šå¼€å‘者"
+#: libsvn_fs_base/bdb/reps-table.c:154
+msgid "allocating new representation (getting next-key)"
+msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
-#: include/svn_error_codes.h:311
-msgid "Invalid lock"
-msgstr "æ— æ•ˆçš„é”定"
+#: libsvn_fs_base/bdb/reps-table.c:175
+#, fuzzy
+msgid "bumping next representation key"
+msgstr "æ£åœ¨æå–下一个请求关键å—"
-#: include/svn_error_codes.h:315
-msgid "Path is not a working copy directory"
-msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/reps-table.c:203
+#, fuzzy
+msgid "deleting representation"
+msgstr "æ£åœ¨åˆ 除请求"
-#: include/svn_error_codes.h:319
-msgid "Path is not a working copy file"
-msgstr "è·¯å¾„ä¸æ˜¯å·¥ä½œæ‹·è´æ–‡ä»¶"
+#. Handle any other error conditions.
+#: libsvn_fs_base/bdb/rev-table.c:87
+#, fuzzy
+msgid "reading filesystem revision"
+msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
-#: include/svn_error_codes.h:323
-msgid "Problem running log"
-msgstr "æ— æ³•æ‰§è¡Œæ—¥å¿—"
+#: libsvn_fs_base/bdb/strings-table.c:89
+msgid "creating cursor for reading a string"
+msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
-#: include/svn_error_codes.h:327
-msgid "Can't find a working copy path"
-msgstr "找ä¸åˆ°å·¥ä½œæ‹·è´è·¯å¾„"
+#: libsvn_fs_base/bdb/txn-table.c:92
+#, fuzzy
+msgid "storing transaction record"
+msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
-#: include/svn_error_codes.h:331
-msgid "Working copy is not up-to-date"
-msgstr "å·¥ä½œæ‹·è´æœªæ›´æ–°è‡³æœ€æ–°ç‰ˆ"
+#: libsvn_fs_base/bdb/uuids-table.c:114
+#, fuzzy
+msgid "get repository uuid"
+msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
-#: include/svn_error_codes.h:335
-msgid "Left locally modified or unversioned files"
-msgstr "ä¿ç•™æœ¬åœ°ä¿®æ”¹æˆ–未纳入版本管ç†çš„æ–‡ä»¶"
+#: libsvn_fs_base/bdb/uuids-table.c:142
+#, fuzzy
+msgid "set repository uuid"
+msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
-#: include/svn_error_codes.h:339
-msgid "Unmergeable scheduling requested on an entry"
-msgstr "è¯¥é¡¹ç›®æœ‰ä¸€ä¸ªæ— æ³•åˆå¹¶çš„调度请求"
+#: libsvn_fs_base/dag.c:239
+#, fuzzy, c-format
+msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
-#: include/svn_error_codes.h:343
-msgid "Found a working copy path"
-msgstr "找到一个工作拷è´è·¯å¾„"
+#: libsvn_fs_base/dag.c:247
+#, fuzzy, c-format
+msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
-#: include/svn_error_codes.h:347
-msgid "A conflict in the working copy obstructs the current operation"
-msgstr "工作拷è´ä¸çš„冲çªé˜»ç¢äº†ç›®å‰çš„æ“ä½œ"
+#: libsvn_fs_base/dag.c:256
+#, fuzzy, c-format
+msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
+msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
-#: include/svn_error_codes.h:351
-msgid "Working copy is corrupt"
-msgstr "工作拷è´å·²æŸå"
+#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:317
+#, fuzzy
+msgid "Attempted to create entry in non-directory parent"
+msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
-#: include/svn_error_codes.h:355
-msgid "Working copy text base is corrupt"
-msgstr "工作拷è´çš„æ–‡ä»¶å‚考基础已æŸå"
+#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:311
+#, c-format
+msgid "Attempted to create a node with an illegal name '%s'"
+msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
-#: include/svn_error_codes.h:359
-msgid "Cannot change node kind"
-msgstr "æ— æ³•æ›´æ”¹èŠ‚ç‚¹ç§ç±»"
+#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:323
+#, fuzzy, c-format
+msgid "Attempted to clone child of non-mutable node"
+msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
-#: include/svn_error_codes.h:363
-msgid "Invalid operation on the current working directory"
-msgstr "这个æ“作对目å‰çš„工作拷è´ç›®å½•æ— æ•ˆ"
+#: libsvn_fs_base/dag.c:494
+#, fuzzy, c-format
+msgid "Attempted to create entry that already exists"
+msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
-#: include/svn_error_codes.h:367
-msgid "Problem on first log entry in a working copy"
-msgstr "æ“作于工作拷è´çš„第一个日志项目时å‘生问题"
+#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:385
+#, fuzzy
+msgid "Attempted to set entry in non-directory node"
+msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
-#: include/svn_error_codes.h:371
-msgid "Unsupported working copy format"
-msgstr "䏿”¯æŒçš„å·¥ä½œæ‹·è´æ ¼å¼"
+#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:391
+#, fuzzy
+msgid "Attempted to set entry in immutable node"
+msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
-#: include/svn_error_codes.h:375
-msgid "Path syntax not supported in this context"
-msgstr "è·¯å¾„è¯æ³•在æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸æ”¯æŒ"
+#: libsvn_fs_base/dag.c:615
+#, c-format
+msgid "Can't set proplist on *immutable* node-revision %s"
+msgstr "ä¸èƒ½åœ¨ä¸å¯æ›´æ”¹èŠ‚ç‚¹ä¿®è®¢ç‰ˆ %s 设置属性列表"
-#: include/svn_error_codes.h:380
-msgid "Invalid schedule"
-msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
+#: libsvn_fs_base/dag.c:727
+#, c-format
+msgid "Attempted to make a child clone with an illegal name '%s'"
+msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
-#: include/svn_error_codes.h:386
-msgid "General filesystem error"
-msgstr "一般性文件系统错误"
+#: libsvn_fs_base/dag.c:852
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from *non*-directory node"
+msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
-#: include/svn_error_codes.h:390
-msgid "Error closing filesystem"
-msgstr "关闿–‡ä»¶ç³»ç»Ÿå‘生错误"
+#: libsvn_fs_base/dag.c:858
+#, fuzzy, c-format
+msgid "Attempted to delete entry '%s' from immutable directory node"
+msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
-#: include/svn_error_codes.h:394
-msgid "Filesystem is already open"
-msgstr "文件系统已打开"
+#: libsvn_fs_base/dag.c:865
+#, c-format
+msgid "Attempted to delete a node with an illegal name '%s'"
+msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
-#: include/svn_error_codes.h:398
-msgid "Filesystem is not open"
-msgstr "文件系档未打开"
+#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
+#, fuzzy, c-format
+msgid "Delete failed: directory has no entry '%s'"
+msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
-#: include/svn_error_codes.h:402
-msgid "Filesystem is corrupt"
-msgstr "文件系统æŸå"
+#: libsvn_fs_base/dag.c:962
+#, fuzzy, c-format
+msgid "Attempted removal of immutable node"
+msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
-#: include/svn_error_codes.h:406
-msgid "Invalid filesystem path syntax"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿè·¯å¾„è¯æ³•"
+#: libsvn_fs_base/dag.c:1082
+#, c-format
+msgid "Attempted to get textual contents of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
-#: include/svn_error_codes.h:410
-msgid "Invalid filesystem revision number"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆå·"
+#: libsvn_fs_base/dag.c:1117
+#, c-format
+msgid "Attempted to get length of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„é•¿åº¦"
-#: include/svn_error_codes.h:414
-msgid "Invalid filesystem transaction name"
-msgstr "æ— æ•ˆçš„æ–‡ä»¶ç³»ç»Ÿäº‹åŠ¡åç§°"
+#: libsvn_fs_base/dag.c:1143
+#, c-format
+msgid "Attempted to get checksum of a *non*-file node"
+msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
-#: include/svn_error_codes.h:418
-msgid "Filesystem directory has no such entry"
-msgstr "æ–‡ä»¶ç³»ç»Ÿç›®å½•æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®"
+#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of a *non*-file node"
+msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
-#: include/svn_error_codes.h:422
-msgid "Filesystem has no such representation"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„è¡¨çŽ° (representation)"
+#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
+#, fuzzy, c-format
+msgid "Attempted to set textual contents of an immutable node"
+msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
-#: include/svn_error_codes.h:426
-msgid "Filesystem has no such string"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„å—串"
+#: libsvn_fs_base/dag.c:1257
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:430
-msgid "Filesystem has no such copy"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„æ‹·è´"
+#: libsvn_fs_base/dag.c:1312
+#, c-format
+msgid "Attempted to open non-existent child node '%s'"
+msgstr "ä¼å›¾æ‰“å¼€ä¸å˜åœ¨çš„å节点“%sâ€"
-#: include/svn_error_codes.h:434
-msgid "The specified transaction is not mutable"
-msgstr "指定的事务ä¸å¯æ”¹å˜"
+#: libsvn_fs_base/dag.c:1318
+#, c-format
+msgid "Attempted to open node with an illegal name '%s'"
+msgstr "ä¼å›¾ä»¥ä¸åˆæ³•çš„åå—“%sâ€æ‰“开节点"
-#: include/svn_error_codes.h:438
-msgid "Filesystem has no item"
-msgstr "文件系统没有项目"
+#: libsvn_fs_base/err.c:38 libsvn_fs_fs/err.c:38
+msgid "Filesystem object has not been opened yet"
+msgstr "文件系统对象尚未打开"
-#: include/svn_error_codes.h:442
-msgid "Filesystem has no such node-rev-id"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„ node-rev-id"
+#: libsvn_fs_base/err.c:51
+#, c-format
+msgid "Corrupt filesystem revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸çš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆ %1$ld æŸå"
-#: include/svn_error_codes.h:446
-msgid "String does not represent a node or node-rev-id"
-msgstr "å—串并未表示一个节点或 node-rev-id"
+#: libsvn_fs_base/err.c:62 libsvn_fs_fs/err.c:52
+#, c-format
+msgid "Reference to non-existent node '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„节点“%1$sâ€"
-#: include/svn_error_codes.h:450
-msgid "Name does not refer to a filesystem directory"
-msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿç›®å½•"
+#: libsvn_fs_base/err.c:72
+#, c-format
+msgid "Reference to non-existent revision %ld in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„修订版“%1$ldâ€"
-#: include/svn_error_codes.h:454
-msgid "Name does not refer to a filesystem file"
-msgstr "åç§°æ²¡æœ‰æŒ‡å‘æ–‡ä»¶ç³»ç»Ÿæ–‡ä»¶"
+#: libsvn_fs_base/err.c:84
+#, c-format
+msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'transactions' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-#: include/svn_error_codes.h:458
-msgid "Name is not a single path component"
-msgstr "åç§°ä¸æ˜¯ä¸€ä¸ªå•一路径"
+#: libsvn_fs_base/err.c:95
+#, c-format
+msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'copies' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
-#: include/svn_error_codes.h:462
-msgid "Attempt to change immutable filesystem node"
-msgstr "å°è¯•è¦ä¿®æ”¹ä¸å¯æ”¹å˜çš„æ–‡ä»¶ç³»ç»ŸèŠ‚ç‚¹"
+#: libsvn_fs_base/err.c:106 libsvn_fs_fs/err.c:63
+#, c-format
+msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
+msgstr "æ–‡ä»¶æ— æ³•å˜æ›´ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-#: include/svn_error_codes.h:466
-msgid "Item already exists in filesystem"
-msgstr "该项目已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿä¸"
+#: libsvn_fs_base/err.c:117
+#, c-format
+msgid "No transaction named '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€ä¸ä¸å˜åœ¨å为“%1$sâ€çš„事务"
-#: include/svn_error_codes.h:470
-msgid "Attempt to remove or recreate fs root dir"
-msgstr "å°è¯•è¦ç§»é™¤æˆ–冿¬¡å»ºç«‹æ–‡ä»¶ç³»ç»Ÿçš„æ ¹ç›®å½•"
+#: libsvn_fs_base/err.c:128 libsvn_fs_fs/err.c:74
+#, c-format
+msgid "Cannot modify transaction named '%s' in filesystem '%s'"
+msgstr "æ— æ³•åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%2$sâ€ä¸ä¿®æ”¹å为“%1$sâ€çš„事务"
-#: include/svn_error_codes.h:474
-msgid "Object is not a transaction root"
-msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹ç‰©ä»¶"
+#: libsvn_fs_base/err.c:139
+#, c-format
+msgid "No copy with id '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸æ²¡æœ‰ç¼–å·â€œ%1$sâ€çš„æ‹·è´"
-#: include/svn_error_codes.h:478
-msgid "Object is not a revision root"
-msgstr "ç‰©ä»¶ä¸æ˜¯ä¸€ä¸ªä¿®è®¢ç‰ˆçš„æ ¹ç‰©ä»¶"
+#: libsvn_fs_base/err.c:149 libsvn_fs_fs/err.c:85
+#, c-format
+msgid "'%s' is not a directory in filesystem '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-#: include/svn_error_codes.h:482
-msgid "Merge conflict during commit"
-msgstr "æäº¤æ—¶å‘生åˆå¹¶å†²çª"
+#: libsvn_fs_base/err.c:160 libsvn_fs_fs/err.c:96
+#, fuzzy, c-format
+msgid "'%s' is not a file in filesystem '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-# as-is
-#: include/svn_error_codes.h:486
-msgid "A representation vanished or changed between reads"
-msgstr "表现消失或读时被改å˜"
+#: libsvn_fs_base/err.c:171
+#, fuzzy, c-format
+msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
+msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
-#: include/svn_error_codes.h:490
-msgid "Tried to change an immutable representation"
-msgstr "å°è¯•å˜æ›´ä¸€ä¸ªä¸å¯æ”¹å˜çš„表现 (representation)"
+#: libsvn_fs_base/err.c:181
+#, fuzzy, c-format
+msgid "No token given for path '%s' in filesystem '%s'"
+msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
-#: include/svn_error_codes.h:494
-msgid "Malformed skeleton data"
-msgstr "畸形的框架数æ®"
+#: libsvn_fs_base/err.c:190
+#, fuzzy, c-format
+msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
-#: include/svn_error_codes.h:498
-msgid "Transaction is out of date"
-msgstr "事务已过时"
+#: libsvn_fs_base/err.c:200 libsvn_fs_fs/err.c:117
+#, fuzzy, c-format
+msgid "No lock on path '%s' in filesystem '%s'"
+msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
-#: include/svn_error_codes.h:502
-msgid "Berkeley DB error"
-msgstr "Berkeley DB 错误"
+#: libsvn_fs_base/err.c:211 libsvn_fs_fs/err.c:128
+#, fuzzy, c-format
+msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
+msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
-#: include/svn_error_codes.h:506
-msgid "Berkeley DB deadlock error"
-msgstr "Berkeley DB å‘生æ»é”错误"
+#: libsvn_fs_base/err.c:222 libsvn_fs_fs/err.c:139
+#, c-format
+msgid "No username is currently associated with filesystem '%s'"
+msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
-#: include/svn_error_codes.h:510
-msgid "Transaction is dead"
-msgstr "事务已结æŸ"
+#: libsvn_fs_base/err.c:235 libsvn_fs_fs/err.c:152
+#, fuzzy, c-format
+msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
+msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
-#: include/svn_error_codes.h:514
-msgid "Transaction is not dead"
-msgstr "事务未结æŸ"
+#: libsvn_fs_base/err.c:247 libsvn_fs_fs/err.c:164
+#, fuzzy, c-format
+msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
+msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
-#: include/svn_error_codes.h:519
-msgid "Unknown FS type"
-msgstr "未知的 FS 类别"
+#: libsvn_fs_base/fs.c:79
+#, c-format
+msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
+msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
-#: include/svn_error_codes.h:524
-#, fuzzy
-msgid "No user associated with filesystem"
-msgstr "没有用户与文件系统关è”"
+#: libsvn_fs_base/fs.c:90
+#, c-format
+msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
+msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
-#: include/svn_error_codes.h:529
+#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:56
#, fuzzy
-msgid "Path is already locked"
-msgstr "路径“%sâ€å·²ç»è¢«é”定"
+msgid "Filesystem object already open"
+msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
-#: include/svn_error_codes.h:534 include/svn_error_codes.h:661
-#, fuzzy
-msgid "Path is not locked"
-msgstr "路径没有被é”定"
+#: libsvn_fs_base/fs.c:189
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while closing environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: include/svn_error_codes.h:539
-msgid "Lock token is incorrect"
-msgstr "é”å®šæ ‡è®°æ˜¯ä¸æ£ç¡®çš„"
+#: libsvn_fs_base/fs.c:539
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while creating environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: include/svn_error_codes.h:544
-#, fuzzy
-msgid "No lock token provided"
-msgstr "没有æä¾›é”å®šæ ‡è®°"
+#: libsvn_fs_base/fs.c:545
+#, fuzzy, c-format
+msgid "Berkeley DB error for filesystem '%s' while opening environment:\n"
+msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
-#: include/svn_error_codes.h:549
-msgid "Username does not match lock owner"
-msgstr "用户åå’Œé”定所有者ä¸åŒ¹é…"
+#: libsvn_fs_base/fs.c:672 libsvn_fs_fs/fs_fs.c:277
+#, c-format
+msgid "Expected FS format '%d'; found format '%d'"
+msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
-#: include/svn_error_codes.h:554
+#: libsvn_fs_base/fs.c:1094
#, fuzzy
-msgid "Filesystem has no such lock"
-msgstr "æ–‡ä»¶ç³»ç»Ÿæ²¡æœ‰è¿™æ ·çš„é”"
-
-#: include/svn_error_codes.h:559
-msgid "Lock has expired"
-msgstr "é”过期"
+msgid ""
+"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
+"may be interfering with the hotcopy algorithm. If \n"
+"the problem persists, try deactivating this feature \n"
+"in DB_CONFIG"
+msgstr ""
+"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
+"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
+"在 DB_CONFIG ä¸å–消这个功能。"
-#: include/svn_error_codes.h:564
+#: libsvn_fs_base/fs.c:1113
#, fuzzy
-msgid "Item is out of date"
-msgstr "æ¡ç›®å·²è¿‡æ—¶"
+msgid ""
+"Error running catastrophic recovery on hotcopy; the \n"
+"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
+"hotcopy algorithm. If the problem persists, try deactivating \n"
+"this feature in DB_CONFIG"
+msgstr ""
+"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
+"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
+"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
-#: include/svn_error_codes.h:576
-#, fuzzy
-msgid "Unsupported FS format"
-msgstr "䏿”¯æŒçš„ FS æ ¼å¼"
+#: libsvn_fs_base/fs.c:1222
+msgid "Module for working with a Berkeley DB repository."
+msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
-#: include/svn_error_codes.h:582
-msgid "The repository is locked, perhaps for db recovery"
-msgstr "档案库被é”定,也许æ£åœ¨ä½œæ•°æ®åº“ä¿®å¤"
+#: libsvn_fs_base/fs.c:1255
+#, c-format
+msgid "Unsupported FS loader version (%d) for bdb"
+msgstr "䏿”¯æŒçš„ bdb çš„ FS 载入器版本 (%d)"
-#: include/svn_error_codes.h:586
-msgid "A repository hook failed"
-msgstr "档案库外挂错误"
+#: libsvn_fs_base/lock.c:444 libsvn_fs_fs/lock.c:615
+#, c-format
+msgid "Cannot verify lock on path '%s'; no username available"
+msgstr "ä¸èƒ½åœ¨è·¯å¾„“%sâ€æ ¡éªŒé”;没有有效的用户å"
-#: include/svn_error_codes.h:590
-msgid "Incorrect arguments supplied"
-msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+#: libsvn_fs_base/lock.c:450 libsvn_fs_fs/lock.c:621
+#, c-format
+msgid "User %s does not own lock on path '%s' (currently locked by %s)"
+msgstr "用户 %s 䏿˜¯è·¯å¾„“%sâ€é”的所有者(当å‰ç”±ç”¨æˆ· %s é”定)"
-#: include/svn_error_codes.h:594
-msgid "A report cannot be generated because no data was supplied"
-msgstr "æ— æ³•äº§ç”ŸæŠ¥å‘Šï¼Œå› ä¸ºæ²¡æœ‰æä¾›ä»»ä½•æ•°æ®"
+#: libsvn_fs_base/lock.c:457 libsvn_fs_fs/lock.c:628
+#, c-format
+msgid "Cannot verify lock on path '%s'; no matching lock-token available"
+msgstr "ä¸èƒ½æ ¡éªŒè·¯å¾„“%sâ€ä¸Šçš„é”;没有匹é…çš„å¯ç”¨é”æ ‡è¯†"
-#: include/svn_error_codes.h:598
-msgid "Bogus revision report"
-msgstr "有问题的修订版报告"
+#. Helper macro that evaluates to an error message indicating that
+#. the representation referred to by X has an unknown node kind.
+#: libsvn_fs_base/reps-strings.c:57
+#, fuzzy, c-format
+msgid "Unknown node kind for representation '%s'"
+msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
-#: include/svn_error_codes.h:607
-msgid "Unsupported repository version"
-msgstr "䏿”¯æŒçš„æ¡£æ¡ˆåº“版本"
+#: libsvn_fs_base/reps-strings.c:108
+#, fuzzy
+msgid "Representation is not of type 'delta'"
+msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
-#: include/svn_error_codes.h:611
-msgid "Disabled repository feature"
-msgstr "å…³é—了的档案库功能"
+#: libsvn_fs_base/reps-strings.c:379
+msgid "Svndiff source length inconsistency"
+msgstr ""
-#: include/svn_error_codes.h:615
-msgid "Error running post-commit hook"
-msgstr "执行 post-commit 外挂时å‘生错误"
+#: libsvn_fs_base/reps-strings.c:506
+#, c-format
+msgid "Diff version inconsistencies in representation '%s'"
+msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
-#: include/svn_error_codes.h:620
-#, fuzzy
-msgid "Error running post-lock hook"
-msgstr "执行 post-lock 外挂时å‘生错误"
+#: libsvn_fs_base/reps-strings.c:532
+#, c-format
+msgid ""
+"Corruption detected whilst reading delta chain from representation '%s' to '%"
+"s'"
+msgstr ""
-#: include/svn_error_codes.h:625
-#, fuzzy
-msgid "Error running post-unlock hook"
-msgstr "执行 post-unlock 外挂时å‘生错误"
+#: libsvn_fs_base/reps-strings.c:780
+#, c-format
+msgid "Rep contents are too large: got %s, limit is %s"
+msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
-#: include/svn_error_codes.h:632
-msgid "Bad URL passed to RA layer"
-msgstr "ä¼ é€’è‡³ RA 层的地å€(URL)有问题"
+#: libsvn_fs_base/reps-strings.c:796
+#, fuzzy, c-format
+msgid "Failure reading rep '%s'"
+msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
-#: include/svn_error_codes.h:636
-msgid "Authorization failed"
-msgstr "授æƒå¤±è´¥"
+#: libsvn_fs_base/reps-strings.c:812 libsvn_fs_base/reps-strings.c:898
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch on rep '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+" 预期: %s\n"
+" 实际: %s\n"
-#: include/svn_error_codes.h:640
-msgid "Unknown authorization method"
-msgstr "æœªçŸ¥çš„æŽˆæƒæ–¹æ³•"
+#: libsvn_fs_base/reps-strings.c:912
+msgid "Null rep, but offset past zero already"
+msgstr "空的报告,å移已ç»è¶…过零值"
-#: include/svn_error_codes.h:644
-msgid "Repository access method not implemented"
-msgstr "该档案库å˜å–方法未实作"
+#: libsvn_fs_base/reps-strings.c:1025 libsvn_fs_base/reps-strings.c:1221
+#, fuzzy, c-format
+msgid "Rep '%s' is not mutable"
+msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
-#: include/svn_error_codes.h:648
-msgid "Item is out-of-date"
-msgstr "项目已过时"
+#: libsvn_fs_base/reps-strings.c:1040
+#, c-format
+msgid "Rep '%s' both mutable and non-fulltext"
+msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
-#: include/svn_error_codes.h:652
-msgid "Repository has no UUID"
-msgstr "档案库没有 UUID"
+#: libsvn_fs_base/reps-strings.c:1340
+msgid "Failed to get new string key"
+msgstr "å–æ–°çš„å—符串关键å—失败"
-#: include/svn_error_codes.h:656
-msgid "Unsupported RA plugin ABI version"
-msgstr "䏿”¯æŒçš„ RA 外挂 ABI 版本"
+#: libsvn_fs_base/reps-strings.c:1416
+#, c-format
+msgid "Attempt to deltify '%s' against itself"
+msgstr "ä¼å›¾ deltify “%s†自身"
-#: include/svn_error_codes.h:668
-msgid "RA layer failed to init socket layer"
-msgstr "RA å±‚æ— æ³•èµ·å§‹ socket 层"
+#: libsvn_fs_base/reps-strings.c:1487
+#, fuzzy, c-format
+msgid "Failed to calculate MD5 digest for '%s'"
+msgstr "计算“%sâ€çš„MD5指纹失败"
-#: include/svn_error_codes.h:672
-msgid "RA layer failed to create HTTP request"
-msgstr "RA 层建立 HTTP 请求失败"
+#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
+#, fuzzy, c-format
+msgid "Transaction is not dead: '%s'"
+msgstr "事务未结æŸï¼šâ€œ%sâ€"
-#: include/svn_error_codes.h:676
-msgid "RA layer request failed"
-msgstr "RA 层请求失败"
+#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
+#, fuzzy, c-format
+msgid "Transaction is dead: '%s'"
+msgstr "事务已结æŸï¼šâ€œ%sâ€"
-#: include/svn_error_codes.h:680
-msgid "RA layer didn't receive requested OPTIONS info"
-msgstr "RA å±‚æ— æ³•å–得请求的 OPTIONS ä¿¡æ¯"
+#: libsvn_fs_base/revs-txns.c:981
+#, fuzzy
+msgid "Transaction aborted, but cleanup failed"
+msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
-#: include/svn_error_codes.h:684
-msgid "RA layer failed to fetch properties"
-msgstr "RA å±‚æ— æ³•å–得属性"
+#. Constructing nice error messages for roots.
+#. Build an SVN_ERR_FS_NOT_FOUND error, with a detailed error text,
+#. for PATH in ROOT.
+#: libsvn_fs_base/tree.c:388 libsvn_fs_fs/tree.c:311
+#, fuzzy, c-format
+msgid "File not found: transaction '%s', path '%s'"
+msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
-#: include/svn_error_codes.h:688
-msgid "RA layer file already exists"
-msgstr "RA 层文件已å˜åœ¨"
+#: libsvn_fs_base/tree.c:393 libsvn_fs_fs/tree.c:317
+#, c-format
+msgid "File not found: revision %ld, path '%s'"
+msgstr "文件找ä¸åˆ°ï¼šä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-#: include/svn_error_codes.h:692
-msgid "Invalid configuration value"
-msgstr "æ— æ•ˆçš„é…置值"
+#. Build a detailed `file already exists' message for PATH in ROOT.
+#: libsvn_fs_base/tree.c:403 libsvn_fs_fs/tree.c:332
+#, fuzzy, c-format
+msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
+msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
-#: include/svn_error_codes.h:696
-msgid "HTTP Path Not Found"
-msgstr "找ä¸åˆ° HTTP 路径"
+#: libsvn_fs_base/tree.c:408 libsvn_fs_fs/tree.c:338
+#, c-format
+msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
+msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
-#: include/svn_error_codes.h:700
+#: libsvn_fs_base/tree.c:416 libsvn_fs_fs/tree.c:348
#, fuzzy
-msgid "Failed to execute WebDAV PROPPATCH"
-msgstr "执行 WebDAV PROPPATCH 失败"
+msgid "Root object must be a transaction root"
+msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
-#: include/svn_error_codes.h:705 include/svn_error_codes.h:741
-#: libsvn_ra_svn/marshal.c:600 libsvn_ra_svn/marshal.c:708
-#: libsvn_ra_svn/marshal.c:735
-msgid "Malformed network data"
-msgstr "畸形的网络数æ®"
+#: libsvn_fs_base/tree.c:831 libsvn_fs_fs/tree.c:757
+#, fuzzy, c-format
+msgid "Failure opening '%s'"
+msgstr "打开“%sâ€å¤±è´¥"
-#: include/svn_error_codes.h:710
-msgid "Unable to extract data from response header"
-msgstr "ä¸èƒ½ä»Žå›žåº”的头信æ¯ä¸èŽ·å–æ•°æ®"
+#: libsvn_fs_base/tree.c:1401 libsvn_fs_fs/tree.c:1155
+#, fuzzy
+msgid "Cannot compare property value between two different filesystems"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
-#: include/svn_error_codes.h:716 include/svn_error_codes.h:745
-msgid "Couldn't find a repository"
-msgstr "æ— æ³•æ‰¾åˆ°æ¡£æ¡ˆåº“"
+#: libsvn_fs_base/tree.c:1735
+msgid "Corrupt DB: faulty predecessor count"
+msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
-#: include/svn_error_codes.h:720
-msgid "Couldn't open a repository"
-msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“"
+#: libsvn_fs_base/tree.c:1790 libsvn_fs_fs/tree.c:1192
+#, fuzzy, c-format
+msgid "Unexpected immutable node at '%s'"
+msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
# as-is
-#: include/svn_error_codes.h:725
-msgid "Special code for wrapping server errors to report to client"
-msgstr "指定的代ç å°è£…æœåŠ¡å™¨é”™è¯¯ä»¥ä¾¿æŠ¥å‘Šå®¢æˆ·ç«¯"
+#: libsvn_fs_base/tree.c:1811 libsvn_fs_fs/tree.c:1215
+#, fuzzy, c-format
+msgid "Conflict at '%s'"
+msgstr "在“%sâ€å†²çª"
-#: include/svn_error_codes.h:729
-msgid "Unknown svn protocol command"
-msgstr "未知的 svn 通讯å定命令"
+#: libsvn_fs_base/tree.c:1861 libsvn_fs_base/tree.c:2566
+#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1751
+msgid "Bad merge; ancestor, source, and target not all in same fs"
+msgstr "错误的åˆå¹¶ï¼›æœ€åˆçš„ï¼ŒåŽŸå§‹ï¼Œç›®æ ‡ä¸æ˜¯å…¨éƒ¨åœ¨åŒä¸€ä¸ªæ–‡ä»¶ç³»ç»Ÿ(fs)"
-#: include/svn_error_codes.h:733
-msgid "Network connection closed unexpectedly"
-msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
+#: libsvn_fs_base/tree.c:1877 libsvn_fs_fs/tree.c:1280
+#, c-format
+msgid "Bad merge; target '%s' has id '%s', same as ancestor"
+msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
-#: include/svn_error_codes.h:737
-msgid "Network read/write error"
-msgstr "网络读写错误"
+#: libsvn_fs_base/tree.c:2373
+#, fuzzy, c-format
+msgid "Transaction '%s' out of date with respect to revision '%s'"
+msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
-#: include/svn_error_codes.h:749
-msgid "Client/server version mismatch"
-msgstr "客户端/æœåŠ¡å™¨ç‰ˆæœ¬ä¸åŒ¹é…"
+#: libsvn_fs_base/tree.c:2749 libsvn_fs_fs/tree.c:1890
+#, fuzzy
+msgid "The root directory cannot be deleted"
+msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
-#: include/svn_error_codes.h:757
-msgid "Credential data unavailable"
-msgstr "æ— æ³•å–å¾—å‡è¯æ•°æ®"
+#: libsvn_fs_base/tree.c:2929 libsvn_fs_fs/tree.c:1962
+#, fuzzy, c-format
+msgid "Cannot copy between two different filesystems ('%s' and '%s')"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
-#: include/svn_error_codes.h:761
-msgid "No authentication provider available"
-msgstr "æ— å¯ç”¨çš„è®¤è¯æä¾›è€…"
+#: libsvn_fs_base/tree.c:2938 libsvn_fs_fs/tree.c:1968
+msgid "Copy from mutable tree not currently supported"
+msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
-#: include/svn_error_codes.h:765 include/svn_error_codes.h:769
-msgid "All authentication providers exhausted"
-msgstr "æ‰€æœ‰çš„è®¤è¯æä¾›è€…å·²è€—å°½"
+#: libsvn_fs_base/tree.c:3433 libsvn_fs_fs/tree.c:2392
+#, fuzzy, c-format
+msgid ""
+"Base checksum mismatch on '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:775
-msgid "Read access denied for root of edit"
-msgstr "ç¼–è¾‘çš„æ ¹ç›®å½•è¯»å–æ‹’ç»"
+#: libsvn_fs_base/tree.c:3686 libsvn_fs_fs/tree.c:2628
+#, fuzzy
+msgid "Cannot compare file contents between two different filesystems"
+msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
+
+#: libsvn_fs_base/tree.c:3695 libsvn_fs_base/tree.c:3700
+#: libsvn_fs_fs/tree.c:2637 libsvn_fs_fs/tree.c:2642
+#: libsvn_repos/rev_hunt.c:605
+#, fuzzy, c-format
+msgid "'%s' is not a file"
+msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
+
+#: libsvn_fs_fs/dag.c:367
+#, fuzzy
+msgid "Can't get entries of non-directory"
+msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
+
+#: libsvn_fs_fs/dag.c:914
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch, file '%s':\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: include/svn_error_codes.h:780
-#, fuzzy
-msgid "Item is not readable"
-msgstr "项目ä¸èƒ½è¯»ã€‚"
+#: libsvn_fs_fs/err.c:107
+#, fuzzy, c-format
+msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
+msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
-#: include/svn_error_codes.h:785
-#, fuzzy
-msgid "Item is partially readable"
-msgstr "项目部分å¯è¯»ã€‚"
+#: libsvn_fs_fs/fs.c:97
+#, c-format
+msgid "Can't fetch FSFS mutex"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:789
-#, fuzzy
-msgid "Invalid authz configuration"
-msgstr "æ— æ•ˆçš„é…置值"
+#: libsvn_fs_fs/fs.c:104
+#, fuzzy, c-format
+msgid "Can't create FSFS mutex"
+msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:794
-#, fuzzy
-msgid "Item is not writable"
-msgstr "项目ä¸èƒ½å†™ã€‚"
+#: libsvn_fs_fs/fs.c:108
+#, c-format
+msgid "Can't store FSFS mutex"
+msgstr "ä¸èƒ½å˜å‚¨æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
-#: include/svn_error_codes.h:800
-msgid "Svndiff data has invalid header"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的档头"
+#: libsvn_fs_fs/fs.c:334
+msgid "Module for working with a plain file (FSFS) repository."
+msgstr "模å—与纯文本文件(FSFS)档案库一起工作。"
-# as-is
-#: include/svn_error_codes.h:804
-msgid "Svndiff data contains corrupt window"
-msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+#: libsvn_fs_fs/fs.c:367
+#, c-format
+msgid "Unsupported FS loader version (%d) for fsfs"
+msgstr "䏿”¯æŒçš„ fsfs çš„ FS 载入器版本 (%d)"
-# as-is
-#: include/svn_error_codes.h:808
-msgid "Svndiff data contains backward-sliding source view"
-msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+#: libsvn_fs_fs/fs_fs.c:467 libsvn_fs_fs/fs_fs.c:481
+msgid "Found malformed header in revision file"
+msgstr "åœ¨ä¿®è®¢ç‰ˆæ–‡ä»¶ä¸æ‰¾åˆ°ç•¸å½¢çš„æ–‡ä»¶å¤´"
-#: include/svn_error_codes.h:812
-msgid "Svndiff data contains invalid instruction"
-msgstr "svndiff æ•°æ®åŒ…å«äº†æ— 效的指令"
+#: libsvn_fs_fs/fs_fs.c:583 libsvn_fs_fs/fs_fs.c:597 libsvn_fs_fs/fs_fs.c:604
+#: libsvn_fs_fs/fs_fs.c:611 libsvn_fs_fs/fs_fs.c:619 libsvn_fs_fs/fs_fs.c:627
+msgid "Malformed text rep offset line in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
-#: include/svn_error_codes.h:816
-msgid "Svndiff data ends unexpectedly"
-msgstr "svndiff æ•°æ®æ„想ä¸åˆ°åœ°ç»“æŸ"
+#: libsvn_fs_fs/fs_fs.c:696
+msgid "Missing kind field in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ kind æ ä½"
-#: include/svn_error_codes.h:822
-msgid "Apache has no path to an SVN filesystem"
-msgstr "Apache æ²¡æœ‰æŒ‡å‘ SVN 文件系统的路径"
+#: libsvn_fs_fs/fs_fs.c:727
+msgid "Missing cpath in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ cpath"
-#: include/svn_error_codes.h:826
-msgid "Apache got a malformed URI"
-msgstr "Apache 得到一个畸形的 URI"
+#: libsvn_fs_fs/fs_fs.c:754 libsvn_fs_fs/fs_fs.c:760
+msgid "Malformed copyroot line in node-rev"
+msgstr "node-rev ä¸çš„ copyroot 行畸形"
-# as-is
-#: include/svn_error_codes.h:830
-msgid "Activity not found"
-msgstr "没有找到活动项"
+#: libsvn_fs_fs/fs_fs.c:778 libsvn_fs_fs/fs_fs.c:784
+msgid "Malformed copyfrom line in node-rev"
+msgstr "node-rev ä¸çš„ copyfrom 行畸形"
-#: include/svn_error_codes.h:834
-msgid "Baseline incorrect"
-msgstr "åŸºçº¿ä¸æ£ç¡®"
+#: libsvn_fs_fs/fs_fs.c:883 libsvn_fs_fs/fs_fs.c:3243
+msgid "Attempted to write to non-transaction"
+msgstr "ä¼å›¾å†™è‡³éžäº‹åŠ¡"
-#: include/svn_error_codes.h:838
-msgid "Input/output error"
-msgstr "输出入错误"
+#: libsvn_fs_fs/fs_fs.c:967
+msgid "Malformed representation header"
+msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
-#: include/svn_error_codes.h:844
-msgid "A path under version control is needed for this operation"
-msgstr "本æ“作仅能作用于纳入版本控制的路径"
+#: libsvn_fs_fs/fs_fs.c:991
+msgid "Missing node-id in node-rev"
+msgstr "node-rev 䏿²¡æœ‰ node-id"
-#: include/svn_error_codes.h:848
-msgid "Repository access is needed for this operation"
-msgstr "本æ“作需è¦å¯¹æ¡£æ¡ˆåº“进行å˜å–"
+#: libsvn_fs_fs/fs_fs.c:997
+msgid "Corrupt node-id in node-rev"
+msgstr "node-rev ä¸çš„ node-id æŸå"
-#: include/svn_error_codes.h:852
-msgid "Bogus revision information given"
-msgstr "使用了有问题的修订版信æ¯"
+#: libsvn_fs_fs/fs_fs.c:1042
+#, c-format
+msgid "Revision file lacks trailing newline"
+msgstr "修订版文件缺少结尾æ¢è¡Œç¬¦"
-#: include/svn_error_codes.h:856
-msgid "Attempting to commit to a URL more than once"
-msgstr "å°è¯•对地å€(URL)进行一次以上的æäº¤"
+#: libsvn_fs_fs/fs_fs.c:1054
+#, c-format
+msgid "Final line in revision file longer than 64 characters"
+msgstr "修订版文件的最åŽä¸€åˆ—大于 64 个å—符长"
-#: include/svn_error_codes.h:860
-msgid "Operation does not apply to binary file"
-msgstr "本æ“作ä¸é€‚用于二进制文件"
+#: libsvn_fs_fs/fs_fs.c:1069
+msgid "Final line in revision file missing space"
+msgstr "修订版文件的最åŽä¸€åˆ—少掉空白å—符"
-#: include/svn_error_codes.h:866
-msgid "Format of an svn:externals property was invalid"
-msgstr "svn:externals å±žæ€§çš„æ ¼å¼æ˜¯æ— 效的"
+#: libsvn_fs_fs/fs_fs.c:1098 libsvn_fs_fs/fs_fs.c:1156 libsvn_repos/log.c:514
+#: libsvn_repos/log.c:518
+#, c-format
+msgid "No such revision %ld"
+msgstr "没有这个修订版 %ld"
-#: include/svn_error_codes.h:870
-msgid "Attempting restricted operation for modified resource"
-msgstr "å°è¯•对已修改的资æºè¿›è¡Œå—é™çš„æ“ä½œ"
+#: libsvn_fs_fs/fs_fs.c:1216
+msgid "Malformed svndiff data in representation"
+msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
-#: include/svn_error_codes.h:874
-msgid "Operation does not apply to directory"
-msgstr "本æ“作ä¸é€‚用于目录"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:1359 libsvn_fs_fs/fs_fs.c:1372
+msgid "Reading one svndiff window read beyond the end of the representation"
+msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
-#: include/svn_error_codes.h:878
-msgid "Revision range is not allowed"
-msgstr "ä¸å…许的修订版范围"
+#: libsvn_fs_fs/fs_fs.c:1508
+msgid "svndiff data requested non-existent source"
+msgstr "svndiff æ•°æ®è¯·æ±‚ä¸å˜åœ¨çš„æ¥æº"
-#: include/svn_error_codes.h:882
-msgid "Inter-repository relocation not allowed"
-msgstr "䏿”¯æŒä¸åŒæ¡£æ¡ˆåº“ä¹‹é—´çš„é‡æ–°å®‰ç½® (relocation)"
+#: libsvn_fs_fs/fs_fs.c:1514
+msgid "svndiff requested position beyond end of stream"
+msgstr "svndiff 请求的ä½ç½®è¶…出了æµçš„结尾"
-#: include/svn_error_codes.h:886
-msgid "Author name cannot contain a newline"
-msgstr "作者åç§°ä¸å¯åŒ…嫿¢è¡Œç¬¦"
+#: libsvn_fs_fs/fs_fs.c:1537 libsvn_fs_fs/fs_fs.c:1554
+msgid "svndiff window length is corrupt"
+msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
-#: include/svn_error_codes.h:890
-msgid "Bad property name"
-msgstr "有问题的属性åç§°"
+#: libsvn_fs_fs/fs_fs.c:1602
+#, fuzzy, c-format
+msgid ""
+"Checksum mismatch while reading representation:\n"
+" expected: %s\n"
+" actual: %s\n"
+msgstr ""
+"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
+" 预期: %s\n"
+" 实际: %s\n"
-#: include/svn_error_codes.h:895
-msgid "Two versioned resources are unrelated"
-msgstr "ä¸¤ä¸ªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„èµ„æºæ²¡æœ‰ç›¸å…³æ€§"
+#: libsvn_fs_fs/fs_fs.c:1825 libsvn_fs_fs/fs_fs.c:1838
+#: libsvn_fs_fs/fs_fs.c:1844
+msgid "Directory entry corrupt"
+msgstr "目录æ¡ç›®æŸå"
-#: include/svn_error_codes.h:900
-msgid "Path has no lock token"
-msgstr "路径没有é”å®šæ ‡è®°"
+#: libsvn_fs_fs/fs_fs.c:2180 libsvn_fs_fs/fs_fs.c:2188
+#: libsvn_fs_fs/fs_fs.c:2220 libsvn_fs_fs/fs_fs.c:2240
+#: libsvn_fs_fs/fs_fs.c:2274 libsvn_fs_fs/fs_fs.c:2279
+msgid "Invalid changes line in rev-file"
+msgstr "rev-file 䏿œ‰æ— æ•ˆçš„å˜æ›´è¡Œ"
-#: include/svn_error_codes.h:906
-msgid "A problem occurred; see later errors for details"
-msgstr "有问题å‘生;请å‚阅éšé™„的细节"
+#: libsvn_fs_fs/fs_fs.c:2213
+msgid "Invalid change kind in rev file"
+msgstr "rev æ–‡ä»¶ä¸æœ‰æ— 效的改å˜ç§ç±»"
-#: include/svn_error_codes.h:910
-msgid "Failure loading plugin"
-msgstr "载入外挂失败"
+#: libsvn_fs_fs/fs_fs.c:2233
+msgid "Invalid text-mod flag in rev-file"
+msgstr "rev-file 䏿œ‰æ— 效的 text-mod æ ‡å¿—"
-#: include/svn_error_codes.h:914
-msgid "Malformed file"
-msgstr "畸形的文件"
+#: libsvn_fs_fs/fs_fs.c:2253
+msgid "Invalid prop-mod flag in rev-file"
+msgstr "rev-file 䏿œ‰æ— 效的 prop-mod æ ‡å¿—"
-#: include/svn_error_codes.h:918
-msgid "Incomplete data"
-msgstr "ä¸å®Œå…¨çš„æ•°æ®"
+#: libsvn_fs_fs/fs_fs.c:2436
+msgid "Copying from transactions not allowed"
+msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
-#: include/svn_error_codes.h:922
-msgid "Incorrect parameters given"
-msgstr "ä½¿ç”¨ä¸æ£ç¡®çš„傿•°"
+#: libsvn_fs_fs/fs_fs.c:2492
+#, fuzzy, c-format
+msgid "Unable to create transaction directory in '%s' for revision %ld"
+msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
-#: include/svn_error_codes.h:926
-msgid "Tried a versioning operation on an unversioned resource"
-msgstr "å°è¯•对未纳入版本控制的资æºè¿›è¡Œç‰ˆæœ¬æŽ§åˆ¶æ“作"
+#: libsvn_fs_fs/fs_fs.c:2671 libsvn_fs_fs/fs_fs.c:2678
+msgid "next-id file corrupt"
+msgstr "next-id 文件æŸå"
-#: include/svn_error_codes.h:930
-msgid "Test failed"
-msgstr "测试失败"
+#: libsvn_fs_fs/fs_fs.c:2763
+#, fuzzy
+msgid "Transaction cleanup failed"
+msgstr "事务清除失败"
-#: include/svn_error_codes.h:934
-msgid "Trying to use an unsupported feature"
-msgstr "å°è¯•è¦ä½¿ç”¨ä¸æ”¯æŒçš„功能"
+#: libsvn_fs_fs/fs_fs.c:2931
+msgid "Invalid change type"
+msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
-#: include/svn_error_codes.h:938
-msgid "Unexpected or unknown property kind"
-msgstr "æ„æƒ³ä¸åˆ°æˆ–未知的属性ç§ç±»"
+#: libsvn_fs_fs/fs_fs.c:3262
+msgid "Can't set text contents of a directory"
+msgstr "æ— æ³•è®¾å®šç›®å½•çš„æ–‡å—内容"
-#: include/svn_error_codes.h:942
-msgid "Illegal target for the requested operation"
-msgstr "对请求的æ“作æ¥è¯´æ˜¯ä¸åˆæ³•çš„ç›®æ ‡"
+#: libsvn_fs_fs/fs_fs.c:3352 libsvn_fs_fs/fs_fs.c:3357
+#: libsvn_fs_fs/fs_fs.c:3364
+msgid "Corrupt current file"
+msgstr "当剿–‡ä»¶æŸå"
-#: include/svn_error_codes.h:946
-msgid "MD5 checksum is missing"
-msgstr "没有 MD5 指纹检查值"
+# as-is
+#: libsvn_fs_fs/fs_fs.c:3654 libsvn_subr/io.c:2658 svn/util.c:236
+#: svn/util.c:260
+#, c-format
+msgid "Can't stat '%s'"
+msgstr "ä¸èƒ½å–得“%sâ€çжæ€"
-#: include/svn_error_codes.h:950
-msgid "Directory needs to be empty but is not"
-msgstr "目录必须为空的,但是结果并éžå¦‚æ¤"
+#: libsvn_fs_fs/fs_fs.c:3658
+#, c-format
+msgid "Can't chmod '%s'"
+msgstr "æ— æ³• chmod“%sâ€"
-#: include/svn_error_codes.h:954
-msgid "Error calling external program"
-msgstr "呼å«å¤–éƒ¨ç¨‹åºæ—¶å‘生错误"
+#: libsvn_fs_fs/fs_fs.c:3797
+#, c-format
+msgid "Can't grab FSFS repository mutex"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶(FSFS)档案库互斥体"
-#: include/svn_error_codes.h:958
-msgid "Python exception has been set with the error"
-msgstr "Python 异常已被设定为错误"
+#: libsvn_fs_fs/fs_fs.c:3811
+#, c-format
+msgid "Can't ungrab FSFS repository mutex"
+msgstr "ä¸èƒ½æ˜¯å¦æ–‡ä»¶(FSFS)档案库互斥体"
-#: include/svn_error_codes.h:962
-msgid "A checksum mismatch occurred"
-msgstr "总和检查值ä¸ç¬¦"
+#: libsvn_fs_fs/fs_fs.c:3928
+msgid "Transaction out of date"
+msgstr "事务过时"
-#: include/svn_error_codes.h:966
-msgid "The operation was interrupted"
-msgstr "æ“ä½œè¢«ä¸æ–"
+#: libsvn_fs_fs/fs_fs.c:4225
+msgid "No such transaction"
+msgstr "æ— æ¤äº‹åŠ¡"
-#: include/svn_error_codes.h:970
-msgid "The specified diff option is not supported"
-msgstr "指定的 diff 选项䏿”¯æŒ"
+#: libsvn_fs_fs/lock.c:230
+#, fuzzy, c-format
+msgid "Cannot write lock/entries hashfile '%s'"
+msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
-#: include/svn_error_codes.h:974
-msgid "Property not found"
-msgstr "找ä¸åˆ°å±žæ€§"
+#: libsvn_fs_fs/lock.c:286
+#, fuzzy, c-format
+msgid "Can't parse lock/entries hashfile '%s'"
+msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
-#: include/svn_error_codes.h:978
-msgid "No auth file path available"
-msgstr "未æä¾› auth 文件路径"
+#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
+#, fuzzy, c-format
+msgid "Path '%s' doesn't exist in HEAD revision"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
-#: include/svn_error_codes.h:983
-msgid "Incompatible library version"
-msgstr "ä¸ç›¸å®¹çš„程åºåº“版本"
+#: libsvn_fs_fs/lock.c:741
+#, c-format
+msgid "Lock failed: newer version of '%s' exists"
+msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
-#: include/svn_error_codes.h:989
-msgid "Client error in parsing arguments"
-msgstr "客户端于剖æžå‚æ•°æ—¶å‘生错误"
+#: libsvn_ra/ra_loader.c:213
+#, fuzzy, c-format
+msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
-#: include/svn_error_codes.h:993
-msgid "Not enough args provided"
-msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
+#: libsvn_ra/ra_loader.c:285
+#, fuzzy, c-format
+msgid "Unrecognized URL scheme for '%s'"
+msgstr ""
+"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%sâ€"
-#: include/svn_error_codes.h:997
-msgid "Mutually exclusive arguments specified"
-msgstr "æŒ‡å®šäº†äº’æ–¥çš„å‚æ•°"
+#: libsvn_ra/ra_loader.c:336
+#, fuzzy, c-format
+msgid "'%s' isn't in the same repository as '%s'"
+msgstr ""
+"“%sâ€\n"
+"与\n"
+"“%sâ€\n"
+"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
-#: include/svn_error_codes.h:1001
-msgid "Attempted command in administrative dir"
-msgstr "å°è¯•于管ç†ç›®å½•䏿‰§è¡Œå‘½ä»¤"
+# as-is
+#: libsvn_ra/ra_loader.c:707
+#, fuzzy, c-format
+msgid " - handles '%s' scheme\n"
+msgstr " - 处ç†â€œ%sâ€è§„则\n"
-#: include/svn_error_codes.h:1005
-msgid "The log message file is under version control"
-msgstr "æ—¥å¿—ä¿¡æ¯æ–‡ä»¶äºŽç‰ˆæœ¬æŽ§åˆ¶ä¹‹ä¸‹"
+#: libsvn_ra/ra_loader.c:793
+#, c-format
+msgid "Unrecognized URL scheme '%s'"
+msgstr ""
+"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
+"则)“%sâ€"
-#: include/svn_error_codes.h:1009
-msgid "The log message is a pathname"
-msgstr "æ—¥å¿—ä¿¡æ¯æ˜¯è·¯å¾„å"
+#: libsvn_ra_dav/commit.c:199
+#, c-format
+msgid "Could not create a request (%s '%s')"
+msgstr "æ— æ³•å»ºç«‹è¯·æ±‚ (%s“%sâ€)"
-#: include/svn_error_codes.h:1013
-msgid "Committing in directory scheduled for addition"
-msgstr "于预计新增的目录ä¸è¿›è¡Œæäº¤"
+#: libsvn_ra_dav/commit.c:298
+msgid ""
+"Could not fetch the Version Resource URL (needed during an import or when it "
+"is missing from the local, cached props)"
+msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
-#: include/svn_error_codes.h:1017
-msgid "No external editor available"
-msgstr "æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨"
+#: libsvn_ra_dav/commit.c:487
+#, fuzzy, c-format
+msgid "Could not create a CHECKOUT request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
-#: include/svn_error_codes.h:1021
-msgid "Something is wrong with the log message's contents"
-msgstr "日志信æ¯çš„内容有ä¸å¦¥çš„地方"
+#: libsvn_ra_dav/commit.c:574 libsvn_ra_serf/commit.c:375
+#: libsvn_ra_serf/commit.c:436
+#, fuzzy, c-format
+msgid "Your file or directory '%s' is probably out-of-date"
+msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
-#: include/svn_error_codes.h:1025
-msgid "A log message was given where none was necessary"
-msgstr "在没有需è¦çš„地方给出一个日志信æ¯"
+#: libsvn_ra_dav/commit.c:582
+msgid "The CHECKOUT response did not contain a 'Location:' header"
+msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
-#: libsvn_client/add.c:371
-#, c-format
-msgid "Error during recursive add of '%s'"
-msgstr "进行“%sâ€çš„递归新增时å‘生错误"
+#: libsvn_ra_dav/commit.c:881
+#, fuzzy, c-format
+msgid "Could not create a DELETE request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
-#: libsvn_client/add.c:382
+#: libsvn_ra_dav/commit.c:1169 libsvn_ra_serf/commit.c:1395
#, c-format
-msgid "Can't close directory '%s'"
-msgstr "æ— æ³•å…³é—目录“%sâ€"
+msgid "File '%s' already exists"
+msgstr "文件“%sâ€å·²å˜åœ¨"
-#: libsvn_client/blame.c:382 libsvn_client/blame.c:774
+#: libsvn_ra_dav/commit.c:1307
#, c-format
-msgid "Cannot calculate blame information for binary file '%s'"
-msgstr "æ— æ³•ä¸ºäºŒè¿›åˆ¶æ–‡ä»¶â€œ%sâ€è®¡ç®—谴责信æ¯"
-
-#: libsvn_client/blame.c:543
-msgid "Start revision must precede end revision"
-msgstr "起始修订版必须大于结æŸä¿®è®¢ç‰ˆ"
+msgid "Could not write svndiff to temp file"
+msgstr "æ— æ³•å†™ svndiff 至临时文件"
-#: libsvn_client/blame.c:659 libsvn_client/cat.c:205
+#: libsvn_ra_dav/commit.c:1397
#, c-format
-msgid "URL '%s' refers to a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个目录"
+msgid "Could not create a PUT request (%s)"
+msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåŠ å…¥(PUT)请求 (%s)"
-#: libsvn_client/blame.c:732
+#: libsvn_ra_dav/commit.c:1559
#, c-format
-msgid "Revision action '%c' for revision %ld of '%s' lacks a prior revision"
-msgstr "修订版动作 '%c' 对修订版 %ld 于“%sâ€ç¼ºå°‘å‰ä¸€ä¸ªä¿®è®¢ç‰ˆ"
+msgid "applying log message to %s"
+msgstr "应用日志信æ¯è‡³â€œ%sâ€"
-#: libsvn_client/cat.c:73 libsvn_client/export.c:241
-#, fuzzy, c-format
-msgid "'%s' is not under version control or doesn't exist"
-msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶æˆ–ä¸å˜åœ¨"
+#: libsvn_ra_dav/fetch.c:285
+msgid "Could not save the URL of the version resource"
+msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
-#: libsvn_client/cat.c:79
+#: libsvn_ra_dav/fetch.c:406
#, fuzzy, c-format
-msgid "'%s' refers to a directory"
-msgstr "“%sâ€å¼•用一个目录"
-
-# as-is
-#: libsvn_client/cat.c:131 libsvn_client/export.c:183
-msgid "(local)"
-msgstr "(本地)"
+msgid "Could not get content-type from response"
+msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
-# as-is
-#: libsvn_client/cat.c:245
+#: libsvn_ra_dav/fetch.c:451
#, c-format
-msgid "Can't seek in '%s'"
-msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
+msgid "Could not create a GET request for '%s'"
+msgstr "æ— æ³•ä¸ºâ€œ%sâ€åˆ›å»º GET 请求"
-#: libsvn_client/checkout.c:88
+#: libsvn_ra_dav/fetch.c:526
#, c-format
-msgid "URL '%s' doesn't exist"
-msgstr "地å€(URL)“%sâ€ä¸å˜åœ¨"
+msgid "GET request failed for '%s'"
+msgstr "对“%sâ€çš„ GET 请求失败"
-#: libsvn_client/checkout.c:92
-#, c-format
-msgid "URL '%s' refers to a file, not a directory"
-msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
+#: libsvn_ra_dav/fetch.c:665
+msgid "Could not save file"
+msgstr "æ— æ³•å‚¨å˜æ–‡ä»¶"
-#: libsvn_client/checkout.c:152
+#: libsvn_ra_dav/fetch.c:906 libsvn_ra_svn/client.c:1002
#, c-format
-msgid "'%s' is already a working copy for a different URL"
-msgstr "“%sâ€å·²æ˜¯ä¸åŒåœ°å€(URL)的工作拷è´"
+msgid ""
+"Checksum mismatch for '%s':\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: libsvn_client/checkout.c:156
-#, fuzzy
-msgid "; run 'svn update' to complete it"
-msgstr ";请执行“svn updateâ€ä»¥å®Œæˆç›®å‰çš„æ“ä½œã€‚"
+#: libsvn_ra_dav/fetch.c:1151
+msgid "Server response missing the expected deadprop-count property"
+msgstr ""
-#: libsvn_client/checkout.c:166
-#, fuzzy, c-format
-msgid "'%s' already exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+#: libsvn_ra_dav/fetch.c:1324
+msgid "Server does not support date-based operations"
+msgstr "æœåС噍䏿”¯æŒåŸºäºŽæ—¥æœŸçš„æ“ä½œ"
-#: libsvn_client/commit.c:209
-#, c-format
-msgid "Unknown or unversionable type for '%s'"
-msgstr "类型“%sâ€æœªçŸ¥æˆ–ä¸å¯ç‰ˆæœ¬æŽ§åˆ¶"
+#: libsvn_ra_dav/fetch.c:1331
+msgid "Invalid server response to dated-rev request"
+msgstr "对 dated-rev è¯·æ±‚çš„æ— æ•ˆæœåŠ¡å™¨å›žåº”"
-#: libsvn_client/commit.c:522
-msgid "New entry name required when importing a file"
-msgstr "导入文件时,需è¦ä¸€ä¸ªæ–°çš„项目åç§°"
+# as-is
+#: libsvn_ra_dav/fetch.c:1470
+#, fuzzy
+msgid "'get-locations' REPORT not implemented"
+msgstr "get-locations REPORT 未实现"
-#: libsvn_client/commit.c:556 libsvn_wc/props.c:1197 libsvn_wc/questions.c:62
-#, c-format
-msgid "'%s' does not exist"
-msgstr "“%sâ€ä¸å˜åœ¨"
+#: libsvn_ra_dav/fetch.c:1643 libsvn_ra_dav/session.c:1188
+#: libsvn_ra_dav/session.c:1474
+#, fuzzy
+msgid "Incomplete lock data returned"
+msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
+
+#: libsvn_ra_dav/fetch.c:1819 libsvn_ra_dav/fetch.c:1827
+#: libsvn_ra_dav/fetch.c:1831 libsvn_ra_serf/locks.c:512
+#, fuzzy
+msgid "Server does not support locking features"
+msgstr "æœåС噍䏿”¯æŒé”定特性"
+
+#: libsvn_ra_dav/fetch.c:1908
+msgid ""
+"DAV request failed; it's possible that the repository's pre-revprop-change "
+"hook either failed or is non-existent"
+msgstr ""
+"DAV 请求失败;å¯èƒ½æ˜¯æ¡£æ¡ˆåº“çš„ pre-revprop-change 外挂执行失败;或是ä¸å˜åœ¨"
-#: libsvn_client/commit.c:616 libsvn_client/copy.c:81 svnlook/main.c:1263
+#: libsvn_ra_dav/fetch.c:2643
#, c-format
-msgid "Path '%s' does not exist"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+msgid "Error writing to '%s': unexpected EOF"
+msgstr "写入“%sâ€æ—¶å‘生错误:æ„外的 EOF"
-#: libsvn_client/commit.c:746 libsvn_client/copy.c:398
-#: libsvn_client/copy.c:414
+#: libsvn_ra_dav/fetch.c:2788
#, c-format
-msgid "Path '%s' already exists"
-msgstr "路径“%sâ€å·²å˜åœ¨"
+msgid "Unknown XML encoding: '%s'"
+msgstr "未知的 XML ç¼–ç :“%sâ€"
-#: libsvn_client/commit.c:756
+# as-is
+#: libsvn_ra_dav/fetch.c:3075
#, c-format
-msgid "'%s' is a reserved name and cannot be imported"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªä¿ç•™çš„åç§°ï¼Œæ— æ³•è¢«å¯¼å…¥"
+msgid "REPORT response handling failed to complete the editor drive"
+msgstr "报告å“应处ç†å¤±è´¥ä¸èƒ½å®Œæˆç¼–辑驱动"
-#: libsvn_client/commit.c:869 libsvn_client/copy.c:544
-msgid "Commit failed (details follow):"
-msgstr "æäº¤å¤±è´¥(细节è§ä¸‹):"
+# as-is
+#: libsvn_ra_dav/file_revs.c:363
+#, fuzzy
+msgid "'get-file-revs' REPORT not implemented"
+msgstr "get-file-revs REPORT 未实现"
-#: libsvn_client/commit.c:877 libsvn_client/copy.c:552
-msgid "Commit succeeded, but other errors follow:"
-msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘生了其它的错误,如åŽï¼š"
+#: libsvn_ra_dav/file_revs.c:379
+msgid "The file-revs report didn't contain any revisions"
+msgstr "file-revs æŠ¥å‘Šä¸æ²¡æœ‰ä»»ä½•修订版"
-#: libsvn_client/commit.c:884 libsvn_client/copy.c:559
-msgid "Error unlocking locked dirs (details follow):"
-msgstr "解除é”定目录时å‘生错误(细节è§ä¸‹):"
+#: libsvn_ra_dav/merge.c:220
+#, c-format
+msgid ""
+"Protocol error: we told the server not to auto-merge any resources, but it "
+"said that '%s' was merged"
+msgstr ""
+"通讯å定错误:我们告知æœåС噍ä¸è¦è‡ªåЍåˆå¹¶ä»»ä½•资æºï¼Œä½†æ˜¯å®ƒæŠ¥å‘Šâ€œ%sâ€å·²è¢«åˆå¹¶"
-#: libsvn_client/commit.c:895
-msgid "Error bumping revisions post-commit (details follow):"
-msgstr "post-commit å¢žåŠ ä¿®è®¢ç‰ˆæ—¶å‘生错误 (细节è§ä¸‹):"
+#: libsvn_ra_dav/merge.c:229
+#, c-format
+msgid ""
+"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
+"element within the MERGE response"
+msgstr "内部错误:在 MERGE 回应ä¸ï¼Œâ€œDAV:responseâ€å…ƒç´ 有个未知的父项目 (%d)"
-#: libsvn_client/commit.c:906 libsvn_client/copy.c:570
-msgid "Error in post-commit clean-up (details follow):"
-msgstr "post-commit 清除时å‘生错误 (细节è§ä¸‹):"
+#: libsvn_ra_dav/merge.c:244
+#, c-format
+msgid ""
+"Protocol error: the MERGE response for the '%s' resource did not return all "
+"of the properties that we asked for (and need to complete the commit)"
+msgstr ""
+"通讯å定错误:对“%sâ€çš„ MERGE 回应并未返回所有我们请求的属性 (è¿™äº›æ˜¯å®Œæˆæäº¤æ“"
+"作所ä¸å¯ç¼ºå°‘çš„)"
-#: libsvn_client/commit.c:1220
+#: libsvn_ra_dav/merge.c:263
#, c-format
-msgid "'%s' is a URL, but URLs cannot be commit targets"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªåœ°å€(URL),但是地å€(URL)ä¸å¯ä¸ºä½œæäº¤çš„ç›®æ ‡"
+msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
+msgstr "对“%sâ€çš„ MERGE å›žåº”å¹¶ä¸æ˜¯ç›®æ ‡ (“%sâ€) çš„å项目"
-#: libsvn_client/commit.c:1412
-msgid "Are all the targets part of the same working copy?"
-msgstr "æ˜¯å¦æ‰€æœ‰çš„ç›®æ ‡éƒ½æ˜¯åŒä¸€ä¸ªå·¥ä½œæ‹·è´çš„一部份?"
+#: libsvn_ra_dav/merge.c:485
+msgid "The MERGE property response had an error status"
+msgstr "MERGE 属性回应包å«é”™è¯¯çжæ€"
-#: libsvn_client/commit.c:1427
-msgid "Cannot non-recursively commit a directory deletion"
-msgstr "æ— æ³•ä»¥éžé€’å½’æäº¤ç›®å½•åˆ é™¤"
+#: libsvn_ra_dav/options.c:130
+msgid ""
+"The OPTIONS response did not include the requested activity-collection-set; "
+"this often means that the URL is not WebDAV-enabled"
+msgstr ""
+"OPTIONS 回应并ä¸åŒ…å«è¯·æ±‚çš„ activity-collection-set;通常这表示该地å€(URL)å¹¶ä¸"
+"æ”¯æŒ WebDAV"
-#: libsvn_client/commit_util.c:243 libsvn_client/commit_util.c:254
+#: libsvn_ra_dav/props.c:588
#, c-format
-msgid "Unknown entry kind for '%s'"
-msgstr "未知的项目类型“%sâ€"
+msgid "Failed to find label '%s' for URL '%s'"
+msgstr "æ— æ³•æ‰¾åˆ°æ ‡è®°â€œ%sâ€äºŽåœ°å€(URL)“%sâ€"
-#: libsvn_client/commit_util.c:271
+#: libsvn_ra_dav/props.c:617
#, c-format
-msgid "Entry '%s' has unexpectedly changed special status"
-msgstr "项目“%sâ€æ„想ä¸åˆ°åœ°å˜æ¢ç‰¹æ®Šçжæ€"
+msgid "'%s' was not present on the resource"
+msgstr "“%sâ€ä¸å˜åœ¨äºŽæœ¬èµ„æºä¸Š"
-#: libsvn_client/commit_util.c:322
+#: libsvn_ra_dav/props.c:656
#, c-format
-msgid "Aborting commit: '%s' remains in conflict"
-msgstr "䏿¢æäº¤ï¼šâ€œ%sâ€ä»å¤„于冲çªçжæ€"
+msgid "Neon was unable to parse URL '%s'"
+msgstr "Neon ä¸èƒ½åˆ†æžåœ°å€(URL)â€%s“"
-#: libsvn_client/commit_util.c:388
-#, c-format
-msgid "Did not expect '%s' to be a working copy root"
-msgstr "并未预期“%sâ€æ˜¯å·¥ä½œæ‹·è´çš„æ ¹ç›®å½•"
+#: libsvn_ra_dav/props.c:685
+msgid "The path was not part of a repository"
+msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
-#: libsvn_client/commit_util.c:406
+#: libsvn_ra_dav/props.c:696
#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
+msgid "No part of path '%s' was found in repository HEAD"
+msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
-#: libsvn_client/commit_util.c:678 libsvn_client/commit_util.c:808
-#: libsvn_client/copy.c:1073 libsvn_client/delete.c:67
-#: libsvn_client/diff.c:1390 libsvn_client/diff.c:1988
-#: libsvn_client/diff.c:2510 libsvn_client/diff.c:2619
-#: libsvn_client/locking_commands.c:248 libsvn_client/locking_commands.c:272
-#: libsvn_client/log.c:129 libsvn_client/prop_commands.c:213
-#: libsvn_client/prop_commands.c:446 libsvn_client/prop_commands.c:602
-#: libsvn_client/prop_commands.c:951 libsvn_client/ra.c:180
-#: libsvn_client/revisions.c:89 libsvn_client/status.c:256
-#: libsvn_client/switch.c:104 libsvn_wc/adm_ops.c:2261
-#: libsvn_wc/adm_ops.c:2287 libsvn_wc/adm_ops.c:2324 libsvn_wc/copy.c:448
-#: libsvn_wc/entries.c:1498 libsvn_wc/entries.c:1990 libsvn_wc/props.c:286
-#: libsvn_wc/props.c:1124 libsvn_wc/questions.c:171
-#, c-format
-msgid "'%s' is not under version control"
-msgstr "“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+#: libsvn_ra_dav/props.c:730 libsvn_ra_dav/props.c:785
+msgid "The VCC property was not found on the resource"
+msgstr "æœ¬èµ„æºæ‰¾ä¸åˆ° VCC 属性"
-#: libsvn_client/commit_util.c:681
-#, c-format
-msgid "Entry for '%s' has no URL"
-msgstr "“%sâ€çš„项目没有地å€(URL)"
+#: libsvn_ra_dav/props.c:798
+msgid "The relative-path property was not found on the resource"
+msgstr "本资æºä¸Šæ‰¾ä¸åˆ°ç›¸å¯¹è·¯å¾„属性"
+
+#: libsvn_ra_dav/props.c:919
+msgid "'DAV:baseline-collection' was not present on the baseline resource"
+msgstr "'DAV:baseline-collection' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+
+#: libsvn_ra_dav/props.c:938
+msgid "'DAV:version-name' was not present on the baseline resource"
+msgstr "'DAV:version-name' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+
+#: libsvn_ra_dav/props.c:1106 libsvn_ra_serf/commit.c:719
+msgid "At least one property change failed; repository is unchanged"
+msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
+
+#: libsvn_ra_dav/replay.c:136 libsvn_ra_serf/replay.c:161
+#, fuzzy
+msgid "Missing revision attr in target-revision element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+
+#: libsvn_ra_dav/replay.c:151 libsvn_ra_serf/replay.c:179
+#, fuzzy
+msgid "Missing revision attr in open-root element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/commit_util.c:714
-#, c-format
-msgid "'%s' is scheduled for addition within unversioned parent"
-msgstr "“%sâ€äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„父路径ä¸è¢«åŠ å…¥æ–°å¢žè°ƒåº¦"
+#: libsvn_ra_dav/replay.c:172 libsvn_ra_serf/replay.c:198
+msgid "Missing name attr in delete-entry element"
+msgstr ""
-#: libsvn_client/commit_util.c:734
-#, c-format
-msgid ""
-"Entry for '%s' is marked as 'copied' but is not itself scheduled\n"
-"for addition. Perhaps you're committing a target that is\n"
-"inside an unversioned (or not-yet-versioned) directory?"
+#: libsvn_ra_dav/replay.c:176
+msgid "Missing rev attr in delete-entry element"
msgstr ""
-"“%sâ€é¡¹ç›®è¢«æ ‡è®°ä¸ºâ€œå·²å¤åˆ¶â€ï¼Œä½†æ˜¯æœ¬èº«å°šæœªåŠ å…¥æ–°å¢žè°ƒåº¦ã€‚ä¹Ÿè®¸æ‚¨æäº¤çš„\n"
-"ç›®æ ‡æ˜¯ä½äºŽæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ (或尚未纳入) 的目录ä¸ï¼Ÿ"
-#: libsvn_client/commit_util.c:774
-#, 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"
+#: libsvn_ra_dav/replay.c:196 libsvn_ra_serf/replay.c:224
+#, fuzzy
+msgid "Missing name attr in open-directory element"
+msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
+
+#: libsvn_ra_dav/replay.c:248 libsvn_ra_dav/replay.c:351
+#: libsvn_ra_serf/replay.c:371
+#, fuzzy, c-format
+msgid "Missing name attr in %s element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
+
+#: libsvn_ra_dav/replay.c:288
+msgid "Got apply-textdelta element without preceding add-file or open-file"
msgstr ""
-"“%sâ€å°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œä¹Ÿä¸æ˜¯æäº¤çš„一部份,但是它的å路径“%sâ€æ˜¯æäº¤çš„一部份"
-#: libsvn_client/commit_util.c:857
-#, c-format
-msgid "Cannot commit both '%s' and '%s' as they refer to the same URL"
-msgstr "æ— æ³•æäº¤â€œ%sâ€ä¸Žâ€œ%sâ€ï¼Œå› 为它们都指å‘åŒä¸€ä¸ªåœ°å€(URL)"
+#: libsvn_ra_dav/replay.c:314
+msgid "Got close-file element without preceding add-file or open-file"
+msgstr ""
-#: libsvn_client/commit_util.c:1002
-#, c-format
-msgid "Commit item '%s' has copy flag but no copyfrom URL"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶åœ°å€åœ°å€(copyfrom URL)"
+#: libsvn_ra_dav/replay.c:329
+msgid "Got close-directory element without ever opening a directory"
+msgstr ""
-#: libsvn_client/commit_util.c:1007
-#, c-format
-msgid "Commit item '%s' has copy flag but an invalid revision"
-msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—ï¼Œä½†æ˜¯ä¿®è®¢ç‰ˆæ— æ•ˆ"
+#: libsvn_ra_dav/replay.c:456 libsvn_ra_serf/replay.c:491
+#, fuzzy, c-format
+msgid "Error writing stream: unexpected EOF"
+msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
-#: libsvn_client/copy.c:101 libsvn_client/copy.c:646 libsvn_client/copy.c:832
-#: libsvn_ra_dav/commit.c:1172
+#: libsvn_ra_dav/replay.c:463
#, c-format
-msgid "File '%s' already exists"
-msgstr "文件“%sâ€å·²å˜åœ¨"
+msgid "Got cdata content for a prop delete"
+msgstr ""
-#: libsvn_client/copy.c:144
-msgid "Move will not be attempted unless forced"
-msgstr "除éžå¼ºè¡Œæ“作,å¦åˆ™ä¸ä¼šæ‰§è¡Œç§»åЍæ“作"
+#: libsvn_ra_dav/session.c:444
+msgid "Invalid URL: illegal character in proxy port number"
+msgstr "æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)通信端å£ç¼–å·ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: libsvn_client/copy.c:328
-#, c-format
-msgid "Cannot move URL '%s' into itself"
-msgstr "æ— æ³•ç§»åŠ¨åœ°å€(URL)“%sâ€è‡³æœ¬èº«"
+#: libsvn_ra_dav/session.c:448
+msgid "Invalid URL: negative proxy port number"
+msgstr "æ— æ•ˆçš„åœ°å€(URL):负的代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼"
-#: libsvn_client/copy.c:359
-#, c-format
+#: libsvn_ra_dav/session.c:451
msgid ""
-"Source and dest appear not to be in the same repository (src: '%s'; dst: '%"
-"s')"
-msgstr "æ¥æºä¸Žç›®çš„似乎ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸ (æ¥æºï¼šâ€œ%sâ€ï¼›ç›®çš„:“%sâ€)"
+"Invalid URL: proxy port number greater than maximum TCP port number 65535"
+msgstr ""
+"æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼å¤§äºŽæœ€å¤§å€¼çš„ TCP é€šä¿¡ç«¯å£æ•°å€¼ 65535"
-#: libsvn_client/copy.c:385
-#, c-format
-msgid "Path '%s' does not exist in revision %ld"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld"
+#: libsvn_ra_dav/session.c:465
+msgid "Invalid config: illegal character in timeout value"
+msgstr "æ— æ•ˆçš„é…ç½®ï¼šè¶…æ—¶æ•°å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: libsvn_client/copy.c:419
-#, c-format
-msgid "Unrecognized node kind of '%s'"
-msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
+#: libsvn_ra_dav/session.c:469
+msgid "Invalid config: negative timeout value"
+msgstr "æ— æ•ˆçš„é…置:负的超时数值"
-#: libsvn_client/copy.c:790
-#, c-format
-msgid "Path '%s' not found in revision %ld"
-msgstr "路径“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
+#: libsvn_ra_dav/session.c:482
+msgid "Invalid config: illegal character in debug mask value"
+msgstr "æ— æ•ˆçš„é…置:除错é®ç½©å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-#: libsvn_client/copy.c:795
-#, c-format
-msgid "Path '%s' not found in head revision"
-msgstr "路径“%sâ€äºŽ HEAD ä¿®è®¢ç‰ˆä¸æ‰¾ä¸åˆ°"
+# as-is
+#: libsvn_ra_dav/session.c:545
+msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
+msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
-#: libsvn_client/copy.c:841
-#, c-format
-msgid "'%s' is in the way"
-msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
+#: libsvn_ra_dav/session.c:600
+msgid "Malformed URL for repository"
+msgstr "档案库的地å€(URL)畸形"
-#: libsvn_client/copy.c:858
-#, c-format
-msgid "Entry for '%s' exists (though the working file is missing)"
-msgstr "å˜åœ¨â€œ%sâ€çš„项目 (ä¸è¿‡å·¥ä½œæ–‡ä»¶å·²ä¸¢å¤±)"
+#: libsvn_ra_dav/session.c:636
+msgid "Network socket initialization failed"
+msgstr "网络 socket å¯å§‹å¤±è´¥"
-#: libsvn_client/copy.c:949
-#, c-format
-msgid "Source URL '%s' is from foreign repository; leaving it as a disjoint WC"
-msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“;把它当作是脱离的工作拷è´(WC)"
+#: libsvn_ra_dav/session.c:662
+msgid "SSL is not supported"
+msgstr "䏿”¯æŒ SSL"
-#: libsvn_client/copy.c:1028
+#: libsvn_ra_dav/session.c:803
#, c-format
-msgid "Cannot copy path '%s' into its own child '%s'"
-msgstr "æ— æ³•å¤åˆ¶è·¯å¾„“%sâ€è‡³å…¶å目录“%sâ€ä¸"
+msgid "Invalid config: unable to load certificate file '%s'"
+msgstr "æ— æ•ˆçš„é…ç½®ï¼šæ— æ³•è½½å…¥å‡è¯æ–‡ä»¶â€œ%sâ€"
-#: libsvn_client/copy.c:1039
-#, c-format
-msgid "Cannot move path '%s' into itself"
-msgstr "æ— æ³•ç§»åŠ¨è·¯å¾„â€œ%sâ€è‡³å…¶æœ¬èº«"
+#: libsvn_ra_dav/session.c:910
+msgid "The UUID property was not found on the resource or any of its parents"
+msgstr "æ— æ³•åœ¨æœ¬èµ„æºæˆ–ä»»ä½•å…¶çˆ¶é¡¹ç›®ä¸æ‰¾åˆ° UUID 属性"
-#: libsvn_client/copy.c:1047
-msgid "No support for repos <--> working copy moves"
-msgstr "䏿”¯æŒæ¡£æ¡ˆåº“ <--> 工作拷è´ç§»åЍ"
+#: libsvn_ra_dav/session.c:918
+msgid "Please upgrade the server to 0.19 or later"
+msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
-#: libsvn_client/copy.c:1079
-#, c-format
-msgid "'%s' does not seem to have a URL associated with it"
-msgstr "“%sâ€ä¼¼ä¹Žæ²¡æœ‰å…³è”的地å€(URL)"
+#: libsvn_ra_dav/session.c:1160 libsvn_ra_dav/session.c:1297
+#, fuzzy
+msgid "Failed to parse URI"
+msgstr "分æžåœ°å€(URI)失败"
-#: libsvn_client/delete.c:62
-#, c-format
-msgid "'%s' is in the way of the resource actually under version control"
-msgstr "“%sâ€æŒ¡äº†å®žé™…纳入版本控制资æºçš„è·¯"
+#: libsvn_ra_dav/session.c:1183
+#, fuzzy
+msgid "Lock request failed"
+msgstr "é”请求失败"
-#: libsvn_client/delete.c:77
-#, c-format
-msgid "'%s' has local modifications"
-msgstr "“%sâ€å·²æœ‰æœ¬åœ°ä¿®æ”¹"
+#: libsvn_ra_dav/session.c:1312 libsvn_ra_serf/locks.c:668
+#, fuzzy, c-format
+msgid "'%s' is not locked in the repository"
+msgstr "â€%s“没有在档案库ä¸è¢«é”定"
-# as-is
-#: libsvn_client/diff.c:94
-#, c-format
-msgid "%sProperty changes on: %s%s"
-msgstr "%s 属性改å˜äºŽï¼š%s%s"
+#: libsvn_ra_dav/session.c:1349
+#, fuzzy
+msgid "Unlock request failed"
+msgstr "解除é”请求失败"
-# as-is
-#: libsvn_client/diff.c:122
-#, c-format
-msgid "Name: %s%s"
-msgstr "åå—:%s%s"
+#: libsvn_ra_dav/session.c:1560
+#, fuzzy
+msgid "Failed to fetch lock information"
+msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
-#: libsvn_client/diff.c:198
+#: libsvn_ra_dav/session.c:1633
#, fuzzy, c-format
-msgid "URLs have no scheme ('%s' and '%s')"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99) (“%"
-"sâ€ä¸Žâ€œ%sâ€)"
+msgid "Unsupported RA loader version (%d) for ra_dav"
+msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
-#: libsvn_client/diff.c:204 libsvn_client/diff.c:210
-#, fuzzy, c-format
-msgid "URL has no scheme: '%s'"
-msgstr ""
-"地å�€(URL)䏿²¡æœ‰è§„则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84%e5%88%99):“%"
-"sâ€"
+#: libsvn_ra_dav/util.c:275
+msgid "authorization failed"
+msgstr "授æƒå¤±è´¥"
-#: libsvn_client/diff.c:217
-#, fuzzy, c-format
-msgid "Access scheme mixtures not yet supported ('%s' and '%s')"
-msgstr "å°šä¸æ”¯æŒæ··åˆçš„å˜å–规则 (“%sâ€ä¸Žâ€œ%sâ€)"
+#: libsvn_ra_dav/util.c:279
+msgid "could not connect to server"
+msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåС噍"
-# as-is
-#: libsvn_client/diff.c:282
-#, c-format
-msgid "%s\t(revision %ld)"
-msgstr "%s\t(修订版 %ld)"
+#: libsvn_ra_dav/util.c:283
+msgid "timed out waiting for server"
+msgstr "ç‰å¾…æœåŠ¡å™¨è¶…æ—¶"
-# as-is
-#: libsvn_client/diff.c:284
+#: libsvn_ra_dav/util.c:489
#, c-format
-msgid "%s\t(working copy)"
-msgstr "%s\t(工作拷è´ï¼‰"
+msgid "Can't calculate the request body size"
+msgstr "æ— æ³•ç®—å‡ºè¯·æ±‚çš„ä¸»ä½“å¤§å°"
-#: libsvn_client/diff.c:428
+#: libsvn_ra_dav/util.c:726
#, c-format
-msgid "Cannot display: file marked as a binary type.%s"
-msgstr "æ— æ³•æ˜¾ç¤ºï¼šæ–‡ä»¶æ ‡è®°ä¸ºäºŒè¿›åˆ¶ç±»åž‹ã€‚%s"
+msgid "Error spooling the %s request response to disk"
+msgstr "请求 %s çš„å“应脱机ä¿å˜åˆ°ç£ç›˜æ—¶å‡ºçŽ°é”™è¯¯"
-#: libsvn_client/diff.c:501
+#: libsvn_ra_dav/util.c:774
#, c-format
-msgid "'%s' is not supported"
-msgstr "“%sâ€ä¸æ”¯æŒ"
-
-# as-is
-#. xgettext: the '.working', '.merge-left.r%ld' and '.merge-right.r%ld'
-#. strings are used to tag onto a filename in case of a merge conflict
-#: libsvn_client/diff.c:771
-msgid ".working"
-msgstr ".working"
+msgid "'%s' path not found"
+msgstr "找ä¸åˆ°è·¯å¾„“%sâ€"
-# as-is
-#: libsvn_client/diff.c:773
+#. We either have a neon error, or some other error
+#. that we didn't expect.
+#: libsvn_ra_dav/util.c:779 libsvn_ra_dav/util.c:1014
#, c-format
-msgid ".merge-left.r%ld"
-msgstr ".merge-left.r%ld"
+msgid "%s of '%s'"
+msgstr "%s 的结果 “%sâ€"
-# as-is
-#: libsvn_client/diff.c:776
+#: libsvn_ra_dav/util.c:797
#, c-format
-msgid ".merge-right.r%ld"
-msgstr ".merge-right.r%ld"
-
-#: libsvn_client/diff.c:1446 libsvn_client/diff.c:2088
-#: libsvn_client/diff.c:2168
-msgid "Not all required revisions are specified"
-msgstr "并未æä¾›å…¨éƒ¨æ‰€éœ€çš„修订版"
-
-#: libsvn_client/diff.c:1717
-#, fuzzy
-msgid "Sorry, svn_client_diff3 was called in a way that is not yet supported"
-msgstr "抱æ‰ï¼Œsvn_client_diff3 以䏿”¯æŒçš„æ–¹å¼è¢«è°ƒç”¨"
-
-#: libsvn_client/diff.c:1756
-msgid ""
-"Only diffs between a path's text-base and its working files are supported at "
-"this time"
-msgstr "ç›®å‰åªæ”¯æŒè·¯å¾„的文件å‚考基础与其工作文件之间的文件差异"
+msgid "Error reading spooled %s request response"
+msgstr "读å–请求 %s å›žåº”çš„è„±æœºæ•°æ®æ—¶å‡ºçŽ°é”™è¯¯"
-#: libsvn_client/diff.c:1871 libsvn_client/diff.c:1876
+#: libsvn_ra_dav/util.c:808
#, c-format
-msgid "'%s' was not found in the repository at revision %ld"
-msgstr "在档案库的修订版 %2$ld 䏿‰¾ä¸åˆ°â€œ%1$sâ€"
+msgid "The %s request returned invalid XML in the response: %s (%s)"
+msgstr "%s è¯·æ±‚çš„å›žåº”è¿”å›žæ— æ•ˆçš„ XML:%s (%s)"
-#: libsvn_client/diff.c:1992 libsvn_client/switch.c:108
+#: libsvn_ra_dav/util.c:828
#, c-format
-msgid "Directory '%s' has no URL"
-msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
-
-#: libsvn_client/diff.c:2179
-msgid "At least one revision must be non-local for a pegged diff"
-msgstr "对于 peg å·®å¼‚ï¼Œå¿…é¡»è‡³å°‘æœ‰ä¸€ä¸ªéžæœ¬åœ°ç«¯çš„修订版"
+msgid "%s request failed on '%s'"
+msgstr "%s 请求“%sâ€å¤±è´¥"
-#: libsvn_client/diff.c:2483 libsvn_client/diff.c:2489
-#: libsvn_client/diff.c:2604 libsvn_client/locking_commands.c:252
-#: libsvn_client/locking_commands.c:276 libsvn_client/ra.c:368
-#: libsvn_client/ra.c:729 libsvn_client/ra.c:865
+#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:587
+#: libsvn_wc/update_editor.c:2355
#, c-format
-msgid "'%s' has no URL"
-msgstr "“%sâ€æ²¡æœ‰åœ°å€(URL)"
+msgid ""
+"'%s'\n"
+"is not the same repository as\n"
+"'%s'"
+msgstr ""
+"“%sâ€\n"
+"与\n"
+"“%sâ€\n"
+"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
-#: libsvn_client/export.c:87
-#, c-format
-msgid "'%s' is not a valid EOL value"
-msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ EOL 值"
+# as-is
+#. ----------------------------------------------------------------
+#. * The RA vtable routines *
+#: libsvn_ra_local/ra_plugin.c:245
+msgid "Module for accessing a repository on local disk."
+msgstr "访问本地ç£ç›˜çš„æ¡£æ¡ˆåº“模å—。"
-#: libsvn_client/export.c:271
-msgid "Destination directory exists, and will not be overwritten unless forced"
-msgstr "目的目录已å˜åœ¨ï¼Œé™¤éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™ä¸ä¼šè¦†ç›–"
+#: libsvn_ra_local/ra_plugin.c:285
+msgid "Unable to open an ra_local session to URL"
+msgstr "æ— æ³•æ‰“å¼€åœ°å€(URL)çš„ ra_local 会è¯"
-#: libsvn_client/export.c:369 libsvn_client/export.c:512
+# as-is
+#: libsvn_ra_local/ra_plugin.c:1340
+#, fuzzy, c-format
+msgid "Unsupported RA loader version (%d) for ra_local"
+msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
+
+#: libsvn_ra_local/split_url.c:44
#, c-format
-msgid "'%s' exists and is not a directory"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œä½†ä¸æ˜¯ç›®å½•"
+msgid "Local URL '%s' does not contain 'file://' prefix"
+msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
-#: libsvn_client/export.c:373 libsvn_client/export.c:516
+#: libsvn_ra_local/split_url.c:55
#, c-format
-msgid "'%s' already exists"
-msgstr "“%sâ€å·²å˜åœ¨"
+msgid "Local URL '%s' contains only a hostname, no path"
+msgstr "本地地å€(URL)“%sâ€ä»…å«ä¸»æœºå称,没有路径"
-#: libsvn_client/export.c:686 libsvn_wc/update_editor.c:1634
-#: libsvn_wc/update_editor.c:2407
+#: libsvn_ra_local/split_url.c:117
#, c-format
-msgid "Checksum mismatch for '%s'; expected: '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›é¢„期:“%sâ€ï¼Œå®žé™…:“%sâ€"
+msgid "Local URL '%s' contains unsupported hostname"
+msgstr "本地地å€(URL)“%sâ€åŒ…嫿œªæ”¯æŒçš„主机åç§°"
-#: libsvn_client/info.c:234
-#, fuzzy, c-format
-msgid "Cannot read entry for '%s'"
-msgstr "ä¸èƒ½è¯»â€œ%sâ€çš„æ¡ç›®"
+#: libsvn_ra_local/split_url.c:127 libsvn_ra_local/split_url.c:134
+#, c-format
+msgid "Unable to open repository '%s'"
+msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“â€œ%sâ€"
-#: libsvn_client/info.c:321 libsvn_client/info.c:346 libsvn_client/info.c:356
+#: libsvn_ra_serf/commit.c:368 libsvn_ra_serf/commit.c:429
+#: libsvn_repos/commit.c:393
#, fuzzy, c-format
-msgid "URL '%s' non-existent in revision '%ld'"
-msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆâ€œ%ldâ€ä¸"
+msgid "Path '%s' not present"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
-#: libsvn_client/locking_commands.c:198
-msgid "No common parent found, unable to operate on disjoint arguments"
-msgstr "没有找到公共父节点,ä¸èƒ½åœ¨åˆ†ç¦»çš„傿•°ä¸Šæ“作"
+#: libsvn_ra_serf/commit.c:910
+#, c-format
+msgid "Failed writing updated file"
+msgstr ""
-#: libsvn_client/locking_commands.c:300
-msgid "Unable to lock/unlock across multiple repositories"
-msgstr "ä¸èƒ½è·¨è¶Šå¤šä¸ªæ¡£æ¡ˆåº“进行 é”定/è§£é”"
+#: libsvn_ra_serf/getlocations.c:289
+#, fuzzy
+msgid "File doesn't exist on HEAD"
+msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
-#: libsvn_client/locking_commands.c:341
+#: libsvn_ra_serf/locks.c:354
#, fuzzy, c-format
-msgid "'%s' is not locked in this working copy"
-msgstr "“%sâ€æ²¡æœ‰åœ¨å·¥ä½œæ‹·è´ä¸é”定"
+msgid "Lock request failed: %d %s"
+msgstr "é”请求失败"
-#: libsvn_client/locking_commands.c:389
+#: libsvn_ra_serf/locks.c:703
#, fuzzy, c-format
-msgid "'%s' is not locked"
-msgstr "“%sâ€æ²¡æœ‰è¢«é”定"
+msgid "Unlock request failed: %d %s"
+msgstr "解除é”请求失败"
-#: libsvn_client/locking_commands.c:425 libsvn_fs/fs-loader.c:896
-#: libsvn_ra/ra_loader.c:512
-msgid "Lock comment has illegal characters"
-msgstr "é”定注释å˜åœ¨éžæ³•å—符"
+#: libsvn_ra_serf/replay.c:204
+#, fuzzy
+msgid "Missing revision attr in delete-entry element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/log.c:72
-msgid "Missing required revision specification"
-msgstr "未æä¾›è¯·æ±‚çš„ä¿®è®¢ç‰ˆè§„æ ¼"
+#: libsvn_ra_serf/replay.c:230
+#, fuzzy
+msgid "Missing revision attr in open-directory element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/log.c:135 libsvn_client/status.c:261
-#: libsvn_client/update.c:86
-#, c-format
-msgid "Entry '%s' has no URL"
-msgstr "项目“%sâ€æ²¡æœ‰åœ°å€(URL)"
+#: libsvn_ra_serf/replay.c:250
+#, fuzzy
+msgid "Missing name attr in add-directory element"
+msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: libsvn_client/log.c:321
+#: libsvn_ra_serf/replay.c:285
#, fuzzy
-msgid "No commits in repository"
-msgstr "æ¡£æ¡ˆåº“ä¸æ²¡æœ‰ä»»ä½•æäº¤"
+msgid "Missing name attr in open-file element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: libsvn_client/ls.c:140 libsvn_client/ls.c:148
-#, c-format
-msgid "URL '%s' non-existent in that revision"
-msgstr "地å€(URL)“%sâ€å¹¶ä¸å˜åœ¨äºŽè¯¥ä¿®è®¢ç‰ˆä¸"
+#: libsvn_ra_serf/replay.c:291
+#, fuzzy
+msgid "Missing revision attr in open-file element"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_client/prop_commands.c:104
-#, c-format
-msgid "'%s' is a wcprop, thus not accessible to clients"
-msgstr "“%sâ€æ˜¯ä¸€ä¸ªå·¥ä½œæ‹·è´å±žæ€§(wcprop),应æ¤ä¸èƒ½è¢«å®¢æˆ·ç«¯å˜å–"
+#: libsvn_ra_serf/replay.c:311
+#, fuzzy
+msgid "Missing name attr in add-file element"
+msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: libsvn_client/prop_commands.c:183
+# as-is
+#: libsvn_ra_serf/serf.c:52
+#, fuzzy
+msgid "Access repository via WebDAV protocol through serf."
+msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
+
+#: libsvn_ra_serf/serf.c:155
#, c-format
-msgid "Revision property '%s' not allowed in this context"
-msgstr "修订版属性“%sâ€åœ¨æ¤ä¸Šä¸‹æ–‡ä¸å¹¶ä¸å…许"
+msgid "Could not lookup hostname: %s://%s"
+msgstr ""
-#: libsvn_client/prop_commands.c:199
+#: libsvn_ra_serf/serf.c:741
#, fuzzy, c-format
-msgid "Setting property on non-local target '%s' is not supported"
-msgstr "è®¾å®šéžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„å±žæ€§å°šä¸æ”¯æŒ"
+msgid "Unsupported RA loader version (%d) for ra_serf"
+msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
-#: libsvn_client/prop_commands.c:205 libsvn_client/prop_commands.c:280
+#: libsvn_ra_serf/update.c:2112
#, c-format
-msgid "Bad property name: '%s'"
-msgstr "有问题的属性å称:“%sâ€"
+msgid "Error retrieving REPORT (%d)"
+msgstr ""
-#: libsvn_client/prop_commands.c:276
-msgid "Value will not be set unless forced"
-msgstr "除éžå¼ºè¿«ä¸ºä¹‹ï¼Œå¦åˆ™å…¶å€¼ä¸ä¼šè¢«è®¾å®š"
+#: libsvn_ra_serf/util.c:743
+msgid "Premature EOF seen from server"
+msgstr ""
-#: libsvn_client/prop_commands.c:499 libsvn_client/prop_commands.c:758
+#: libsvn_ra_svn/client.c:127
#, c-format
-msgid "Unknown node kind for '%s'"
-msgstr "“%sâ€ä¸ºæœªçŸ¥çš„节点类型"
+msgid "Unknown hostname '%s'"
+msgstr "未知的主机å称“%sâ€"
-#: libsvn_client/ra.c:131
+#: libsvn_ra_svn/client.c:139
#, c-format
-msgid "Attempt to set wc property '%s' on '%s' in a non-commit operation"
-msgstr "è¯•å›¾åœ¨éžæäº¤æ“作ä¸ï¼Œè®¾å®šå·¥ä½œæ‹·è´å±žæ€§â€œ%sâ€äºŽâ€œ%sâ€"
+msgid "Can't create socket"
+msgstr "æ— æ³•å»ºç«‹ socket"
-#: libsvn_client/ra.c:345
+#: libsvn_ra_svn/client.c:143
#, c-format
-msgid "Can't find entry for '%s'"
-msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„项目"
+msgid "Can't connect to host '%s'"
+msgstr "æ— æ³•è¿žçº¿è‡³ä¸»æœºâ€œ%sâ€"
-#: libsvn_client/ra.c:489
-#, c-format
-msgid "Missing changed-path information for '%s' in revision %ld"
-msgstr "未æä¾›â€œ%sâ€äºŽä¿®è®¢ç‰ˆ %ld çš„ changed-path ä¿¡æ¯"
+# as-is
+#: libsvn_ra_svn/client.c:164
+msgid "Proplist element not a list"
+msgstr "å±žæ€§åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/ra.c:609
-#, c-format
-msgid "path '%s' doesn't exist in revision %ld"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽä¿®è®¢ç‰ˆ %ld ä¸"
+# as-is
+#: libsvn_ra_svn/client.c:188
+msgid "Prop diffs element not a list"
+msgstr "Prop diffs å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_client/ra.c:656 libsvn_client/ra.c:813
+#: libsvn_ra_svn/client.c:226
#, c-format
-msgid "Unable to find repository location for '%s' in revision %ld"
-msgstr "æ— æ³•æ‰¾åˆ°â€œ%sâ€çš„æ¡£æ¡ˆåº“ä½ç½®äºŽä¿®è®¢ç‰ˆ %ld"
+msgid "Unrecognized node kind '%s' from server"
+msgstr "æ— æ³•è¾¨è¯†æ¥è‡ªæœåŠ¡å™¨çš„èŠ‚ç‚¹ç§ç±»â€œ%sâ€"
-#: libsvn_client/ra.c:667
+#: libsvn_ra_svn/client.c:273 libsvn_ra_svn/client.c:327
#, c-format
-msgid "'%s' in revision %ld is an unrelated object"
-msgstr "“%sâ€äºŽä¿®è®¢ç‰ˆ %ld æ˜¯ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
+msgid "Authentication error from server: %s"
+msgstr "æ¥è‡ªæœåŠ¡å™¨çš„è®¤è¯é”™è¯¯ï¼š%s"
-#: libsvn_client/ra.c:818
-#, c-format
-msgid ""
-"The location for '%s' for revision %ld does not exist in the repository or "
-"refers to an unrelated object"
-msgstr ""
-"“%sâ€çš„ä½ç½®å¯¹åº”至修订版 %ld å¹¶ä¸å˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼Œæˆ–是指å‘ä¸€ä¸ªæ— å…³çš„ç‰©ä»¶"
+#: libsvn_ra_svn/client.c:276 libsvn_ra_svn/cram.c:194
+#: libsvn_ra_svn/cram.c:212
+msgid "Unexpected server response to authentication"
+msgstr "æ„æƒ³ä¸åˆ°çš„è®¤è¯æ—¶æœåŠ¡å™¨å›žåº”"
-#: libsvn_client/relocate.c:53
+#: libsvn_ra_svn/client.c:314 libsvn_subr/prompt.c:156
#, c-format
-msgid "The repository at '%s' has uuid '%s', but the WC has '%s'"
-msgstr "于“%sâ€çš„æ¡£æ¡ˆåº“有 uuid “%sâ€ï¼Œä½†æ˜¯å·¥ä½œæ‹·è´çš„æ˜¯â€œ%sâ€"
+msgid "Can't get password"
+msgstr "æ— æ³•å–得密ç "
+
+#: libsvn_ra_svn/client.c:334
+msgid "Cannot negotiate authentication mechanism"
+msgstr "æ— æ³•å商出认识机制"
-#: libsvn_client/revisions.c:105
+#: libsvn_ra_svn/client.c:466
#, c-format
-msgid "Unrecognized revision type requested for '%s'"
-msgstr "æ— æ³•è¾¨è¯†è¯·æ±‚çš„â€œ%sâ€çš„修订版类别"
+msgid "Undefined tunnel scheme '%s'"
+msgstr "æ— æ³•è¾¨è¯†çš„éš§é“规则“%sâ€"
-#: libsvn_delta/svndiff.c:350
+#: libsvn_ra_svn/client.c:483
#, c-format
-msgid "Invalid diff stream: insn %d cannot be decoded"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d ä¸èƒ½è§£ç "
+msgid "Tunnel scheme %s requires environment variable %s to be defined"
+msgstr "éš§é“规则 %s 需è¦è®¾å®šçŽ¯å¢ƒå˜æ•° %s"
-#: libsvn_delta/svndiff.c:354
+# as-is
+#: libsvn_ra_svn/client.c:494
#, c-format
-msgid "Invalid diff stream: insn %d has non-positive length"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d å‡ºçŽ°éžæ£çš„长度"
+msgid "Can't tokenize command '%s'"
+msgstr "ä¸èƒ½ tokenize 命令“%sâ€"
-#: libsvn_delta/svndiff.c:358
+#: libsvn_ra_svn/client.c:525
#, c-format
-msgid "Invalid diff stream: insn %d overflows the target view"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼šinsn %d æº¢å‡ºç›®æ ‡è§†å›¾"
+msgid "Error in child process: %s"
+msgstr "å程åºé”™è¯¯ï¼š%s"
-#: libsvn_delta/svndiff.c:367
+#: libsvn_ra_svn/client.c:549
#, c-format
-msgid "Invalid diff stream: [src] insn %d overflows the source view"
-msgstr "æ— æ•ˆçš„è¯§å¼‚æµï¼š[src] insn %d 溢出æºè§†å›¾"
+msgid "Can't create tunnel"
+msgstr "æ— æ³•å»ºç«‹ tunnel"
-#: libsvn_delta/svndiff.c:374
+#: libsvn_ra_svn/client.c:588
#, c-format
-msgid ""
-"Invalid diff stream: [tgt] insn %d starts beyond the target view position"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[tgt] insn %d èµ·ç‚¹è¶…è¿‡ç›®æ ‡è§†å›¾ä½ç½®"
+msgid "Illegal svn repository URL '%s'"
+msgstr "ä¸åˆæ³•çš„ svn 档案库地å€(URL)“%sâ€"
-#: libsvn_delta/svndiff.c:381
+#: libsvn_ra_svn/client.c:627
#, c-format
-msgid "Invalid diff stream: [new] insn %d overflows the new data section"
-msgstr "æ— æ•ˆçš„å·®å¼‚æµï¼š[new] insn %d 溢出新数æ®åŒºåŸŸ"
+msgid "Server requires minimum version %d"
+msgstr "æœåŠ¡å™¨æœ€ä½Žè¦æ±‚的版å·ä¸º %d"
-#: libsvn_delta/svndiff.c:391
-msgid "Delta does not fill the target window"
-msgstr "Delta ä¸èƒ½å¡«å……ç›®æ ‡çª—å£"
+#: libsvn_ra_svn/client.c:682
+msgid "Impossibly long repository root from server"
+msgstr "æœåŠ¡å™¨å›žä¼ çš„æ¡£æ¡ˆåº“æ ¹è·¯å¾„é•¿å¾—å¤ªå¤¸å¼ "
-#: libsvn_delta/svndiff.c:394
-msgid "Delta does not contain enough new data"
-msgstr "Deltaä¸èƒ½åŒ…å«è¶³å¤Ÿçš„æ–°æ•°æ®"
+# as-is
+#: libsvn_ra_svn/client.c:693
+msgid "Module for accessing a repository using the svn network protocol."
+msgstr "使用svn网络å议访问档案库的模å—。"
-#: libsvn_delta/svndiff.c:471
-msgid "Svndiff has invalid header"
-msgstr "Svndiff æ•°æ®åŒ…å«äº†æ— 效的数æ®å¤´"
+#: libsvn_ra_svn/client.c:841
+msgid "Server did not send repository root"
+msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”å›žæ¡£æ¡ˆåº“æ ¹è·¯å¾„"
+
+#: libsvn_ra_svn/client.c:982
+msgid "Non-string as part of file contents"
+msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
# as-is
-#: libsvn_delta/svndiff.c:526 libsvn_delta/svndiff.c:681
-msgid "Svndiff contains corrupt window header"
-msgstr "Svndiff æ•°æ®åŒ…嫿— 效窗å£"
+#: libsvn_ra_svn/client.c:1081
+msgid "Dirlist element not a list"
+msgstr "ç›®å½•åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
# as-is
-#: libsvn_delta/svndiff.c:535
-msgid "Svndiff has backwards-sliding source views"
-msgstr "Svndiff æ•°æ®åŒ…å«å‘åŽå˜åŒ–的资æºè§†å›¾"
+#: libsvn_ra_svn/client.c:1238
+msgid "Log entry not a list"
+msgstr "日志æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_delta/svndiff.c:583 libsvn_delta/svndiff.c:630
-#: libsvn_delta/svndiff.c:703
-msgid "Unexpected end of svndiff input"
-msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
+# as-is
+#: libsvn_ra_svn/client.c:1251
+msgid "Changed-path entry not a list"
+msgstr "已修改路径æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_diff/diff_file.c:666
-#, c-format
-msgid "%s\\ No newline at end of file%s"
-msgstr "%s\\ 在文件 %s 末尾没有新行"
+# as-is
+#: libsvn_ra_svn/client.c:1327
+#, fuzzy
+msgid "'stat' not implemented"
+msgstr "get-locations 未实现"
-#: libsvn_diff/diff_file.c:1225
-#, c-format
-msgid "Failed to delete mmap '%s'"
-msgstr "åˆ é™¤mmap â€%s“失败"
+# as-is
+#: libsvn_ra_svn/client.c:1384
+#, fuzzy
+msgid "'get-locations' not implemented"
+msgstr "get-locations 未实现"
-#: libsvn_fs/fs-loader.c:105 libsvn_ra/ra_loader.c:157
-#: libsvn_ra/ra_loader.c:170
-#, c-format
-msgid "'%s' does not define '%s()'"
-msgstr "“%sâ€æœªå®šä¹‰ '%s()'"
+# as-is
+#: libsvn_ra_svn/client.c:1396
+msgid "Location entry not a list"
+msgstr "区域æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_fs/fs-loader.c:131
-#, fuzzy, c-format
-msgid "Failed to load module for FS type '%s'"
-msgstr "装载FS类别“%sâ€æ¨¡å—失败"
+# as-is
+#: libsvn_ra_svn/client.c:1446
+#, fuzzy
+msgid "'get-file-revs' not implemented"
+msgstr "get-file-revs 未实现"
-#: libsvn_fs/fs-loader.c:138
-#, c-format
-msgid ""
-"Mismatched FS module version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "对“%sâ€æœ‰ä¸ç¬¦åˆçš„ FS 模å—版本:找到 %d.%d.%d%s,预期 %d.%d.%d%s"
+# as-is
+#: libsvn_ra_svn/client.c:1459
+msgid "Revision entry not a list"
+msgstr "修订版æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_fs/fs-loader.c:163
-#, c-format
-msgid "Unknown FS type '%s'"
-msgstr "未知的文件系统(FS)类别“%sâ€"
+#: libsvn_ra_svn/client.c:1472 libsvn_ra_svn/client.c:1497
+msgid "Text delta chunk not a string"
+msgstr "æ–‡å—差异区段并éžå—串"
-#: libsvn_fs/fs-loader.c:244
+#: libsvn_ra_svn/client.c:1509
+msgid "The get-file-revs command didn't return any revisions"
+msgstr "get-file-revs 命令没有返回任何修订版"
+
+#: libsvn_ra_svn/client.c:1557
#, fuzzy
-msgid "Can't allocate FS mutex"
-msgstr "ä¸èƒ½åˆ†é…文件系统(FS)互斥体"
+msgid "Server doesn't support the lock command"
+msgstr "æœåС噍䏿”¯æŒé”命令"
-#: libsvn_fs/fs-loader.c:280
+#: libsvn_ra_svn/client.c:1621
#, fuzzy
-msgid "Can't grab FS mutex"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+msgid "Server doesn't support the unlock command"
+msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
-#: libsvn_fs/fs-loader.c:286
-msgid "Can't ungrab FS mutex"
-msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
+# as-is
+#: libsvn_ra_svn/client.c:1718
+#, fuzzy
+msgid "Lock response not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_fs/fs-loader.c:902
-msgid "Negative expiration date passed to svn_fs_lock"
-msgstr "ä¸èƒ½æŽ¥å—çš„æœ‰æ•ˆæœŸä¼ é€’åˆ° svn_fs_lock"
+#: libsvn_ra_svn/client.c:1732
+#, fuzzy
+msgid "Unknown status for lock command"
+msgstr "未知的 svn 通讯å定命令"
-#: libsvn_fs_base/bdb/bdb-err.c:101
-#, c-format
-msgid "Berkeley DB error for filesystem %s while %s:\n"
-msgstr "文件系统 %s 上的伯克利数æ®åº“(Berkeley DB)当 %s 时错误:\n"
+#: libsvn_ra_svn/client.c:1754
+msgid "Didn't receive end marker for lock responses"
+msgstr ""
-#: libsvn_fs_base/bdb/changes-table.c:88
-msgid "creating change"
-msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
+# as-is
+#: libsvn_ra_svn/client.c:1841
+#, fuzzy
+msgid "Unlock response not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_fs_base/bdb/changes-table.c:114
-msgid "deleting changes"
-msgstr "æ£åœ¨åˆ 除更改"
+#: libsvn_ra_svn/client.c:1855
+#, fuzzy
+msgid "Unknown status for unlock command"
+msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
-#: libsvn_fs_base/bdb/changes-table.c:146 libsvn_fs_fs/fs_fs.c:1965
-msgid "Missing required node revision ID"
-msgstr "未æä¾›å¿…须的节点修订版 ID"
+#: libsvn_ra_svn/client.c:1876
+msgid "Didn't receive end marker for unlock responses"
+msgstr ""
-#: libsvn_fs_base/bdb/changes-table.c:157 libsvn_fs_fs/fs_fs.c:1975
-msgid "Invalid change ordering: new node revision ID without delete"
-msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šæœ‰æ–°çš„节点修订版 ID è€Œæ²¡åˆ é™¤"
+#: libsvn_ra_svn/client.c:1900 libsvn_ra_svn/client.c:1928
+#, fuzzy
+msgid "Server doesn't support the get-lock command"
+msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
-#: libsvn_fs_base/bdb/changes-table.c:167 libsvn_fs_fs/fs_fs.c:1986
-msgid "Invalid change ordering: non-add change on deleted path"
-msgstr "æ— æ•ˆçš„æ”¹å˜é¡ºåºï¼šå¯¹åˆ é™¤è·¯å¾„è¿›è¡Œéžæ–°å¢žçš„æ”¹å˜"
+# as-is
+#: libsvn_ra_svn/client.c:1941
+#, fuzzy
+msgid "Lock element not a list"
+msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
-#: libsvn_fs_base/bdb/changes-table.c:257
-#: libsvn_fs_base/bdb/changes-table.c:381
-msgid "creating cursor for reading changes"
-msgstr "æ£åœ¨ä¸ºè¯»å–更改创建指针"
+#: libsvn_ra_svn/client.c:1964
+#, fuzzy
+msgid "Server doesn't support the replay command"
+msgstr "æœåС噍䏿”¯æŒé”命令"
-#: libsvn_fs_base/bdb/changes-table.c:283
-#: libsvn_fs_base/bdb/changes-table.c:402
+#: libsvn_ra_svn/client.c:2028
#, fuzzy, c-format
-msgid "Error reading changes for key '%s'"
-msgstr "读关键å—“%sâ€çš„æ›´æ”¹æ—¶å‘生错误"
+msgid "Unsupported RA loader version (%d) for ra_svn"
+msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
-#: libsvn_fs_base/bdb/changes-table.c:342
-#: libsvn_fs_base/bdb/changes-table.c:425
-msgid "fetching changes"
-msgstr "æ£åœ¨èŽ·å–æ›´æ”¹"
+# as-is
+#: libsvn_ra_svn/editor.c:387 libsvn_ra_svn/editorp.c:456
+msgid "Invalid file or dir token during edit"
+msgstr "编辑时é‡åˆ°æ— 效的文件或目录"
-#: libsvn_fs_base/bdb/changes-table.c:355
-#: libsvn_fs_base/bdb/changes-table.c:438
-msgid "closing changes cursor"
-msgstr "æ£åœ¨å…³é—更改指针"
+#: libsvn_ra_svn/editor.c:621
+msgid "Non-string as part of text delta"
+msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
-#: libsvn_fs_base/bdb/copies-table.c:87
-#, fuzzy
-msgid "storing copy record"
-msgstr "æ£åœ¨å˜å‚¨æ‹·è´è®°å½•"
+#: libsvn_ra_svn/editor.c:717 libsvn_ra_svn/editorp.c:800
+#, c-format
+msgid "Command 'finish-replay' invalid outside of replays"
+msgstr ""
-#: libsvn_fs_base/bdb/copies-table.c:112
-msgid "allocating new copy ID (getting 'next-key')"
-msgstr "æ£åœ¨åˆ†é…æ–°æ‹·è´ID (æ£åœ¨èŽ·å–'next-key')"
+# as-is
+#: libsvn_ra_svn/editorp.c:129
+msgid "Successful edit status returned too soon"
+msgstr "æˆåŠŸä¿®æ”¹çŠ¶æ€è¿”回太快"
-#: libsvn_fs_base/bdb/copies-table.c:130
-msgid "bumping next copy key"
-msgstr "æ£åœ¨æå–下一个拷è´å…³é”®å—"
+# as-is
+#: libsvn_ra_svn/editorp.c:665
+msgid "Apply-textdelta already active"
+msgstr "Apply-textdelta å·²ç»æ¿€æ´»"
-#: libsvn_fs_base/bdb/copies-table.c:169
-msgid "deleting entry from 'copies' table"
-msgstr "æ£åœ¨ä»Ž 'copies' 表ä¸åˆ 除æ¡ç›®"
+# as-is
+#: libsvn_ra_svn/editorp.c:687 libsvn_ra_svn/editorp.c:705
+msgid "Apply-textdelta not active"
+msgstr "Apply-textdelta 没有激活"
+
+#: libsvn_ra_svn/editorp.c:891 libsvn_ra_svn/marshal.c:842
+#, c-format
+msgid "Unknown command '%s'"
+msgstr "未知的命令:“%sâ€"
# as-is
-#: libsvn_fs_base/bdb/copies-table.c:197
-#, fuzzy
-msgid "reading copy"
-msgstr "æ£åœ¨è¯»å–æ‹·è´"
+#: libsvn_ra_svn/marshal.c:78
+msgid "Capability entry is not a word"
+msgstr "容釿¡ç›®ä¸æ˜¯ä¸€ä¸ª word"
-#: libsvn_fs_base/bdb/nodes-table.c:99
-msgid "allocating new node ID (getting 'next-key')"
-msgstr "æ£åœ¨åˆ†é…新的节点 ID (æ£åœ¨èŽ·å– 'next-key')"
+#: libsvn_ra_svn/marshal.c:166
+#, c-format
+msgid "Can't write to connection"
+msgstr "æ— æ³•å†™å…¥è¿žçº¿"
-#: libsvn_fs_base/bdb/nodes-table.c:117
-msgid "bumping next node ID key"
-msgstr "æ£åœ¨æå–下一个节点 ID 关键å—"
+#: libsvn_ra_svn/marshal.c:259
+#, c-format
+msgid "Can't read from connection"
+msgstr "æ— æ³•è¯»å–连线"
-#: libsvn_fs_base/bdb/nodes-table.c:154
-#, fuzzy, c-format
-msgid "Successor id '%s' (for '%s') already exists in filesystem '%s'"
-msgstr "åŽç» id “%sâ€ï¼ˆå¯¹äºŽ%s)已å˜åœ¨äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+#: libsvn_ra_svn/marshal.c:262
+msgid "Connection closed unexpectedly"
+msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
-#: libsvn_fs_base/bdb/nodes-table.c:180
-msgid "deleting entry from 'nodes' table"
-msgstr "æ£åœ¨ä»Ž 'nodes' è¡¨åˆ é™¤æ¡ç›®"
+#: libsvn_ra_svn/marshal.c:506
+msgid "String length larger than maximum"
+msgstr "å—串长度超出上é™"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/nodes-table.c:220
-#, fuzzy
-msgid "reading node revision"
-msgstr "æ£åœ¨è¯»å–节点修订版"
+#: libsvn_ra_svn/marshal.c:543
+msgid "Too many nested items"
+msgstr "太多嵌套的项目"
-#: libsvn_fs_base/bdb/nodes-table.c:252
-#, fuzzy
-msgid "storing node revision"
-msgstr "æ£åœ¨å˜å‚¨èŠ‚ç‚¹ä¿®è®¢ç‰ˆ"
+#: libsvn_ra_svn/marshal.c:562
+msgid "Number is larger than maximum"
+msgstr "æ•°å—大å°è¶…过上é™"
-#: libsvn_fs_base/bdb/reps-table.c:95 libsvn_fs_base/bdb/reps-table.c:202
-#, fuzzy, c-format
-msgid "No such representation '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„è¯·æ±‚ “%sâ€"
+#: libsvn_ra_svn/marshal.c:765
+msgid "Empty error list"
+msgstr "空的错误列表"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:98
-#, fuzzy
-msgid "reading representation"
-msgstr "æ£åœ¨è¯»å–请求"
+#: libsvn_ra_svn/marshal.c:774
+msgid "Malformed error list"
+msgstr "畸形的错误列表"
-#: libsvn_fs_base/bdb/reps-table.c:126
-#, fuzzy
-msgid "storing representation"
-msgstr "æ£åœ¨å˜å‚¨è¯·æ±‚"
+#: libsvn_ra_svn/marshal.c:813
+#, c-format
+msgid "Unknown status '%s' in command response"
+msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
-#: libsvn_fs_base/bdb/reps-table.c:156
-msgid "allocating new representation (getting next-key)"
-msgstr "æ£åœ¨åˆ†é…新请求 (æ£åœ¨èŽ·å– next-key)"
+#: libsvn_repos/commit.c:128
+#, c-format
+msgid "Out of date: '%s' in transaction '%s'"
+msgstr "过期:â€%s“在事务â€%s“"
-#: libsvn_fs_base/bdb/reps-table.c:177
-#, fuzzy
-msgid "bumping next representation key"
-msgstr "æ£åœ¨æå–下一个请求关键å—"
+#: libsvn_repos/commit.c:292 libsvn_repos/commit.c:453
+#, c-format
+msgid "Got source path but no source revision for '%s'"
+msgstr "获得æºè·¯å¾„,但â€%s“没有æºä¿®è®¢ç‰ˆ"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/reps-table.c:205
-#, fuzzy
-msgid "deleting representation"
-msgstr "æ£åœ¨åˆ 除请求"
+#: libsvn_repos/commit.c:324 libsvn_repos/commit.c:484
+#, c-format
+msgid "Source url '%s' is from different repository"
+msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“"
-#. Handle any other error conditions.
-#: libsvn_fs_base/bdb/rev-table.c:88
-#, fuzzy
-msgid "reading filesystem revision"
-msgstr "æ£åœ¨è¯»å–文件系统修订版å·"
+#: libsvn_repos/commit.c:609
+#, c-format
+msgid ""
+"Checksum mismatch for resulting fulltext\n"
+"(%s):\n"
+" expected checksum: %s\n"
+" actual checksum: %s\n"
+msgstr ""
+"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
+" 预期的总和检查值:%s\n"
+" 实际的总和检查值:%s\n"
-#: libsvn_fs_base/bdb/strings-table.c:91
-msgid "creating cursor for reading a string"
-msgstr "æ£åœ¨ä¸ºè¯»å–一个å—符串创建指针"
+#: libsvn_repos/delta.c:180
+msgid "Unable to open root of edit"
+msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
-#: libsvn_fs_base/bdb/txn-table.c:94
-#, fuzzy
-msgid "storing transaction record"
-msgstr "æ£åœ¨å˜å‚¨äº‹åŠ¡è®°å½•"
+#: libsvn_repos/delta.c:231
+msgid "Invalid target path"
+msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
-#: libsvn_fs_base/bdb/uuids-table.c:112
-#, fuzzy
-msgid "get repository uuid"
-msgstr "èŽ·å–æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+#: libsvn_repos/delta.c:257
+msgid ""
+"Invalid editor anchoring; at least one of the input paths is not a directory "
+"and there was no source entry"
+msgstr "æ— æ•ˆçš„ç¼–è¾‘å™¨å®šä½ï¼›è‡³å°‘ä¸€ä¸ªè¾“å…¥è·¯å¾„ä¸æ˜¯ç›®å½•并且没有æºå…¥å£"
-#: libsvn_fs_base/bdb/uuids-table.c:140
-#, fuzzy
-msgid "set repository uuid"
-msgstr "è®¾ç½®æ¡£æ¡ˆåº“å”¯ä¸€æ ‡è®°(uuid)"
+# as-is
+#: libsvn_repos/dump.c:416
+#, c-format
+msgid ""
+"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
+"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
+"WARNING: will fail.\n"
+msgstr ""
+"è¦å‘Šï¼šä¿®è®¢ç‰ˆ %ld çš„å‚è€ƒæ•°æ®æ¯”æœ€æ—§çš„è½¬å˜æ•°æ®ä¿®è®¢ç‰ˆ (%ld)还旧。\n"
+"è¦å‘Šï¼š 装载这个转å˜åˆ°ç©ºçš„æ¡£æ¡ˆåº“会失败。\n"
+"\n"
-#: libsvn_fs_base/dag.c:239
-#, fuzzy, c-format
-msgid "Corrupt DB: initial transaction id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„事务编å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+#: libsvn_repos/dump.c:933
+#, c-format
+msgid "Start revision %ld is greater than end revision %ld"
+msgstr "起始修订版 %ld 比结æŸä¿®è®¢ç‰ˆå· %ld 为大"
-#: libsvn_fs_base/dag.c:247
+#: libsvn_repos/dump.c:938
+#, c-format
+msgid "End revision %ld is invalid (youngest revision is %ld)"
+msgstr "结æŸä¿®è®¢ç‰ˆ %ld æ— æ•ˆ (最新的修订版为 %ld)"
+
+# as-is
+#: libsvn_repos/dump.c:1045
#, fuzzy, c-format
-msgid "Corrupt DB: initial copy id not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„å¤åˆ¶ç¼–å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+msgid "* Dumped revision %ld.\n"
+msgstr "* 导出修订版 %ld。\n"
-#: libsvn_fs_base/dag.c:256
+# as-is
+#: libsvn_repos/dump.c:1046
#, fuzzy, c-format
-msgid "Corrupt DB: initial revision number is not '0' in filesystem '%s'"
-msgstr "æŸå的数æ®åº“:åˆå§‹çš„修订版本å·åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸ä¸æ˜¯'0'"
+msgid "* Verified revision %ld.\n"
+msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
-#: libsvn_fs_base/dag.c:304 libsvn_fs_base/dag.c:481 libsvn_fs_fs/dag.c:386
-#, fuzzy
-msgid "Attempted to create entry in non-directory parent"
-msgstr "ä¼å›¾åœ¨éžç›®å½•的父节点创建æ¡ç›®"
+#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1207
+msgid "Commit succeeded, but post-commit hook failed"
+msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘é€æäº¤å¤–æŒ‚(post-commit)失败"
-#: libsvn_fs_base/dag.c:475 libsvn_fs_fs/dag.c:380
+#: libsvn_repos/fs-wrap.c:157
#, c-format
-msgid "Attempted to create a node with an illegal name '%s'"
-msgstr "ä¼å›¾ç”¨ä¸€ä¸ªéžæ³•çš„åå—“%sâ€åˆ›å»ºèŠ‚ç‚¹"
-
-#: libsvn_fs_base/dag.c:487 libsvn_fs_base/dag.c:721 libsvn_fs_fs/dag.c:392
-#, fuzzy
-msgid "Attempted to clone child of non-mutable node"
-msgstr "ä¼å›¾å…‹éš†éžå¯å˜èŠ‚ç‚¹çš„å节点"
+msgid ""
+"Storage of non-regular property '%s' is disallowed through the repository "
+"interface, and could indicate a bug in your client"
+msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
-#: libsvn_fs_base/dag.c:494
-#, fuzzy
-msgid "Attempted to create entry that already exists"
-msgstr "ä¼å›¾åˆ›å»ºå·²ç»å˜åœ¨çš„åæ¡ç›®"
+#: libsvn_repos/fs-wrap.c:296
+#, fuzzy, c-format
+msgid "Write denied: not authorized to read all of revision %ld"
+msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
-#: libsvn_fs_base/dag.c:545 libsvn_fs_fs/dag.c:454
-#, fuzzy
-msgid "Attempted to set entry in non-directory node"
-msgstr "ä¼å›¾åœ¨éžç›®å½•节点ä¸è®¾ç½®æ¡ç›®"
+#: libsvn_repos/fs-wrap.c:484
+#, c-format
+msgid "Cannot unlock path '%s', no authenticated username available"
+msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
-#: libsvn_fs_base/dag.c:551 libsvn_fs_fs/dag.c:460
+#: libsvn_repos/fs-wrap.c:498
#, fuzzy
-msgid "Attempted to set entry in immutable node"
-msgstr "ä¼å›¾åœ¨ä¸å¯æ”¹å˜çš„节点设置æ¡ç›®"
+msgid "Unlock succeeded, but post-unlock hook failed"
+msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
-#: libsvn_fs_base/dag.c:615
+#: libsvn_repos/hooks.c:71
#, c-format
-msgid "Can't set proplist on *immutable* node-revision %s"
-msgstr "ä¸èƒ½åœ¨ä¸å¯æ›´æ”¹èŠ‚ç‚¹ä¿®è®¢ç‰ˆ %s 设置属性列表"
+msgid "Can't create pipe for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
-#: libsvn_fs_base/dag.c:727
+#: libsvn_repos/hooks.c:83
+#, fuzzy, c-format
+msgid "Can't make pipe read handle non-inherited for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+
+#: libsvn_repos/hooks.c:89
+#, fuzzy, c-format
+msgid "Can't make pipe write handle non-inherited for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+
+#: libsvn_repos/hooks.c:98
#, c-format
-msgid "Attempted to make a child clone with an illegal name '%s'"
-msgstr "ä¼å›¾ä»¥éžæ³•åå—“%sâ€å»ºç«‹å克隆"
+msgid "Can't create null stdout for hook '%s'"
+msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç©ºçš„æ ‡å‡†è¾“出"
-#: libsvn_fs_base/dag.c:852
-#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from *non*-directory node"
-msgstr "ä¼å›¾ä»Žéžç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
+#: libsvn_repos/hooks.c:110
+#, c-format
+msgid "Error closing write end of stderr pipe"
+msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
-#: libsvn_fs_base/dag.c:858
+#: libsvn_repos/hooks.c:115
#, fuzzy, c-format
-msgid "Attempted to delete entry '%s' from immutable directory node"
-msgstr "ä¼å›¾ä»Žä¸å¯æ›´æ”¹ç›®å½•èŠ‚ç‚¹åˆ é™¤æ¡ç›®â€œ%sâ€"
+msgid "Failed to start '%s' hook"
+msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
-#: libsvn_fs_base/dag.c:865
+#: libsvn_repos/hooks.c:137
#, c-format
-msgid "Attempted to delete a node with an illegal name '%s'"
-msgstr "ä¼å›¾åˆ é™¤ä¸€ä¸ªéžæ³•åå—“%sâ€çš„节点"
+msgid ""
+"'%s' hook failed with error output:\n"
+"%s"
+msgstr ""
+"外挂“%sâ€å¤±è´¥ï¼Œé”™è¯¯è¾“出:\n"
+"%s"
-#: libsvn_fs_base/dag.c:880 libsvn_fs_base/dag.c:913
+#: libsvn_repos/hooks.c:144
#, fuzzy, c-format
-msgid "Delete failed: directory has no entry '%s'"
-msgstr "åˆ é™¤å¤±è´¥ï¼šç›®å½•æ²¡æœ‰é¡¹ç›®â€œ%sâ€"
+msgid "'%s' hook failed; no error output available"
+msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
-#: libsvn_fs_base/dag.c:962
-#, fuzzy
-msgid "Attempted removal of immutable node"
-msgstr "ä¼å›¾åˆ 除ä¸å¯æ”¹å˜çš„节点"
+#: libsvn_repos/hooks.c:163
+#, c-format
+msgid "Error closing read end of stderr pipe"
+msgstr "å…³é—è¯»æ ‡å‡†é”™è¯¯ç®¡é“æœ«å°¾å‘生错误"
-#: libsvn_fs_base/dag.c:1082
-msgid "Attempted to get textual contents of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ–‡æœ¬å†…å®¹"
+#: libsvn_repos/hooks.c:167
+#, c-format
+msgid "Error closing null file"
+msgstr "å…³é—空文件å‘生错误"
-#: libsvn_fs_base/dag.c:1117
-msgid "Attempted to get length of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„é•¿åº¦"
+#: libsvn_repos/hooks.c:465
+#, c-format
+msgid "Failed to run '%s' hook; broken symlink"
+msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥ï¼›æ— 效的符å·è¿žæŽ¥"
-#: libsvn_fs_base/dag.c:1143
-msgid "Attempted to get checksum of a *non*-file node"
-msgstr "ä¼å›¾èŽ·å–éžæ–‡ä»¶èŠ‚ç‚¹çš„æ ¡éªŒå’Œ"
+#: libsvn_repos/hooks.c:606
+msgid ""
+"Repository has not been enabled to accept revision propchanges;\n"
+"ask the administrator to create a pre-revprop-change hook"
+msgstr ""
+"档案库未激活接å—修订版属性改å˜ï¼›è¯·ç®¡ç†å‘˜åˆ›å»ºä¸€ä¸ª pre-revprop-change 外挂"
-#: libsvn_fs_base/dag.c:1174 libsvn_fs_base/dag.c:1228
-#, fuzzy
-msgid "Attempted to set textual contents of a *non*-file node"
-msgstr "ä¼å›¾è®¾ç½®éžæ–‡ä»¶èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+#: libsvn_repos/load.c:117
+msgid "Premature end of content data in dumpstream"
+msgstr "导出æµä¸å†…容数æ®è¿‡æ—©ç»“æŸ"
-#: libsvn_fs_base/dag.c:1180 libsvn_fs_base/dag.c:1234
-#, fuzzy
-msgid "Attempted to set textual contents of an immutable node"
-msgstr "ä¼å›¾è®¾ç½®ä¸å¯æ”¹å˜èŠ‚ç‚¹æ–‡æœ¬å†…å®¹"
+#: libsvn_repos/load.c:124
+msgid "Dumpstream data appears to be malformed"
+msgstr "å¯¼å‡ºæµæ•°æ®ä¸å‡ºçŽ°ç•¸å½¢"
-#: libsvn_fs_base/dag.c:1257
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
+#: libsvn_repos/load.c:173
+#, c-format
+msgid "Dump stream contains a malformed header (with no ':') at '%.20s'"
msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,报告“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
-#: libsvn_fs_base/dag.c:1312
+#: libsvn_repos/load.c:186
#, c-format
-msgid "Attempted to open non-existent child node '%s'"
-msgstr "ä¼å›¾æ‰“å¼€ä¸å˜åœ¨çš„å节点“%sâ€"
+msgid "Dump stream contains a malformed header (with no value) at '%.20s'"
+msgstr ""
-#: libsvn_fs_base/dag.c:1318
-#, c-format
-msgid "Attempted to open node with an illegal name '%s'"
-msgstr "ä¼å›¾ä»¥ä¸åˆæ³•çš„åå—“%sâ€æ‰“开节点"
+#: libsvn_repos/load.c:270
+msgid "Incomplete or unterminated property block"
+msgstr "ä¸å®Œæ•´æˆ–未结æŸçš„属性å—"
-#: libsvn_fs_base/err.c:37 libsvn_fs_fs/err.c:39
-msgid "Filesystem object has not been opened yet"
-msgstr "文件系统对象尚未打开"
+#: libsvn_repos/load.c:407
+msgid "Unexpected EOF writing contents"
+msgstr "å†™å†…å®¹æ—¶æœ‰æ„æ–™ä¹‹å¤–的结æŸç¬¦"
+
+#: libsvn_repos/load.c:436
+msgid "Malformed dumpfile header"
+msgstr "畸形的导出文件头"
-#: libsvn_fs_base/err.c:68 libsvn_fs_fs/err.c:70
+#: libsvn_repos/load.c:442 libsvn_repos/load.c:484
#, c-format
-msgid "Corrupt filesystem revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸çš„æ–‡ä»¶ç³»ç»Ÿä¿®è®¢ç‰ˆ %1$ld æŸå"
+msgid "Unsupported dumpfile version: %d"
+msgstr "䏿”¯æŒçš„导出文件版本:%d"
+
+#: libsvn_repos/load.c:587
+msgid "Unrecognized record type in stream"
+msgstr "æµä¸æœ‰æ— 法辨识的记录类型"
+
+#: libsvn_repos/load.c:699
+msgid "Sum of subblock sizes larger than total block content length"
+msgstr "åå—大尿€»æ•°å¤§äºŽå—内容长度总数"
-#: libsvn_fs_base/err.c:81 libsvn_fs_fs/err.c:83
+# as-is
+#: libsvn_repos/load.c:880
#, c-format
-msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
-msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
+msgid "<<< Started new transaction, based on original revision %ld\n"
+msgstr "<<< 开始新的事务,基于最åˆçš„修订版 %ld\n"
-#: libsvn_fs_base/err.c:101 libsvn_fs_fs/err.c:103
+#: libsvn_repos/load.c:925
#, c-format
-msgid "Reference to non-existent node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„节点“%1$sâ€"
+msgid "Relative source revision %ld is not available in current repository"
+msgstr "ç›¸å¯¹æ¥æºä¿®è®¢ç‰ˆ %ld ä¸å˜åœ¨äºŽç›®å‰æ¡£æ¡ˆåº“之ä¸"
+
+#: libsvn_repos/load.c:974
+msgid "Malformed dumpstream: Revision 0 must not contain node records"
+msgstr "畸形的导出æµï¼šä¿®è®¢ç‰ˆ 0 ä¸èƒ½åŒ…å«èŠ‚ç‚¹è®°å½•"
-#: libsvn_fs_base/err.c:111 libsvn_fs_fs/err.c:113
+#: libsvn_repos/load.c:984
#, c-format
-msgid "Reference to non-existent revision %ld in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸å¼•用ä¸å˜åœ¨çš„修订版“%1$ldâ€"
+msgid " * editing path : %s ..."
+msgstr " * æ£åœ¨ä¿®æ”¹è·¯å¾„:%s ..."
-#: libsvn_fs_base/err.c:122 libsvn_fs_fs/err.c:124
+#: libsvn_repos/load.c:991
#, c-format
-msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
-msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
+msgid " * deleting path : %s ..."
+msgstr " * æ£åœ¨åˆ 除路径:%s ..."
-#: libsvn_fs_base/err.c:132 libsvn_fs_fs/err.c:134
+#: libsvn_repos/load.c:999
#, c-format
-msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid " * adding path : %s ..."
+msgstr " * æ£åœ¨æ·»åŠ è·¯å¾„ï¼š%s ..."
-#: libsvn_fs_base/err.c:144 libsvn_fs_fs/err.c:146
+#: libsvn_repos/load.c:1008
#, c-format
-msgid "Corrupt entry in 'transactions' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'transactions' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid " * replacing path : %s ..."
+msgstr " * æ£åœ¨æ›¿æ¢è·¯å¾„:%s ..."
-#: libsvn_fs_base/err.c:155 libsvn_fs_fs/err.c:157
+#: libsvn_repos/load.c:1018
#, c-format
-msgid "Corrupt entry in 'copies' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'copies' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+msgid "Unrecognized node-action on node '%s'"
+msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
+
+#: libsvn_repos/load.c:1154
+#, fuzzy
+msgid " done.\n"
+msgstr "完æˆã€‚\n"
-#: libsvn_fs_base/err.c:166 libsvn_fs_fs/err.c:190
+# as-is
+#: libsvn_repos/load.c:1229
#, c-format
-msgid "File is not mutable: filesystem '%s', revision %ld, path '%s'"
-msgstr "æ–‡ä»¶æ— æ³•å˜æ›´ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
+msgid ""
+"\n"
+"------- Committed revision %ld >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- æäº¤åŽçš„修订版 %ld >>>\n"
+"\n"
-#: libsvn_fs_base/err.c:177 libsvn_fs_fs/err.c:201
+# as-is
+#: libsvn_repos/load.c:1235
#, c-format
-msgid "Search for malformed path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
+msgid ""
+"\n"
+"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
+"\n"
+msgstr ""
+"\n"
+"------- æäº¤æ–°ä¿®è®¢ç‰ˆ %ld (从原始修订版 %ld 装载) >>>\n"
+"\n"
-#: libsvn_fs_base/err.c:188 libsvn_fs_fs/err.c:212
+#: libsvn_repos/node_tree.c:238
#, c-format
-msgid "No transaction named '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸ä¸å˜åœ¨å为“%1$sâ€çš„事务"
+msgid "'%s' not found in filesystem"
+msgstr "åœ¨æ–‡ä»¶ç³»ç»Ÿä¸æ‰¾ä¸åˆ°â€œ%sâ€"
-#: libsvn_fs_base/err.c:199 libsvn_fs_fs/err.c:223
+#: libsvn_repos/replay.c:359
#, c-format
-msgid "Cannot modify transaction named '%s' in filesystem '%s'"
-msgstr "æ— æ³•åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%2$sâ€ä¸ä¿®æ”¹å为“%1$sâ€çš„事务"
+msgid "Filesystem path '%s' is neither a file nor a directory"
+msgstr "文件系统ä¸è·¯å¾„“%sâ€æ—¢ä¸æ˜¯æ–‡ä»¶ä¹Ÿä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/err.c:210 libsvn_fs_fs/err.c:234
+#: libsvn_repos/reporter.c:603
#, c-format
-msgid "No copy with id '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸æ²¡æœ‰ç¼–å·â€œ%1$sâ€çš„æ‹·è´"
+msgid "Working copy path '%s' does not exist in repository"
+msgstr "工作拷è´è·¯å¾„“%sâ€ä¸å˜åœ¨æ¡£æ¡ˆåº“ä¸"
+
+#: libsvn_repos/reporter.c:824
+msgid "Not authorized to open root of edit operation"
+msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
+
+#: libsvn_repos/reporter.c:843
+#, fuzzy
+msgid "Target path does not exist"
+msgstr "路径“%sâ€ä¸å˜åœ¨"
+
+#: libsvn_repos/reporter.c:850
+msgid "Cannot replace a directory from within"
+msgstr "ä¸èƒ½åœ¨ç›®å½•䏿›¿æ¢"
+
+#: libsvn_repos/reporter.c:893
+msgid "Invalid report for top level of working copy"
+msgstr "æ— æ•ˆçš„æœ€ä¸Šå±‚å·¥ä½œæ‹·è´æŠ¥å‘Š"
+
+#: libsvn_repos/reporter.c:908
+msgid "Two top-level reports with no target"
+msgstr "ä¸¤ä¸ªæœ€ä¸Šå±‚æŠ¥å‘Šæ²¡æœ‰ç›®æ ‡"
-#: libsvn_fs_base/err.c:220 libsvn_fs_fs/err.c:266
+#: libsvn_repos/repos.c:176
#, c-format
-msgid "'%s' is not a directory in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+msgid "'%s' exists and is non-empty"
+msgstr "“%sâ€å·²å˜åœ¨å¹¶ä¸”éžç©º"
-#: libsvn_fs_base/err.c:231 libsvn_fs_fs/err.c:288
-#, fuzzy, c-format
-msgid "'%s' is not a file in filesystem '%s'"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
+#: libsvn_repos/repos.c:238
+msgid "Creating db logs lock file"
+msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“æ—¥å€¼é”æ–‡ä»¶"
-#: libsvn_fs_base/err.c:242 libsvn_fs_fs/err.c:277
-#, fuzzy, c-format
-msgid "Token '%s' does not point to any existing lock in filesystem '%s'"
-msgstr "æ ‡è¯†â€œ%sâ€æ²¡æœ‰æŒ‡å‘文件系统“%sâ€ä¸å˜åœ¨çš„é”"
+#: libsvn_repos/repos.c:256
+msgid "Creating db lock file"
+msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“锿–‡ä»¶"
-#: libsvn_fs_base/err.c:252
-#, fuzzy, c-format
-msgid "No token given for path '%s' in filesystem '%s'"
-msgstr "没有给出在文件系统“%2$sâ€ä¸çš„路径“%1$sâ€æ ‡è¯†"
+#: libsvn_repos/repos.c:266
+msgid "Creating lock dir"
+msgstr "æ£åœ¨åˆ›å»ºé”文件目录"
-#: libsvn_fs_base/err.c:261
-#, fuzzy, c-format
-msgid "Corrupt lock in 'locks' table for '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸â€œ%sâ€çš„ 'locks' è¡¨æ ¼æœ‰æ— æ•ˆçš„é”"
+#: libsvn_repos/repos.c:307
+msgid "Creating hook directory"
+msgstr "æ£åœ¨åˆ›å»ºå¤–挂目录"
-#: libsvn_fs_base/err.c:271 libsvn_fs_fs/err.c:244
-#, fuzzy, c-format
-msgid "No lock on path '%s' in filesystem '%s'"
-msgstr "文件系统“%2$sâ€ä¸çš„路径“%1$sâ€ä¸æ²¡æœ‰é”"
+#: libsvn_repos/repos.c:413
+msgid "Creating start-commit hook"
+msgstr "æ£åœ¨åˆ›å»º start-commit 外挂时å‘生错误"
-#: libsvn_fs_base/err.c:282 libsvn_fs_fs/err.c:179
-#, fuzzy, c-format
-msgid "Lock has expired: lock-token '%s' in filesystem '%s'"
-msgstr "é”已过期:文件系统“%2$sâ€ä¸çš„锿 ‡è¯†â€œ%1$sâ€"
+#: libsvn_repos/repos.c:550
+msgid "Creating pre-commit hook"
+msgstr "æ£åœ¨åˆ›å»º pre-commit 外挂"
-#: libsvn_fs_base/err.c:293 libsvn_fs_fs/err.c:255
-#, c-format
-msgid "No username is currently associated with filesystem '%s'"
-msgstr "文件系统“%sâ€å½“剿²¡æœ‰ç”¨æˆ·åå…³è”"
+#: libsvn_repos/repos.c:682
+msgid "Creating pre-revprop-change hook"
+msgstr "æ£åœ¨åˆ›å»º pre-revprop-change 外挂"
-#: libsvn_fs_base/err.c:305 libsvn_fs_fs/err.c:312
-#, fuzzy, c-format
-msgid "User '%s' is trying to use a lock owned by '%s' in filesystem '%s'"
-msgstr "用户“%1$sâ€å°è¯•在文件系统“%3$sâ€ä¸ä½¿ç”¨å±žäºŽâ€œ%2$sâ€çš„é”"
+#: libsvn_repos/repos.c:1057
+msgid "Creating post-commit hook"
+msgstr "æ£åœ¨åˆ›å»º post-commit 外挂"
-#: libsvn_fs_base/err.c:317 libsvn_fs_fs/err.c:299
-#, fuzzy, c-format
-msgid "Path '%s' is already locked by user '%s' in filesystem '%s'"
-msgstr "路径“%1$sâ€å·²ç»åœ¨æ–‡ä»¶ç³»ç»Ÿâ€œ%3$sâ€ä¸è¢«ç”¨æˆ·â€œ%2$sâ€é”定"
+#: libsvn_repos/repos.c:1377
+msgid "Creating post-revprop-change hook"
+msgstr "æ£åœ¨åˆ›å»º post-revprop-change 外挂"
-#: libsvn_fs_base/fs.c:79
-#, c-format
-msgid "Bad database version: got %d.%d.%d, should be at least %d.%d.%d"
-msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:得到 %d.%d.%d,应该最低是 %d.%d.%d"
+#: libsvn_repos/repos.c:1387
+msgid "Creating conf directory"
+msgstr "æ£åœ¨åˆ›å»º conf 目录"
-#: libsvn_fs_base/fs.c:90
-#, c-format
-msgid "Bad database version: compiled with %d.%d.%d, running against %d.%d.%d"
-msgstr "䏿£ç¡®çš„æ•°æ®åº“版本:用 %d.%d.%d 版本编译,æ£åœ¨è¿è¡Œç‰ˆæœ¬ %d.%d.%d"
+#: libsvn_repos/repos.c:1453
+msgid "Creating svnserve.conf file"
+msgstr "æ£åœ¨åˆ›å»º svnserve.conf 文件"
+
+#: libsvn_repos/repos.c:1478
+msgid "Creating passwd file"
+msgstr "æ£åœ¨åˆ›å»º passwd 文件"
-#: libsvn_fs_base/fs.c:108 libsvn_fs_fs/fs.c:57
+#: libsvn_repos/repos.c:1527
#, fuzzy
-msgid "Filesystem object already open"
-msgstr "æ–‡ä»¶ç³»ç»Ÿå¯¹è±¡å·²ç»æ‰“å¼€"
+msgid "Creating authz file"
+msgstr "æ£åœ¨åˆ›å»º passwd 文件"
+
+#: libsvn_repos/repos.c:1560
+msgid "Could not create top-level directory"
+msgstr "æ— æ³•åˆ›å»ºæœ€ä¸Šå±‚ç›®å½•"
+
+#: libsvn_repos/repos.c:1564
+msgid "Creating DAV sandbox dir"
+msgstr "æ£åœ¨åˆ›å»º DAV sandbox 目录"
-#: libsvn_fs_base/fs.c:676 libsvn_fs_fs/fs_fs.c:252
-#, c-format
-msgid "Expected FS format '%d'; found format '%d'"
-msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+#: libsvn_repos/repos.c:1645
+msgid "Error opening db lockfile"
+msgstr "打开数æ®åº“锿–‡ä»¶é”™è¯¯"
-# as-is
-#: libsvn_fs_base/fs.c:1055
-#, fuzzy, c-format
-msgid "Can't open file '%s' for reading"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
+#: libsvn_repos/repos.c:1682
+msgid "Repository creation failed"
+msgstr "档案库创建失败"
-# as-is
-#: libsvn_fs_base/fs.c:1064
+#: libsvn_repos/repos.c:1763
#, fuzzy, c-format
-msgid "Can't open file '%s' for writing"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
+msgid "Expected repository format '%d' or '%d'; found format '%d'"
+msgstr "期待文件系统(FS)æ ¼å¼ â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
-#: libsvn_fs_base/fs.c:1084
-#, fuzzy, c-format
-msgid "Error reading file '%s'"
-msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
+#: libsvn_repos/rev_hunt.c:64
+#, c-format
+msgid "Failed to find time on revision %ld"
+msgstr "æ— æ³•æ‰¾åˆ°ä¿®è®¢ç‰ˆ %ld 的时间"
-#: libsvn_fs_base/fs.c:1095
-#, fuzzy, c-format
-msgid "Error writing file '%s'"
-msgstr "写入文件“%sâ€æ—¶å‘生错误"
+#: libsvn_repos/rev_hunt.c:219
+#, c-format
+msgid "Invalid start revision %ld"
+msgstr "æ— æ•ˆçš„èµ·å§‹ä¿®è®¢ç‰ˆ %ld"
-#: libsvn_fs_base/fs.c:1103 libsvn_fs_base/fs.c:1107 libsvn_subr/io.c:2210
+#: libsvn_repos/rev_hunt.c:223
#, c-format
-msgid "Can't close file '%s'"
-msgstr "æ— æ³•å…³é—æ–‡ä»¶â€œ%sâ€"
+msgid "Invalid end revision %ld"
+msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
-#: libsvn_fs_base/fs.c:1216
+#: libsvn_repos/rev_hunt.c:315
#, fuzzy
-msgid ""
-"Error copying logfile; the DB_LOG_AUTOREMOVE feature \n"
-"may be interfering with the hotcopy algorithm. If \n"
-"the problem persists, try deactivating this feature \n"
-"in DB_CONFIG"
-msgstr ""
-"å¤åˆ¶æ—¥å¿—文件时å‘生错误;DB_LOG_AUTOREMOVE å¯èƒ½å¯¹åˆ¶ä½œ\n"
-"峿—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·å°è¯•\n"
-"在 DB_CONFIG ä¸å–消这个功能。"
+msgid "Unreadable path encountered; access denied"
+msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
-#: libsvn_fs_base/fs.c:1235
-#, fuzzy
-msgid ""
-"Error running catastrophic recovery on hotcopy; the \n"
-"DB_LOG_AUTOREMOVE feature may be interfering with the \n"
-"hotcopy algorithm. If the problem persists, try deactivating \n"
-"this feature in DB_CONFIG"
+#: libsvn_subr/cmdline.c:481
+#, c-format
+msgid "Error initializing command line arguments"
msgstr ""
-"坹峿—¶æ‹·è´æ‰§è¡Œç¾åŽé‡å»ºæ—¶å‘生错误;DB_LOG_AUTOREMOVE 功能\n"
-"å¯èƒ½å¯¹åˆ¶ä½œå³æ—¶æ‹·è´çš„æ¼”算法有所影å“ã€‚å¦‚æžœé—®é¢˜ä¾æ—§å˜åœ¨ï¼Œè¯·\n"
-"å°è¯•在 DB_CONFIG ä¸å–消这个功能。"
-
-#: libsvn_fs_base/fs.c:1345
-msgid "Module for working with a Berkeley DB repository."
-msgstr "模å—与伯克利数æ®åº“(Berkeley DB)档案库一起工作。"
-#: libsvn_fs_base/fs.c:1379
+#: libsvn_subr/config.c:630
#, c-format
-msgid "Unsupported FS loader version (%d) for bdb"
-msgstr "䏿”¯æŒçš„ bdb çš„ FS 载入器版本 (%d)"
+msgid "Config error: invalid boolean value '%s'"
+msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„å¸ƒå°”å€¼â€œ%sâ€"
-#: libsvn_fs_base/lock.c:449 libsvn_fs_fs/lock.c:615
+#: libsvn_subr/config.c:880
#, c-format
-msgid "Cannot verify lock on path '%s'; no username available"
-msgstr "ä¸èƒ½åœ¨è·¯å¾„“%sâ€æ ¡éªŒé”;没有有效的用户å"
+msgid "Config error: invalid integer value '%s'"
+msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„æ•´æ•°å€¼â€œ%sâ€"
+
+#: libsvn_subr/config_auth.c:94
+msgid "Unable to open auth file for reading"
+msgstr "ä¸èƒ½æ‰“å¼€è®¤è¯æ–‡ä»¶è¯»å–æ•°æ®"
-#: libsvn_fs_base/lock.c:455 libsvn_fs_fs/lock.c:621
+#: libsvn_subr/config_auth.c:99
#, c-format
-msgid "User %s does not own lock on path '%s' (currently locked by %s)"
-msgstr "用户 %s 䏿˜¯è·¯å¾„“%sâ€é”的所有者(当å‰ç”±ç”¨æˆ· %s é”定)"
+msgid "Error parsing '%s'"
+msgstr "分解“%sâ€æ—¶å‘生错误"
+
+#: libsvn_subr/config_auth.c:123
+msgid "Unable to locate auth file"
+msgstr "æ— æ³•å®šä½è®¤è¯æ–‡ä»¶æ–‡ä»¶"
+
+#: libsvn_subr/config_auth.c:134
+msgid "Unable to open auth file for writing"
+msgstr "æ— æ³•æ‰“å¼€è®¤è¯æ–‡ä»¶å†™å…¥æ•°æ®"
-#: libsvn_fs_base/lock.c:462 libsvn_fs_fs/lock.c:628
+#: libsvn_subr/config_auth.c:137
#, c-format
-msgid "Cannot verify lock on path '%s'; no matching lock-token available"
-msgstr "ä¸èƒ½æ ¡éªŒè·¯å¾„“%sâ€ä¸Šçš„é”;没有匹é…çš„å¯ç”¨é”æ ‡è¯†"
+msgid "Error writing hash to '%s'"
+msgstr "写哈希数æ®è‡³â€œ%sâ€æ—¶å‘生错误"
-#: libsvn_fs_base/reps-strings.c:103
-#, fuzzy
-msgid "Representation is not of type 'delta'"
-msgstr "è¯·æ±‚ä¸æ˜¯ “delta†类型"
+#: libsvn_subr/date.c:204
+#, c-format
+msgid "Can't manipulate current date"
+msgstr "ä¸èƒ½è޷得当剿—¥æœŸ"
-#: libsvn_fs_base/reps-strings.c:495
+#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
#, c-format
-msgid "Diff version inconsistencies in representation '%s'"
-msgstr "在“%sâ€è¯·æ±‚Diff 的版本冲çª"
+msgid "Can't calculate requested date"
+msgstr "æ— æ³•è®¡ç®—è¢«è¯·æ±‚çš„æ—¥æœŸ"
-#: libsvn_fs_base/reps-strings.c:758
+#: libsvn_subr/date.c:281
#, c-format
-msgid "Rep contents are too large: got %s, limit is %s"
-msgstr "报告内容太大:得到 %s,é™åˆ¶æ˜¯ %s"
+msgid "Can't expand time"
+msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
-#: libsvn_fs_base/reps-strings.c:774
+#: libsvn_subr/dso.c:70
#, fuzzy, c-format
-msgid "Failure reading rep '%s'"
-msgstr "è¯»å–æŠ¥å‘Šâ€œ%sâ€å¤±è´¥"
+msgid "Can't grab DSO mutex"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: libsvn_fs_base/reps-strings.c:790 libsvn_fs_base/reps-strings.c:876
+#: libsvn_subr/dso.c:84 libsvn_subr/dso.c:106 libsvn_subr/dso.c:121
#, fuzzy, c-format
-msgid ""
-"Checksum mismatch on rep '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"报告“%sâ€çš„æ ¡éªŒå’Œä¸åŒ¹é…:\n"
-" 预期: %s\n"
-" 实际: %s\n"
-
-#: libsvn_fs_base/reps-strings.c:890
-msgid "Null rep, but offset past zero already"
-msgstr "空的报告,å移已ç»è¶…过零值"
+msgid "Can't ungrab DSO mutex"
+msgstr "ä¸èƒ½é‡Šæ”¾æ–‡ä»¶ç³»ç»Ÿ(FS)互斥体"
-#: libsvn_fs_base/reps-strings.c:1003 libsvn_fs_base/reps-strings.c:1199
-#, fuzzy, c-format
-msgid "Rep '%s' is not mutable"
-msgstr "报告“%sâ€æ˜¯ä¸å¯å˜çš„"
+#: libsvn_subr/error.c:326
+msgid "Can't recode error string from APR"
+msgstr "æ— æ³•è‡ª APR 将错误信æ¯é‡æ–°ç¼–ç "
-#: libsvn_fs_base/reps-strings.c:1018
+#: libsvn_subr/error.c:417
#, c-format
-msgid "Rep '%s' both mutable and non-fulltext"
-msgstr "报告 “%s†å¯å˜å¹¶ä¸”éžå…¨æ–‡æœ¬"
+msgid "%swarning: %s\n"
+msgstr "%sè¦å‘Šï¼š%s\n"
-#: libsvn_fs_base/reps-strings.c:1318
-msgid "Failed to get new string key"
-msgstr "å–æ–°çš„å—符串关键å—失败"
+#: libsvn_subr/io.c:122
+#, c-format
+msgid "Can't check path '%s'"
+msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€"
-#: libsvn_fs_base/reps-strings.c:1393
+#: libsvn_subr/io.c:376 libsvn_subr/io.c:507
#, c-format
-msgid "Attempt to deltify '%s' against itself"
-msgstr "ä¼å›¾ deltify “%s†自身"
+msgid "Can't open '%s'"
+msgstr "ä¸èƒ½æ‰“开“%sâ€"
-#: libsvn_fs_base/reps-strings.c:1459
-#, fuzzy, c-format
-msgid "Failed to calculate MD5 digest for '%s'"
-msgstr "计算“%sâ€çš„MD5指纹失败"
+#: libsvn_subr/io.c:398 libsvn_subr/io.c:520
+#, c-format
+msgid "Unable to make name for '%s'"
+msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
-#: libsvn_fs_base/revs-txns.c:65 libsvn_fs_fs/revs-txns.c:58
-#, fuzzy, c-format
-msgid "Transaction is not dead: '%s'"
-msgstr "事务未结æŸï¼šâ€œ%sâ€"
+#: libsvn_subr/io.c:524 libsvn_subr/io.c:578 libsvn_subr/io.c:606
+msgid "Symbolic links are not supported on this platform"
+msgstr "æ¤å¹³å°ä¸æ”¯æŒç¬¦å·é“¾æŽ¥"
-#: libsvn_fs_base/revs-txns.c:68 libsvn_fs_fs/revs-txns.c:61
-#, fuzzy, c-format
-msgid "Transaction is dead: '%s'"
-msgstr "事务已结æŸï¼šâ€œ%sâ€"
+#: libsvn_subr/io.c:557
+#, c-format
+msgid "Can't read contents of link"
+msgstr "ä¸èƒ½è¯»å–连接的内容"
-#: libsvn_fs_base/revs-txns.c:981
-#, fuzzy
-msgid "Transaction aborted, but cleanup failed"
-msgstr "äº‹åŠ¡ä¸æ¢ï¼Œä½†æ¸…除失败"
+#: libsvn_subr/io.c:619
+#, c-format
+msgid "Can't find a temporary directory"
+msgstr "æ— æ³•æ‰¾åˆ°ä¸´æ—¶ç›®å½•"
-#: libsvn_fs_base/tree.c:391 libsvn_fs_fs/tree.c:311
-#, fuzzy, c-format
-msgid "File not found: transaction '%s', path '%s'"
-msgstr "文件找ä¸åˆ°ï¼šäº‹åŠ¡â€œ%s†,路径“%sâ€"
+#: libsvn_subr/io.c:752
+#, c-format
+msgid "Can't copy '%s' to '%s'"
+msgstr "ä¸èƒ½å¤åˆ¶â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_base/tree.c:397 libsvn_fs_fs/tree.c:317
+# as-is
+#: libsvn_subr/io.c:786
#, c-format
-msgid "File not found: revision %ld, path '%s'"
-msgstr "文件找ä¸åˆ°ï¼šä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
+msgid "Can't set permissions on '%s'"
+msgstr "ä¸èƒ½åœ¨â€œ%sâ€è®¾ç½®è®¸å¯æƒé™"
-#: libsvn_fs_base/tree.c:412 libsvn_fs_fs/tree.c:332
-#, fuzzy, c-format
-msgid "File already exists: filesystem '%s', transaction '%s', path '%s'"
-msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œäº‹åŠ¡ “%sâ€ï¼Œè·¯å¾„“%sâ€"
+#: libsvn_subr/io.c:808
+#, c-format
+msgid "Can't append '%s' to '%s'"
+msgstr "ä¸èƒ½é™„åŠ â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_base/tree.c:418 libsvn_fs_fs/tree.c:338
+#: libsvn_subr/io.c:842
#, c-format
-msgid "File already exists: filesystem '%s', revision %ld, path '%s'"
-msgstr "文件已å˜åœ¨ï¼šæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ï¼Œä¿®è®¢ç‰ˆ %ld,路径“%sâ€"
+msgid "Source '%s' is not a directory"
+msgstr "æºâ€œ%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/tree.c:428 libsvn_fs_fs/tree.c:348
-#, fuzzy
-msgid "Root object must be a transaction root"
-msgstr "æ ¹å¯¹è±¡å¿…é¡»æ˜¯ä¸€ä¸ªäº‹åŠ¡çš„æ ¹å¯¹è±¡"
+#: libsvn_subr/io.c:848
+#, c-format
+msgid "Destination '%s' is not a directory"
+msgstr "目的“%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_fs_base/tree.c:837 libsvn_fs_fs/tree.c:757
-#, fuzzy, c-format
-msgid "Failure opening '%s'"
-msgstr "打开“%sâ€å¤±è´¥"
+#: libsvn_subr/io.c:854
+#, c-format
+msgid "Destination '%s' already exists"
+msgstr "目的“%sâ€å·²å˜åœ¨"
-#: libsvn_fs_base/tree.c:1407 libsvn_fs_fs/tree.c:1155
-#, fuzzy
-msgid "Cannot compare property value between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿä¹‹é—´æ¯”较属性值"
+#: libsvn_subr/io.c:923 libsvn_subr/io.c:1816 libsvn_subr/io.c:1867
+#: libsvn_subr/io.c:1930
+#, c-format
+msgid "Can't read directory '%s'"
+msgstr "æ— æ³•è¯»å–目录“%sâ€"
-#: libsvn_fs_base/tree.c:1741
-msgid "Corrupt DB: faulty predecessor count"
-msgstr "æ— æ•ˆçš„æ•°æ®åº“:先å‰çš„æ•°ç›®ä¸å®Œæ•´"
+#: libsvn_subr/io.c:928 libsvn_subr/io.c:1821 libsvn_subr/io.c:1872
+#: libsvn_subr/io.c:1935 libsvn_subr/io.c:2982
+#, c-format
+msgid "Error closing directory '%s'"
+msgstr "å…³é—目录“%sâ€æ—¶å‘生错误"
-#: libsvn_fs_base/tree.c:1796 libsvn_fs_fs/tree.c:1192
-#, fuzzy, c-format
-msgid "Unexpected immutable node at '%s'"
-msgstr "在“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ä¸å¯æ”¹å˜èŠ‚ç‚¹"
+#: libsvn_subr/io.c:954
+#, c-format
+msgid "Can't make directory '%s'"
+msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
# as-is
-#: libsvn_fs_base/tree.c:1817 libsvn_fs_fs/tree.c:1215
-#, fuzzy, c-format
-msgid "Conflict at '%s'"
-msgstr "在“%sâ€å†²çª"
-
-#: libsvn_fs_base/tree.c:1867 libsvn_fs_base/tree.c:2570
-#: libsvn_fs_fs/tree.c:1264 libsvn_fs_fs/tree.c:1753
-msgid "Bad merge; ancestor, source, and target not all in same fs"
-msgstr "错误的åˆå¹¶ï¼›æœ€åˆçš„ï¼ŒåŽŸå§‹ï¼Œç›®æ ‡ä¸æ˜¯å…¨éƒ¨åœ¨åŒä¸€ä¸ªæ–‡ä»¶ç³»ç»Ÿ(fs)"
+#: libsvn_subr/io.c:1041
+#, c-format
+msgid "Can't set access time of '%s'"
+msgstr "ä¸èƒ½è®¾ç½®â€œ%sâ€çš„å˜å–æ—¶é—´"
-#: libsvn_fs_base/tree.c:1883 libsvn_fs_fs/tree.c:1280
+#: libsvn_subr/io.c:1181
#, c-format
-msgid "Bad merge; target '%s' has id '%s', same as ancestor"
-msgstr "错误的åˆå¹¶ï¼šç›®æ ‡â€œ%sâ€æ‹¥æœ‰ç¼–å·â€œ%sâ€ï¼Œä¸Žåˆå§‹çš„相åŒ"
+msgid "Can't get default file perms for file at '%s' (file stat error)"
+msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
-#: libsvn_fs_base/tree.c:2377
+# as-is
+#: libsvn_subr/io.c:1192
#, fuzzy, c-format
-msgid "Transaction '%s' out of date with respect to revision '%s'"
-msgstr "关于修订版本“%2$sâ€çš„事务“%sâ€å·²ç»è¿‡æ—¶"
-
-#: libsvn_fs_base/tree.c:2753 libsvn_fs_fs/tree.c:1892
-#, fuzzy
-msgid "The root directory cannot be deleted"
-msgstr "æ ¹ç›®å½•ä¸èƒ½åˆ 除"
+msgid "Can't open file at '%s'"
+msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
-#: libsvn_fs_base/tree.c:2912 libsvn_fs_fs/tree.c:1939
-msgid "Copy from mutable tree not currently supported"
-msgstr "当å‰ä¸æ”¯æŒä»Žå¯å˜çš„æ ‘å¤åˆ¶"
+#: libsvn_subr/io.c:1196
+#, fuzzy, c-format
+msgid "Can't get file perms for file at '%s' (file stat error)"
+msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
-#: libsvn_fs_base/tree.c:3407 libsvn_fs_fs/tree.c:2363
+#: libsvn_subr/io.c:1235 libsvn_subr/io.c:1330
#, fuzzy, c-format
-msgid ""
-"Base checksum mismatch on '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"åŸºæœ¬æ ¡éªŒå’Œåœ¨â€œ%sâ€ä¸åŒ¹é…:\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+msgid "Can't change perms of file '%s'"
+msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
-#: libsvn_fs_base/tree.c:3660 libsvn_fs_fs/tree.c:2599
-#, fuzzy
-msgid "Cannot compare file contents between two different filesystems"
-msgstr "在两个ä¸åŒçš„æ–‡ä»¶ç³»ç»Ÿè¯¢é—®å†…容的更改"
+#: libsvn_subr/io.c:1370
+#, c-format
+msgid "Can't set file '%s' read-only"
+msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€åªè¯»"
-#: libsvn_fs_base/tree.c:3669 libsvn_fs_base/tree.c:3674
-#: libsvn_fs_fs/tree.c:2608 libsvn_fs_fs/tree.c:2613
-#: libsvn_repos/rev_hunt.c:540
-#, fuzzy, c-format
-msgid "'%s' is not a file"
-msgstr "“%sâ€ä¸æ˜¯ä¸€ä¸ªæ–‡ä»¶"
+#: libsvn_subr/io.c:1402
+#, c-format
+msgid "Can't set file '%s' read-write"
+msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€å¯è¯»å†™"
+
+#: libsvn_subr/io.c:1446
+#, c-format
+msgid "Error getting UID of process"
+msgstr "获å–进程用户ID(UID)时å‘生错误"
-#: libsvn_fs_fs/dag.c:436
-#, fuzzy
-msgid "Can't get entries of non-directory"
-msgstr "ä¸èƒ½èŽ·å–éžç›®å½•çš„æ¡ç›®"
+#: libsvn_subr/io.c:1527
+#, c-format
+msgid "Can't get shared lock on file '%s'"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%s“的共享é”"
-#: libsvn_fs_fs/dag.c:952
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch, file '%s':\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"æ ¡éªŒå’Œä¸åŒ¹é…,文件“%sâ€ï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+#: libsvn_subr/io.c:1531
+#, c-format
+msgid "Can't get exclusive lock on file '%s'"
+msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%sâ€çš„æŽ’ä»–é”"
-#: libsvn_fs_fs/err.c:60
+# as-is
+#: libsvn_subr/io.c:1562
#, c-format
-msgid "Corrupt node revision for node '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
+msgid "Can't flush file '%s'"
+msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_fs/err.c:92
+#: libsvn_subr/io.c:1563
#, c-format
-msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
-msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+msgid "Can't flush stream"
+msgstr "ä¸èƒ½å†™å…¥æµ"
-#: libsvn_fs_fs/err.c:168
-#, fuzzy, c-format
-msgid "Corrupt lockfile for path '%s' in filesystem '%s'"
-msgstr "在文件系统“%2$sâ€çš„路径“%sâ€æœ‰æŸåçš„é”æ–‡ä»¶"
+#: libsvn_subr/io.c:1575 libsvn_subr/io.c:1592
+#, c-format
+msgid "Can't flush file to disk"
+msgstr "ä¸èƒ½æŠŠæ–‡ä»¶å†™å…¥ç£ç›˜"
-#: libsvn_fs_fs/fs.c:98
-msgid "Can't fetch FSFS mutex"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+#: libsvn_subr/io.c:1613
+msgid "Reading from stdin is currently broken, so disabled"
+msgstr "ä»Žæ ‡å‡†è¾“å…¥è®¾å¤‡è¯»å–æ•°æ®æ—¶è¢«ä¸æ–ï¼Œæ‰€ä»¥æŠŠå®ƒç¦æ¢"
-#: libsvn_fs_fs/fs.c:105
-#, fuzzy
-msgid "Can't create FSFS mutex"
-msgstr "æ— æ³•åˆ›å»ºæ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+#: libsvn_subr/io.c:1634
+#, c-format
+msgid "Can't get file name"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
-#: libsvn_fs_fs/fs.c:109
-msgid "Can't store FSFS mutex"
-msgstr "ä¸èƒ½å˜å‚¨æ–‡ä»¶ç³»ç»Ÿ(FSFS)互斥体"
+# as-is
+#: libsvn_subr/io.c:1702
+#, c-format
+msgid "Can't remove file '%s'"
+msgstr "ä¸èƒ½ç§»åŠ¨æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_fs/fs.c:334
-msgid "Module for working with a plain file (FSFS) repository."
-msgstr "模å—与纯文本文件(FSFS)档案库一起工作。"
+#: libsvn_subr/io.c:1731
+#, c-format
+msgid "Can't rewind directory '%s'"
+msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs.c:368
+#: libsvn_subr/io.c:1766 libsvn_subr/io.c:2833 libsvn_subr/io.c:2919
#, c-format
-msgid "Unsupported FS loader version (%d) for fsfs"
-msgstr "䏿”¯æŒçš„ fsfs çš„ FS 载入器版本 (%d)"
+msgid "Can't open directory '%s'"
+msgstr "æ— æ³•æ‰“å¼€ç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:455 libsvn_fs_fs/fs_fs.c:469
-msgid "Found malformed header in revision file"
-msgstr "åœ¨ä¿®è®¢ç‰ˆæ–‡ä»¶ä¸æ‰¾åˆ°ç•¸å½¢çš„æ–‡ä»¶å¤´"
+#: libsvn_subr/io.c:1805 libsvn_subr/io.c:1827
+#, c-format
+msgid "Can't remove '%s'"
+msgstr "æ— æ³•åˆ é™¤â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:571 libsvn_fs_fs/fs_fs.c:585 libsvn_fs_fs/fs_fs.c:592
-#: libsvn_fs_fs/fs_fs.c:599 libsvn_fs_fs/fs_fs.c:607 libsvn_fs_fs/fs_fs.c:615
-msgid "Malformed text rep offset line in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ text rep offset 列"
+#: libsvn_subr/io.c:1999
+#, c-format
+msgid "Can't create process '%s' attributes"
+msgstr "æ— æ³•å»ºç«‹è¿›ç¨‹â€œ%sâ€çš„属性"
-#: libsvn_fs_fs/fs_fs.c:684
-msgid "Missing kind field in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ kind æ ä½"
+#: libsvn_subr/io.c:2005
+#, c-format
+msgid "Can't set process '%s' cmdtype"
+msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„命令类型"
-#: libsvn_fs_fs/fs_fs.c:715
-msgid "Missing cpath in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ cpath"
+#: libsvn_subr/io.c:2017
+#, c-format
+msgid "Can't set process '%s' directory"
+msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
-#: libsvn_fs_fs/fs_fs.c:742 libsvn_fs_fs/fs_fs.c:748
-msgid "Malformed copyroot line in node-rev"
-msgstr "node-rev ä¸çš„ copyroot 行畸形"
+#: libsvn_subr/io.c:2030
+#, c-format
+msgid "Can't set process '%s' child input"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
-#: libsvn_fs_fs/fs_fs.c:766 libsvn_fs_fs/fs_fs.c:772
-msgid "Malformed copyfrom line in node-rev"
-msgstr "node-rev ä¸çš„ copyfrom 行畸形"
+#: libsvn_subr/io.c:2037
+#, c-format
+msgid "Can't set process '%s' child outfile"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
-#: libsvn_fs_fs/fs_fs.c:871 libsvn_fs_fs/fs_fs.c:3184
-msgid "Attempted to write to non-transaction"
-msgstr "ä¼å›¾å†™è‡³éžäº‹åŠ¡"
+#: libsvn_subr/io.c:2044
+#, c-format
+msgid "Can't set process '%s' child errfile"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_fs/fs_fs.c:955
-msgid "Malformed representation header"
-msgstr "畸形的æè¿°æ–‡ä»¶å¤´"
+#: libsvn_subr/io.c:2051
+#, fuzzy, c-format
+msgid "Can't set process '%s' child errfile for error handler"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_fs/fs_fs.c:979
-msgid "Missing node-id in node-rev"
-msgstr "node-rev 䏿²¡æœ‰ node-id"
+#: libsvn_subr/io.c:2057
+#, fuzzy, c-format
+msgid "Can't set process '%s' error handler"
+msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
-#: libsvn_fs_fs/fs_fs.c:985
-msgid "Corrupt node-id in node-rev"
-msgstr "node-rev ä¸çš„ node-id æŸå"
+# as-is
+#: libsvn_subr/io.c:2080
+#, c-format
+msgid "Can't start process '%s'"
+msgstr "ä¸èƒ½å–得进程“%sâ€çжæ€"
-#: libsvn_fs_fs/fs_fs.c:1030
-msgid "Revision file lacks trailing newline"
-msgstr "修订版文件缺少结尾æ¢è¡Œç¬¦"
+#: libsvn_subr/io.c:2104
+#, c-format
+msgid "Error waiting for process '%s'"
+msgstr "为进程“%sâ€å†™å…¥æ—¶å‘生错误"
-#: libsvn_fs_fs/fs_fs.c:1042
-msgid "Final line in revision file longer than 64 characters"
-msgstr "修订版文件的最åŽä¸€åˆ—大于 64 个å—符长"
+#: libsvn_subr/io.c:2112
+#, c-format
+msgid "Process '%s' failed (exitwhy %d)"
+msgstr "进程“%sâ€å¤±è´¥(返回 %d)"
-#: libsvn_fs_fs/fs_fs.c:1055
-msgid "Final line in revision file missing space"
-msgstr "修订版文件的最åŽä¸€åˆ—少掉空白å—符"
+#: libsvn_subr/io.c:2119
+#, c-format
+msgid "Process '%s' returned error exitcode %d"
+msgstr "进程“%sâ€è¿”回错误退出ç %d"
-#: libsvn_fs_fs/fs_fs.c:1085 libsvn_fs_fs/fs_fs.c:3593
+#: libsvn_subr/io.c:2230
#, c-format
-msgid "Can't chmod '%s'"
-msgstr "æ— æ³• chmod“%sâ€"
+msgid "'%s' returned %d"
+msgstr "“%s†返回 %d"
-#: libsvn_fs_fs/fs_fs.c:1143 libsvn_fs_fs/fs_fs.c:1200 libsvn_repos/log.c:480
-#: libsvn_repos/log.c:484
+#: libsvn_subr/io.c:2353
#, c-format
-msgid "No such revision %ld"
-msgstr "没有这个修订版 %ld"
+msgid ""
+"Error running '%s': exitcode was %d, args were:\n"
+"in directory '%s', basenames:\n"
+"%s\n"
+"%s\n"
+"%s"
+msgstr ""
+"è¿è¡Œâ€œ%sâ€æ—¶å‘ç”Ÿé”™è¯¯ï¼šé€€å‡ºç æ˜¯ %dï¼Œå‚æ•°æ˜¯ï¼š\n"
+"在目录“%sâ€ï¼Œåå—:\n"
+"%s\n"
+"%s\n"
+"%s"
-#: libsvn_fs_fs/fs_fs.c:1275
-msgid "Malformed svndiff data in representation"
-msgstr "请求的svndiff æ•°æ®ç•¸å½¢"
+#: libsvn_subr/io.c:2406
+#, c-format
+msgid "Can't detect MIME type of non-file '%s'"
+msgstr "ä¸èƒ½æ£€æµ‹éžæ–‡ä»¶çš„“%sâ€çš„MIME类型"
# as-is
-#: libsvn_fs_fs/fs_fs.c:1386 libsvn_fs_fs/fs_fs.c:1399
-#: libsvn_fs_fs/fs_fs.c:1430
-msgid "Reading one svndiff window read beyond the end of the representation"
-msgstr "æ£åœ¨è¯»å–请求的一个 svndiff çª—å£æœ€æœ«ç«¯"
+#: libsvn_subr/io.c:2473
+#, c-format
+msgid "Can't open file '%s'"
+msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:1543
-msgid "svndiff data requested non-existent source"
-msgstr "svndiff æ•°æ®è¯·æ±‚ä¸å˜åœ¨çš„æ¥æº"
+#: libsvn_subr/io.c:2509
+#, c-format
+msgid "Can't close file '%s'"
+msgstr "æ— æ³•å…³é—æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:1549
-msgid "svndiff requested position beyond end of stream"
-msgstr "svndiff 请求的ä½ç½®è¶…出了æµçš„结尾"
+#: libsvn_subr/io.c:2510
+#, c-format
+msgid "Can't close stream"
+msgstr "æ— æ³•å…³é—æµ"
-#: libsvn_fs_fs/fs_fs.c:1572 libsvn_fs_fs/fs_fs.c:1589
-msgid "svndiff window length is corrupt"
-msgstr "svndiff çš„çª—æ ¼é•¿åº¦å·²æ¯æŸ"
+# as-is
+#: libsvn_subr/io.c:2520 libsvn_subr/io.c:2544 libsvn_subr/io.c:2557
+#, c-format
+msgid "Can't read file '%s'"
+msgstr "ä¸èƒ½è¯»å–文件“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:1637
-#, fuzzy, c-format
-msgid ""
-"Checksum mismatch while reading representation:\n"
-" expected: %s\n"
-" actual: %s\n"
-msgstr ""
-"当读å–è¯·æ±‚æ—¶æ ¡éªŒå’Œä¸åŒ¹é…:\n"
-" 预期: %s\n"
-" 实际: %s\n"
+#: libsvn_subr/io.c:2521 libsvn_subr/io.c:2545 libsvn_subr/io.c:2558
+#, c-format
+msgid "Can't read stream"
+msgstr "æ— æ³•è¯»å–æµ"
-#: libsvn_fs_fs/fs_fs.c:1773 libsvn_fs_fs/fs_fs.c:1786
-#: libsvn_fs_fs/fs_fs.c:1792
-msgid "Directory entry corrupt"
-msgstr "目录æ¡ç›®æŸå"
+#: libsvn_subr/io.c:2532
+#, c-format
+msgid "Can't get attribute information from file '%s'"
+msgstr "æ— æ³•ä»Žæ–‡ä»¶â€œ%sâ€èŽ·å–属性信æ¯"
-#: libsvn_fs_fs/fs_fs.c:2128 libsvn_fs_fs/fs_fs.c:2136
-#: libsvn_fs_fs/fs_fs.c:2168 libsvn_fs_fs/fs_fs.c:2188
-#: libsvn_fs_fs/fs_fs.c:2222 libsvn_fs_fs/fs_fs.c:2227
-msgid "Invalid changes line in rev-file"
-msgstr "rev-file 䏿œ‰æ— æ•ˆçš„å˜æ›´è¡Œ"
+#: libsvn_subr/io.c:2533
+#, c-format
+msgid "Can't get attribute information from stream"
+msgstr "æ— æ³•ä»ŽæµèŽ·å–属性信æ¯"
-#: libsvn_fs_fs/fs_fs.c:2161
-msgid "Invalid change kind in rev file"
-msgstr "rev æ–‡ä»¶ä¸æœ‰æ— 效的改å˜ç§ç±»"
+#: libsvn_subr/io.c:2569
+#, c-format
+msgid "Can't set position pointer in file '%s'"
+msgstr "æ— æ³•åœ¨æ–‡ä»¶â€œ%sâ€è®¾ç½®å®šä½æŒ‡é’ˆ"
-#: libsvn_fs_fs/fs_fs.c:2181
-msgid "Invalid text-mod flag in rev-file"
-msgstr "rev-file 䏿œ‰æ— 效的 text-mod æ ‡å¿—"
+#: libsvn_subr/io.c:2570
+#, c-format
+msgid "Can't set position pointer in stream"
+msgstr "æ— æ³•åœ¨æµä¸è®¾ç½®å®šä½æŒ‡é’ˆ"
-#: libsvn_fs_fs/fs_fs.c:2201
-msgid "Invalid prop-mod flag in rev-file"
-msgstr "rev-file 䏿œ‰æ— 效的 prop-mod æ ‡å¿—"
+#: libsvn_subr/io.c:2581 libsvn_subr/io.c:2594
+#, c-format
+msgid "Can't write to file '%s'"
+msgstr "æ— æ³•å†™å…¥æ–‡ä»¶â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:2384
-msgid "Copying from transactions not allowed"
-msgstr "自事务进行å¤åˆ¶æ˜¯ä¸è¢«å…许的"
+#: libsvn_subr/io.c:2582 libsvn_subr/io.c:2595
+#, c-format
+msgid "Can't write to stream"
+msgstr "æ— æ³•å†™å…¥æµ"
-#: libsvn_fs_fs/fs_fs.c:2440
+# as-is
+#: libsvn_subr/io.c:2635
#, fuzzy, c-format
-msgid "Unable to create transaction directory in '%s' for revision %ld"
-msgstr "æ— æ³•ä¸ºä¿®è®¢ç‰ˆ %2$ld 在“%sâ€åˆ›å»ºäº‹åŠ¡ç›®å½•"
-
-#: libsvn_fs_fs/fs_fs.c:2629 libsvn_fs_fs/fs_fs.c:2636
-msgid "next-id file corrupt"
-msgstr "next-id 文件æŸå"
+msgid "Can't read length line in file '%s'"
+msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
-#: libsvn_fs_fs/fs_fs.c:2721
+#: libsvn_subr/io.c:2639
#, fuzzy
-msgid "Transaction cleanup failed"
-msgstr "事务清除失败"
+msgid "Can't read length line in stream"
+msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
-#: libsvn_fs_fs/fs_fs.c:2884
-msgid "Invalid change type"
-msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
+#: libsvn_subr/io.c:2686
+#, c-format
+msgid "Can't move '%s' to '%s'"
+msgstr "ä¸èƒ½ç§»åŠ¨â€œ%sâ€åˆ°â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:3203
-msgid "Can't set text contents of a directory"
-msgstr "æ— æ³•è®¾å®šç›®å½•çš„æ–‡å—内容"
+#: libsvn_subr/io.c:2764
+#, c-format
+msgid "Can't create directory '%s'"
+msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:3293 libsvn_fs_fs/fs_fs.c:3298
-#: libsvn_fs_fs/fs_fs.c:3305
-msgid "Corrupt current file"
-msgstr "当剿–‡ä»¶æŸå"
+#: libsvn_subr/io.c:2775 libsvn_wc/copy.c:204
+#, c-format
+msgid "Can't hide directory '%s'"
+msgstr "æ— æ³•éšè—目录“%sâ€"
-#: libsvn_fs_fs/fs_fs.c:3731
-msgid "Can't grab FSFS repository mutex"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶(FSFS)档案库互斥体"
+#: libsvn_subr/io.c:2787
+#, c-format
+msgid "Can't stat directory '%s'"
+msgstr "æ— æ³•èŽ·å–目录“%sâ€çš„状æ€"
-#: libsvn_fs_fs/fs_fs.c:3745
-msgid "Can't ungrab FSFS repository mutex"
-msgstr "ä¸èƒ½æ˜¯å¦æ–‡ä»¶(FSFS)档案库互斥体"
+#: libsvn_subr/io.c:2851
+#, c-format
+msgid "Can't remove directory '%s'"
+msgstr "æ— æ³•åˆ é™¤ç›®å½•â€œ%sâ€"
+
+#: libsvn_subr/io.c:2869
+#, c-format
+msgid "Can't read directory"
+msgstr "æ— æ³•è¯»å–目录"
+
+#: libsvn_subr/io.c:2938
+#, c-format
+msgid "Can't read directory entry in '%s'"
+msgstr "æ— æ³•åœ¨ç›®å½•â€œ%sâ€è¯»å–内容"
+
+#: libsvn_subr/io.c:3063
+#, c-format
+msgid "Can't check directory '%s'"
+msgstr "æ— æ³•æ£€æŸ¥ç›®å½•â€œ%sâ€"
-#: libsvn_fs_fs/fs_fs.c:3861
-msgid "Transaction out of date"
-msgstr "事务过时"
+#: libsvn_subr/io.c:3085
+#, c-format
+msgid "Version %d is not non-negative"
+msgstr "版本 %d 未被确认"
-#: libsvn_fs_fs/fs_fs.c:4133
-msgid "No such transaction"
-msgstr "æ— æ¤äº‹åŠ¡"
+#: libsvn_subr/io.c:3135
+#, c-format
+msgid "Reading '%s'"
+msgstr "æ£åœ¨è¯»å–“%sâ€"
-#: libsvn_fs_fs/lock.c:230
-#, fuzzy, c-format
-msgid "Cannot write lock/entries hashfile '%s'"
-msgstr "æ— æ³•å†™å…¥é”/æ¡ç›®çš„æ··æ‚文件“%sâ€"
+#: libsvn_subr/io.c:3151
+#, c-format
+msgid "First line of '%s' contains non-digit"
+msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
-#: libsvn_fs_fs/lock.c:286
+#: libsvn_subr/nls.c:79
#, fuzzy, c-format
-msgid "Can't parse lock/entries hashfile '%s'"
-msgstr "ä¸èƒ½åˆ†æžé”/æ¡ç›®çš„æ··æ‚文件“%s“"
+msgid "Can't convert string to UCS-2: '%s'"
+msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
-#: libsvn_fs_fs/lock.c:715 libsvn_fs_fs/lock.c:736
-#, fuzzy, c-format
-msgid "Path '%s' doesn't exist in HEAD revision"
-msgstr "路径“%sâ€ä¸å˜åœ¨äºŽæœ€æ–°ä¿®è®¢ç‰ˆä¸"
+#: libsvn_subr/nls.c:86
+#, fuzzy
+msgid "Can't get module file name"
+msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
-#: libsvn_fs_fs/lock.c:741
+#: libsvn_subr/nls.c:101
#, c-format
-msgid "Lock failed: newer version of '%s' exists"
-msgstr "é”失败:新的版本“%sâ€å·²ç»å˜åœ¨"
-
-#: libsvn_ra/ra_loader.c:212
-#, fuzzy, c-format
-msgid "Mismatched RA version for '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„ RA 外挂版本ä¸ç¬¦åˆï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
+msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
+msgstr "ä¸èƒ½æŠŠæ¨¡å—路径从UCS-2转æ¢ä¸ºUTF-8:“%sâ€"
-#: libsvn_ra/ra_loader.c:268
-#, fuzzy, c-format
-msgid "Unrecognized URL scheme for '%s'"
+#: libsvn_subr/opt.c:217 libsvn_subr/opt.c:295
+msgid ""
+"\n"
+"Valid options:\n"
msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+"\n"
+"有效选项:\n"
-# as-is
-#: libsvn_ra/ra_loader.c:582
-#, fuzzy, c-format
-msgid " - handles '%s' scheme\n"
-msgstr " - 处ç†â€œ%sâ€è§„则\n"
+#: libsvn_subr/opt.c:424
+msgid " arg"
+msgstr " 傿•°"
-#: libsvn_ra/ra_loader.c:668
+#: libsvn_subr/opt.c:447 libsvn_subr/opt.c:470
#, c-format
-msgid "Unrecognized URL scheme '%s'"
+msgid ""
+"\"%s\": unknown command.\n"
+"\n"
msgstr ""
-"æ— æ³•è¾¨è¯†çš„åœ°å�€(URL)规则(一般需è¦�svn://,http://%ef%bc%8cfile://%e7%ad%89%e5%bc%80%e5%a4%b4%e6%8c%87%e6%98%8e%e4%bd%bf%e7%94%a8%e7%9a%84%e8%a7%84"
-"则)“%sâ€"
+"“%sâ€ï¼šæœªçŸ¥çš„命令。\n"
+"\n"
-#: libsvn_ra_dav/commit.c:193
+#: libsvn_subr/opt.c:740
#, c-format
-msgid "Could not create a request (%s '%s')"
-msgstr "æ— æ³•å»ºç«‹è¯·æ±‚ (%s“%sâ€)"
+msgid "Syntax error parsing revision '%s'"
+msgstr "剖æžä¿®è®¢ç‰ˆâ€œ%sâ€æ—¶å‘ç”Ÿè¯æ³•错误"
-#: libsvn_ra_dav/commit.c:292
-msgid ""
-"Could not fetch the Version Resource URL (needed during an import or when it "
-"is missing from the local, cached props)"
-msgstr "ä¸èƒ½èŽ·å–版本资æºåœ°å€(URL)(å¯¼å…¥æ—¶éœ€è¦æˆ–本地,缓å˜å±žæ€§ä¸ç¼ºå°‘)"
+#: libsvn_subr/opt.c:817
+#, c-format
+msgid "URL '%s' is not properly URI-encoded"
+msgstr "地å€(URL)“%sâ€ä¸æ˜¯æ£ç¡®åœ°ä»¥ URI ç¼–ç "
-#: libsvn_ra_dav/commit.c:485
-#, fuzzy, c-format
-msgid "Could not create a CHECKOUT request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªç¾å‡º(CHECKOUT) 请求 (%s)"
+#: libsvn_subr/opt.c:823
+#, c-format
+msgid "URL '%s' contains a '..' element"
+msgstr "地å€(URL)“%sâ€åŒ…å« '..' å…ƒç´ "
-#: libsvn_ra_dav/commit.c:572
-#, fuzzy, c-format
-msgid "Your file or directory '%s' is probably out-of-date"
-msgstr "您的文件或目录â€%s“或许已ç»è¿‡æ—¶"
+#: libsvn_subr/opt.c:852
+#, c-format
+msgid "Error resolving case of '%s'"
+msgstr "è§£æžâ€œ%sâ€æ—¶å‘生错误"
-#: libsvn_ra_dav/commit.c:580
-msgid "The CHECKOUT response did not contain a 'Location:' header"
-msgstr "ç¾å‡º(CHECKOUT)的回应没有包å«ä¸€ä¸ª 'Location:' 的头信æ¯"
+#: libsvn_subr/opt.c:954
+#, c-format
+msgid ""
+"%s, version %s\n"
+" compiled %s, %s\n"
+"\n"
+msgstr ""
+"%s,版本 %s\n"
+" 编译于 %s,%s\n"
+"\n"
-#: libsvn_ra_dav/commit.c:879
-#, fuzzy, c-format
-msgid "Could not create a DELETE request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåˆ é™¤(DELETE)请求 (%s)"
+# as-is
+#: libsvn_subr/opt.c:957
+#, fuzzy
+msgid ""
+"Copyright (C) 2000-2006 CollabNet.\n"
+"Subversion is open source software, see http://subversion.tigris.org/\n"
+"This product includes software developed by CollabNet (http://www.Collab."
+"Net/).\n"
+"\n"
+msgstr ""
+"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
+"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
+"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
+"\n"
-#: libsvn_ra_dav/commit.c:1310
-msgid "Could not write svndiff to temp file"
-msgstr "æ— æ³•å†™ svndiff 至临时文件"
+#: libsvn_subr/opt.c:1010 libsvn_subr/opt.c:1053
+#, c-format
+msgid "Type '%s help' for usage.\n"
+msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-#: libsvn_ra_dav/commit.c:1400
+#: libsvn_subr/path.c:1054
#, c-format
-msgid "Could not create a PUT request (%s)"
-msgstr "æ— æ³•äº§ç”Ÿä¸€ä¸ªåŠ å…¥(PUT)请求 (%s)"
+msgid "Couldn't determine absolute path of '%s'"
+msgstr "ä¸èƒ½ç¡®å®šâ€œ%sâ€çš„ç»å¯¹è·¯å¾„"
-#: libsvn_ra_dav/commit.c:1564
+#: libsvn_subr/path.c:1093
#, c-format
-msgid "applying log message to %s"
-msgstr "应用日志信æ¯è‡³â€œ%sâ€"
+msgid "'%s' is neither a file nor a directory name"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-#: libsvn_ra_dav/fetch.c:277
-msgid "Could not save the URL of the version resource"
-msgstr "æ— æ³•å‚¨å˜ç‰ˆæœ¬èµ„æºçš„地å€(URL)"
+#: libsvn_subr/path.c:1199
+#, c-format
+msgid "Can't determine the native path encoding"
+msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
-#: libsvn_ra_dav/fetch.c:398
-msgid "Could not get content-type from response."
-msgstr "ä¸èƒ½ä»Žå›žåº”ä¸èŽ·å¾—å†…å®¹ç±»åž‹(content-type)"
+#: libsvn_subr/path.c:1253
+#, fuzzy, c-format
+msgid "Invalid control character '0x%02x' in path '%s'"
+msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
-#: libsvn_ra_dav/fetch.c:443
+#: libsvn_subr/prompt.c:97 svnserve/main.c:475
#, c-format
-msgid "Could not create a GET request for '%s'"
-msgstr "æ— æ³•ä¸ºâ€œ%sâ€åˆ›å»º GET 请求"
+msgid "Can't open stdin"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å…¥"
-#: libsvn_ra_dav/fetch.c:518
+#: libsvn_subr/prompt.c:115 libsvn_subr/prompt.c:119
#, c-format
-msgid "GET request failed for '%s'"
-msgstr "对“%sâ€çš„ GET 请求失败"
+msgid "Can't read stdin"
+msgstr "æ— æ³•è¯»å–æ ‡å‡†è¾“å…¥"
-#: libsvn_ra_dav/fetch.c:657
-msgid "Could not save file"
-msgstr "æ— æ³•å‚¨å˜æ–‡ä»¶"
+#: libsvn_subr/prompt.c:178
+#, c-format
+msgid "Authentication realm: %s\n"
+msgstr "认è¯é¢†åŸŸï¼š%s\n"
+
+#: libsvn_subr/prompt.c:204 libsvn_subr/prompt.c:227
+msgid "Username: "
+msgstr "用户登录å:"
-#: libsvn_ra_dav/fetch.c:898 libsvn_ra_svn/client.c:912
+#: libsvn_subr/prompt.c:206
#, c-format
+msgid "Password for '%s': "
+msgstr "“%sâ€çš„密ç :"
+
+#: libsvn_subr/prompt.c:249
+#, c-format
+msgid "Error validating server certificate for '%s':\n"
+msgstr "验è¯â€œ%sâ€çš„æœåŠ¡å™¨å‡è¯æ—¶å‘生错误:\n"
+
+#: libsvn_subr/prompt.c:255
msgid ""
-"Checksum mismatch for '%s':\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
+" - The certificate is not issued by a trusted authority. Use the\n"
+" fingerprint to validate the certificate manually!\n"
msgstr ""
-"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
-
-#: libsvn_ra_dav/fetch.c:1163
-msgid "Server does not support date-based operations"
-msgstr "æœåС噍䏿”¯æŒåŸºäºŽæ—¥æœŸçš„æ“ä½œ"
+" - 本å‡è¯å¹¶ä¸æ˜¯ç”±å—信任的æƒå¨æœºæƒæ‰€æ ¸å‘。请手动利用指纹以验è¯\n"
+" å‡è¯çš„æœ‰æ•ˆæ€§ï¼\n"
-#: libsvn_ra_dav/fetch.c:1170
-msgid "Invalid server response to dated-rev request"
-msgstr "对 dated-rev è¯·æ±‚çš„æ— æ•ˆæœåŠ¡å™¨å›žåº”"
+#: libsvn_subr/prompt.c:262
+msgid " - The certificate hostname does not match.\n"
+msgstr " - 本å‡è¯çš„主机åç§°ä¸ç¬¦ã€‚\n"
-# as-is
-#: libsvn_ra_dav/fetch.c:1309
-#, fuzzy
-msgid "'get-locations' REPORT not implemented"
-msgstr "get-locations REPORT 未实现"
+#: libsvn_subr/prompt.c:268
+msgid " - The certificate is not yet valid.\n"
+msgstr " - 本å‡è¯å°šæœªè¿›å…¥æœ‰æ•ˆæœŸé—´ã€‚\n"
-#: libsvn_ra_dav/fetch.c:1482 libsvn_ra_dav/session.c:1129
-#: libsvn_ra_dav/session.c:1415
-#, fuzzy
-msgid "Incomplete lock data returned"
-msgstr "返回了ä¸å®Œå…¨çš„锿•°æ®"
+#: libsvn_subr/prompt.c:274
+msgid " - The certificate has expired.\n"
+msgstr " - 本å‡è¯å·²è¿‡æœŸã€‚\n"
-#: libsvn_ra_dav/fetch.c:1651 libsvn_ra_dav/fetch.c:1659
-#: libsvn_ra_dav/fetch.c:1663
-#, fuzzy
-msgid "Server does not support locking features"
-msgstr "æœåС噍䏿”¯æŒé”定特性"
+#: libsvn_subr/prompt.c:280
+msgid " - The certificate has an unknown error.\n"
+msgstr " - 本å‡è¯å‘ç”Ÿä¸æ˜Žçš„错误。\n"
-#: libsvn_ra_dav/fetch.c:1740
+#: libsvn_subr/prompt.c:285
+#, c-format
msgid ""
-"DAV request failed; it's possible that the repository's pre-revprop-change "
-"hook either failed or is non-existent"
+"Certificate information:\n"
+" - Hostname: %s\n"
+" - Valid: from %s until %s\n"
+" - Issuer: %s\n"
+" - Fingerprint: %s\n"
msgstr ""
-"DAV 请求失败;å¯èƒ½æ˜¯æ¡£æ¡ˆåº“çš„ pre-revprop-change 外挂执行失败;或是ä¸å˜åœ¨"
+"å‡è¯ä¿¡æ¯ï¼š\n"
+" - 主机å称:%s\n"
+" - 有效期间:自 %s 至 %s\n"
+" - å‘行者:%s\n"
+" - 指纹:%s\n"
+
+#: libsvn_subr/prompt.c:300
+msgid "(R)eject, accept (t)emporarily or accept (p)ermanently? "
+msgstr "(R)æ‹’ç»ï¼Œ(t)æš‚æ—¶æŽ¥å— æˆ– (p)永远接å—?"
+
+#: libsvn_subr/prompt.c:304
+msgid "(R)eject or accept (t)emporarily? "
+msgstr "(R)æ‹’ç» æˆ– (t)æš‚æ—¶æŽ¥å— ï¼Ÿ"
-#: libsvn_ra_dav/fetch.c:2474
+#: libsvn_subr/prompt.c:343
+msgid "Client certificate filename: "
+msgstr "用户å‡è¯æ–‡ä»¶å:"
+
+#: libsvn_subr/prompt.c:366
#, c-format
-msgid "Error writing to '%s': unexpected EOF"
-msgstr "写入“%sâ€æ—¶å‘生错误:æ„外的 EOF"
+msgid "Passphrase for '%s': "
+msgstr "“%sâ€çš„密ç :"
+
+#: libsvn_subr/subst.c:1559
+#, fuzzy, c-format
+msgid "'%s' has unsupported special file type '%s'"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€çš„目录"
-#: libsvn_ra_dav/fetch.c:2619
+#: libsvn_subr/subst.c:1660 libsvn_wc/props.c:1467
#, c-format
-msgid "Unknown XML encoding: '%s'"
-msgstr "未知的 XML ç¼–ç :“%sâ€"
+msgid "File '%s' has inconsistent newlines"
+msgstr "文件“%sâ€å†…çš„æ¢è¡Œç¬¦ä¸ä¸€è‡´"
-# as-is
-#: libsvn_ra_dav/fetch.c:2901
-msgid "REPORT response handling failed to complete the editor drive"
-msgstr "报告å“应处ç†å¤±è´¥ä¸èƒ½å®Œæˆç¼–辑驱动"
+#: libsvn_subr/utf.c:194
+msgid "Can't lock charset translation mutex"
+msgstr "ä¸èƒ½é”定å—符转æ¢äº’斥体"
+
+#: libsvn_subr/utf.c:212 libsvn_subr/utf.c:319
+msgid "Can't unlock charset translation mutex"
+msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
+
+#: libsvn_subr/utf.c:271
+#, fuzzy, c-format
+msgid "Can't create a character converter from native encoding to '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
+
+#: libsvn_subr/utf.c:275
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to native encoding"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
+
+#: libsvn_subr/utf.c:279
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%s' to '%s'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
+
+#: libsvn_subr/utf.c:285
+#, fuzzy, c-format
+msgid "Can't create a character converter from '%i' to '%i'"
+msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
+
+#: libsvn_subr/utf.c:513
+#, fuzzy, c-format
+msgid "Can't convert string from native encoding to '%s':"
+msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
+
+#: libsvn_subr/utf.c:517
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to native encoding:"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
-# as-is
-#: libsvn_ra_dav/file_revs.c:360
-#, fuzzy
-msgid "'get-file-revs' REPORT not implemented"
-msgstr "get-file-revs REPORT 未实现"
+#: libsvn_subr/utf.c:521
+#, fuzzy, c-format
+msgid "Can't convert string from '%s' to '%s':"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
-#: libsvn_ra_dav/file_revs.c:376
-msgid "The file-revs report didn't contain any revisions"
-msgstr "file-revs æŠ¥å‘Šä¸æ²¡æœ‰ä»»ä½•修订版"
+#: libsvn_subr/utf.c:527
+#, fuzzy, c-format
+msgid "Can't convert string from CCSID '%i' to CCSID '%i'"
+msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
-#: libsvn_ra_dav/merge.c:217
-#, c-format
+#: libsvn_subr/utf.c:572
+#, fuzzy, c-format
msgid ""
-"Protocol error: we told the server not to auto-merge any resources, but it "
-"said that '%s' was merged"
-msgstr ""
-"通讯å定错误:我们告知æœåС噍ä¸è¦è‡ªåЍåˆå¹¶ä»»ä½•资æºï¼Œä½†æ˜¯å®ƒæŠ¥å‘Šâ€œ%sâ€å·²è¢«åˆå¹¶"
+"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
+"UTF-8"
+msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
-#: libsvn_ra_dav/merge.c:226
+#: libsvn_subr/utf.c:580
#, c-format
msgid ""
-"Internal error: there is an unknown parent (%d) for the 'DAV:response' "
-"element within the MERGE response"
-msgstr "内部错误:在 MERGE 回应ä¸ï¼Œâ€œDAV:responseâ€å…ƒç´ 有个未知的父项目 (%d)"
+"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
+msgstr "检测到éžASCIIå—符 (代ç %d),并且ä¸èƒ½è½¬æ¢åˆ°UTF-8(或从UTF-8转æ¢)"
-#: libsvn_ra_dav/merge.c:241
+#: libsvn_subr/utf.c:622
#, 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)"
+"Valid UTF-8 data\n"
+"(hex:%s)\n"
+"followed by invalid UTF-8 sequence\n"
+"(hex:%s)"
msgstr ""
-"通讯å定错误:对“%sâ€çš„ MERGE 回应并未返回所有我们请求的属性 (è¿™äº›æ˜¯å®Œæˆæäº¤æ“"
-"作所ä¸å¯ç¼ºå°‘çš„)"
+"有效 UTF-8 æ•°æ®\n"
+"(16进制:%s)\n"
+"åŽæŽ¥æ— æ•ˆ UTF-8 åºåˆ—\n"
+"(16进制:%s)"
-#: libsvn_ra_dav/merge.c:260
+#: libsvn_subr/validate.c:48
#, c-format
-msgid "A MERGE response for '%s' is not a child of the destination ('%s')"
-msgstr "对“%sâ€çš„ MERGE å›žåº”å¹¶ä¸æ˜¯ç›®æ ‡ (“%sâ€) çš„å项目"
-
-#: libsvn_ra_dav/merge.c:481
-msgid "The MERGE property response had an error status"
-msgstr "MERGE 属性回应包å«é”™è¯¯çжæ€"
-
-#: libsvn_ra_dav/options.c:130
-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 "MIME type '%s' has empty media type"
+msgstr "MIME 类别“%sâ€å«æœ‰ç©ºçš„媒体类别"
-#: libsvn_ra_dav/props.c:585
+#: libsvn_subr/validate.c:53
#, c-format
-msgid "Failed to find label '%s' for URL '%s'"
-msgstr "æ— æ³•æ‰¾åˆ°æ ‡è®°â€œ%sâ€äºŽåœ°å€(URL)“%sâ€"
+msgid "MIME type '%s' does not contain '/'"
+msgstr "MIME 类别“%sâ€æ²¡åŒ…å« '/'"
-#: libsvn_ra_dav/props.c:614
+#: libsvn_subr/validate.c:58
#, c-format
-msgid "'%s' was not present on the resource"
-msgstr "“%sâ€ä¸å˜åœ¨äºŽæœ¬èµ„æºä¸Š"
+msgid "MIME type '%s' ends with non-alphanumeric character"
+msgstr "MIME 类别“%sâ€ä»¥éžå—æ¯ä¸Žæ•°å—å—符结æŸ"
-#: libsvn_ra_dav/props.c:653
+#: libsvn_subr/version.c:74
#, c-format
-msgid "Neon was unable to parse URL '%s'"
-msgstr "Neon ä¸èƒ½åˆ†æžåœ°å€(URL)â€%s“"
-
-#: libsvn_ra_dav/props.c:682
-msgid "The path was not part of a repository"
-msgstr "è·¯å¾„ä¸æ˜¯æ¡£æ¡ˆåº“的一部份"
+msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
+msgstr "“%sâ€çš„版本ä¸ä¸€è‡´ï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
-#: libsvn_ra_dav/props.c:693
+#: libsvn_subr/xml.c:400
#, c-format
-msgid "No part of path '%s' was found in repository HEAD"
-msgstr "路径“%sâ€çš„任何一部份在档案库 HEAD ä¸éƒ½æ‰¾ä¸åˆ°"
-
-#: libsvn_ra_dav/props.c:727 libsvn_ra_dav/props.c:782
-msgid "The VCC property was not found on the resource"
-msgstr "æœ¬èµ„æºæ‰¾ä¸åˆ° VCC 属性"
+msgid "Malformed XML: %s at line %d"
+msgstr "畸形的XML:%s 在第 %d 行"
-#: libsvn_ra_dav/props.c:795
-msgid "The relative-path property was not found on the resource"
-msgstr "本资æºä¸Šæ‰¾ä¸åˆ°ç›¸å¯¹è·¯å¾„属性"
+#: libsvn_wc/adm_crawler.c:599
+msgid "Error aborting report"
+msgstr "å–æ¶ˆæŠ¥å‘Šæ—¶å‘生错误"
-#: libsvn_ra_dav/props.c:916
-msgid "'DAV:baseline-collection' was not present on the baseline resource"
-msgstr "'DAV:baseline-collection' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+#: libsvn_wc/adm_crawler.c:794
+msgid "Error opening local file"
+msgstr "打开本地文件时å‘生错误"
-#: libsvn_ra_dav/props.c:935
-msgid "'DAV:version-name' was not present on the baseline resource"
-msgstr "'DAV:version-name' ä¸å˜åœ¨äºŽåŸºçº¿èµ„æº"
+#: libsvn_wc/adm_crawler.c:859
+#, c-format
+msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
-#: libsvn_ra_dav/props.c:1103
-msgid "At least one property change failed; repository is unchanged"
-msgstr "è‡³å°‘æœ‰ä¸€ä¸ªå±žæ€§å˜æ›´å¤±è´¥ï¼›æ¡£æ¡ˆåº“未改å˜"
+#: libsvn_wc/adm_files.c:100
+#, fuzzy, c-format
+msgid "'%s' is not a valid administrative directory name"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-#: libsvn_ra_dav/session.c:442
-msgid "Invalid URL: illegal character in proxy port number"
-msgstr "æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)通信端å£ç¼–å·ä¸æœ‰ä¸åˆæ³•çš„å—符"
+# plz leave this as-is
+#: libsvn_wc/adm_files.c:260
+msgid "Bad type indicator"
+msgstr "错误的类型"
-#: libsvn_ra_dav/session.c:446
-msgid "Invalid URL: negative proxy port number"
-msgstr "æ— æ•ˆçš„åœ°å€(URL):负的代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼"
+#: libsvn_wc/adm_files.c:501
+msgid "APR_APPEND not supported for adm files"
+msgstr "APR_APPEND 䏿”¯æŒç®¡ç†æ–‡ä»¶"
-#: libsvn_ra_dav/session.c:449
+#: libsvn_wc/adm_files.c:544
msgid ""
-"Invalid URL: proxy port number greater than maximum TCP port number 65535"
-msgstr ""
-"æ— æ•ˆçš„åœ°å€(URL):代ç†(proxy)é€šä¿¡ç«¯å£æ•°å€¼å¤§äºŽæœ€å¤§å€¼çš„ TCP é€šä¿¡ç«¯å£æ•°å€¼ 65535"
-
-#: libsvn_ra_dav/session.c:463
-msgid "Invalid config: illegal character in timeout value"
-msgstr "æ— æ•ˆçš„é…ç½®ï¼šè¶…æ—¶æ•°å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-
-#: libsvn_ra_dav/session.c:467
-msgid "Invalid config: negative timeout value"
-msgstr "æ— æ•ˆçš„é…置:负的超时数值"
-
-#: libsvn_ra_dav/session.c:480
-msgid "Invalid config: illegal character in debug mask value"
-msgstr "æ— æ•ˆçš„é…置:除错é®ç½©å€¼ä¸æœ‰ä¸åˆæ³•çš„å—符"
-
-# as-is
-#: libsvn_ra_dav/session.c:543
-msgid "Module for accessing a repository via WebDAV (DeltaV) protocol."
-msgstr "通过WebDAV (DeltaV) å议访问档案库的模å—。"
-
-#: libsvn_ra_dav/session.c:593
-msgid "Malformed URL for repository"
-msgstr "档案库的地å€(URL)畸形"
+"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
+"again"
+msgstr "您的 .svn/tmp 目录å¯èƒ½ä¸¢å¤±æˆ–æŸå;请执行“svn cleanupâ€ï¼Œç„¶åŽå†è¯•一次"
-#: libsvn_ra_dav/session.c:601
-msgid "Network socket initialization failed"
-msgstr "网络 socket å¯å§‹å¤±è´¥"
+#: libsvn_wc/adm_files.c:687 libsvn_wc/lock.c:592 libsvn_wc/lock.c:855
+#, c-format
+msgid "'%s' is not a working copy"
+msgstr "“%sâ€ä¸æ˜¯å·¥ä½œæ‹·è´"
-#: libsvn_ra_dav/session.c:618
-msgid "SSL is not supported"
-msgstr "䏿”¯æŒ SSL"
+#: libsvn_wc/adm_files.c:694 libsvn_wc/adm_files.c:762
+#: libsvn_wc/adm_files.c:824
+msgid "No such thing as 'base' working copy properties!"
+msgstr "没有 '基础' 工作拷è´å±žæ€§è¿™æ ·çš„东西"
-#: libsvn_ra_dav/session.c:764
+#: libsvn_wc/adm_files.c:893 libsvn_wc/util.c:51
#, c-format
-msgid "Invalid config: unable to load certificate file '%s'"
-msgstr "æ— æ•ˆçš„é…ç½®ï¼šæ— æ³•è½½å…¥å‡è¯æ–‡ä»¶â€œ%sâ€"
+msgid "'%s' is not a directory"
+msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
-#: libsvn_ra_dav/session.c:852
-msgid "The UUID property was not found on the resource or any of its parents"
-msgstr "æ— æ³•åœ¨æœ¬èµ„æºæˆ–ä»»ä½•å…¶çˆ¶é¡¹ç›®ä¸æ‰¾åˆ° UUID 属性"
+#: libsvn_wc/adm_files.c:955
+#, c-format
+msgid "No entry for '%s'"
+msgstr "没有“%sâ€çš„项目"
-#: libsvn_ra_dav/session.c:860
-msgid "Please upgrade the server to 0.19 or later"
-msgstr "请将æœåС噍å‡çº§è‡³ 0.19 或更新的版本"
+#: libsvn_wc/adm_files.c:968
+#, c-format
+msgid "Revision %ld doesn't match existing revision %ld in '%s'"
+msgstr "修订版 %ld ä¸ç¬¦åˆçŽ°æœ‰çš„ä¿®è®¢ç‰ˆ %ld 于“%sâ€ä¸"
-#: libsvn_ra_dav/session.c:1101 libsvn_ra_dav/session.c:1238
-#, fuzzy
-msgid "Failed to parse URI"
-msgstr "分æžåœ°å€(URI)失败"
+#: libsvn_wc/adm_files.c:976
+#, c-format
+msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
+msgstr "地å€(URL)“%sâ€ä¸ç¬¦åˆçŽ°æœ‰çš„åœ°å€(URL)“%sâ€äºŽâ€œ%sâ€ä¸"
-#: libsvn_ra_dav/session.c:1124
-#, fuzzy
-msgid "Lock request failed"
-msgstr "é”请求失败"
+#: libsvn_wc/adm_ops.c:258
+#, c-format
+msgid "Unrecognized node kind: '%s'"
+msgstr "æ— æ³•ç¡®è®¤çš„èŠ‚ç‚¹ç§ç±»ï¼šâ€œ%sâ€"
-#: libsvn_ra_dav/session.c:1253
-#, fuzzy, c-format
-msgid "'%s' is not locked in the repository"
-msgstr "â€%s“没有在档案库ä¸è¢«é”定"
+#: libsvn_wc/adm_ops.c:1059
+#, c-format
+msgid "'%s' not found"
+msgstr "找ä¸åˆ°â€œ%sâ€"
-#: libsvn_ra_dav/session.c:1290
-#, fuzzy
-msgid "Unlock request failed"
-msgstr "解除é”请求失败"
+#: libsvn_wc/adm_ops.c:1063
+#, c-format
+msgid "Unsupported node kind for path '%s'"
+msgstr "路径“%sâ€ä¸ºä¸æ”¯æŒçš„节点ç§ç±»"
-#: libsvn_ra_dav/session.c:1501
-#, fuzzy
-msgid "Failed to fetch lock information"
-msgstr "获å–é”ä¿¡æ¯å¤±è´¥"
+#: libsvn_wc/adm_ops.c:1093
+#, c-format
+msgid "'%s' is already under version control"
+msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_dav/session.c:1572
+#: libsvn_wc/adm_ops.c:1105
#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_dav"
-msgstr "䏿”¯æŒçš„ ra_dav çš„ RA 载入器版本 (%d)"
-
-#: libsvn_ra_dav/util.c:275
-msgid "authorization failed"
-msgstr "授æƒå¤±è´¥"
-
-#: libsvn_ra_dav/util.c:279
-msgid "could not connect to server"
-msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåС噍"
-
-#: libsvn_ra_dav/util.c:283
-msgid "timed out waiting for server"
-msgstr "ç‰å¾…æœåŠ¡å™¨è¶…æ—¶"
-
-#: libsvn_ra_dav/util.c:489
-msgid "Can't calculate the request body size"
-msgstr "æ— æ³•ç®—å‡ºè¯·æ±‚çš„ä¸»ä½“å¤§å°"
+msgid ""
+"Can't replace '%s' with a node of a differing type; the deletion must be "
+"committed and the parent updated before adding '%s'"
+msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
-#: libsvn_ra_dav/util.c:725
+#: libsvn_wc/adm_ops.c:1122
#, c-format
-msgid "Error spooling the %s request response to disk"
-msgstr "请求 %s çš„å“应脱机ä¿å˜åˆ°ç£ç›˜æ—¶å‡ºçŽ°é”™è¯¯"
+msgid "Can't find parent directory's entry while trying to add '%s'"
+msgstr "在å°è¯•新增“%sâ€æ—¶ï¼Œæ— 法找到父目录的项目"
-#: libsvn_ra_dav/util.c:773
+#: libsvn_wc/adm_ops.c:1127
#, c-format
-msgid "'%s' path not found"
-msgstr "找ä¸åˆ°è·¯å¾„“%sâ€"
+msgid "Can't add '%s' to a parent directory scheduled for deletion"
+msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
-#. We either have a neon error, or some other error
-#. that we didn't expect.
-#: libsvn_ra_dav/util.c:778 libsvn_ra_dav/util.c:1008
-#, c-format
-msgid "%s of '%s'"
-msgstr "%s 的结果 “%sâ€"
+#: libsvn_wc/adm_ops.c:1143
+#, fuzzy, c-format
+msgid "The URL '%s' has a different repository root than its parent"
+msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-#: libsvn_ra_dav/util.c:796
+#: libsvn_wc/adm_ops.c:1472
#, c-format
-msgid "Error reading spooled %s request response"
-msgstr "读å–请求 %s å›žåº”çš„è„±æœºæ•°æ®æ—¶å‡ºçŽ°é”™è¯¯"
+msgid "Error restoring text for '%s'"
+msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
-#: libsvn_ra_dav/util.c:807
+#: libsvn_wc/adm_ops.c:1603
#, c-format
-msgid "The %s request returned invalid XML in the response: %s (%s)"
-msgstr "%s è¯·æ±‚çš„å›žåº”è¿”å›žæ— æ•ˆçš„ XML:%s (%s)"
+msgid "Cannot revert: '%s' is not under version control"
+msgstr "æ— æ³•æ¢å¤ï¼šâ€œ%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_dav/util.c:827
+#: libsvn_wc/adm_ops.c:1631
#, c-format
-msgid "%s request failed on '%s'"
-msgstr "%s 请求“%sâ€å¤±è´¥"
+msgid "Cannot revert '%s': unsupported entry node kind"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šä¸æ”¯æŒçš„项目节点ç§ç±»"
-#: libsvn_ra_local/ra_plugin.c:103 libsvn_ra_local/ra_plugin.c:576
+#: libsvn_wc/adm_ops.c:1642
#, c-format
-msgid ""
-"'%s'\n"
-"is not the same repository as\n"
-"'%s'"
-msgstr ""
-"“%sâ€\n"
-"与\n"
-"“%sâ€\n"
-"å¹¶ä¸åœ¨åŒä¸€ä¸ªæ¡£æ¡ˆåº“ä¸"
-
-# as-is
-#. ----------------------------------------------------------------
-#. * The RA vtable routines *
-#: libsvn_ra_local/ra_plugin.c:245
-msgid "Module for accessing a repository on local disk."
-msgstr "访问本地ç£ç›˜çš„æ¡£æ¡ˆåº“模å—。"
-
-#: libsvn_ra_local/ra_plugin.c:285
-msgid "Unable to open an ra_local session to URL"
-msgstr "æ— æ³•æ‰“å¼€åœ°å€(URL)çš„ ra_local 会è¯"
+msgid "Cannot revert '%s': unsupported node kind in working copy"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šå·¥ä½œæ‹·è´ä¸æœ‰ä¸æ”¯æŒçš„节点ç§ç±»"
-# as-is
-#: libsvn_ra_local/ra_plugin.c:1286
-#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_local"
-msgstr "䏿”¯æŒçš„ ra_local çš„ RA 载入器版本 (%d) for ra_local"
+#: libsvn_wc/adm_ops.c:1689
+msgid ""
+"Cannot revert addition of current directory; please try again from the "
+"parent directory"
+msgstr "æ— æ³•æ¢å¤ç›®å‰ç›®å½•的新增;请从父目录å†è¯•一次"
-#: libsvn_ra_local/split_url.c:44
+#: libsvn_wc/adm_ops.c:1711
#, c-format
-msgid "Local URL '%s' does not contain 'file://' prefix"
-msgstr "本地地�(URL)“%s�并未包� 'file://' 开头"
+msgid "Unknown or unexpected kind for path '%s'"
+msgstr "路径“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ç§ç±»"
-#: libsvn_ra_local/split_url.c:55
+#: libsvn_wc/adm_ops.c:1873
#, c-format
-msgid "Local URL '%s' contains only a hostname, no path"
-msgstr "本地地å€(URL)“%sâ€ä»…å«ä¸»æœºå称,没有路径"
+msgid "File '%s' has local modifications"
+msgstr "文件“%sâ€æœ‰æœ¬åœ°çš„修改"
-#: libsvn_ra_local/split_url.c:74
+#: libsvn_wc/copy.c:77
#, c-format
-msgid "Local URL '%s' contains unsupported hostname"
-msgstr "本地地å€(URL)“%sâ€åŒ…嫿œªæ”¯æŒçš„主机åç§°"
+msgid "'%s' already exists and is in the way"
+msgstr "“%sâ€å·²å˜åœ¨ï¼Œå˜æˆè·¯ä¸é—´çš„大石头"
-#: libsvn_ra_local/split_url.c:128 libsvn_ra_local/split_url.c:135
+#: libsvn_wc/copy.c:89
#, c-format
-msgid "Unable to open repository '%s'"
-msgstr "æ— æ³•æ‰“å¼€æ¡£æ¡ˆåº“â€œ%sâ€"
+msgid "There is already a versioned item '%s'"
+msgstr "已有纳入版本控制项目“%sâ€"
-#: libsvn_ra_svn/client.c:125
+#: libsvn_wc/copy.c:100
#, c-format
-msgid "Unknown hostname '%s'"
-msgstr "未知的主机å称“%sâ€"
-
-#: libsvn_ra_svn/client.c:137
-msgid "Can't create socket"
-msgstr "æ— æ³•å»ºç«‹ socket"
+msgid "Cannot copy or move '%s': it's not under version control"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-#: libsvn_ra_svn/client.c:141
+#: libsvn_wc/copy.c:107
#, c-format
-msgid "Can't connect to host '%s'"
-msgstr "æ— æ³•è¿žçº¿è‡³ä¸»æœºâ€œ%sâ€"
+msgid ""
+"Cannot copy or move '%s': it's not in the repository yet; try committing "
+"first"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-# as-is
-#: libsvn_ra_svn/client.c:162
-msgid "Proplist element not a list"
-msgstr "å±žæ€§åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/copy.c:356
+#, c-format
+msgid ""
+"Cannot copy or move '%s': it is not in the repository yet; try committing "
+"first"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-# as-is
-#: libsvn_ra_svn/client.c:186
-msgid "Prop diffs element not a list"
-msgstr "Prop diffs å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/copy.c:444
+#, fuzzy, c-format
+msgid "Cannot copy to '%s', as it is not from repository '%s'; it is from '%s'"
+msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
-#: libsvn_ra_svn/client.c:224
+#: libsvn_wc/copy.c:451
#, c-format
-msgid "Unrecognized node kind '%s' from server"
-msgstr "æ— æ³•è¾¨è¯†æ¥è‡ªæœåŠ¡å™¨çš„èŠ‚ç‚¹ç§ç±»â€œ%sâ€"
+msgid "Cannot copy to '%s' as it is scheduled for deletion"
+msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€è‡³å› 为它已预定为è¦åˆ 除"
-#: libsvn_ra_svn/client.c:269 libsvn_ra_svn/client.c:323
+#: libsvn_wc/entries.c:91 libsvn_wc/entries.c:349 libsvn_wc/entries.c:558
+#: libsvn_wc/entries.c:806
#, c-format
-msgid "Authentication error from server: %s"
-msgstr "æ¥è‡ªæœåŠ¡å™¨çš„è®¤è¯é”™è¯¯ï¼š%s"
+msgid "Entry '%s' has invalid '%s' value"
+msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
-#: libsvn_ra_svn/client.c:272 libsvn_ra_svn/cram.c:194
-#: libsvn_ra_svn/cram.c:212
-msgid "Unexpected server response to authentication"
-msgstr "æ„æƒ³ä¸åˆ°çš„è®¤è¯æ—¶æœåŠ¡å™¨å›žåº”"
+#: libsvn_wc/entries.c:111
+#, fuzzy
+msgid "Invalid escape sequence"
+msgstr "æ— æ•ˆçš„è®¡åˆ’ä»»åŠ¡"
-#: libsvn_ra_svn/client.c:330
-msgid "Cannot negotiate authentication mechanism"
-msgstr "æ— æ³•å商出认识机制"
+#: libsvn_wc/entries.c:118
+#, fuzzy
+msgid "Invalid escaped character"
+msgstr "æ— æ•ˆçš„å˜æ›´ç±»åž‹"
-#: libsvn_ra_svn/client.c:461
-#, c-format
-msgid "Undefined tunnel scheme '%s'"
-msgstr "æ— æ³•è¾¨è¯†çš„éš§é“规则“%sâ€"
+#: libsvn_wc/entries.c:136 libsvn_wc/entries.c:165 libsvn_wc/entries.c:191
+#: libsvn_wc/entries.c:203
+#, fuzzy
+msgid "Unexpected end of entry"
+msgstr "æ‰¾åˆ°ä¸€ä¸ªæ„æ–™ä¹‹å¤–的节点ç§ç±»"
-#: libsvn_ra_svn/client.c:478
+#: libsvn_wc/entries.c:225
#, c-format
-msgid "Tunnel scheme %s requires environment variable %s to be defined"
-msgstr "éš§é“规则 %s 需è¦è®¾å®šçŽ¯å¢ƒå˜æ•° %s"
+msgid "Invalid value for field '%s'"
+msgstr ""
-# as-is
-#: libsvn_ra_svn/client.c:489
+#: libsvn_wc/entries.c:307 libsvn_wc/entries.c:533
#, c-format
-msgid "Can't tokenize command '%s'"
-msgstr "ä¸èƒ½ tokenize 命令“%sâ€"
+msgid "Entry '%s' has invalid node kind"
+msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
+
+#: libsvn_wc/entries.c:328 libsvn_wc/entries.c:510
+#, fuzzy, c-format
+msgid "Entry for '%s' has invalid repository root"
+msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
-#: libsvn_ra_svn/client.c:518
+#: libsvn_wc/entries.c:931
#, c-format
-msgid "Error in child process: %s"
-msgstr "å程åºé”™è¯¯ï¼š%s"
+msgid "XML parser failed in '%s'"
+msgstr "XML 剖æžå™¨æ— 法处ç†â€œ%sâ€"
-#: libsvn_ra_svn/client.c:541
-msgid "Can't create tunnel"
-msgstr "æ— æ³•å»ºç«‹ tunnel"
+#: libsvn_wc/entries.c:990
+msgid "Missing default entry"
+msgstr "丢失默认项目"
-# as-is
-#: libsvn_ra_svn/client.c:570
-msgid "Module for accessing a repository using the svn network protocol."
-msgstr "使用svn网络å议访问档案库的模å—。"
+#: libsvn_wc/entries.c:995
+msgid "Default entry has no revision number"
+msgstr "默认项目没有修订版编å·"
+
+#: libsvn_wc/entries.c:1000
+msgid "Default entry is missing URL"
+msgstr "默认项目没有地å€(URL)"
+
+#: libsvn_wc/entries.c:1076
+#, fuzzy, c-format
+msgid "Invalid version line in entries file of '%s'"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+
+#: libsvn_wc/entries.c:1093
+#, fuzzy
+msgid "Missing entry terminator"
+msgstr "丢失默认项目"
+
+#: libsvn_wc/entries.c:1096
+#, fuzzy
+msgid "Invalid entry terminator"
+msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+
+#: libsvn_wc/entries.c:1100
+#, fuzzy, c-format
+msgid "Error at entry %d in entries file for '%s':"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-#: libsvn_ra_svn/client.c:607
+#: libsvn_wc/entries.c:1196
#, c-format
-msgid "Illegal svn repository URL '%s'"
-msgstr "ä¸åˆæ³•çš„ svn 档案库地å€(URL)“%sâ€"
+msgid "Corrupt working copy: '%s' has no default entry"
+msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æ²¡æœ‰é»˜è®¤çš„项目"
-#: libsvn_ra_svn/client.c:633
+#: libsvn_wc/entries.c:1213
#, c-format
-msgid "Server requires minimum version %d"
-msgstr "æœåŠ¡å™¨æœ€ä½Žè¦æ±‚的版å·ä¸º %d"
+msgid "Corrupt working copy: directory '%s' has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æœ‰æ— 效的调度"
-#: libsvn_ra_svn/client.c:683
-msgid "Impossibly long repository root from server"
-msgstr "æœåŠ¡å™¨å›žä¼ çš„æ¡£æ¡ˆåº“æ ¹è·¯å¾„é•¿å¾—å¤ªå¤¸å¼ "
+#: libsvn_wc/entries.c:1247
+#, c-format
+msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸æœ‰æ— 效的调度"
-#: libsvn_ra_svn/client.c:750
-msgid "Server did not send repository root"
-msgstr "æœåŠ¡å™¨æ²¡æœ‰è¿”å›žæ¡£æ¡ˆåº“æ ¹è·¯å¾„"
+#: libsvn_wc/entries.c:1256
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"addition) is not itself scheduled for addition"
+msgstr ""
+"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ–°å¢žè°ƒåº¦) ä¸ŽåŠ å…¥æ–°å¢žè°ƒåº¦çš„ä¸ä¸€è‡´"
-#: libsvn_ra_svn/client.c:892
-msgid "Non-string as part of file contents"
-msgstr "æ–‡ä»¶å†…å®¹çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+#: libsvn_wc/entries.c:1264
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"deletion) is not itself scheduled for deletion"
+msgstr ""
+"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥åˆ é™¤è°ƒåº¦) ä¸ŽåŠ å…¥åˆ é™¤è°ƒåº¦çš„ä¸ä¸€è‡´"
-# as-is
-#: libsvn_ra_svn/client.c:960
-msgid "Dirlist element not a list"
-msgstr "ç›®å½•åˆ—è¡¨å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:1272
+#, c-format
+msgid ""
+"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
+"replacement) has an invalid schedule"
+msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ›¿æ¢è°ƒåº¦) æœ‰æ— æ•ˆçš„è°ƒåº¦"
-# as-is
-#: libsvn_ra_svn/client.c:1116
-msgid "Log entry not a list"
-msgstr "日志æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:1890
+#, c-format
+msgid "No default entry in directory '%s'"
+msgstr "在目录“%sâ€ä¸æ²¡æœ‰é»˜è®¤çš„项目"
-# as-is
-#: libsvn_ra_svn/client.c:1129
-msgid "Changed-path entry not a list"
-msgstr "已修改路径æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:1945
+#, c-format
+msgid "Error writing to '%s'"
+msgstr "写至“%sâ€æ—¶å‘生错误"
-# as-is
-#: libsvn_ra_svn/client.c:1208
-#, fuzzy
-msgid "'stat' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/entries.c:2252
+#, c-format
+msgid ""
+"Can't add '%s' to deleted directory; try undeleting its parent directory "
+"first"
+msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²åˆ 除的目录;请先å°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
-# as-is
-#: libsvn_ra_svn/client.c:1265
-#, fuzzy
-msgid "'get-locations' not implemented"
-msgstr "get-locations 未实现"
+#: libsvn_wc/entries.c:2258
+#, c-format
+msgid ""
+"Can't replace '%s' in deleted directory; try undeleting its parent directory "
+"first"
+msgstr "æ— æ³•åœ¨å·²åˆ é™¤çš„ç›®å½•ä¸æ›¿æ¢â€œ%sâ€ï¼›è¯·å…ˆå°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
-# as-is
-#: libsvn_ra_svn/client.c:1277
-msgid "Location entry not a list"
-msgstr "区域æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:2267
+#, c-format
+msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
+msgstr "“%sâ€è¢«æ ‡è®°ä¸ºä¸å˜åœ¨ï¼Œæ‰€ä»¥æ— æ³•åŠ å…¥æ–°å¢žè°ƒåº¦"
-# as-is
-#: libsvn_ra_svn/client.c:1327
-#, fuzzy
-msgid "'get-file-revs' not implemented"
-msgstr "get-file-revs 未实现"
+#: libsvn_wc/entries.c:2296
+#, c-format
+msgid "Entry '%s' is already under version control"
+msgstr "项目“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
-# as-is
-#: libsvn_ra_svn/client.c:1340
-msgid "Revision entry not a list"
-msgstr "修订版æ¡ç›®ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:2393
+#, c-format
+msgid "Entry '%s' has illegal schedule"
+msgstr "项目“%sâ€æœ‰ä¸åˆæ³•的调度"
-#: libsvn_ra_svn/client.c:1353 libsvn_ra_svn/client.c:1378
-msgid "Text delta chunk not a string"
-msgstr "æ–‡å—差异区段并éžå—串"
+#: libsvn_wc/entries.c:2537
+#, c-format
+msgid "No such entry: '%s'"
+msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
-#: libsvn_ra_svn/client.c:1390
-msgid "The get-file-revs command didn't return any revisions"
-msgstr "get-file-revs 命令没有返回任何修订版"
+#: libsvn_wc/entries.c:2664
+#, c-format
+msgid "Error writing entries file for '%s'"
+msgstr "写入“%sâ€çš„项目文件时å‘生错误"
-#: libsvn_ra_svn/client.c:1438
-#, fuzzy
-msgid "Server doesn't support the lock command"
-msgstr "æœåС噍䏿”¯æŒé”命令"
+#: libsvn_wc/entries.c:2703
+#, c-format
+msgid "Directory '%s' has no THIS_DIR entry"
+msgstr "目录“%sâ€æ²¡æœ‰ THIS_DIR 项目"
-#: libsvn_ra_svn/client.c:1502
-#, fuzzy
-msgid "Server doesn't support the unlock command"
-msgstr "æœåС噍䏿”¯æŒè§£é™¤é”命令"
+#: libsvn_wc/entries.c:2792
+#, c-format
+msgid "'%s' has an unrecognized node kind"
+msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-# as-is
-#: libsvn_ra_svn/client.c:1602 libsvn_ra_svn/client.c:1755
-#, fuzzy
-msgid "Lock element not a list"
-msgstr "é”å…ƒç´ ä¸æ˜¯ä¸€ä¸ªåˆ—表"
+#: libsvn_wc/entries.c:2828
+#, c-format
+msgid "Unexpectedly found '%s': path is marked 'missing'"
+msgstr "æ„æƒ³ä¸åˆ°åœ°æ‰¾åˆ°äº†â€œ%sâ€ï¼šè·¯å¾„å·²è¢«æ ‡è®°ä¸º '丢失'"
-#: libsvn_ra_svn/client.c:1607
-#, fuzzy
-msgid "Unable to parse lock data"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+#: libsvn_wc/lock.c:356 libsvn_wc/lock.c:562
+#, c-format
+msgid "Working copy '%s' locked"
+msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
-#: libsvn_ra_svn/client.c:1714 libsvn_ra_svn/client.c:1742
-#, fuzzy
-msgid "Server doesn't support the get-lock command"
-msgstr "æœåС噍䏿”¯æŒèŽ·å–é”命令get-lock"
+#: libsvn_wc/lock.c:481
+#, c-format
+msgid "Path '%s' ends in '%s', which is unsupported for this operation"
+msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
-#: libsvn_ra_svn/client.c:1814
+#: libsvn_wc/lock.c:927 libsvn_wc/lock.c:957
#, fuzzy, c-format
-msgid "Unsupported RA loader version (%d) for ra_svn"
-msgstr "䏿”¯æŒçš„ ra_svn çš„ RA 载入器版本 (%d)"
-
-# as-is
-#: libsvn_ra_svn/editor.c:383 libsvn_ra_svn/editorp.c:418
-msgid "Invalid file or dir token during edit"
-msgstr "编辑时é‡åˆ°æ— 效的文件或目录"
-
-#: libsvn_ra_svn/editor.c:616
-msgid "Non-string as part of text delta"
-msgstr "æ–‡ä»¶å·®å¼‚çš„ä¸€éƒ¨ä»½ä¸æ˜¯å—串"
+msgid "Unable to check path existence for '%s'"
+msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
-# as-is
-#: libsvn_ra_svn/editorp.c:128
-msgid "Successful edit status returned too soon"
-msgstr "æˆåŠŸä¿®æ”¹çŠ¶æ€è¿”回太快"
+#: libsvn_wc/lock.c:937
+#, c-format
+msgid "Expected '%s' to be a directory but found a file"
+msgstr ""
-# as-is
-#: libsvn_ra_svn/editorp.c:609
-msgid "Apply-textdelta already active"
-msgstr "Apply-textdelta å·²ç»æ¿€æ´»"
+#: libsvn_wc/lock.c:944
+#, fuzzy, c-format
+msgid "Expected '%s' to be a file but found a directory"
+msgstr "地å€(URL)“%sâ€æŒ‡å‘一个文件,而éžç›®å½•"
-# as-is
-#: libsvn_ra_svn/editorp.c:631 libsvn_ra_svn/editorp.c:649
-msgid "Apply-textdelta not active"
-msgstr "Apply-textdelta 没有激活"
+#: libsvn_wc/lock.c:963
+#, fuzzy, c-format
+msgid "Directory '%s' is missing"
+msgstr "目录“%sâ€æ²¡æœ‰åœ°å€(URL)"
-#: libsvn_ra_svn/editorp.c:797 libsvn_ra_svn/marshal.c:833
+#: libsvn_wc/lock.c:968
#, c-format
-msgid "Unknown command '%s'"
-msgstr "未知的命令:“%sâ€"
+msgid "Directory '%s' containing working copy admin area is missing"
+msgstr ""
-# as-is
-#: libsvn_ra_svn/marshal.c:78
-msgid "Capability entry is not a word"
-msgstr "容釿¡ç›®ä¸æ˜¯ä¸€ä¸ª word"
+#: libsvn_wc/lock.c:973
+#, fuzzy, c-format
+msgid "Unable to lock '%s'"
+msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
-#: libsvn_ra_svn/marshal.c:160
-msgid "Can't write to connection"
-msgstr "æ— æ³•å†™å…¥è¿žçº¿"
+#: libsvn_wc/lock.c:978
+#, fuzzy, c-format
+msgid "Working copy '%s' is not locked"
+msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
-#: libsvn_ra_svn/marshal.c:250
-msgid "Can't read from connection"
-msgstr "æ— æ³•è¯»å–连线"
+#: libsvn_wc/lock.c:1371
+#, c-format
+msgid "Write-lock stolen in '%s'"
+msgstr "“%sâ€ä¸çš„写入é”定被å·èµ°äº†"
-#: libsvn_ra_svn/marshal.c:253
-msgid "Connection closed unexpectedly"
-msgstr "ç½‘ç»œè¿žçº¿æ„æƒ³ä¸åˆ°åœ°å…³é—"
+#: libsvn_wc/lock.c:1379
+#, c-format
+msgid "No write-lock in '%s'"
+msgstr "“%sâ€ä¸æ²¡æœ‰å†™å…¥é”定"
-#: libsvn_ra_svn/marshal.c:497
-msgid "String length larger than maximum"
-msgstr "å—串长度超出上é™"
+#: libsvn_wc/lock.c:1401
+#, c-format
+msgid "Lock file '%s' is not a regular file"
+msgstr "é”定文件“%sâ€ä¸æ˜¯ä¸€èˆ¬çš„æ–‡ä»¶"
-#: libsvn_ra_svn/marshal.c:534
-msgid "Too many nested items"
-msgstr "太多嵌套的项目"
+#: libsvn_wc/log.c:334
+msgid "Can't move source to dest"
+msgstr "æ— æ³•ç§»åŠ¨æ¥æºè‡³ç›®çš„"
-#: libsvn_ra_svn/marshal.c:553
-msgid "Number is larger than maximum"
-msgstr "æ•°å—大å°è¶…过上é™"
+#: libsvn_wc/log.c:495
+#, c-format
+msgid "In directory '%s'"
+msgstr "在目录“%sâ€ä¸"
-#: libsvn_ra_svn/marshal.c:756
-msgid "Empty error list"
-msgstr "空的错误列表"
+#: libsvn_wc/log.c:523
+#, c-format
+msgid "Missing 'left' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'left' 属性"
-#: libsvn_ra_svn/marshal.c:765
-msgid "Malformed error list"
-msgstr "畸形的错误列表"
+#: libsvn_wc/log.c:530
+#, c-format
+msgid "Missing 'right' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'right' 属性"
-#: libsvn_ra_svn/marshal.c:804
+#: libsvn_wc/log.c:598
#, c-format
-msgid "Unknown status '%s' in command response"
-msgstr "命令回应ä¸çš„æœªçŸ¥çжæ€â€œ%sâ€"
+msgid "Missing 'dest' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'dest' 属性"
-#: libsvn_repos/commit.c:128
+#: libsvn_wc/log.c:679
#, c-format
-msgid "Out of date: '%s' in transaction '%s'"
-msgstr "过期:â€%s“在事务â€%s“"
+msgid "Missing 'timestamp' attribute in '%s'"
+msgstr "“%sâ€ä¸¢å¤± 'timestamp' 属性"
-#: libsvn_repos/commit.c:295 libsvn_repos/commit.c:460
+#: libsvn_wc/log.c:775 libsvn_wc/log.c:815
#, c-format
-msgid "Got source path but no source revision for '%s'"
-msgstr "获得æºè·¯å¾„,但â€%s“没有æºä¿®è®¢ç‰ˆ"
+msgid "Error getting 'affected time' on '%s'"
+msgstr "å–得“%sâ€çš„“affected timeâ€æ—¶å‘生错误"
-#: libsvn_repos/commit.c:327 libsvn_repos/commit.c:491
+#: libsvn_wc/log.c:826
#, c-format
-msgid "Source url '%s' is from different repository"
-msgstr "æ¥æºåœ°å€(URL)“%sâ€æ¥è‡ªå…¶å®ƒçš„æ¡£æ¡ˆåº“"
+msgid "Error modifying entry for '%s'"
+msgstr "修改“%sâ€çš„项目时å‘生错误"
-#: libsvn_repos/commit.c:400
+#: libsvn_wc/log.c:852
#, fuzzy, c-format
-msgid "Path '%s' not present"
-msgstr "路径“%sâ€ä¸å˜åœ¨"
+msgid "Error removing lock from entry for '%s'"
+msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
-#: libsvn_repos/commit.c:616
+#: libsvn_wc/log.c:982
#, c-format
-msgid ""
-"Checksum mismatch for resulting fulltext\n"
-"(%s):\n"
-" expected checksum: %s\n"
-" actual checksum: %s\n"
-msgstr ""
-"“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼š\n"
-" 预期的总和检查值:%s\n"
-" 实际的总和检查值:%s\n"
+msgid "Missing 'revision' attribute for '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_repos/delta.c:180
-msgid "Unable to open root of edit"
-msgstr "æ— æ³•æ‰“å¼€ç¼–è¾‘"
+#: libsvn_wc/log.c:1006
+#, c-format
+msgid "Log command for directory '%s' is mislocated"
+msgstr "对目录“%sâ€çš„æ—¥å¿—命令被错置"
-#: libsvn_repos/delta.c:231
-msgid "Invalid target path"
-msgstr "æ— æ•ˆçš„ç›®æ ‡è·¯å¾„"
+#: libsvn_wc/log.c:1181 libsvn_wc/log.c:1257
+#, c-format
+msgid "Error checking existence of '%s'"
+msgstr "检查“%sâ€æ˜¯å¦å˜åœ¨æ—¶å‘生错误"
-#: libsvn_repos/delta.c:257
-msgid ""
-"Invalid editor anchoring; at least one of the input paths is not a directory "
-"and there was no source entry"
-msgstr "æ— æ•ˆçš„ç¼–è¾‘å™¨å®šä½ï¼›è‡³å°‘ä¸€ä¸ªè¾“å…¥è·¯å¾„ä¸æ˜¯ç›®å½•并且没有æºå…¥å£"
+#: libsvn_wc/log.c:1191 libsvn_wc/log.c:1197
+#, c-format
+msgid "Error getting 'affected time' for '%s'"
+msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
-# as-is
-#: libsvn_repos/dump.c:416
+#: libsvn_wc/log.c:1207
#, c-format
-msgid ""
-"WARNING: Referencing data in revision %ld, which is older than the oldest\n"
-"WARNING: dumped revision (%ld). Loading this dump into an empty repository\n"
-"WARNING: will fail.\n"
-msgstr ""
-"è¦å‘Šï¼šä¿®è®¢ç‰ˆ %ld çš„å‚è€ƒæ•°æ®æ¯”æœ€æ—§çš„è½¬å˜æ•°æ®ä¿®è®¢ç‰ˆ (%ld)还旧。\n"
-"è¦å‘Šï¼š 装载这个转å˜åˆ°ç©ºçš„æ¡£æ¡ˆåº“会失败。\n"
-"\n"
+msgid "Error comparing '%s' and '%s'"
+msgstr "比较“%sâ€ä¸Žâ€œ%sâ€æ—¶å‘生错误"
-#: libsvn_repos/dump.c:934
+#: libsvn_wc/log.c:1317
#, c-format
-msgid "Start revision %ld is greater than end revision %ld"
-msgstr "起始修订版 %ld 比结æŸä¿®è®¢ç‰ˆå· %ld 为大"
+msgid "Error replacing text-base of '%s'"
+msgstr "替æ¢â€œ%sâ€çš„æ–‡ä»¶å‚考基础时å‘生错误"
-#: libsvn_repos/dump.c:939
+#: libsvn_wc/log.c:1326
#, c-format
-msgid "End revision %ld is invalid (youngest revision is %ld)"
-msgstr "结æŸä¿®è®¢ç‰ˆ %ld æ— æ•ˆ (最新的修订版为 %ld)"
+msgid "Error getting 'affected time' of '%s'"
+msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
-# as-is
-#: libsvn_repos/dump.c:1045
-#, fuzzy, c-format
-msgid "* Dumped revision %ld.\n"
-msgstr "* 导出修订版 %ld。\n"
+#: libsvn_wc/log.c:1364 libsvn_wc/log.c:1431
+#, c-format
+msgid "Error modifying entry of '%s'"
+msgstr "修改“%sâ€çš„项目时å‘生错误"
-# as-is
-#: libsvn_repos/dump.c:1046
-#, fuzzy, c-format
-msgid "* Verified revision %ld.\n"
-msgstr "* æ ¡éªŒä¿®è®¢ç‰ˆ %ld。\n"
+#: libsvn_wc/log.c:1486
+#, fuzzy
+msgid "Invalid 'format' attribute"
+msgstr "æ— æ•ˆçš„é…置值"
-#: libsvn_repos/fs-wrap.c:57 libsvn_repos/load.c:1218
-msgid "Commit succeeded, but post-commit hook failed"
-msgstr "æäº¤æˆåŠŸï¼Œä½†æ˜¯å‘é€æäº¤å¤–æŒ‚(post-commit)失败"
+#: libsvn_wc/log.c:1521
+#, c-format
+msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
+msgstr "日志文件项目丢失 'name' 属性 (项目“%sâ€å¯¹åº”至目录“%sâ€)"
-#: libsvn_repos/fs-wrap.c:157
+#: libsvn_wc/log.c:1589
#, c-format
-msgid ""
-"Storage of non-regular property '%s' is disallowed through the repository "
-"interface, and could indicate a bug in your client"
-msgstr "ä¸å…许通过档案库接å£å˜å‚¨éžæ£è§„的属性“%sâ€ï¼Œå¹¶ä¸”æ‚¨çš„å®¢æˆ·ç«¯æœ‰æ¼æ´ž"
+msgid "Unrecognized logfile element '%s' in '%s'"
+msgstr "æ— æ³•ç¡®è®¤çš„æ—¥å¿—æ–‡ä»¶å…ƒç´ â€œ%sâ€äºŽâ€œ%sâ€ä¸"
-#: libsvn_repos/fs-wrap.c:296
-#, fuzzy, c-format
-msgid "Write denied: not authorized to read all of revision %ld"
-msgstr "æ‹’ç»å†™å…¥ï¼šæœªæŽˆæƒé˜…读所有修订版 %ld。"
+#: libsvn_wc/log.c:1600
+#, c-format
+msgid "Error processing command '%s' in '%s'"
+msgstr "在“%2$sâ€ä¸å¤„ç†å‘½ä»¤â€œ%1$sâ€æ—¶å‘生错误"
-#: libsvn_repos/fs-wrap.c:484
+#: libsvn_wc/log.c:1778
+msgid "Couldn't open log"
+msgstr "æ— æ³•æ‰“å¼€æ—¥å¿—æ–‡ä»¶"
+
+#: libsvn_wc/log.c:1789
#, c-format
-msgid "Cannot unlock path '%s', no authenticated username available"
-msgstr "ä¸èƒ½è§£é™¤è·¯å¾„â€%s“的é”定,没有å¯ç”¨çš„已授æƒç”¨æˆ·å"
+msgid "Error reading administrative log file in '%s'"
+msgstr "于“%sâ€ä¸è¯»å–ç®¡ç†æ—¥å¿—文件时å‘生错误"
-#: libsvn_repos/fs-wrap.c:498
-#, fuzzy
-msgid "Unlock succeeded, but post-unlock hook failed"
-msgstr "解除é”定æˆåŠŸï¼Œä½†æ˜¯å‘é€è§£é™¤é”定外挂(post-unlock)失败"
+#: libsvn_wc/log.c:2416
+#, c-format
+msgid "Error writing log for '%s'"
+msgstr "为“%sâ€å†™å…¥æ—¥å¿—æ—¶å‘生错误"
-#: libsvn_repos/hooks.c:66
+#: libsvn_wc/log.c:2464
#, c-format
-msgid "Can't create pipe for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç®¡é“"
+msgid "'%s' is not a working copy directory"
+msgstr "“%sâ€å¹¶ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
-#: libsvn_repos/hooks.c:73
+#: libsvn_wc/props.c:93
#, c-format
-msgid "Can't create null stdout for hook '%s'"
-msgstr "æ— æ³•ä¸ºå¤–æŒ‚â€œ%sâ€åˆ›å»ºç©ºçš„æ ‡å‡†è¾“出"
+msgid "Can't parse '%s'"
+msgstr "æ— æ³•å‰–æžâ€œ%sâ€"
-#: libsvn_repos/hooks.c:85
-msgid "Error closing write end of stderr pipe"
-msgstr "关闿 ‡å‡†é”™è¯¯ç®¡é“末尾å‘生错误"
+#: libsvn_wc/props.c:120
+#, c-format
+msgid "Can't write property hash to '%s'"
+msgstr "æ— æ³•å†™å…¥å±žæ€§é›†åˆ°â€œ%sâ€"
-#: libsvn_repos/hooks.c:90
-#, fuzzy, c-format
-msgid "Failed to start '%s' hook"
-msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥"
+#: libsvn_wc/props.c:213
+#, c-format
+msgid "Can't find entry '%s' in '%s'"
+msgstr "æ— æ³•åœ¨â€œ%2$sâ€ä¸æ‰¾åˆ°é¡¹ç›®â€œ%1$sâ€"
-#: libsvn_repos/hooks.c:108
+#: libsvn_wc/props.c:628
#, c-format
msgid ""
-"'%s' hook failed with error output:\n"
-"%s"
+"Trying to add new property '%s' with value '%s',\n"
+"but property already exists with value '%s'."
msgstr ""
-"外挂“%sâ€å¤±è´¥ï¼Œé”™è¯¯è¾“出:\n"
-"%s"
-
-#: libsvn_repos/hooks.c:115
-#, fuzzy, c-format
-msgid "'%s' hook failed; no error output available"
-msgstr "外挂“%sâ€å¤±è´¥ï¼›æ²¡æœ‰å¯ç”¨çš„错误输出"
-
-#: libsvn_repos/hooks.c:134
-msgid "Error closing read end of stderr pipe"
-msgstr "å…³é—è¯»æ ‡å‡†é”™è¯¯ç®¡é“æœ«å°¾å‘生错误"
-
-#: libsvn_repos/hooks.c:138
-msgid "Error closing null file"
-msgstr "å…³é—空文件å‘生错误"
+"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
+"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
-#: libsvn_repos/hooks.c:220
+#: libsvn_wc/props.c:651
#, c-format
-msgid "Failed to run '%s' hook; broken symlink"
-msgstr "è¿è¡Œå¤–挂“%sâ€å¤±è´¥ï¼›æ— 效的符å·è¿žæŽ¥"
-
-#: libsvn_repos/hooks.c:361
msgid ""
-"Repository has not been enabled to accept revision propchanges;\n"
-"ask the administrator to create a pre-revprop-change hook"
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but the property does not exist."
msgstr ""
-"档案库未激活接å—修订版属性改å˜ï¼›è¯·ç®¡ç†å‘˜åˆ›å»ºä¸€ä¸ª pre-revprop-change 外挂"
-
-#: libsvn_repos/load.c:157 libsvn_repos/load.c:169
-msgid "Found malformed header block in dumpfile stream"
-msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
-
-#: libsvn_repos/load.c:187
-msgid "Premature end of content data in dumpstream"
-msgstr "导出æµä¸å†…容数æ®è¿‡æ—©ç»“æŸ"
-
-#: libsvn_repos/load.c:194
-msgid "Dumpstream data appears to be malformed"
-msgstr "å¯¼å‡ºæµæ•°æ®ä¸å‡ºçŽ°ç•¸å½¢"
-
-#: libsvn_repos/load.c:232
-msgid "Incomplete or unterminated property block"
-msgstr "ä¸å®Œæ•´æˆ–未结æŸçš„属性å—"
-
-#: libsvn_repos/load.c:425
-msgid "Unexpected EOF writing contents"
-msgstr "å†™å†…å®¹æ—¶æœ‰æ„æ–™ä¹‹å¤–的结æŸç¬¦"
+"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
+"但是属性并ä¸å˜åœ¨ã€‚"
-#: libsvn_repos/load.c:454
-msgid "Malformed dumpfile header"
-msgstr "畸形的导出文件头"
+#: libsvn_wc/props.c:679
+#, fuzzy, c-format
+msgid ""
+"Trying to delete property '%s' but value has been modified from '%s' to '%s'."
+msgstr ""
+"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
+"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
-#: libsvn_repos/load.c:460 libsvn_repos/load.c:502
+#: libsvn_wc/props.c:697
#, c-format
-msgid "Unsupported dumpfile version: %d"
-msgstr "䏿”¯æŒçš„导出文件版本:%d"
+msgid ""
+"Trying to change property '%s' from '%s' to '%s',\n"
+"but property already exists with value '%s'."
+msgstr ""
+"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
+"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
-#: libsvn_repos/load.c:600
-msgid "Unrecognized record type in stream"
-msgstr "æµä¸æœ‰æ— 法辨识的记录类型"
+#: libsvn_wc/props.c:880
+#, fuzzy, c-format
+msgid "Missing end of line in wcprops file for '%s'"
+msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
-#: libsvn_repos/load.c:712
-msgid "Sum of subblock sizes larger than total block content length"
-msgstr "åå—大尿€»æ•°å¤§äºŽå—内容长度总数"
+#: libsvn_wc/props.c:1064 libsvn_wc/props.c:1100 libsvn_wc/props.c:1370
+#: libsvn_wc/props.c:1626
+msgid "Failed to load properties from disk"
+msgstr "æ— æ³•ä»Žç£ç¢Ÿè£…载属性"
-# as-is
-#: libsvn_repos/load.c:891
+#: libsvn_wc/props.c:1128
#, c-format
-msgid "<<< Started new transaction, based on original revision %ld\n"
-msgstr "<<< 开始新的事务,基于最åˆçš„修订版 %ld\n"
+msgid "Cannot write property hash for '%s'"
+msgstr "æ— æ³•å†™å…¥â€œ%sâ€çš„属性æ‚凑"
-#: libsvn_repos/load.c:936
+#: libsvn_wc/props.c:1362 libsvn_wc/props.c:1498
#, c-format
-msgid "Relative source revision %ld is not available in current repository"
-msgstr "ç›¸å¯¹æ¥æºä¿®è®¢ç‰ˆ %ld ä¸å˜åœ¨äºŽç›®å‰æ¡£æ¡ˆåº“之ä¸"
+msgid "Property '%s' is an entry property"
+msgstr "属性“%sâ€æ˜¯é¡¹ç›®å±žæ€§"
-#: libsvn_repos/load.c:985
-msgid "Malformed dumpstream: Revision 0 must not contain node records"
-msgstr "畸形的导出æµï¼šä¿®è®¢ç‰ˆ 0 ä¸èƒ½åŒ…å«èŠ‚ç‚¹è®°å½•"
+#: libsvn_wc/props.c:1407
+#, c-format
+msgid "Cannot set '%s' on a directory ('%s')"
+msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽç›®å½• (“%sâ€)"
-#: libsvn_repos/load.c:995
+#: libsvn_wc/props.c:1415
#, c-format
-msgid " * editing path : %s ..."
-msgstr " * æ£åœ¨ä¿®æ”¹è·¯å¾„:%s ..."
+msgid "Cannot set '%s' on a file ('%s')"
+msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽæ–‡ä»¶ (“%sâ€)"
-#: libsvn_repos/load.c:1002
+#: libsvn_wc/props.c:1421
#, c-format
-msgid " * deleting path : %s ..."
-msgstr " * æ£åœ¨åˆ 除路径:%s ..."
+msgid "'%s' is not a file or directory"
+msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶æˆ–目录"
-#: libsvn_repos/load.c:1010
+#: libsvn_wc/props.c:1445
#, c-format
-msgid " * adding path : %s ..."
-msgstr " * æ£åœ¨æ·»åŠ è·¯å¾„ï¼š%s ..."
+msgid "File '%s' has binary mime type property"
+msgstr "文件“%sâ€æœ‰äºŒè¿›åˆ¶çš„ mime 型别属性"
-#: libsvn_repos/load.c:1019
+#: libsvn_wc/props.c:2101
#, c-format
-msgid " * replacing path : %s ..."
-msgstr " * æ£åœ¨æ›¿æ¢è·¯å¾„:%s ..."
+msgid "Error parsing %s property on '%s': '%s'"
+msgstr "å‰–æž %s 属性于“%sâ€å‘生错误:“%sâ€"
-#: libsvn_repos/load.c:1029
+#: libsvn_wc/props.c:2114
#, c-format
-msgid "Unrecognized node-action on node '%s'"
-msgstr "“%sâ€çš„节点ç§åŠ¨ä½œæ³•è¾¨è¯†"
+msgid ""
+"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
+"path"
+msgstr "æ— æ•ˆå±žæ€§ %s 于“%sâ€ï¼šç›®å½•牵涉到 '.' 或 '..' 或是ç»å¯¹è·¯å¾„"
-#: libsvn_repos/load.c:1165
-#, fuzzy
-msgid " done.\n"
-msgstr "完æˆã€‚\n"
+#: libsvn_wc/questions.c:120
+#, c-format
+msgid ""
+"Working copy format of '%s' is too old (%d); please check out your working "
+"copy again"
+msgstr "“%sâ€çš„å·¥ä½œæ‹·è´æ ¼å¼å·²è¿‡æ—¶(%d)ï¼›è¯·é‡æ–°å–出您的工作拷è´"
-# as-is
-#: libsvn_repos/load.c:1240
+#: libsvn_wc/questions.c:128
#, c-format
msgid ""
-"\n"
-"------- Committed revision %ld >>>\n"
-"\n"
-msgstr ""
-"\n"
-"------- æäº¤åŽçš„修订版 %ld >>>\n"
-"\n"
+"This client is too old to work with working copy '%s'; please get a newer "
+"Subversion client"
+msgstr "æœ¬å®¢æˆ·ç«¯å·²è¿‡æ—¶ï¼Œæ— æ³•å˜å–工作拷è´â€œ%sâ€ï¼›è¯·å–得更新版的 Subversion 客户端"
-# as-is
-#: libsvn_repos/load.c:1246
+#: libsvn_wc/questions.c:337
#, c-format
msgid ""
-"\n"
-"------- Committed new rev %ld (loaded from original rev %ld) >>>\n"
-"\n"
+"Checksum mismatch indicates corrupt text base: '%s'\n"
+" expected: %s\n"
+" actual: %s\n"
msgstr ""
-"\n"
-"------- æäº¤æ–°ä¿®è®¢ç‰ˆ %ld (从原始修订版 %ld 装载) >>>\n"
-"\n"
+"总和检查值ä¸ä¸€è‡´ï¼Œè¡¨ç¤ºæ–‡ä»¶å‚考基础æŸå:“%sâ€\n"
+" 预期: %s\n"
+" 实际: %s\n"
-#: libsvn_repos/node_tree.c:238
+#: libsvn_wc/relocate.c:69
+msgid "Relocate can only change the repository part of an URL"
+msgstr ""
+
+#: libsvn_wc/update_editor.c:387
#, c-format
-msgid "'%s' not found in filesystem"
-msgstr "åœ¨æ–‡ä»¶ç³»ç»Ÿä¸æ‰¾ä¸åˆ°â€œ%sâ€"
+msgid "No '.' entry in: '%s'"
+msgstr "ä¸å˜åœ¨ '.' 项目:“%sâ€"
-#: libsvn_repos/replay.c:159
+#: libsvn_wc/update_editor.c:888
#, c-format
-msgid "Filesystem path '%s' is neither a file nor a directory"
-msgstr "文件系统ä¸è·¯å¾„“%sâ€æ—¢ä¸æ˜¯æ–‡ä»¶ä¹Ÿä¸æ˜¯ç›®å½•"
+msgid "Won't delete locally modified directory '%s'"
+msgstr "æ— æ³•åˆ é™¤æœ¬åœ°ä¿®æ”¹çš„ç›®å½•â€œ%sâ€"
-#: libsvn_repos/reporter.c:603
+#: libsvn_wc/update_editor.c:962
#, c-format
-msgid "Working copy path '%s' does not exist in repository"
-msgstr "工作拷è´è·¯å¾„“%sâ€ä¸å˜åœ¨æ¡£æ¡ˆåº“ä¸"
+msgid "Error writing log file for '%s'"
+msgstr "写入“%sâ€çš„æ—¥å¿—文件时å‘生错误"
-#: libsvn_repos/reporter.c:824
-msgid "Not authorized to open root of edit operation"
-msgstr "æœªæŽˆæƒæ‰“å¼€æ ¹è¿›è¡Œç¼–è¾‘æ“作"
+#: libsvn_wc/update_editor.c:1065
+#, c-format
+msgid "Failed to add directory '%s': object of the same name already exists"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/reporter.c:845
-msgid "Cannot replace a directory from within"
-msgstr "ä¸èƒ½åœ¨ç›®å½•䏿›¿æ¢"
+#: libsvn_wc/update_editor.c:1073
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name as the administrative "
+"directory"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šç‰©ä»¶ä¸Žç®¡ç†ç›®å½•åŒå"
-#: libsvn_repos/reporter.c:888
-msgid "Invalid report for top level of working copy"
-msgstr "æ— æ•ˆçš„æœ€ä¸Šå±‚å·¥ä½œæ‹·è´æŠ¥å‘Š"
+#: libsvn_wc/update_editor.c:1087
+#, c-format
+msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šcopyfrom 傿•°å°šä¸æ”¯æŒ"
-#: libsvn_repos/reporter.c:903
-msgid "Two top-level reports with no target"
-msgstr "ä¸¤ä¸ªæœ€ä¸Šå±‚æŠ¥å‘Šæ²¡æœ‰ç›®æ ‡"
+#: libsvn_wc/update_editor.c:1108
+#, c-format
+msgid ""
+"Failed to add directory '%s': object of the same name is already scheduled "
+"for addition"
+msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/repos.c:176
+#: libsvn_wc/update_editor.c:1312
+msgid "Couldn't do property merge"
+msgstr "æ— æ³•è¿›è¡Œå±žæ€§åˆå¹¶"
+
+#: libsvn_wc/update_editor.c:1376
#, c-format
-msgid "'%s' exists and is non-empty"
-msgstr "“%sâ€å·²å˜åœ¨å¹¶ä¸”éžç©º"
+msgid ""
+"Failed to mark '%s' absent: item of the same name is already scheduled for "
+"addition"
+msgstr "æ— æ³•å°†â€œ%sâ€æ ‡è®°ä¸ºä¸å˜åœ¨ï¼šåŒåé¡¹ç›®å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/repos.c:200
-msgid "Creating db logs lock file"
-msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“æ—¥å€¼é”æ–‡ä»¶"
+#: libsvn_wc/update_editor.c:1468
+#, c-format
+msgid "Failed to add file '%s': object of the same name already exists"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
-#: libsvn_repos/repos.c:225
-msgid "Creating db lock file"
-msgstr "æ£åœ¨åˆ›å»ºæ•°æ®åº“锿–‡ä»¶"
+#: libsvn_wc/update_editor.c:1489
+#, c-format
+msgid ""
+"Failed to add file '%s': object of the same name is already scheduled for "
+"addition"
+msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-#: libsvn_repos/repos.c:235
-msgid "Creating lock dir"
-msgstr "æ£åœ¨åˆ›å»ºé”文件目录"
+#: libsvn_wc/update_editor.c:1497
+#, c-format
+msgid "File '%s' in directory '%s' is not a versioned resource"
+msgstr "文件“%sâ€äºŽç›®å½•“%sâ€ä¸çš„并䏿˜¯çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„资æº"
-#: libsvn_repos/repos.c:276
-msgid "Creating hook directory"
-msgstr "æ£åœ¨åˆ›å»ºå¤–挂目录"
+#: libsvn_wc/update_editor.c:1609
+#, c-format
+msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
+msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›è®°å½•:“%sâ€ï¼Œå®žé™…:“%sâ€"
-#: libsvn_repos/repos.c:382
-msgid "Creating start-commit hook"
-msgstr "æ£åœ¨åˆ›å»º start-commit 外挂时å‘生错误"
+#: libsvn_wc/update_editor.c:2686
+#, c-format
+msgid "'%s' has no ancestry information"
+msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
-#: libsvn_repos/repos.c:519
-msgid "Creating pre-commit hook"
-msgstr "æ£åœ¨åˆ›å»º pre-commit 外挂"
+#: libsvn_wc/update_editor.c:2849
+#, fuzzy, c-format
+msgid "Copyfrom-url '%s' has different repository root than '%s'"
+msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-#: libsvn_repos/repos.c:651
-msgid "Creating pre-revprop-change hook"
-msgstr "æ£åœ¨åˆ›å»º pre-revprop-change 外挂"
+#: libsvn_wc/util.c:83
+msgid "Unable to make any directories"
+msgstr "æ— æ³•å»ºç«‹ä»»ä½•ç›®å½•"
-#: libsvn_repos/repos.c:1026
-msgid "Creating post-commit hook"
-msgstr "æ£åœ¨åˆ›å»º post-commit 外挂"
+#: svn/blame-cmd.c:234 svn/list-cmd.c:252
+msgid "'verbose' option invalid in XML mode"
+msgstr "在XML模å¼ä¸â€œè¯¦ç»†â€é€‰é¡¹æ— 效"
-#: libsvn_repos/repos.c:1346
-msgid "Creating post-revprop-change hook"
-msgstr "æ£åœ¨åˆ›å»º post-revprop-change 外挂"
+#: svn/blame-cmd.c:246 svn/info-cmd.c:473 svn/list-cmd.c:264
+#: svn/status-cmd.c:219
+msgid "'incremental' option only valid in XML mode"
+msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
-#: libsvn_repos/repos.c:1356
-msgid "Creating conf directory"
-msgstr "æ£åœ¨åˆ›å»º conf 目录"
+#: svn/blame-cmd.c:313
+#, c-format
+msgid "Skipping binary file: '%s'\n"
+msgstr "跳过二进制文件:“%sâ€\n"
-#: libsvn_repos/repos.c:1408
-msgid "Creating svnserve.conf file"
-msgstr "æ£åœ¨åˆ›å»º svnserve.conf 文件"
+#: svn/checkout-cmd.c:129 svn/switch-cmd.c:127
+#, c-format
+msgid "'%s' does not appear to be a URL"
+msgstr "“%sâ€ä¸åƒæ˜¯åœ°å€(URL)"
-#: libsvn_repos/repos.c:1433
-msgid "Creating passwd file"
-msgstr "æ£åœ¨åˆ›å»º passwd 文件"
+#: svn/copy-cmd.c:108 svn/delete-cmd.c:64 svn/mkdir-cmd.c:66
+msgid "Local, non-commit operations do not take a log message"
+msgstr "本地æ“ä½œï¼Œéžæäº¤çš„æ“作ä¸èƒ½èŽ·å–æ—¥å¿—ä¿¡æ¯"
-#: libsvn_repos/repos.c:1459
-msgid "Could not create top-level directory"
-msgstr "æ— æ³•åˆ›å»ºæœ€ä¸Šå±‚ç›®å½•"
+#: svn/diff-cmd.c:117 svnserve/main.c:484
+#, c-format
+msgid "Can't open stdout"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†è¾“å‡º (stdout)"
-#: libsvn_repos/repos.c:1463
-msgid "Creating DAV sandbox dir"
-msgstr "æ£åœ¨åˆ›å»º DAV sandbox 目录"
+#: svn/diff-cmd.c:119
+#, c-format
+msgid "Can't open stderr"
+msgstr "æ— æ³•æ‰“å¼€æ ‡å‡†é”™è¯¯ (stderr)"
-# as-is
-#: libsvn_repos/repos.c:1506
-msgid "Creating readme file"
-msgstr "æ£åœ¨åˆ›å»º readme 文件"
+#: svn/diff-cmd.c:184
+#, fuzzy
+msgid "'--new' option only valid with '--old' option"
+msgstr "åªæœ‰åœ¨XML模å¼â€œå¢žåŠ â€é€‰é¡¹æ‰æœ‰æ•ˆ"
-#: libsvn_repos/repos.c:1538
-msgid "Repository creation failed"
-msgstr "档案库创建失败"
+#: svn/diff-cmd.c:214
+#, c-format
+msgid "Target lists to diff may not contain both working copy paths and URLs"
+msgstr "å·®å¼‚æ¯”è¾ƒç›®æ ‡ä¸å¯åŒæ—¶åŒ…å«å·¥ä½œæ‹·è´è·¯å¾„与地å€(URL)"
+
+#: svn/export-cmd.c:84
+msgid ""
+"Destination directory exists; please remove the directory or use --force to "
+"overwrite"
+msgstr "目的目录已å˜åœ¨ï¼›è¯·åˆ 除目录或用 --force æ¥è¦†ç›–目录"
-#: libsvn_repos/repos.c:1610
+#: svn/help-cmd.c:45
#, fuzzy, c-format
-msgid "Expected format '%d' of repository; found format '%d'"
-msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+msgid ""
+"usage: svn <subcommand> [options] [args]\n"
+"Subversion command-line client, version %s.\n"
+"Type 'svn help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svn --version' to see the program version and RA modules\n"
+" or 'svn --version --quiet' to see just the version number.\n"
+"\n"
+"Most subcommands take file and/or directory arguments, recursing\n"
+"on the directories. If no arguments are supplied to such a\n"
+"command, it recurses on the current directory (inclusive) by default.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"用法:svn <subcommand> [options] [args]\n"
+"Subversion 命令行客户端,版本 %s。\n"
+"请使用 “svn help <subcommand>†显示å命令的辅助说明。\n"
+"大多数的å命令坿ޥ嗿–‡ä»¶æˆ–ç›®å½•å‚æ•°ï¼Œå¯¹ç›®å½•进行递回å˜å–。\n"
+"å¦‚æ— æŒ‡å®šå‚æ•°ç»™å‘½ä»¤ï¼Œé»˜è®¤å°†ä¼šè‡ªå½“å‰çš„目录 (包å«) è¿›\n"
+"行递归å˜å–。\n"
+"\n"
+"å¯ç”¨çš„å命令:\n"
-#: libsvn_repos/repos.c:1658
-msgid "Error opening db lockfile"
-msgstr "打开数æ®åº“锿–‡ä»¶é”™è¯¯"
+#: svn/help-cmd.c:58
+msgid ""
+"Subversion is a tool for version control.\n"
+"For additional information, see http://subversion.tigris.org/\n"
+msgstr ""
+"Subversion 是个版本控制系统的工具。\n"
+"欲�得详细资料,请�考 http://subversion.tigris.org/\n"
-#: libsvn_repos/rev_hunt.c:63
-#, c-format
-msgid "Failed to find time on revision %ld"
-msgstr "æ— æ³•æ‰¾åˆ°ä¿®è®¢ç‰ˆ %ld 的时间"
+#: svn/help-cmd.c:65 svnsync/main.c:1246
+msgid ""
+"The following repository access (RA) modules are available:\n"
+"\n"
+msgstr ""
+"å¯ä½¿ç”¨ä»¥ä¸‹çš„æ¡£æ¡ˆåº“å˜å– (RA) 模å—:\n"
+"\n"
-#: libsvn_repos/rev_hunt.c:218
-#, c-format
-msgid "Invalid start revision %ld"
-msgstr "æ— æ•ˆçš„èµ·å§‹ä¿®è®¢ç‰ˆ %ld"
+#: svn/import-cmd.c:82
+msgid "Repository URL required when importing"
+msgstr "导入时必须æä¾›æ¡£æ¡ˆåº“的地å€(URL)"
+
+#: svn/import-cmd.c:86
+msgid "Too many arguments to import command"
+msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
-#: libsvn_repos/rev_hunt.c:222
+#: svn/import-cmd.c:101
#, c-format
-msgid "Invalid end revision %ld"
-msgstr "æ— æ•ˆçš„ç»“æŸä¿®è®¢ç‰ˆ %ld"
+msgid "Invalid URL '%s'"
+msgstr "æ— æ•ˆåœ°å€(URL)“%sâ€"
-#: libsvn_repos/rev_hunt.c:314
-#, fuzzy
-msgid "Unreadable path encountered; access denied"
-msgstr "é‡åˆ°ä¸èƒ½è¯»çš„路径;访问拒ç»ã€‚"
+#: svn/info-cmd.c:111
+#, fuzzy, c-format
+msgid "'%s' has invalid revision"
+msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
-#: libsvn_subr/config.c:632
+#: svn/info-cmd.c:263 svnadmin/main.c:1046
#, c-format
-msgid "Config error: invalid boolean value '%s'"
-msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„å¸ƒå°”å€¼â€œ%sâ€"
+msgid "Path: %s\n"
+msgstr "路径:%s\n"
-#: libsvn_subr/config.c:882
+# this points to filename according to sunny256
+#: svn/info-cmd.c:269 svnlook/main.c:734
#, c-format
-msgid "Config error: invalid integer value '%s'"
-msgstr "é…ç½®é”™è¯¯ï¼šæ— æ•ˆçš„æ•´æ•°å€¼â€œ%sâ€"
-
-#: libsvn_subr/config_auth.c:94
-msgid "Unable to open auth file for reading"
-msgstr "ä¸èƒ½æ‰“å¼€è®¤è¯æ–‡ä»¶è¯»å–æ•°æ®"
+msgid "Name: %s\n"
+msgstr "文件å:%s\n"
-#: libsvn_subr/config_auth.c:99
+#: svn/info-cmd.c:273
#, c-format
-msgid "Error parsing '%s'"
-msgstr "分解“%sâ€æ—¶å‘生错误"
+msgid "URL: %s\n"
+msgstr "地å€(URL):%s\n"
-#: libsvn_subr/config_auth.c:123
-msgid "Unable to locate auth file"
-msgstr "æ— æ³•å®šä½è®¤è¯æ–‡ä»¶æ–‡ä»¶"
+#: svn/info-cmd.c:276
+#, fuzzy, c-format
+msgid "Repository Root: %s\n"
+msgstr "æ¡£æ¡ˆåº“æ ¹è·¯å¾„ï¼š%s\n"
-#: libsvn_subr/config_auth.c:134
-msgid "Unable to open auth file for writing"
-msgstr "æ— æ³•æ‰“å¼€è®¤è¯æ–‡ä»¶å†™å…¥æ•°æ®"
+#: svn/info-cmd.c:280
+#, c-format
+msgid "Repository UUID: %s\n"
+msgstr "档案库 UUID:%s\n"
-#: libsvn_subr/config_auth.c:137
+#: svn/info-cmd.c:284
#, c-format
-msgid "Error writing hash to '%s'"
-msgstr "写哈希数æ®è‡³â€œ%sâ€æ—¶å‘生错误"
+msgid "Revision: %ld\n"
+msgstr "修订版:%ld\n"
-# as-is
-#: libsvn_subr/config_file.c:393
+#: svn/info-cmd.c:289
#, c-format
-msgid "Can't open config file '%s'"
-msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
+msgid "Node Kind: file\n"
+msgstr "节点ç§ç±»ï¼šæ–‡ä»¶\n"
-# as-is
-#: libsvn_subr/config_file.c:397
+#: svn/info-cmd.c:293
#, c-format
-msgid "Can't find config file '%s'"
-msgstr "找ä¸åˆ°é…置文件“%sâ€"
+msgid "Node Kind: directory\n"
+msgstr "节点ç§ç±»ï¼šç›®å½•\n"
-#: libsvn_subr/date.c:204
-msgid "Can't manipulate current date"
-msgstr "ä¸èƒ½è޷得当剿—¥æœŸ"
+#: svn/info-cmd.c:297
+#, c-format
+msgid "Node Kind: none\n"
+msgstr "节点ç§ç±»ï¼šæ— \n"
-#: libsvn_subr/date.c:278 libsvn_subr/date.c:286
-msgid "Can't calculate requested date"
-msgstr "æ— æ³•è®¡ç®—è¢«è¯·æ±‚çš„æ—¥æœŸ"
+#: svn/info-cmd.c:302
+#, c-format
+msgid "Node Kind: unknown\n"
+msgstr "节点ç§ç±»ï¼šæœªçŸ¥\n"
-#: libsvn_subr/date.c:281
-msgid "Can't expand time"
-msgstr "æ— æ³•æ˜Žç¡®æ—¶é—´"
+#: svn/info-cmd.c:311
+#, c-format
+msgid "Schedule: normal\n"
+msgstr "调度:æ£å¸¸\n"
-#: libsvn_subr/error.c:326
-msgid "Can't recode error string from APR"
-msgstr "æ— æ³•è‡ª APR 将错误信æ¯é‡æ–°ç¼–ç "
+#: svn/info-cmd.c:315
+#, c-format
+msgid "Schedule: add\n"
+msgstr "调度:新增\n"
-#: libsvn_subr/error.c:414
+#: svn/info-cmd.c:319
#, c-format
-msgid "%swarning: %s\n"
-msgstr "%sè¦å‘Šï¼š%s\n"
+msgid "Schedule: delete\n"
+msgstr "è°ƒåº¦ï¼šåˆ é™¤\n"
-#: libsvn_subr/io.c:129
+#: svn/info-cmd.c:323
#, c-format
-msgid "Can't check path '%s'"
-msgstr "æ— æ³•æ£€æŸ¥è·¯å¾„â€œ%sâ€"
+msgid "Schedule: replace\n"
+msgstr "调度:替æ¢\n"
-#: libsvn_subr/io.c:248 libsvn_subr/io.c:337
+#: svn/info-cmd.c:331
#, c-format
-msgid "Can't open '%s'"
-msgstr "ä¸èƒ½æ‰“开“%sâ€"
+msgid "Copied From URL: %s\n"
+msgstr "å¤åˆ¶è‡ªåœ°å€(URL):%s\n"
-#: libsvn_subr/io.c:262 libsvn_subr/io.c:350
+#: svn/info-cmd.c:335
#, c-format
-msgid "Unable to make name for '%s'"
-msgstr "ä¸èƒ½ä½¿ç”¨åå—“%sâ€"
+msgid "Copied From Rev: %ld\n"
+msgstr "å¤åˆ¶è‡ªä¿®è®¢ç‰ˆï¼š%ld\n"
-#: libsvn_subr/io.c:354 libsvn_subr/io.c:390 libsvn_subr/io.c:418
-msgid "Symbolic links are not supported on this platform"
-msgstr "æ¤å¹³å°ä¸æ”¯æŒç¬¦å·é“¾æŽ¥"
+#: svn/info-cmd.c:340
+#, c-format
+msgid "Last Changed Author: %s\n"
+msgstr "最åŽä¿®æ”¹çš„作者:%s\n"
-#: libsvn_subr/io.c:377
-msgid "Can't read contents of link"
-msgstr "ä¸èƒ½è¯»å–连接的内容"
+#: svn/info-cmd.c:344
+#, c-format
+msgid "Last Changed Rev: %ld\n"
+msgstr "最åŽä¿®æ”¹çš„修订版:%ld\n"
-#: libsvn_subr/io.c:519 libsvn_subr/io.c:529
-msgid "Can't find a temporary directory"
-msgstr "æ— æ³•æ‰¾åˆ°ä¸´æ—¶ç›®å½•"
+#: svn/info-cmd.c:349
+msgid "Last Changed Date"
+msgstr "最åŽä¿®æ”¹çš„æ—¶é—´"
-#: libsvn_subr/io.c:566
-#, c-format
-msgid "Can't copy '%s' to '%s'"
-msgstr "ä¸èƒ½å¤åˆ¶â€œ%sâ€åˆ°â€œ%sâ€"
+#: svn/info-cmd.c:355
+msgid "Text Last Updated"
+msgstr "æ–‡æœ¬æœ€åŽæ›´æ–°"
-# as-is
-#: libsvn_subr/io.c:599
-#, c-format
-msgid "Can't set permissions on '%s'"
-msgstr "ä¸èƒ½åœ¨â€œ%sâ€è®¾ç½®è®¸å¯æƒé™"
+#: svn/info-cmd.c:359
+msgid "Properties Last Updated"
+msgstr "å±žæ€§æœ€åŽæ›´æ–°"
-#: libsvn_subr/io.c:621
+#: svn/info-cmd.c:362
#, c-format
-msgid "Can't append '%s' to '%s'"
-msgstr "ä¸èƒ½é™„åŠ â€œ%sâ€åˆ°â€œ%sâ€"
+msgid "Checksum: %s\n"
+msgstr "æ ¡éªŒå’Œï¼š%s\n"
-#: libsvn_subr/io.c:655
+#: svn/info-cmd.c:367
#, c-format
-msgid "Source '%s' is not a directory"
-msgstr "æºâ€œ%sâ€ä¸æ˜¯ç›®å½•"
+msgid "Conflict Previous Base File: %s\n"
+msgstr "冲çªä¹‹å‰çš„æ–‡ä»¶ï¼š%s\n"
-#: libsvn_subr/io.c:661
+#: svn/info-cmd.c:373
#, c-format
-msgid "Destination '%s' is not a directory"
-msgstr "目的“%sâ€ä¸æ˜¯ç›®å½•"
+msgid "Conflict Previous Working File: %s\n"
+msgstr "冲çªä¹‹å‰çš„工作文件:%s\n"
-#: libsvn_subr/io.c:667
+#: svn/info-cmd.c:378
#, c-format
-msgid "Destination '%s' already exists"
-msgstr "目的“%sâ€å·²å˜åœ¨"
+msgid "Conflict Current Base File: %s\n"
+msgstr "冲çªä¹‹å‰çš„当剿–‡ä»¶ï¼š%s\n"
-#: libsvn_subr/io.c:736 libsvn_subr/io.c:1636 libsvn_subr/io.c:1707
+#: svn/info-cmd.c:383
#, c-format
-msgid "Can't read directory '%s'"
-msgstr "æ— æ³•è¯»å–目录“%sâ€"
+msgid "Conflict Properties File: %s\n"
+msgstr "冲çªçš„属性文件:%s\n"
-#: libsvn_subr/io.c:741 libsvn_subr/io.c:1641 libsvn_subr/io.c:1712
-#: libsvn_subr/io.c:2695
+#: svn/info-cmd.c:391
#, c-format
-msgid "Error closing directory '%s'"
-msgstr "å…³é—目录“%sâ€æ—¶å‘生错误"
+msgid "Lock Token: %s\n"
+msgstr "é”定记å·ï¼š%s\n"
-#: libsvn_subr/io.c:767
+#: svn/info-cmd.c:395
#, c-format
-msgid "Can't make directory '%s'"
-msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
+msgid "Lock Owner: %s\n"
+msgstr "é”定所有者:%s\n"
-# as-is
-#: libsvn_subr/io.c:835
-#, c-format
-msgid "Can't set access time of '%s'"
-msgstr "ä¸èƒ½è®¾ç½®â€œ%sâ€çš„å˜å–æ—¶é—´"
+#: svn/info-cmd.c:400
+msgid "Lock Created"
+msgstr "é”定已创建的"
-#: libsvn_subr/io.c:950
-#, c-format
-msgid "Can't set file '%s' read-only"
-msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€åªè¯»"
+#: svn/info-cmd.c:404
+msgid "Lock Expires"
+msgstr "é”定过期的"
-#: libsvn_subr/io.c:975
+#: svn/info-cmd.c:413
#, c-format
-msgid "Can't set file '%s' read-write"
-msgstr "æ— æ³•è®¾ç½®æ–‡ä»¶â€œ%sâ€å¯è¯»å†™"
+msgid ""
+"Lock Comment (%i lines):\n"
+"%s\n"
+msgstr ""
+"é”定注释(%i 行):\n"
+"%s\n"
-#: libsvn_subr/io.c:1025
+#: svn/info-cmd.c:414
#, c-format
-msgid "Can't get default file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+msgid ""
+"Lock Comment (%i line):\n"
+"%s\n"
+msgstr ""
+"é”定注释(%i line):\n"
+"%s\n"
-# as-is
-#: libsvn_subr/io.c:1035
-#, fuzzy, c-format
-msgid "Can't open file at '%s'"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
+#: svn/info-cmd.c:505
+#, c-format
+msgid ""
+"%s: (Not a versioned resource)\n"
+"\n"
+msgstr ""
+"%s:(䏿˜¯å—版本控制的资æº)\n"
+"\n"
-#: libsvn_subr/io.c:1039
+#: svn/info-cmd.c:514
#, fuzzy, c-format
-msgid "Can't get file perms for file at '%s' (file stat error)"
-msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(文件 stat 错误)"
+msgid ""
+"%s: (Not a valid URL)\n"
+"\n"
+msgstr ""
+"%s:(䏿˜¯æœ‰æ•ˆçš„地å€(URL))\n"
+"\n"
-#: libsvn_subr/io.c:1072 libsvn_subr/io.c:1132
-#, fuzzy, c-format
-msgid "Can't change read-write perms of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯è¯»å†™æƒé™"
+#: svn/lock-cmd.c:52
+#, fuzzy
+msgid "Lock comment contains a zero byte"
+msgstr "é”å®šçš„æ³¨é‡Šä¸æœ‰ä¸€ä¸ªé›¶å—节"
-#: libsvn_subr/io.c:1171 libsvn_subr/io.c:1215 libsvn_subr/io.c:1239
-#, c-format
-msgid "Can't change executability of file '%s'"
-msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
+#: svn/log-cmd.c:162
+msgid "(no author)"
+msgstr "(没有作者信æ¯)"
-#: libsvn_subr/io.c:1266
-msgid "Error getting UID of process"
-msgstr "获å–进程用户ID(UID)时å‘生错误"
+#: svn/log-cmd.c:173
+msgid "(no date)"
+msgstr "(没有时间)"
-#: libsvn_subr/io.c:1347
+#: svn/log-cmd.c:203
#, c-format
-msgid "Can't get shared lock on file '%s'"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%s“的共享é”"
+msgid "Changed paths:\n"
+msgstr "改å˜çš„路径:\n"
-#: libsvn_subr/io.c:1351
+#: svn/log-cmd.c:218
#, c-format
-msgid "Can't get exclusive lock on file '%s'"
-msgstr "ä¸èƒ½èŽ·å–æ–‡ä»¶â€œ%sâ€çš„æŽ’ä»–é”"
+msgid " (from %s:%ld)"
+msgstr " (从 %s:%ld)"
-# as-is
-#: libsvn_subr/io.c:1382
-#, c-format
-msgid "Can't flush file '%s'"
-msgstr "ä¸èƒ½å†™å…¥æ–‡ä»¶â€œ%sâ€"
+#: svn/log-cmd.c:450
+msgid "When specifying working copy paths, only one target may be given"
+msgstr "当指定工作拷è´è·¯å¾„ï¼Œåªæœ‰ä¸€ä¸ªç›®æ ‡ä¼šè¢«æŒ‡å®š"
-#: libsvn_subr/io.c:1383
-msgid "Can't flush stream"
-msgstr "ä¸èƒ½å†™å…¥æµ"
+#: svn/log-cmd.c:462
+msgid "Only relative paths can be specified after a URL"
+msgstr "地å€(URL)åŽåªèƒ½æŒ‡å®šç›¸å¯¹è·¯å¾„"
-#: libsvn_subr/io.c:1395 libsvn_subr/io.c:1412
-msgid "Can't flush file to disk"
-msgstr "ä¸èƒ½æŠŠæ–‡ä»¶å†™å…¥ç£ç›˜"
+#: svn/main.c:60
+msgid "force operation to run"
+msgstr "强制æ“作è¿è¡Œ"
-#: libsvn_subr/io.c:1433
-msgid "Reading from stdin is currently broken, so disabled"
-msgstr "ä»Žæ ‡å‡†è¾“å…¥è®¾å¤‡è¯»å–æ•°æ®æ—¶è¢«ä¸æ–ï¼Œæ‰€ä»¥æŠŠå®ƒç¦æ¢"
+#: svn/main.c:62
+msgid "force validity of log message source"
+msgstr "å¼ºåˆ¶æ ¡éªŒæ—¥å¿—ä¿¡æ¯èµ„æº"
-#: libsvn_subr/io.c:1454
-msgid "Can't get file name"
-msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+#: svn/main.c:63 svn/main.c:64 svnadmin/main.c:227 svnadmin/main.c:230
+#: svndumpfilter/main.c:780 svndumpfilter/main.c:783 svnlook/main.c:90
+#: svnlook/main.c:93 svnsync/main.c:104 svnsync/main.c:106
+msgid "show help on a subcommand"
+msgstr "显示å命令帮助"
-# as-is
-#: libsvn_subr/io.c:1522
-#, c-format
-msgid "Can't remove file '%s'"
-msgstr "ä¸èƒ½ç§»åŠ¨æ–‡ä»¶â€œ%sâ€"
+#: svn/main.c:65
+#, fuzzy
+msgid "specify log message ARG"
+msgstr "指定æäº¤ä¿¡æ¯ARG"
-#: libsvn_subr/io.c:1551
-#, c-format
-msgid "Can't rewind directory '%s'"
-msgstr "æ— æ³•è¿”å›žç›®å½•â€œ%sâ€"
+#: svn/main.c:66
+msgid "print as little as possible"
+msgstr "打å°å°½å¯èƒ½å°‘"
+
+#: svn/main.c:67
+msgid "descend recursively"
+msgstr "å‘下递归"
+
+#: svn/main.c:68
+msgid "operate on single directory only"
+msgstr "åªåœ¨å•个目录æ“作"
+
+#: svn/main.c:70
+msgid ""
+"the change made by revision ARG (like -r ARG-1:ARG)\n"
+" If ARG is negative this is like -r ARG:ARG-1"
+msgstr ""
+
+#: svn/main.c:74
+#, fuzzy
+msgid ""
+"ARG (some commands also take ARG1:ARG2 range)\n"
+" A revision argument can be one of:\n"
+" NUMBER revision number\n"
+" '{' DATE '}' revision at start of the date\n"
+" 'HEAD' latest in repository\n"
+" 'BASE' base rev of item's working "
+"copy\n"
+" 'COMMITTED' last commit at or before BASE\n"
+" 'PREV' revision just before COMMITTED"
+msgstr ""
+"ARG (ä¸€äº›å‘½ä»¤éœ€è¦ ARG1:ARG2 )\n"
+" ä¿®è®¢ç‰ˆå‚æ•°å¯ä»¥æ˜¯ï¼š\n"
+" æ•°å— ä¿®è®¢ç‰ˆå·\n"
+" \"{\" 日期 \"}\" 在指定时间以åŽçš„修订版date\n"
+" \"HEAD\" 最近的档案库\n"
+" \"BASE\" 基线,基于修订版的工作æ¡ç›® \n"
+" \"COMMITTED\" æœ€åŽæäº¤æˆ–åŸºçº¿ä¹‹å‰\n"
+" \"PREV\" 修订版æäº¤ä¹‹å‰"
-#: libsvn_subr/io.c:1586 libsvn_subr/io.c:2544 libsvn_subr/io.c:2632
-#, c-format
-msgid "Can't open directory '%s'"
-msgstr "æ— æ³•æ‰“å¼€ç›®å½•â€œ%sâ€"
+#: svn/main.c:84
+#, fuzzy
+msgid "read log message from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
-#: libsvn_subr/io.c:1625 libsvn_subr/io.c:1647
-#, c-format
-msgid "Can't remove '%s'"
-msgstr "æ— æ³•åˆ é™¤â€œ%sâ€"
+#: svn/main.c:86
+msgid "give output suitable for concatenation"
+msgstr "给予适åˆè¾“出的"
-#: libsvn_subr/io.c:1751
-#, c-format
-msgid "Can't create process '%s' attributes"
-msgstr "æ— æ³•å»ºç«‹è¿›ç¨‹â€œ%sâ€çš„属性"
+#: svn/main.c:89
+msgid "treat value as being in charset encoding ARG"
+msgstr "指定的值 ARG 为å—符编ç "
-#: libsvn_subr/io.c:1757
-#, c-format
-msgid "Can't set process '%s' cmdtype"
-msgstr "æ— æ³•è®¾ç½®è¿›ç¨‹â€œ%sâ€çš„命令类型"
+#: svn/main.c:92 svnadmin/main.c:233 svndumpfilter/main.c:786
+#: svnlook/main.c:96 svnserve/main.c:149 svnsync/main.c:102
+#: svnversion/main.c:125
+#, fuzzy
+msgid "show program version information"
+msgstr "显示版本信æ¯"
-#: libsvn_subr/io.c:1769
-#, c-format
-msgid "Can't set process '%s' directory"
-msgstr "æ— æ³•è®¾å®šè¿›ç¨‹â€œ%sâ€ç›®å½•"
+#: svn/main.c:93
+msgid "print extra information"
+msgstr "打å°é™„åŠ ä¿¡æ¯"
-#: libsvn_subr/io.c:1782
-#, c-format
-msgid "Can't set process '%s' child input"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“å…¥"
+#: svn/main.c:94
+msgid "display update information"
+msgstr "显示更新信æ¯"
-#: libsvn_subr/io.c:1789
-#, c-format
-msgid "Can't set process '%s' child outfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€è¾“出文件"
+#: svn/main.c:96 svnsync/main.c:96
+msgid "specify a username ARG"
+msgstr "指定用户 ARG"
-#: libsvn_subr/io.c:1796
-#, c-format
-msgid "Can't set process '%s' child errfile"
-msgstr "æ— æ³•è®¾ç½®å进程“%sâ€é”™è¯¯è¾“出文件"
+#: svn/main.c:98 svnsync/main.c:98
+msgid "specify a password ARG"
+msgstr "指定密ç ARG"
-# as-is
-#: libsvn_subr/io.c:1820
-#, c-format
-msgid "Can't start process '%s'"
-msgstr "ä¸èƒ½å–得进程“%sâ€çжæ€"
+#: svn/main.c:101
+msgid ""
+"Default: '-u'. When Subversion is invoking an\n"
+" external diff program, ARG is simply passed "
+"along\n"
+" to the program. But when Subversion is using "
+"its\n"
+" default internal diff implementation, or when\n"
+" Subversion is displaying blame annotations, "
+"ARG\n"
+" could be any of the following:\n"
+" -u (--unified):\n"
+" Output 3 lines of unified context.\n"
+" -b (--ignore-space-change):\n"
+" Ignore changes in the amount of white "
+"space.\n"
+" -w (--ignore-all-space):\n"
+" Ignore all white space.\n"
+" --ignore-eol-style:\n"
+" Ignore changes in EOL style"
+msgstr ""
-#: libsvn_subr/io.c:1842
-#, c-format
-msgid "Error waiting for process '%s'"
-msgstr "为进程“%sâ€å†™å…¥æ—¶å‘生错误"
+#: svn/main.c:130
+msgid "pass contents of file ARG as additional args"
+msgstr "ä¼ é€’æ–‡ä»¶ ARG å†…å®¹ä¸ºé™„ä»¶å‚æ•°"
-#: libsvn_subr/io.c:1850
-#, c-format
-msgid "Process '%s' failed (exitwhy %d)"
-msgstr "进程“%sâ€å¤±è´¥(返回 %d)"
+#: svn/main.c:131
+msgid "output in XML"
+msgstr "输出为 XML"
-#: libsvn_subr/io.c:1857
-#, c-format
-msgid "Process '%s' returned error exitcode %d"
-msgstr "进程“%sâ€è¿”回错误退出ç %d"
+#: svn/main.c:132
+msgid "use strict semantics"
+msgstr "ä½¿ç”¨ä¸¥æ ¼çš„è¯æ³•"
-#: libsvn_subr/io.c:1968
-#, c-format
-msgid "'%s' returned %d"
-msgstr "“%s†返回 %d"
+#: svn/main.c:134
+msgid "do not cross copies while traversing history"
+msgstr "查看历å²ä¸è¦è·¨è¶Šä¸åŒçš„æ‹·è´"
-#: libsvn_subr/io.c:2071
-#, c-format
-msgid ""
-"Error running '%s': exitcode was %d, args were:\n"
-"in directory '%s', basenames:\n"
-"%s\n"
-"%s\n"
-"%s"
-msgstr ""
-"è¿è¡Œâ€œ%sâ€æ—¶å‘ç”Ÿé”™è¯¯ï¼šé€€å‡ºç æ˜¯ %dï¼Œå‚æ•°æ˜¯ï¼š\n"
-"在目录“%sâ€ï¼Œåå—:\n"
-"%s\n"
-"%s\n"
-"%s"
+#: svn/main.c:136
+msgid "disregard default and svn:ignore property ignores"
+msgstr "忽略默认值和 svn:ignore 属性"
-#: libsvn_subr/io.c:2107
-#, c-format
-msgid "Can't detect MIME type of non-file '%s'"
-msgstr "ä¸èƒ½æ£€æµ‹éžæ–‡ä»¶çš„“%sâ€çš„MIME类型"
+#: svn/main.c:138 svnsync/main.c:94
+msgid "do not cache authentication tokens"
+msgstr "ä¸è¦ç¼“冲用户验è¯"
-# as-is
-#: libsvn_subr/io.c:2174
-#, c-format
-msgid "Can't open file '%s'"
-msgstr "ä¸èƒ½æ‰“开文件“%sâ€"
+#: svn/main.c:140 svnsync/main.c:92
+msgid "do no interactive prompting"
+msgstr "ä¸è¦äº¤äº’æç¤º"
-#: libsvn_subr/io.c:2211
-msgid "Can't close stream"
-msgstr "æ— æ³•å…³é—æµ"
+#: svn/main.c:142
+msgid "try operation but make no changes"
+msgstr "å°è¯•æ“作但ä¸ä¿®æ”¹"
-# as-is
-#: libsvn_subr/io.c:2221 libsvn_subr/io.c:2245 libsvn_subr/io.c:2258
-#, c-format
-msgid "Can't read file '%s'"
-msgstr "ä¸èƒ½è¯»å–文件“%sâ€"
+#: svn/main.c:144 svnlook/main.c:111
+msgid "do not print differences for deleted files"
+msgstr "ä¸è¦æ‰“å°å·²åˆ 除文件的ä¸åŒå¤„"
-#: libsvn_subr/io.c:2222 libsvn_subr/io.c:2246 libsvn_subr/io.c:2259
-msgid "Can't read stream"
-msgstr "æ— æ³•è¯»å–æµ"
+#: svn/main.c:146
+msgid "notice ancestry when calculating differences"
+msgstr "比较差异时æç¤ºåŽŸå§‹ä¿¡æ¯"
-#: libsvn_subr/io.c:2233
-#, c-format
-msgid "Can't get attribute information from file '%s'"
-msgstr "æ— æ³•ä»Žæ–‡ä»¶â€œ%sâ€èŽ·å–属性信æ¯"
+#: svn/main.c:148
+msgid "ignore ancestry when calculating merges"
+msgstr "åˆå¹¶æ—¶å¿½ç•¥åŽŸå§‹ä¿¡æ¯"
-#: libsvn_subr/io.c:2234
-msgid "Can't get attribute information from stream"
-msgstr "æ— æ³•ä»ŽæµèŽ·å–属性信æ¯"
+#: svn/main.c:150
+msgid "ignore externals definitions"
+msgstr "忽略外部定义"
-#: libsvn_subr/io.c:2270
-#, c-format
-msgid "Can't set position pointer in file '%s'"
-msgstr "æ— æ³•åœ¨æ–‡ä»¶â€œ%sâ€è®¾ç½®å®šä½æŒ‡é’ˆ"
+#: svn/main.c:153
+msgid "use ARG as diff command"
+msgstr "使用 ARG 作为差异比较命令"
-#: libsvn_subr/io.c:2271
-msgid "Can't set position pointer in stream"
-msgstr "æ— æ³•åœ¨æµä¸è®¾ç½®å®šä½æŒ‡é’ˆ"
+#: svn/main.c:155
+msgid "use ARG as merge command"
+msgstr "使用 ARG 作为åˆå¹¶å‘½ä»¤"
-#: libsvn_subr/io.c:2282 libsvn_subr/io.c:2295
-#, c-format
-msgid "Can't write to file '%s'"
-msgstr "æ— æ³•å†™å…¥æ–‡ä»¶â€œ%sâ€"
+#: svn/main.c:157
+msgid "use ARG as external editor"
+msgstr "使用 ARG 作为外部编辑器"
-#: libsvn_subr/io.c:2283 libsvn_subr/io.c:2296
-msgid "Can't write to stream"
-msgstr "æ— æ³•å†™å…¥æµ"
+#: svn/main.c:160
+msgid "use ARG as the older target"
+msgstr "使用 ARG ä½œä¸ºæ—§ç›®æ ‡"
-# as-is
-#: libsvn_subr/io.c:2336
-#, fuzzy, c-format
-msgid "Can't read length line in file '%s'"
-msgstr "ä¸èƒ½ä»Žæ–‡ä»¶â€œ%sâ€è¯»å–长度行"
+#: svn/main.c:162
+msgid "use ARG as the newer target"
+msgstr "使用 ARG ä½œä¸ºæ–°ç›®æ ‡"
-#: libsvn_subr/io.c:2340
-#, fuzzy
-msgid "Can't read length line in stream"
-msgstr "æ— æ³•ä»Žæ•°æ®æµè¯»å–长度行"
+#: svn/main.c:164
+msgid "operate on a revision property (use with -r)"
+msgstr "在修订版属性上作æ“作(使用-r傿•°)"
-#: libsvn_subr/io.c:2415
-#, c-format
-msgid "Can't move '%s' to '%s'"
-msgstr "ä¸èƒ½ç§»åŠ¨â€œ%sâ€åˆ°â€œ%sâ€"
+#: svn/main.c:166
+msgid "relocate via URL-rewriting"
+msgstr "通过URLæ”¹å†™é‡æ–°éƒ¨ç½²"
-#: libsvn_subr/io.c:2460
-#, c-format
-msgid "Can't create directory '%s'"
-msgstr "æ— æ³•åˆ›å»ºç›®å½•â€œ%sâ€"
+#: svn/main.c:168 svnadmin/main.c:269 svnsync/main.c:100
+msgid "read user configuration files from directory ARG"
+msgstr "从目录 ARG 读å–用户é…置文件"
-#: libsvn_subr/io.c:2471 libsvn_wc/copy.c:303
-#, c-format
-msgid "Can't hide directory '%s'"
-msgstr "æ— æ³•éšè—目录“%sâ€"
+#: svn/main.c:170
+msgid "enable automatic properties"
+msgstr "使自动属性有效"
-#: libsvn_subr/io.c:2484
-#, c-format
-msgid "Can't stat directory '%s'"
-msgstr "æ— æ³•èŽ·å–目录“%sâ€çš„状æ€"
+#: svn/main.c:172
+msgid "disable automatic properties"
+msgstr "ä½¿è‡ªåŠ¨å±žæ€§æ— æ•ˆ"
-#: libsvn_subr/io.c:2500
-#, c-format
-msgid "Can't stat new directory '%s'"
-msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
+#: svn/main.c:174
+#, fuzzy
+msgid ""
+"use a different EOL marker than the standard\n"
+" system marker for files with the svn:eol-style\n"
+" property set to 'native'.\n"
+" ARG may be one of 'LF', 'CR', 'CRLF'"
+msgstr ""
+"ä½¿ç”¨ä¸€ä¸ªä¸Žæ ‡å‡†ä¸åŒçš„ EOL æ ‡è®°\n"
+" ç³»ç»Ÿä¸ºæ–‡ä»¶æ ‡è®° svn:eol-style 属性为 'native'。\n"
+" ARG å¯ä»¥æ˜¯ä»¥ä¸‹ä¹‹ä¸€ 'LF','CR','CRLF'"
-#: libsvn_subr/io.c:2562
-#, c-format
-msgid "Can't remove directory '%s'"
-msgstr "æ— æ³•åˆ é™¤ç›®å½•â€œ%sâ€"
+#: svn/main.c:182
+msgid "maximum number of log entries"
+msgstr "日值项最大值"
-#: libsvn_subr/io.c:2580
-msgid "Can't read directory"
-msgstr "æ— æ³•è¯»å–目录"
+#: svn/main.c:184
+msgid "don't unlock the targets"
+msgstr "ä¸è¦é”å®šç›®æ ‡"
-#: libsvn_subr/io.c:2651
-#, c-format
-msgid "Can't read directory entry in '%s'"
-msgstr "æ— æ³•åœ¨ç›®å½•â€œ%sâ€è¯»å–内容"
+#: svn/main.c:186
+msgid "show a summary of the results"
+msgstr ""
-#: libsvn_subr/io.c:2776
-#, c-format
-msgid "Can't check directory '%s'"
-msgstr "æ— æ³•æ£€æŸ¥ç›®å½•â€œ%sâ€"
+#: svn/main.c:225
+msgid ""
+"Put files and directories under version control, scheduling\n"
+"them for addition to repository. They will be added in next commit.\n"
+"usage: add PATH...\n"
+msgstr ""
+"把文件和目录放入版本控制ä¸ï¼Œ\n"
+"é€šè¿‡è°ƒåº¦åŠ åˆ°æ¡£æ¡ˆåº“ã€‚å®ƒä»¬ä¼šåœ¨ä¸‹ä¸€æ¬¡æäº¤æ—¶åŠ å…¥ã€‚\n"
+"用法:add 路径...\n"
-#: libsvn_subr/io.c:2798
-#, c-format
-msgid "Version %d is not non-negative"
-msgstr "版本 %d 未被确认"
+#: svn/main.c:233
+msgid ""
+"Output the content of specified files or\n"
+"URLs with revision and author information in-line.\n"
+"usage: blame TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地å€(URL)的内容,æ¯è¡ŒåŒ…å«ä¿®è®¢ç‰ˆå’Œä½œè€…ä¿¡æ¯ã€‚\n"
+"\n"
+"用法:blame ç›®æ ‡[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
-#: libsvn_subr/io.c:2845
-#, c-format
-msgid "Reading '%s'"
-msgstr "æ£åœ¨è¯»å–“%sâ€"
+#: svn/main.c:243
+msgid ""
+"Output the content of specified files or URLs.\n"
+"usage: cat TARGET[@REV]...\n"
+"\n"
+" If specified, REV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"输出指定文件或地å€(URL)的内容。\n"
+"用法:cat ç›®æ ‡[@修订版]...\n"
+"\n"
+" 如果指定了修订版,将从指定的修订版开始查找。\n"
+" \n"
-#: libsvn_subr/io.c:2861
-#, c-format
-msgid "First line of '%s' contains non-digit"
-msgstr "“%sâ€çš„第一行包å«äº†éžé˜¿æ‹‰ä¼¯æ•°å—"
+#: svn/main.c:251
+#, fuzzy
+msgid ""
+"Check out a working copy from a repository.\n"
+"usage: checkout URL[@REV]... [PATH]\n"
+"\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up.\n"
+"\n"
+" If PATH is omitted, the basename of the URL will be used as\n"
+" the destination. If multiple URLs are given each will be checked\n"
+" out into a sub-directory of PATH, with the name of the sub-directory\n"
+" being the basename of the URL.\n"
+msgstr ""
+"从档案库ç¾å‡ºå·¥ä½œæ‹·è´ã€‚\n"
+"用法:checkout 地å€[@版本]... [路径]\n"
+"\n"
+" 注æ„:如果路径忽略路径,地å€(URL)最末目录åä½œä¸ºç›®æ ‡è·¯å¾„ã€‚\n"
+" 如果给定了多个地å€(URL),æ¯ä¸ªåœ°å€(URL)å°†ç¾å‡ºåˆ°æŒ‡å®šè·¯å¾„ä¸\n"
+" 以地å€(URL)最末目录å为åå—çš„å目录ä¸ã€‚\n"
+"\n"
-#: libsvn_subr/nls.c:79
-#, fuzzy, c-format
-msgid "Can't convert string to UCS-2: '%s'"
-msgstr "ä¸èƒ½æŠŠå—符串转æ¢ä¸ºUCS-2:“%sâ€ã€‚"
+#: svn/main.c:265
+msgid ""
+"Recursively clean up the working copy, removing locks, resuming\n"
+"unfinished operations, etc.\n"
+"usage: cleanup [PATH...]\n"
+msgstr ""
+"递归清ç†å·¥ä½œæ‹·è´ï¼Œå޻除é”ï¼Œè®°å½•æœªå®Œæˆæ“作,ç‰ç‰ã€‚\n"
+"\n"
+"用法:cleanup [路径...]\n"
-#: libsvn_subr/nls.c:86
+#: svn/main.c:272
#, fuzzy
-msgid "Can't get module file name"
-msgstr "æ— æ³•èŽ·å–æ¨¡å—文件å"
-
-#: libsvn_subr/nls.c:101
-#, c-format
-msgid "Can't convert module path to UTF-8 from UCS-2: '%s'"
-msgstr "ä¸èƒ½æŠŠæ¨¡å—路径从UCS-2转æ¢ä¸ºUTF-8:“%sâ€"
-
-#: libsvn_subr/opt.c:146
msgid ""
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
"\n"
-"Valid options:\n"
+" A log message must be provided, but it can be empty. If it is not\n"
+" given by a --message or --file option, an editor will be started.\n"
+" If any targets are (or contain) locked items, those will be\n"
+" unlocked after a successful commit.\n"
msgstr ""
+"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"用法:commit [路径...]\n"
"\n"
-"有效选项:\n"
-
-#: libsvn_subr/opt.c:236
-msgid " arg"
-msgstr " 傿•°"
+" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
+" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
+" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
+" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
-#: libsvn_subr/opt.c:259
-#, c-format
+#: svn/main.c:280
+#, fuzzy
msgid ""
-"\"%s\": unknown command.\n"
+"Send changes from your working copy to the repository.\n"
+"usage: commit [PATH...]\n"
"\n"
+" A log message must be provided, but it can be empty.\n"
+" OS400 does not support the starting of an editor,\n"
+" so --message or --file must be used. If any targets are\n"
+" (or contain) locked items, those will be unlocked after a\n"
+" successful commit.\n"
msgstr ""
-"“%sâ€ï¼šæœªçŸ¥çš„命令。\n"
+"把改å˜ä»Žå·¥ä½œæ‹·è´å‘é€åˆ°æ¡£æ¡ˆåº“。\n"
+"用法:commit [路径...]\n"
"\n"
+" 日志信æ¯å¿…é¡»æä¾›ï¼Œä½†å¯ä»¥æ˜¯ç©ºçš„。\n"
+" 如果没有指定 --message 或 --file 选项,会å¯åŠ¨ä¸€ä¸ªç¼–è¾‘å™¨ã€‚\n"
+" å¦‚æžœä¸€äº›ç›®æ ‡ï¼ˆæˆ–åŒ…å«ï¼‰é”定了æ¡ç›®ï¼Œ\n"
+" 在一个æäº¤æˆåŠŸåŽè¿™äº›æ¡ç›®ä¼šè¢«è§£é™¤é”定。\n"
-#: libsvn_subr/opt.c:449
-msgid "Too few arguments"
-msgstr "傿•°å¤ªå°‘"
-
-#: libsvn_subr/opt.c:530
-#, c-format
-msgid "Syntax error parsing revision '%s'"
-msgstr "剖æžä¿®è®¢ç‰ˆâ€œ%sâ€æ—¶å‘ç”Ÿè¯æ³•错误"
-
-#: libsvn_subr/opt.c:607
-#, c-format
-msgid "URL '%s' is not properly URI-encoded"
-msgstr "地å€(URL)“%sâ€ä¸æ˜¯æ£ç¡®åœ°ä»¥ URI ç¼–ç "
-
-#: libsvn_subr/opt.c:613
-#, c-format
-msgid "URL '%s' contains a '..' element"
-msgstr "地å€(URL)“%sâ€åŒ…å« '..' å…ƒç´ "
-
-#: libsvn_subr/opt.c:642
-#, c-format
-msgid "Error resolving case of '%s'"
-msgstr "è§£æžâ€œ%sâ€æ—¶å‘生错误"
+#: svn/main.c:293
+msgid ""
+"Duplicate something in working copy or repository, remembering history.\n"
+"usage: copy SRC DST\n"
+"\n"
+" SRC and DST can each be either a working copy (WC) path or URL:\n"
+" WC -> WC: copy and schedule for addition (with history)\n"
+" WC -> URL: immediately commit a copy of WC to URL\n"
+" URL -> WC: check out URL into WC, schedule for addition\n"
+" URL -> URL: complete server-side copy; used to branch & tag\n"
+msgstr ""
+"åœ¨å·¥ä½œæ‹·è´æˆ–档案库ä¸å¤åˆ¶æ•°æ®ï¼Œæ¢å¤åކå²ã€‚\n"
+"用法:copy èµ·æº ç›®çš„\n"
+"\n"
+" èµ·æº å’Œ 目的 å¯ä»¥æ˜¯å·¥ä½œæ‹·è´è·¯å¾„或地å€(URL):\n"
+" å·¥ä½œæ‹·è´ -> å·¥ä½œæ‹·è´ ï¼š å¤åˆ¶å’Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ (包å«åކå²)\n"
+" å·¥ä½œæ‹·è´ -> 地å€(URL) : 马上æäº¤ä¸€ä¸ªå·¥ä½œæ‹·è´åˆ°åœ°å€(URL)\n"
+" 地å€(URL) -> å·¥ä½œæ‹·è´ ï¼š ç¾å‡ºåœ°å€(URL)åˆ°å·¥ä½œç›®å½•ï¼Œé€šè¿‡è°ƒåº¦è¿›è¡Œå¢žåŠ \n"
+" 地å€(URL) -> 地å€(URL) : 完全æœåŠ¡å™¨ç«¯å¤åˆ¶ï¼›ä¸€èˆ¬ç”¨äºŽåˆ†æ”¯å’Œæ ‡ç¾\n"
-#: libsvn_subr/opt.c:738
-#, c-format
+#: svn/main.c:305
msgid ""
-"%s, version %s\n"
-" compiled %s, %s\n"
+"Remove files and directories from version control.\n"
+"usage: 1. delete PATH...\n"
+" 2. delete URL...\n"
+"\n"
+" 1. Each item specified by a PATH is scheduled for deletion upon\n"
+" the next commit. Files, and directories that have not been\n"
+" committed, are immediately removed from the working copy.\n"
+" PATHs that are, or contain, unversioned or modified items will\n"
+" not be removed unless the --force option is given.\n"
"\n"
+" 2. Each item specified by a URL is deleted from the repository\n"
+" via an immediate commit.\n"
msgstr ""
-"%s,版本 %s\n"
-" 编译于 %s,%s\n"
+"从版本控制ä¸åˆ 除文件和目录。\n"
+"用法:1ã€delete 路径...\n"
+" 2ã€delete 地å€...\n"
+"\n"
+" 1ã€æ¯ä¸€ä¸ªé€šè¿‡è·¯å¾„æŒ‡å®šçš„é¡¹ç›®ä¼šè¢«è¿›è¡Œè°ƒåº¦åˆ é™¤ï¼Œä¸‹æ¬¡æäº¤æ—¶è¢«çœŸæ£åˆ 除。\n"
+" 文件和目录若未改å˜å°†é©¬ä¸Šä»Žå·¥ä½œæ‹·è´ä¸åˆ 除。\n"
+" 路径本身或包å«ä¸å—版本控制或已修改项目,\n"
+" ä¸ä¼šè¢«åˆ é™¤ï¼Œé™¤éžæŒ‡å®šäº† --force 选项。\n"
+" \n"
"\n"
+" 2ã€æ¯ä¸€ä¸ªåœ°å€(URL)指定的项目会被马上从档案库ä¸åˆ 除,并æäº¤ã€‚\n"
+" \n"
-# as-is
-#: libsvn_subr/opt.c:741
+#: svn/main.c:321
#, fuzzy
msgid ""
-"Copyright (C) 2000-2005 CollabNet.\n"
-"Subversion is open source software, see http://subversion.tigris.org/\n"
-"This product includes software developed by CollabNet (http://www.Collab."
-"Net/).\n"
+"Display the differences between two revisions or paths.\n"
+"usage: 1. diff [-c M | -r N[:M]] [TARGET[@REV]...]\n"
+" 2. diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] "
+"\\\n"
+" [PATH...]\n"
+" 3. diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]\n"
+"\n"
+" 1. Display the changes made to TARGETs as they are seen in REV between\n"
+" two revisions. TARGETs may be all working copy paths or all URLs.\n"
+" If TARGETs are working copy paths, N defaults to BASE and M to the\n"
+" working copy; if URLs, N must be specified and M defaults to HEAD.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" 2. Display the differences between OLD-TGT as it was seen in OLDREV and\n"
+" NEW-TGT as it was seen in NEWREV. PATHs, if given, are relative to\n"
+" OLD-TGT and NEW-TGT and restrict the output to differences for those\n"
+" paths. OLD-TGT and NEW-TGT may be working copy paths or URL[@REV]. \n"
+" NEW-TGT defaults to OLD-TGT if not specified. -r N makes OLDREV "
+"default\n"
+" to N, -r N:M makes OLDREV default to N and NEWREV default to M.\n"
+"\n"
+" 3. Shorthand for 'svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV]'\n"
"\n"
+" Use just 'svn diff' to display local modifications in a working copy.\n"
msgstr ""
-"ç‰ˆæƒæ‰€æœ‰ (C) 2000-2004 CollabNet.\n"
-"Subversion 是开放æº�代ç �软件,请看 http://subversion.tigris.org/\n"
-"æ¤äº§å“�包å�«çš„软件由 CollabNet (http://www.Collab.Net/)å¼€å�‘。\n"
+"显示两个路径ä¸çš„差异。\n"
+"用法:1ã€diff [-r N[:M]] [ç›®æ ‡[@REV]...]\n"
+" 2ã€diff [-r N[:M]] --old=æ—§ç›®æ ‡[@OLDREV] [--new=æ–°ç›®æ ‡[@NEWREV]] \\\n"
+" [PATH...]\n"
+" 3ã€diff æ—§URL[@OLDREV] æ–°URL[@NEWREV]\n"
"\n"
+" 1ã€æ˜¾ç¤ºåœ¨ä¿®è®¢ç‰ˆä¸å˜åœ¨çš„ ç›®æ ‡ï¼Œå®ƒ (们) 在两个ä¸åŒçš„修订版之间的\n"
+" å·®å¼‚ã€‚ç›®æ ‡ å¯ä»¥ä¸ºå·¥ä½œæ‹·è´è·¯å¾„,或是地å€(URL)。\n"
+"\n"
+" 如果任何的 ç›®æ ‡ 是工作拷è´çš„è¯ï¼ŒN 默认为 BASE,å¦åˆ™å°±å¿…é¡»åŠ ä»¥æŒ‡å®šã€‚\n"
+" 如果任何的 ç›®æ ‡ 是工作拷è´è·¯å¾„,M 默认为目å‰çš„工作版本,å¦åˆ™é»˜è®¤ä¸º\n"
+" HEAD。\n"
+"\n"
+" 2ã€æ˜¾ç¤ºäºŽæ—§ä¿®è®¢ç‰ˆçš„æ—§ç›®æ ‡ä¸ŽäºŽæ–°ä¿®è®¢ç‰ˆçš„æ–°ç›®æ ‡ä¹‹é—´çš„\n"
+" 差异。如果有指定路径的è¯ï¼Œå®ƒä»¬æ˜¯ç›¸å¯¹äºŽæ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡ï¼Œè€Œå·®å¼‚\n"
+" 的输出会é™åˆ¶åœ¨è¿™äº›è·¯å¾„ä¸ã€‚æ—§ç›®æ ‡ä¸Žæ–°ç›®æ ‡å¯ä¸ºå·¥ä½œè·¯å¾„或\n"
+" 地å€URL[@REV]ã€‚æ²¡æœ‰æŒ‡å®šæ–°ç›®æ ‡æ—¶ï¼Œé»˜è®¤ä¸º æ—§ç›®æ ‡ã€‚-r N 使得 æ—§ç›®æ ‡ \n"
+" 默认为 N,而 -r N:M 让 æ—§ç›®æ ‡ 默认为 Nï¼Œæ–°ç›®æ ‡ 默认为 M。\n"
+" 3ã€â€œsvn diff --old=旧地å€URL[@OLDREV] --new=新地å€URL[@NEWREV]â€çš„便æ·ç”¨"
+"法。\n"
+"\n"
+" 仅在使用“svn diffâ€æ—¶ï¼Œä¼šæ˜¾ç¤ºå·¥ä½œæ‹·è´ä¸çš„æœ¬åœ°ä¿®æ”¹ã€‚\n"
-#: libsvn_subr/opt.c:794
-#, c-format
-msgid "Type '%s help' for usage.\n"
-msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-
-#: libsvn_subr/path.c:1059
-#, c-format
-msgid "Couldn't determine absolute path of '%s'"
-msgstr "ä¸èƒ½ç¡®å®šâ€œ%sâ€çš„ç»å¯¹è·¯å¾„"
-
-#: libsvn_subr/path.c:1098
-#, c-format
-msgid "'%s' is neither a file nor a directory name"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶åä¹Ÿä¸æ˜¯ç›®å½•å"
-
-#: libsvn_subr/path.c:1204
-msgid "Can't determine the native path encoding"
-msgstr "ä¸èƒ½ç¡®å®šæœ¬åœ°è·¯å¾„ç¼–ç "
-
-#: libsvn_subr/path.c:1258
-#, fuzzy, c-format
-msgid "Invalid control character '0x%02x' in path '%s'"
-msgstr "在路径“%2$sâ€å˜åœ¨æ— 效的控制å—符â€0x%1$02x“"
-
-#: libsvn_subr/subst.c:1013 libsvn_wc/props.c:1441
-#, c-format
-msgid "File '%s' has inconsistent newlines"
-msgstr "文件“%sâ€å†…çš„æ¢è¡Œç¬¦ä¸ä¸€è‡´"
-
-#: libsvn_subr/utf.c:157
-msgid "Can't lock charset translation mutex"
-msgstr "ä¸èƒ½é”定å—符转æ¢äº’斥体"
-
-#: libsvn_subr/utf.c:175 libsvn_subr/utf.c:263
-msgid "Can't unlock charset translation mutex"
-msgstr "ä¸èƒ½è§£é”å—符转æ¢äº’斥体"
-
-#: libsvn_subr/utf.c:222
-#, fuzzy, c-format
-msgid "Can't create a character converter from native encoding to '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žæœ¬åœ°ç¼–ç 到“%sâ€çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:226
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to native encoding"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°æœ¬åœ°ç¼–ç çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:230
-#, fuzzy, c-format
-msgid "Can't create a character converter from '%s' to '%s'"
-msgstr "ä¸èƒ½åˆ›å»ºä»Žâ€œ%sâ€åˆ°â€œ%sâ€çš„å—符转æ¢å™¨"
-
-#: libsvn_subr/utf.c:454
-#, fuzzy, c-format
-msgid "Can't convert string from native encoding to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从本地编ç 转æ¢ä¸ºâ€%s“编ç 。"
+#: svn/main.c:351
+#, fuzzy
+msgid ""
+"Create an unversioned copy of a tree.\n"
+"usage: 1. export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2. export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1. Exports a clean directory tree from the repository specified by\n"
+" URL, at revision REV if it is given, otherwise at HEAD, into\n"
+" PATH. If PATH is omitted, the last component of the URL is used\n"
+" for the local directory name.\n"
+"\n"
+" 2. Exports a clean directory tree from the working copy specified by\n"
+" PATH1, at revision REV if it is given, otherwise at WORKING, into\n"
+" PATH2. If PATH2 is omitted, the last component of the PATH1 is used\n"
+" for the local directory name. If REV is not specified, all local\n"
+" changes will be preserved. Files not under version control will\n"
+" not be copied.\n"
+"\n"
+" If specified, PEGREV determines in which revision the target is first\n"
+" looked up.\n"
+msgstr ""
+"äº§ç”Ÿä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„ç›®å½•æ ‘æ‹·è´ã€‚\n"
+"用法:1ã€export [-r REV] URL[@PEGREV] [PATH]\n"
+" 2ã€export [-r REV] PATH1[@PEGREV] [PATH2]\n"
+"\n"
+" 1ã€ä»Ž URL æŒ‡å®šçš„æ¡£æ¡ˆåº“ï¼Œå¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH。如果有指定\n"
+" REV çš„è¯ï¼Œå†…容å³ä¸ºè¯¥ä¿®è®¢ç‰ˆçš„,å¦åˆ™å°±æ˜¯ HEAD 修订版。如果 PATH\n"
+" 被çœç•¥çš„è¯ï¼Œåœ°å€(URL)的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
+"\n"
+" 2ã€åœ¨å·¥ä½œæ‹·è´ä¸ï¼Œä»ŽæŒ‡å®šçš„ PATH1 å¯¼å‡ºä¸€ä¸ªå¹²å‡€çš„ç›®å½•æ ‘åˆ° PATH2。如果\n"
+" 有指定 REV çš„è¯ï¼Œä¼šä»ŽæŒ‡å®šçš„修订版导出,å¦åˆ™ä»Ž WORKING 导出。如果\n"
+" PATH2 被çœç•¥çš„è¯ï¼ŒPATH1 的最åŽéƒ¨ä»½ä¼šè¢«ç”¨æ¥å½“æˆæœ¬åœ°çš„目录å称。\n"
+" 如果没有指定 REV çš„è¯ï¼Œæ‰€æœ‰çš„æœ¬åœ°ä¿®æ”¹éƒ½è¿˜ä¼šä¿æŒè‘—,但是未纳入\n"
+" 版本控制的文件ä¸ä¼šè¢«å¤åˆ¶ã€‚\n"
+"\n"
+" 如果指定了 PEGREV ,将从指定的修订版本开始查找。\n"
+"\n"
-#: libsvn_subr/utf.c:458
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to native encoding:"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºæœ¬åœ°ç¼–ç 。"
+#: svn/main.c:374
+msgid ""
+"Describe the usage of this program or its subcommands.\n"
+"usage: help [SUBCOMMAND...]\n"
+msgstr ""
+"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
+"用法:help [å命令...]\n"
-#: libsvn_subr/utf.c:462
-#, fuzzy, c-format
-msgid "Can't convert string from '%s' to '%s':"
-msgstr "ä¸èƒ½æŠŠå—符串从â€%s“编ç 转æ¢ä¸ºâ€%s“编ç 。"
+#: svn/main.c:380
+#, fuzzy
+msgid ""
+"Commit an unversioned file or tree into the repository.\n"
+"usage: import [PATH] URL\n"
+"\n"
+" Recursively commit a copy of PATH to URL.\n"
+" If PATH is omitted '.' is assumed.\n"
+" Parent directories are created as necessary in the repository.\n"
+" If PATH is a directory, the contents of the directory are added\n"
+" directly under URL.\n"
+msgstr ""
+"æäº¤æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„æ–‡ä»¶æˆ–ç›®å½•æ ‘è‡³æ¡£æ¡ˆåº“ã€‚\n"
+"用法:import [PATH] URL\n"
+"\n"
+" 递归地æäº¤ PATH 的拷è´è‡³åœ°å€(URL)。如果çœç•¥ PATH,默认为 '.'。父目录会\n"
+" ä¾éœ€è¦äºŽæ¡£æ¡ˆåº“内建立。\n"
-#: libsvn_subr/utf.c:506
-#, fuzzy, c-format
+#: svn/main.c:393
+#, fuzzy
msgid ""
-"Safe data '%s' was followed by non-ASCII byte %d: unable to convert to/from "
-"UTF-8"
-msgstr "安全数æ®â€%sâ€œæ˜¯åŽæŽ¥éžASCIIå—节%d:ä¸èƒ½è½¬æ¢åˆ°/从 UTF-8"
+"Display information about a local or remote item.\n"
+"usage: info [TARGET[@REV]...]\n"
+"\n"
+" Print information about each TARGET (default: '.')\n"
+" TARGET may be either a working-copy path or URL. If specified, REV\n"
+" determines in which revision the target is first looked up.\n"
+msgstr ""
+"显示本地或远端æ¡ç›®çš„ä¿¡æ¯ã€‚\n"
+"用法:info [TARGET...]\n"
+"\n"
+" 显示æ¯ä¸ª TARGET çš„ä¿¡æ¯ (默认:'.')。\n"
+" TARGET å¯ä»¥æ˜¯å·¥ä½œç›®å½•或地å€(URL)。\n"
-#: libsvn_subr/utf.c:514
-#, c-format
+#: svn/main.c:403
+#, fuzzy
msgid ""
-"Non-ASCII character (code %d) detected, and unable to convert to/from UTF-8"
-msgstr "检测到éžASCIIå—符 (代ç %d),并且ä¸èƒ½è½¬æ¢åˆ°UTF-8(或从UTF-8转æ¢)"
+"List directory entries in the repository.\n"
+"usage: list [TARGET[@REV]...]\n"
+"\n"
+" List each TARGET file and the contents of each TARGET directory as\n"
+" they exist in the repository. If TARGET is a working copy path, the\n"
+" corresponding repository URL will be used. If specified, REV determines\n"
+" in which revision the target is first looked up.\n"
+"\n"
+" The default TARGET is '.', meaning the repository URL of the current\n"
+" working directory.\n"
+"\n"
+" With --verbose, the following fields will be shown for each item:\n"
+"\n"
+" Revision number of the last commit\n"
+" Author of the last commit\n"
+" If locked, the letter 'O'. (Use 'svn info URL' to see details)\n"
+" Size (in bytes)\n"
+" Date and time of the last commit\n"
+msgstr ""
+"列出档案库ä¸çš„目录项目。\n"
+"用法:list [TARGET[@REV]...]\n"
+"\n"
+" 列出æ¯ä¸ª TARGET 文件与æ¯ä¸ªæ¡£æ¡ˆåº“里的 TARGET 目录。如果 TARGET 是\n"
+" 工作拷è´çš„路径,那么相对应的档案库地å€(URL)就会被拿æ¥ä½¿ç”¨ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+"\n"
+" 默认的 TARGET 是 '.',表示目å‰å·¥ä½œæ‹·è´ç›®å½•的档案库地å€(URL)。\n"
+"\n"
+" åŠ ä¸Š --verbose çš„è¯ï¼Œä»¥ä¸‹çš„æ ä½ä¼šæ˜¾ç¤ºå‡ºæ¯ä¸ªæ¡ç›®çš„ä¿¡æ¯ï¼š\n"
+"\n"
+" 剿¬¡æäº¤çš„修订版å·ç \n"
+" 剿¬¡æäº¤çš„作者\n"
+" 如果被é”å®šï¼Œæ˜¾ç¤ºå—æ¯ 'O'。(使用‘svn info URLâ€™æ¥æŸ¥çœ‹è¯¦ç»†ä¿¡æ¯ï¼‰\n"
+" å¤§å° (以å—节为å•ä½)\n"
+" 剿¬¡æäº¤çš„æ—¥æœŸä¸Žæ—¶é—´\n"
-#: libsvn_subr/utf.c:556
-#, c-format
+#: svn/main.c:425
+#, fuzzy
msgid ""
-"Valid UTF-8 data\n"
-"(hex:%s)\n"
-"followed by invalid UTF-8 sequence\n"
-"(hex:%s)"
+"Lock working copy paths or URLs in the repository, so that\n"
+"no other user can commit changes to them.\n"
+"usage: lock TARGET...\n"
+"\n"
+" Use --force to steal the lock from another user or working copy.\n"
msgstr ""
-"有效 UTF-8 æ•°æ®\n"
-"(16进制:%s)\n"
-"åŽæŽ¥æ— æ•ˆ UTF-8 åºåˆ—\n"
-"(16进制:%s)"
-
-#: libsvn_subr/validate.c:48
-#, c-format
-msgid "MIME type '%s' has empty media type"
-msgstr "MIME 类别“%sâ€å«æœ‰ç©ºçš„媒体类别"
-
-#: libsvn_subr/validate.c:53
-#, c-format
-msgid "MIME type '%s' does not contain '/'"
-msgstr "MIME 类别“%sâ€æ²¡åŒ…å« '/'"
-
-#: libsvn_subr/validate.c:58
-#, c-format
-msgid "MIME type '%s' ends with non-alphanumeric character"
-msgstr "MIME 类别“%sâ€ä»¥éžå—æ¯ä¸Žæ•°å—å—符结æŸ"
+"在档案库ä¸é”定工作目录或地å€(URL),\n"
+"使得其他用户ä¸èƒ½å‘它æäº¤ä¿®æ”¹ã€‚\n"
+"用法:lock TARGET...\n"
+"\n"
+" 使用 -force å¯ä»¥ä»Žå…¶ä»–用户或工作拷è´çªƒå–到é”。\n"
-#: libsvn_subr/version.c:74
-#, c-format
-msgid "Version mismatch in '%s': found %d.%d.%d%s, expected %d.%d.%d%s"
-msgstr "“%sâ€çš„版本ä¸ä¸€è‡´ï¼šæ‰¾åˆ° %d.%d.%d%s,预期 %d.%d.%d%s"
+#: svn/main.c:433
+#, fuzzy
+msgid "read lock comment from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
-#: libsvn_subr/xml.c:400
-#, c-format
-msgid "Malformed XML: %s at line %d"
-msgstr "畸形的XML:%s 在第 %d 行"
+#: svn/main.c:434
+#, fuzzy
+msgid "specify lock comment ARG"
+msgstr "指定æäº¤ä¿¡æ¯ARG"
-#: libsvn_wc/adm_crawler.c:379
-#, c-format
+#: svn/main.c:437
+#, fuzzy
msgid ""
-"The entry '%s' is no longer a directory; remove the entry before updating"
-msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-
-#: libsvn_wc/adm_crawler.c:633
-msgid "Error aborting report"
-msgstr "å–æ¶ˆæŠ¥å‘Šæ—¶å‘生错误"
-
-#: libsvn_wc/adm_crawler.c:823
-#, c-format
-msgid "Checksum mismatch for '%s'; expected '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ä¸€è‡´ï¼šé¢„期“%sâ€ï¼Œå®žé™…:“%sâ€"
-
-#: libsvn_wc/adm_crawler.c:849
-msgid "Error opening local file"
-msgstr "打开本地文件时å‘生错误"
-
-# plz leave this as-is
-#: libsvn_wc/adm_files.c:202
-msgid "Bad type indicator"
-msgstr "错误的类型"
-
-#: libsvn_wc/adm_files.c:394
-msgid "APR_APPEND not supported for adm files"
-msgstr "APR_APPEND 䏿”¯æŒç®¡ç†æ–‡ä»¶"
+"Show the log messages for a set of revision(s) and/or file(s).\n"
+"usage: 1. log [PATH]\n"
+" 2. log URL[@REV] [PATH...]\n"
+"\n"
+" 1. Print the log messages for a local PATH (default: '.').\n"
+" The default revision range is BASE:1.\n"
+"\n"
+" 2. Print the log messages for the PATHs (default: '.') under URL.\n"
+" If specified, REV determines in which revision the URL is first\n"
+" looked up. The default revision range is HEAD:1.\n"
+"\n"
+" With -v, also print all affected paths with each log message.\n"
+" With -q, don't print the log message body itself (note that this is\n"
+" compatible with -v).\n"
+"\n"
+" Each log message is printed just once, even if more than one of the\n"
+" affected paths for that revision were explicitly requested. Logs\n"
+" follow copy history by default. Use --stop-on-copy to disable this\n"
+" behavior, which can be useful for determining branchpoints.\n"
+"\n"
+" Examples:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
+msgstr ""
+"显示一组修订版与/或文件的æäº¤æ—¥å¿—ä¿¡æ¯ã€‚\n"
+"用法:1ã€log [PATH]\n"
+" 2ã€log URL [PATH...]\n"
+"\n"
+" 1ã€æ˜¾ç¤ºæœ¬åœ° PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
+" BASE:1。\n"
+"\n"
+" 2ã€æ˜¾ç¤º URL 下的 PATH (默认:'.') 的日志信æ¯ã€‚默认的修订版范围为\n"
+" HEAD:1。\n"
+"\n"
+" 使用 -v 时,一并于æ¯ä¸ªæ—¥å¿—ä¿¡æ¯ä¸æ˜¾ç¤ºå—å½±å“的路径。\n"
+" 使用 -q æ—¶ï¼Œä¸æ˜¾ç¤ºæ—¥å¿—ä¿¡æ¯ä¸»ä½“ (请注æ„,这å¯å’Œ -v å¹¶å˜)。\n"
+"\n"
+" æ¯ä¸€ä¸ªæ—¥å¿—ä¿¡æ¯åªä¼šæ˜¾ç¤ºä¸€æ¬¡è€Œå·²ï¼Œå°±ç®—明确地指定多个被它所影å“的路径\n"
+" 亦åŒã€‚默认的显示信æ¯ä¼šè¿½æº¯å¤åˆ¶åކå²ï¼›ä½¿ç”¨ --stop-on-copy å¯ä»¥å…³é—è¿™\n"
+" 个功能,这在找出分支点的很方便。\n"
+"\n"
+" 范例:\n"
+" svn log\n"
+" svn log foo.c\n"
+" svn log http://www.example.com/repo/project/foo.c\n"
+" svn log http://www.example.com/repo/project foo.c bar.c\n"
-#: libsvn_wc/adm_files.c:437
+#: svn/main.c:467
+#, fuzzy
msgid ""
-"Your .svn/tmp directory may be missing or corrupt; run 'svn cleanup' and try "
-"again"
-msgstr "您的 .svn/tmp 目录å¯èƒ½ä¸¢å¤±æˆ–æŸå;请执行“svn cleanupâ€ï¼Œç„¶åŽå†è¯•一次"
-
-#: libsvn_wc/adm_files.c:612 libsvn_wc/lock.c:378 libsvn_wc/lock.c:631
-#, c-format
-msgid "'%s' is not a working copy"
-msgstr "“%sâ€ä¸æ˜¯å·¥ä½œæ‹·è´"
-
-#: libsvn_wc/adm_files.c:619 libsvn_wc/adm_files.c:687
-#: libsvn_wc/adm_files.c:749
-msgid "No such thing as 'base' working copy properties!"
-msgstr "没有 '基础' 工作拷è´å±žæ€§è¿™æ ·çš„东西"
-
-#: libsvn_wc/adm_files.c:818 libsvn_wc/util.c:51
-#, c-format
-msgid "'%s' is not a directory"
-msgstr "“%sâ€ä¸æ˜¯ç›®å½•"
-
-#: libsvn_wc/adm_files.c:872
-#, c-format
-msgid "No entry for '%s'"
-msgstr "没有“%sâ€çš„项目"
-
-#: libsvn_wc/adm_files.c:884
-#, c-format
-msgid "Revision %ld doesn't match existing revision %ld in '%s'"
-msgstr "修订版 %ld ä¸ç¬¦åˆçŽ°æœ‰çš„ä¿®è®¢ç‰ˆ %ld 于“%sâ€ä¸"
-
-#: libsvn_wc/adm_files.c:893
-#, c-format
-msgid "URL '%s' doesn't match existing URL '%s' in '%s'"
-msgstr "地å€(URL)“%sâ€ä¸ç¬¦åˆçŽ°æœ‰çš„åœ°å€(URL)“%sâ€äºŽâ€œ%sâ€ä¸"
-
-#: libsvn_wc/adm_ops.c:223
-#, c-format
-msgid "Unrecognized node kind: '%s'"
-msgstr "æ— æ³•ç¡®è®¤çš„èŠ‚ç‚¹ç§ç±»ï¼šâ€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:443 libsvn_wc/update_editor.c:946
-#: libsvn_wc/update_editor.c:1347
-#, c-format
-msgid "Error writing log file for '%s'"
-msgstr "写入“%sâ€çš„æ—¥å¿—文件时å‘生错误"
-
-#: libsvn_wc/adm_ops.c:977
-#, c-format
-msgid "'%s' not found"
-msgstr "找ä¸åˆ°â€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:981
-#, c-format
-msgid "Unsupported node kind for path '%s'"
-msgstr "路径“%sâ€ä¸ºä¸æ”¯æŒçš„节点ç§ç±»"
-
-#: libsvn_wc/adm_ops.c:1011
-#, c-format
-msgid "'%s' is already under version control"
-msgstr "“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+"Apply the differences between two sources to a working copy path.\n"
+"usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1. In the first form, the source URLs are specified at revisions\n"
+" N and M. These are the two sources to be compared. The revisions\n"
+" default to HEAD if omitted.\n"
+"\n"
+" 2. In the second form, the URLs corresponding to the source working\n"
+" copy paths define the sources to be compared. The revisions must\n"
+" be specified.\n"
+"\n"
+" 3. In the third form, SOURCE can be a URL, or working copy item\n"
+" in which case the corresponding URL is used. This URL in\n"
+" revision REV is compared as it existed between revisions N and \n"
+" M. If REV is not specified, HEAD is assumed.\n"
+" The '-c M' option is equivalent to '-r N:M' where N = M-1.\n"
+" Using '-c -M' does the reverse: '-r M:N' where N = M-1.\n"
+"\n"
+" WCPATH is the working copy path that will receive the changes.\n"
+" If WCPATH is omitted, a default value of '.' is assumed, unless\n"
+" the sources have identical basenames that match a file within '.':\n"
+" in which case, the differences will be applied to that file.\n"
+msgstr ""
+"å°†ä¸¤ä¸ªæ¥æºä¹‹é—´çš„差异应用至工作拷è´è·¯å¾„。\n"
+"用法:1ã€merge sourceURL1[@N] sourceURL2[@M] [WCPATH]\n"
+" 2ã€merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]\n"
+" 3ã€merge -r N:M SOURCE[@REV] [WCPATH]\n"
+"\n"
+" 1ã€ç¬¬ä¸€ç§å½¢å¼ä¸ï¼Œæ¥æº URL å„被指定到修订版 N 与 M。这两个就是作为\n"
+" æ¯”è¾ƒçš„æ¥æºã€‚如果没有指定修订版的è¯ï¼Œé»˜è®¤ä¸º HEAD。\n"
+"\n"
+" 2ã€åœ¨ç¬¬äºŒç§å½¢å¼ä¸ï¼Œå¯¹åº”åˆ°ä¸¤ä¸ªæ¥æºçš„工作拷è´è·¯å¾„çš„ URL 定义出用以\n"
+" è¿›è¡Œæ¯”è¾ƒçš„æ¥æºã€‚这里必须指定修订版。\n"
+"\n"
+" 3ã€ç¬¬ä¸‰ç§å½¢å¼ä¸ï¼ŒSOURCE å¯ä¸º URL 或工作拷è´é¡¹ç›®ï¼ŒåŽè€…会使用对应的\n"
+" 地å€(URL)。在修订版 REV çš„ 地å€(URL) 会以它å˜åœ¨äºŽä¿®è®¢ç‰ˆ N 与 M 的路径æ¥"
+"作\n"
+" 比较。如果未指定 REV,就会å‡è®¾ä¸º HEAD。\n"
+"\n"
+" WCPATH æ˜¯æŽ¥å—æ”¹å˜çš„工作拷è´è·¯å¾„。如果çœç•¥ WCPATH çš„è¯ï¼Œé»˜è®¤å€¼ä¸º\n"
+" '.'ï¼Œé™¤éžæ¥æºçš„主è¦åå—ç¬¦åˆ '.' 里的æŸä¸ªæ–‡ä»¶ï¼›åœ¨è¿™ç§æƒ…况下,文件\n"
+" 差异将会直接应用至该文件去。\n"
-#: libsvn_wc/adm_ops.c:1023
-#, c-format
+#: svn/main.c:496
msgid ""
-"Can't replace '%s' with a node of a differing type; commit the deletion, "
-"update the parent, and then add '%s'"
-msgstr "æ— æ³•ä»¥ä¸åŒç§ç±»èŠ‚ç‚¹æ¥æ›¿æ¢â€œ%sâ€ï¼šè¯·æäº¤è¯¥åˆ é™¤ï¼Œæ›´æ–°çˆ¶é¡¹ç›®ï¼Œå†æ–°å¢žâ€œ%sâ€"
-
-#: libsvn_wc/adm_ops.c:1039
-#, c-format
-msgid "Can't find parent directory's entry while trying to add '%s'"
-msgstr "在å°è¯•新增“%sâ€æ—¶ï¼Œæ— 法找到父目录的项目"
-
-#: libsvn_wc/adm_ops.c:1044
-#, c-format
-msgid "Can't add '%s' to a parent directory scheduled for deletion"
-msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²é¢„定è¦åˆ 除的父目录"
-
-#: libsvn_wc/adm_ops.c:1060
-#, fuzzy, c-format
-msgid "The URL '%s' has different repository root than its parent"
-msgstr "地å€(URL)“%sâ€ä¸Žå®ƒçš„ä¸Šçº§çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-
-#: libsvn_wc/adm_ops.c:1334 libsvn_wc/adm_ops.c:1339 libsvn_wc/adm_ops.c:1375
-#, c-format
-msgid "Error restoring props for '%s'"
-msgstr "还原“%sâ€çš„属性时å‘生错误"
+"Create a new directory under version control.\n"
+"usage: 1. mkdir PATH...\n"
+" 2. mkdir URL...\n"
+"\n"
+" Create version controlled directories.\n"
+"\n"
+" 1. Each directory specified by a working copy PATH is created locally\n"
+" and scheduled for addition upon the next commit.\n"
+"\n"
+" 2. Each directory specified by a URL is created in the repository via\n"
+" an immediate commit.\n"
+"\n"
+" In both cases, all the intermediate directories must already exist.\n"
+msgstr ""
+"建立纳入版本控制下的新目录。\n"
+"用法:1ã€mkdir PATH...\n"
+" 2ã€mkdir URL...\n"
+"\n"
+" 建立版本控制的目录。\n"
+"\n"
+" 1ã€æ¯ä¸€ä¸ªä»¥å·¥ä½œæ‹·è´ PATH æŒ‡å®šçš„ç›®å½•ï¼Œéƒ½ä¼šå»ºç«‹åœ¨æœ¬åœ°ç«¯ï¼Œå¹¶ä¸”åŠ å…¥æ–°å¢ž\n"
+" 调度,以待下一次的æäº¤ã€‚\n"
+"\n"
+" 2ã€æ¯ä¸ªä»¥åœ°å€(URL)指定的目录,都会é€è¿‡ç«‹å³æäº¤äºŽæ¡£æ¡ˆåº“ä¸å»ºç«‹ã€‚\n"
+"\n"
+" 在这两个情况下,所有的ä¸é—´ç›®å½•都必须事先å˜åœ¨ã€‚\n"
-#: libsvn_wc/adm_ops.c:1349
-#, c-format
-msgid "Error removing props for '%s'"
-msgstr "移除“%sâ€çš„属性时å‘生错误"
+#: svn/main.c:513
+#, fuzzy
+msgid ""
+"Move and/or rename something in working copy or repository.\n"
+"usage: move SRC DST\n"
+"\n"
+" Note: this subcommand is equivalent to a 'copy' and 'delete'.\n"
+" Note: the --revision option has no use and is deprecated.\n"
+"\n"
+" SRC and DST can both be working copy (WC) paths or URLs:\n"
+" WC -> WC: move and schedule for addition (with history)\n"
+" URL -> URL: complete server-side rename.\n"
+msgstr ""
+"移动或更åå·¥ä½œæ‹·è´æˆ–档案库里的东西。\n"
+"用法:move SRC DST\n"
+"\n"
+" 注æ„: 本å命令ç‰åŒäºŽ 'copy' ç„¶åŽ 'delete'。\n"
+"\n"
+" SRC å¯åŒæ—¶ä¸ºå·¥ä½œæ‹·è´ (WC) 路径或地å€(URL):\n"
+" WC -> WC : ç§»åŠ¨å¹¶åŠ å…¥æ–°å¢žè°ƒåº¦ (连åŒåކå²è®°å½•)\n"
+" URL -> URL : 完全是æœåŠ¡å™¨ç«¯çš„æ›´å。\n"
-#: libsvn_wc/adm_ops.c:1421
-#, c-format
-msgid "Error restoring text for '%s'"
-msgstr "还原“%sâ€æ–‡å—æ—¶å‘生错误"
+#: svn/main.c:526
+#, fuzzy
+msgid ""
+"Remove a property from files, dirs, or revisions.\n"
+"usage: 1. propdel PROPNAME [PATH...]\n"
+" 2. propdel PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Removes versioned props in working copy.\n"
+" 2. Removes unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"移除目录,文件,或修订版的属性。\n"
+"用法:1ã€propdel PROPNAME [PATH...]\n"
+" 2ã€propdel PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€ç§»é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
+" 2ã€ç§»é™¤æ— 版本控制的远端档案库修订版属性。\n"
-#: libsvn_wc/adm_ops.c:1522
-#, c-format
-msgid "Cannot revert: '%s' is not under version control"
-msgstr "æ— æ³•æ¢å¤ï¼šâ€œ%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+#: svn/main.c:538
+#, fuzzy
+msgid ""
+"Edit a property with an external editor.\n"
+"usage: 1. propedit PROPNAME PATH...\n"
+" 2. propedit PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Edits versioned props in working copy.\n"
+" 2. Edits unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"ä»¥å¤–éƒ¨ç¼–è¾‘å™¨ç¼–è¾‘ç›®æ ‡çš„å±žæ€§ PROPNAME。\n"
+"用法:1ã€propedit PROPNAME PATH...\n"
+" 2ã€propedit PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€ç¼–辑纳入版本控制的工作拷è´å±žæ€§ã€‚\n"
+" 2ã€ç¼–è¾‘æ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
-#: libsvn_wc/adm_ops.c:1550
-#, c-format
-msgid "Cannot revert '%s': unsupported entry node kind"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šä¸æ”¯æŒçš„项目节点ç§ç±»"
+#: svn/main.c:551
+#, fuzzy
+msgid ""
+"Print the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propget PROPNAME [TARGET[@REV]...]\n"
+" 2. propget PROPNAME --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Prints versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Prints unversioned remote prop on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" By default, this subcommand will add an extra newline to the end\n"
+" of the property values so that the output looks pretty. Also,\n"
+" whenever there are multiple paths involved, each property value\n"
+" is prefixed with the path with which it is associated. Use\n"
+" the --strict option to disable these beautifications (useful,\n"
+" for example, when redirecting binary property values to a file).\n"
+msgstr ""
+"显示目录,文件,或修订版的属性内容。\n"
+"用法:1ã€propget PROPNAME [TARGET[@REV]...]\n"
+" 2ã€propget PROPNAME --revprop -r REV [URL]\n"
+"\n"
+" 1ã€æ˜¾ç¤ºçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„工作拷è´å±žæ€§ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2ã€æ˜¾ç¤ºæ— 版本控制的远端档案库修订版属性。\n"
+"\n"
+" 本åå‘½ä»¤é»˜è®¤ä¼šåœ¨å±žæ€§å†…å®¹åŠ ä¸Šé¢å¤–çš„æ¢è¡Œç¬¦ï¼Œå¦‚æ¤å¯å¾—到较\n"
+" 美观的输出。å¦å¤–ï¼Œå½“åŒæ—¶å¤„ç†å¤šä¸ªè·¯å¾„时,æ¯ä¸€ä¸ªå±žæ€§å†…å®¹ä¼šåŠ ä¸Šå®ƒ\n"
+" 所对应到的路径。使用 --strict 选项以关é—这项美化行为 (举例æ¥è¯´ï¼Œ\n"
+" 将二进制属性内容é‡å¯¼è‡³ä¸€ä¸ªæ–‡ä»¶æ—¶å°±å¾ˆæœ‰ç”¨)。\n"
-#: libsvn_wc/adm_ops.c:1561
-#, c-format
-msgid "Cannot revert '%s': unsupported node kind in working copy"
-msgstr "æ— æ³•æ¢å¤â€œ%sâ€ï¼šå·¥ä½œæ‹·è´ä¸æœ‰ä¸æ”¯æŒçš„节点ç§ç±»"
+#: svn/main.c:570
+#, fuzzy
+msgid ""
+"List all properties on files, dirs, or revisions.\n"
+"usage: 1. proplist [TARGET[@REV]...]\n"
+" 2. proplist --revprop -r REV [TARGET]\n"
+"\n"
+" 1. Lists versioned props. If specified, REV determines in which\n"
+" revision the target is first looked up.\n"
+" 2. Lists unversioned remote props on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+msgstr ""
+"列出所有目录,文件,或修订版的属性。\n"
+"用法:1ã€proplist [TARGET[@REV]...]\n"
+" 2ã€proplist --revprop -r REV [URL]\n"
+"\n"
+" 1ã€åˆ—出纳入版本管ç†çš„工作拷è´å±žæ€§ã€‚\n"
+" 如果指定了 REV,将从指定的修订版开始查找。\n"
+" 2ã€åˆ—å‡ºæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå±žæ€§æ”¹å˜ã€‚\n"
-#: libsvn_wc/adm_ops.c:1609
+#: svn/main.c:582
+#, fuzzy
msgid ""
-"Cannot revert addition of current directory; please try again from the "
-"parent directory"
-msgstr "æ— æ³•æ¢å¤ç›®å‰ç›®å½•的新增;请从父目录å†è¯•一次"
+"Set the value of a property on files, dirs, or revisions.\n"
+"usage: 1. propset PROPNAME PROPVAL PATH...\n"
+" 2. propset PROPNAME --revprop -r REV PROPVAL [TARGET]\n"
+"\n"
+" 1. Creates a versioned, local propchange in working copy.\n"
+" 2. Creates an unversioned, remote propchange on repos revision.\n"
+" TARGET only determines which repository to access.\n"
+"\n"
+" The value may be provided with the --file option instead of PROPVAL.\n"
+"\n"
+" Note: svn recognizes the following special versioned properties\n"
+" but will store any arbitrary properties set:\n"
+" svn:ignore - A newline separated list of file patterns to ignore.\n"
+" svn:keywords - Keywords to be expanded. Valid keywords are:\n"
+" URL, HeadURL - The URL for the head version of the "
+"object.\n"
+" Author, LastChangedBy - The last person to modify the file.\n"
+" Date, LastChangedDate - The date/time the object was last "
+"modified.\n"
+" Rev, Revision, - The last revision the object changed.\n"
+" LastChangedRevision\n"
+" Id - A compressed summary of the previous\n"
+" 4 keywords.\n"
+" svn:executable - If present, make the file executable.\n"
+" svn:eol-style - One of 'native', 'LF', 'CR', 'CRLF'.\n"
+" svn:mime-type - The mimetype of the file. Used to determine\n"
+" whether to merge the file, and how to serve it from Apache.\n"
+" A mimetype beginning with 'text/' (or an absent mimetype) is\n"
+" treated as text. Anything else is treated as binary.\n"
+" svn:externals - A newline separated list of module specifiers,\n"
+" each of which consists of a relative directory path, optional\n"
+" revision flags, and an URL. For example\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - If present, indicates that the file should be locked\n"
+" before it is modified. Makes the working copy file read-only\n"
+" when it is not locked.\n"
+" The svn:keywords, svn:executable, svn:eol-style, svn:mime-type and\n"
+" svn:needs-lock properties cannot be set on a directory. A non-recursive\n"
+" attempt will fail, and a recursive attempt will set the property\n"
+" only on the file children of the directory.\n"
+msgstr ""
+"设定目录,文件,或修订版的 PROPNAME 内容为 PROPVAL。\n"
+"用法:1ã€propset PROPNAME [PROPVAL | -F VALFILE] PATH...\n"
+" 2ã€propset PROPNAME --revprop -r REV [PROPVAL | -F VALFILE] [URL]\n"
+"\n"
+" 1ã€åœ¨å·¥ä½œæ‹·è´ä¸å»ºç«‹ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶çš„æœ¬åœ°å±žæ€§æ”¹å˜ã€‚\n"
+" 2ã€å¯¹æ¡£æ¡ˆåº“ä¿®è®¢ç‰ˆå»ºç«‹ä¸€ä¸ªæ— ç‰ˆæœ¬æŽ§åˆ¶çš„è¿œç«¯å±žæ€§æ”¹å˜ã€‚\n"
+"\n"
+" 注æ„:svn 承认以下å—版本控制的特殊属性,ä¸è¿‡è¿˜æ˜¯å¯ä»¥å‚¨å˜ä»»æ„的属性:\n"
+" svn:ignore - 以æ¢è¡Œç¬¦éš”å¼€çš„å¿½ç•¥æ–‡ä»¶æ ·å¼åˆ—表。\n"
+" svn:keywords - 欲展开的关键å—。有效的关键å—为。\n"
+" URL, HeadURL - 本物件于档案库 HEAD 版的地å€(URL)。\n"
+" Author, LastChangedBy - 最åŽä¸€æ¬¡ä¿®æ”¹æ–‡ä»¶çš„使用者。\n"
+" Date, LastChangedDate - 本物件最近一次改å˜çš„æ—¥æœŸã€‚\n"
+" Rev, Revision, - 本物件最åŽä¸€æ¬¡æ”¹å˜çš„修订版。\n"
+" LastChangedRevision\n"
+" Id - å‰å››ä¸ªå…³é”®å—的压缩摘è¦ã€‚\n"
+" svn:executable - 如果å¯ä»¥çš„è¯ï¼Œè®©æ–‡ä»¶å˜æˆå¯æ‰§è¡Œæ–‡ä»¶ã€‚è¿™ä¸ªå±žæ€§æ— æ³•\n"
+" 对目录设定。éžé€’å½’çš„æ“作会失败,而递归的æ“作åªä¼šè®¾å®šè¯¥ç›®å½•\n"
+" 下的文件å项目。\n"
+" svn:eol-style - 'native','LF','CR','CRLF' å…¶ä¸ä¹‹ä¸€ã€‚\n"
+" svn:mime-type - 文件的 mime 类别。用以决定是å¦è¯¥åˆå¹¶è¯¥æ–‡ä»¶ï¼Œ\n"
+" 或是该如何从 Apache 处ç†å®ƒã€‚以 'text/' (或是没有指定 mime 类别)\n"
+" 开始的会被视为文å—,其它则为二进制数æ®ã€‚\n"
+" svn:externals - 以æ¢è¡Œç¬¦éš”å¼€çš„æ¨¡å—æŒ‡å®šåˆ—表,æ¯ä¸€ä¸ªéƒ½åŒ…å«äº†ä¸€ä¸ª\n"
+" ç›¸å¯¹ç›®å½•è·¯å¾„ï¼Œé€‰æ‹©æ€§çš„ä¿®è®¢ç‰ˆæ ‡å¿—ï¼Œä»¥åŠä¸€ä¸ªåœ°å€(URL)。举例说明\n"
+" foo http://example.com/repos/zig\n"
+" foo/bar -r 1234 http://example.com/repos/zag\n"
+" svn:needs-lock - 如果å¯ä»¥ï¼ŒæŒ‡å‡ºæ–‡ä»¶åœ¨ä¿®æ”¹å‰åº”该是é”定的。 当没有被"
+"é”å®šï¼ŒæŠŠå·¥ä½œæ‹·è´æ–‡ä»¶è®¾ç½®ä¸ºåªè¯»ã€‚\n"
+" svn:keywords, svn:executable, svn:eol-style, svn:mime-type ä»¥åŠ svn:"
+"needs-lock 属性ä¸èƒ½è®¾ç½®åœ¨ä¸€ä¸ªç›®å½•上。 一个éžé€’å½’æ“作会失败, 一个递归æ“"
+"作åªä¼šåœ¨ç›®å½•下的文件设置属性。\n"
-#: libsvn_wc/adm_ops.c:1631
-#, c-format
-msgid "Unknown or unexpected kind for path '%s'"
-msgstr "路径“%sâ€æœ‰æœªçŸ¥æˆ–æ„æƒ³ä¸åˆ°çš„ç§ç±»"
+#: svn/main.c:624
+#, fuzzy
+msgid "read property value from file ARG"
+msgstr "从文件 ARG è¯»å–æ•°æ®"
-#: libsvn_wc/adm_ops.c:1834
-#, c-format
-msgid "File '%s' has local modifications"
-msgstr "文件“%sâ€æœ‰æœ¬åœ°çš„修改"
+#: svn/main.c:627
+msgid ""
+"Remove 'conflicted' state on working copy files or directories.\n"
+"usage: resolved PATH...\n"
+"\n"
+" Note: this subcommand does not semantically resolve conflicts or\n"
+" remove conflict markers; it merely removes the conflict-related\n"
+" artifact files and allows PATH to be committed again.\n"
+msgstr ""
+"移除工作拷è´çš„目录或文件的 '冲çª' 状æ€ã€‚\n"
+"用法:resolved PATH...\n"
+"\n"
+" 注æ„:本å命令ä¸ä¼šä¾è¯æ³•æ¥è§£å†³å†²çªæˆ–æ˜¯ç§»é™¤å†²çªæ ‡è®°ï¼›å®ƒåªæ˜¯ç§»é™¤å†²çªçš„\n"
+" 相关文件,然åŽè®© PATH å¯ä»¥å†æ¬¡æäº¤ã€‚\n"
-#: libsvn_wc/copy.c:148
-#, c-format
-msgid "'%s' already exists and is in the way"
-msgstr "“%sâ€å·²å˜åœ¨ï¼Œå˜æˆè·¯ä¸é—´çš„大石头"
+#: svn/main.c:636
+msgid ""
+"Restore pristine working copy file (undo most local edits).\n"
+"usage: revert PATH...\n"
+"\n"
+" Note: this subcommand does not require network access, and resolves\n"
+" any conflicted states. However, it does not restore removed directories.\n"
+msgstr ""
+"æ¢å¤åŽŸå§‹æœªæ”¹å˜çš„å·¥ä½œæ‹·è´æ–‡ä»¶ (æ¢å¤å¤§éƒ¨ä»½çš„æœ¬åœ°ä¿®æ”¹)。\n"
+"用法:revert PATH...\n"
+"\n"
+" 注æ„:本å命令ä¸ä¼šå˜å–网络,并且会解除冲çªçš„状况。但是它ä¸ä¼šæ¢å¤\n"
+" è¢«åˆ é™¤çš„ç›®å½•\n"
-#: libsvn_wc/copy.c:160
-#, c-format
+#: svn/main.c:644
+#, fuzzy
msgid ""
-"'%s' is scheduled for deletion; it must be committed before being overwritten"
-msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
-
-#: libsvn_wc/copy.c:165
-#, c-format
-msgid "There is already a versioned item '%s'"
-msgstr "已有纳入版本控制项目“%sâ€"
-
-#: libsvn_wc/copy.c:176
-#, c-format
-msgid "Cannot copy or move '%s': it's not under version control"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+"Print the status of working copy files and directories.\n"
+"usage: status [PATH...]\n"
+"\n"
+" With no args, print only locally modified items (no network access).\n"
+" With -u, add working revision and server out-of-date information.\n"
+" With -v, print full revision information on every item.\n"
+"\n"
+" The first six columns in the output are each one character wide:\n"
+" First column: Says if item was added, deleted, or otherwise changed\n"
+" ' ' no modifications\n"
+" 'A' Added\n"
+" 'C' Conflicted\n"
+" 'D' Deleted\n"
+" 'I' Ignored\n"
+" 'M' Modified\n"
+" 'R' Replaced\n"
+" 'X' item is unversioned, but is used by an externals definition\n"
+" '?' item is not under version control\n"
+" '!' item is missing (removed by non-svn command) or incomplete\n"
+" '~' versioned item obstructed by some item of a different kind\n"
+" Second column: Modifications of a file's or directory's properties\n"
+" ' ' no modifications\n"
+" 'C' Conflicted\n"
+" 'M' Modified\n"
+" Third column: Whether the working copy directory is locked\n"
+" ' ' not locked\n"
+" 'L' locked\n"
+" Fourth column: Scheduled commit will contain addition-with-history\n"
+" ' ' no history scheduled with commit\n"
+" '+' history scheduled with commit\n"
+" Fifth column: Whether the item is switched relative to its parent\n"
+" ' ' normal\n"
+" 'S' switched\n"
+" Sixth column: Repository lock token\n"
+" (without -u)\n"
+" ' ' no lock token\n"
+" 'K' lock token present\n"
+" (with -u)\n"
+" ' ' not locked in repository, no lock token\n"
+" 'K' locked in repository, lock toKen present\n"
+" 'O' locked in repository, lock token in some Other working copy\n"
+" 'T' locked in repository, lock token present but sTolen\n"
+" 'B' not locked in repository, lock token present but Broken\n"
+"\n"
+" The out-of-date information appears in the eighth column (with -u):\n"
+" '*' a newer revision exists on the server\n"
+" ' ' the working copy is up to date\n"
+"\n"
+" Remaining fields are variable width and delimited by spaces:\n"
+" The working revision (with -u or -v)\n"
+" The last committed revision and last committed author (with -v)\n"
+" The working copy path is always the final field, so it can\n"
+" include spaces.\n"
+"\n"
+" Example output:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
+msgstr ""
+"显示工作拷è´ç›®å½•与文件的状æ€ã€‚\n"
+"用法:status [PATH...]\n"
+"\n"
+" æœªæŒ‡å®šå‚æ•°æ—¶ï¼Œå®ƒåªä¼šæ˜¾ç¤ºæœ¬åœ°ä¿®æ”¹çš„项目 (没有网络的å˜å–æ“作)。\n"
+" 使用 -u 时,å†åŠ ä¸Šå·¥ä½œä¿®è®¢ç‰ˆä¸ŽæœåŠ¡å™¨è¿‡æ—¶çš„ä¿¡æ¯ã€‚\n"
+" 使用 -v 时,显示æ¯ä¸€ä¸ªé¡¹ç›®çš„完整修订版信æ¯ã€‚\n"
+"\n"
+" 输出的å‰äº”个æ ä½å„为一个å—符宽:\n"
+" 第一æ ï¼šè¡¨ç¤ºä¸€ä¸ªé¡¹ç›®æ˜¯æ–°å¢žï¼Œåˆ é™¤ï¼Œä¸ç„¶å°±æ˜¯ä¿®æ”¹è¿‡çš„\n"
+" ' ' æ— ä¿®æ”¹\n"
+" 'A' 新增\n"
+" 'C' 冲çª\n"
+" 'D' åˆ é™¤\n"
+" 'G' åˆå¹¶\n"
+" 'I' 忽略\n"
+" 'M' 改å˜\n"
+" 'R' 替æ¢\n"
+" 'X' 未纳入版本控制,但被外部定义所用\n"
+" '?' 该项目未纳入版本控制\n"
+" '!' 该项目已é—失 (è¢«éž svn å‘½ä»¤æ‰€åˆ é™¤) 或是ä¸å®Œæ•´\n"
+" '~' 版本控制下的项目被ä¸åŒç±»åž‹çš„æ‰€æ›¿æ¢\n"
+" 第二æ :显示目录或文件的属性状æ€\n"
+" ' ' æ— ä¿®æ”¹\n"
+" 'C' 冲çª\n"
+" 'M' 改å˜\n"
+" 第三æ :åªåœ¨å·¥ä½œæ‹·è´ç›®å½•被é”定时æ‰ä¼šå‡ºçް\n"
+" ' ' 未é”定\n"
+" 'L' é”定\n"
+" 第四æ :预定è¦è¿žåŒåކå²è®°å½•被新增\n"
+" ' ' 预定的æäº¤å¹¶ä¸åŒ…å«åކå²è®°å½•\n"
+" '+' 预定的æäº¤åŒ…å«åކå²è®°å½•\n"
+" 第五æ :该项目相对其父目录是å¦å·²è¢«åˆ‡æ¢\n"
+" ' ' æ£å¸¸\n"
+" 'S' 被切æ¢\n"
+" ç¬¬å…æ :档案库é”å®šæ ‡è®° (没有 -u)\n"
+" ' ' 没有é”å®šæ ‡è®°\n"
+" 'K' å˜åœ¨é”å®šæ ‡è®°\n"
+" (有 -u)\n"
+" ' ' 没有在档案库ä¸é”定,没有é”å®šæ ‡è®°\n"
+" 'K' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°\n"
+" 'O' 在档案库ä¸è¢«é”定,é”å®šæ ‡è®°åœ¨ä¸€äº›å…¶ä»–å·¥ä½œæ‹·è´ä¸\n"
+" 'T' 在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«çªƒå–\n"
+" 'B' 没有在档案库ä¸è¢«é”定,å˜åœ¨é”å®šæ ‡è®°ä½†å·²è¢«ä¸æ¢\n"
+"\n"
+" 是å¦è¿‡æ—¶çš„ä¿¡æ¯ï¼Œå‡ºçŽ°çš„ä½ç½®æ˜¯ç¬¬å…«æ (与 -u 并用时):\n"
+" '*' æœåŠ¡å™¨ä¸Šæœ‰æ›´æ–°ä¿®è®¢ç‰ˆ\n"
+" ' ' å·¥ä½œæ‹·è´æ˜¯æœ€æ–°ç‰ˆçš„\n"
+"\n"
+" 剩余的æ ä½çš†ä¸ºå˜åŠ¨å®½åº¦ï¼Œå¹¶ä»¥ç©ºç™½éš”å¼€ï¼š\n"
+" 工作修订版 (与 -u 或 -v 并用时)\n"
+" æœ€åŽæäº¤çš„ä¿®è®¢ç‰ˆä¸Žæœ€åŽæäº¤çš„ä½œè€… (与 -v 并用时)\n"
+" 工作拷è´è·¯å¾„一定是最åŽä¸€æ ,所以它å¯ä»¥åŒ…å«ç©ºç™½å—符。\n"
+"\n"
+" 范例输出:\n"
+" svn status wc\n"
+" M wc/bar.c\n"
+" A + wc/qax.c\n"
+"\n"
+" svn status -u wc\n"
+" M 965 wc/bar.c\n"
+" * 965 wc/foo.c\n"
+" A + 965 wc/qax.c\n"
+" Status against revision: 981\n"
+"\n"
+" svn status --show-updates --verbose wc\n"
+" M 965 938 kfogel wc/bar.c\n"
+" * 965 922 sussman wc/foo.c\n"
+" A + 965 687 joe wc/qax.c\n"
+" 965 687 joe wc/zig.c\n"
+" Status against revision: 981\n"
-#: libsvn_wc/copy.c:183
-#, c-format
+#: svn/main.c:720
+#, fuzzy
msgid ""
-"Cannot copy or move '%s': it's not in the repository yet; try committing "
-"first"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
+"Update the working copy to a different URL.\n"
+"usage: 1. switch URL [PATH]\n"
+" 2. switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1. Update the working copy to mirror a new URL within the repository.\n"
+" This behaviour is similar to 'svn update', and is the way to\n"
+" move a working copy to a branch or tag within the same repository.\n"
+"\n"
+" 2. Rewrite working copy URL metadata to reflect a syntactic change only.\n"
+" This is used when repository's root URL changes (such as a scheme\n"
+" or hostname change) but your working copy still reflects the same\n"
+" directory within the same repository.\n"
+msgstr ""
+"更新工作拷è´è‡³ä¸åŒçš„地å€(URL)。\n"
+"用法:1ã€switch URL [PATH]\n"
+" 2ã€switch --relocate FROM TO [PATH...]\n"
+"\n"
+" 1ã€æ›´æ–°ä½ 的工作拷è´ï¼Œæ˜ 射到一个新的地å€(URL)。这æ“作跟“svn updateâ€å¾ˆåƒï¼Œ\n"
+" 也是将工作拷è´ç§»è‡³åŒä¸€æ¡£æ¡ˆåº“ä¸çš„æŸä¸€åˆ†æ”¯æˆ–æ ‡è®°ã€‚\n"
+"\n"
+" 2ã€æ”¹å†™å·¥ä½œæ‹·è´çš„地å€(URL)æè¿°æ•°æ®ï¼Œä»¥åæ˜ å•çº¯çš„è¯æ³•改å˜ã€‚å½“æ¡£æ¡ˆåº“çš„æ ¹\n"
+" 地å€(URL)å˜åЍ (åƒæ˜¯è§„则或是主机åç§°å˜åЍ),但是工作拷è´ä»æ—§å¯¹æ˜ 到åŒä¸€\n"
+" 档案库的åŒä¸€ç›®å½•时用之。\n"
-#: libsvn_wc/copy.c:455
-#, c-format
+#: svn/main.c:736
+#, fuzzy
msgid ""
-"Cannot copy or move '%s': it is not in the repository yet; try committing "
-"first"
-msgstr "æ— æ³•å¤åˆ¶æˆ–移动“%sâ€ï¼šå®ƒå°šæœªå˜åœ¨äºŽæ¡£æ¡ˆåº“之ä¸ï¼›è¯·å°è¯•先进行æäº¤"
+"Unlock working copy paths or URLs.\n"
+"usage: unlock TARGET...\n"
+"\n"
+" Use --force to break the lock.\n"
+msgstr ""
+"è§£é™¤å·¥ä½œæ‹·è´æˆ–地å€(URL)çš„é”定。\n"
+"用法:unlock TARGET...\n"
+"\n"
+" 使用 -force 䏿¢é”定。\n"
-#: libsvn_wc/copy.c:525
-#, c-format
-msgid "Cannot copy to '%s' as it is scheduled for deletion"
-msgstr "æ— æ³•å¤åˆ¶åˆ°â€œ%sâ€è‡³å› 为它已预定为è¦åˆ 除"
+#: svn/main.c:744
+#, fuzzy
+msgid ""
+"Bring changes from the repository into the working copy.\n"
+"usage: update [PATH...]\n"
+"\n"
+" If no revision given, bring working copy up-to-date with HEAD rev.\n"
+" Else synchronize working copy to revision given by -r.\n"
+"\n"
+" For each updated item a line will start with a character reporting the\n"
+" action taken. These characters have the following meaning:\n"
+"\n"
+" A Added\n"
+" D Deleted\n"
+" U Updated\n"
+" C Conflict\n"
+" G Merged\n"
+"\n"
+" A character in the first column signifies an update to the actual file,\n"
+" while updates to the file's properties are shown in the second column.\n"
+" A 'B' in the third column signifies that the lock for the file has\n"
+" been broken or stolen.\n"
+msgstr ""
+"将档案库的改å˜å应至工作拷è´ã€‚\n"
+"用法:update [PATH...]\n"
+"\n"
+" 如果没有æä¾›ä¿®è®¢ç‰ˆçš„è¯ï¼Œå®ƒä¼šå°†æ‚¨çš„å·¥ä½œæ‹·è´æ›´æ–°è‡³ HEAD 修订版。\n"
+" ä¸ç„¶çš„è¯ï¼ŒåŒæ¥è‡³ -r 选项所指定的修订版。\n"
+"\n"
+" 对æ¯ä¸€ä¸ªæ›´æ–°çš„项目,æ¯ä¸€åˆ—开头会以一个å—符表示所采å–的行为。\n"
+" 这些å—符代表如下:\n"
+"\n"
+" A 新增\n"
+" D åˆ é™¤\n"
+" U æ›´æ–°\n"
+" C 冲çª\n"
+" G åˆå¹¶\n"
+"\n"
+" 第一æ çš„å—符表示实际文件的更新,\n"
+" ç¬¬äºŒæ æ˜¾ç¤ºè¢«æ“作的文件。\n"
+" å¦‚æžœæœ‰å—æ¯â€˜B’出现在第三æ 上,表示文件的é”å®šè¢«ç ´åæˆ–ç›—å–。\n"
-#: libsvn_wc/entries.c:127
-#, c-format
-msgid "Error writing entries file for '%s'"
-msgstr "写入“%sâ€çš„项目文件时å‘生错误"
+#: svn/main.c:806 svnadmin/main.c:78 svnlook/main.c:285 svnsync/main.c:146
+msgid "Caught signal"
+msgstr "æ•æ‰åˆ°ä¿¡å·(䏿–)"
-#: libsvn_wc/entries.c:222
-#, fuzzy, c-format
-msgid "Entry for '%s' has invalid repository root"
-msgstr "“%sâ€çš„入壿¡£æ¡ˆåº“æ ¹ç›®å½•æ— æ•ˆ"
+#: svn/main.c:918
+msgid "Non-numeric limit argument given"
+msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
-#: libsvn_wc/entries.c:244
-#, c-format
-msgid "Entry '%s' has invalid node kind"
-msgstr "项目“%sâ€æœ‰æ— 效的节点ç§ç±»"
+#: svn/main.c:924
+msgid "Argument to --limit must be positive"
+msgstr ""
-#: libsvn_wc/entries.c:269 libsvn_wc/entries.c:319 libsvn_wc/entries.c:359
-#: libsvn_wc/entries.c:386 libsvn_wc/entries.c:413
-#, c-format
-msgid "Entry '%s' has invalid '%s' value"
-msgstr "项目“%sâ€æœ‰æ— 效的“%sâ€å€¼"
+#: svn/main.c:944
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -c twice, or both -c "
+"and -r"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
-#: libsvn_wc/entries.c:627
-msgid "Missing default entry"
-msgstr "丢失默认项目"
+#: svn/main.c:952 svn/main.c:1143
+msgid "Can't specify -c with --old"
+msgstr ""
-#: libsvn_wc/entries.c:632
-msgid "Default entry has no revision number"
-msgstr "默认项目没有修订版编å·"
+#: svn/main.c:959
+#, fuzzy
+msgid "Non-numeric change argument given to -c"
+msgstr "ç»™äº†éžæ•°å—çš„å‚æ•°"
-#: libsvn_wc/entries.c:637
-msgid "Default entry is missing URL"
-msgstr "默认项目没有地å€(URL)"
+#: svn/main.c:965
+#, fuzzy
+msgid "There is no change 0"
+msgstr "æ£åœ¨åˆ›å»ºæ›´æ”¹"
+
+#: svn/main.c:992
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; can't specify -r and -c, or try '-r "
+"N:M' instead of '-r N -r M'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
-#: libsvn_wc/entries.c:725
+#: svn/main.c:1005 svnadmin/main.c:1244
#, c-format
-msgid "XML parser failed in '%s'"
-msgstr "XML 剖æžå™¨æ— 法处ç†â€œ%sâ€"
+msgid "Syntax error in revision argument '%s'"
+msgstr "ä¿®è®¢ç‰ˆå‚æ•°â€œ%sâ€ä¸æœ‰è¯æ³•错误"
-#: libsvn_wc/entries.c:813
+#: svn/main.c:1159 svn/main.c:1169
+msgid "--auto-props and --no-auto-props are mutually exclusive"
+msgstr "--auto-props 与 --no-auto-props 是互相排斥的"
+
+#: svn/main.c:1185
#, c-format
-msgid "Corrupt working copy: '%s' has no default entry"
-msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æ²¡æœ‰é»˜è®¤çš„项目"
+msgid "Syntax error in native-eol argument '%s'"
+msgstr "原生æ¢åˆ—符å·å‚数“%sâ€ä¸æœ‰è¯æ³•错误"
-#: libsvn_wc/entries.c:830
+#: svn/main.c:1249 svndumpfilter/main.c:1207 svnlook/main.c:2037
#, c-format
-msgid "Corrupt working copy: directory '%s' has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šç›®å½•“%sâ€æœ‰æ— 效的调度"
+msgid "Subcommand argument required\n"
+msgstr "å¿…é¡»æä¾›å命令傿•°\n"
-#: libsvn_wc/entries.c:864
+#: svn/main.c:1268 svnadmin/main.c:1367 svndumpfilter/main.c:1226
+#: svnlook/main.c:2056
#, c-format
-msgid "Corrupt working copy: '%s' in directory '%s' has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸æœ‰æ— 效的调度"
+msgid "Unknown command: '%s'\n"
+msgstr "未知的命令:“%sâ€\n"
-#: libsvn_wc/entries.c:873
+#: svn/main.c:1301
#, c-format
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"addition) is not itself scheduled for addition"
+"Subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svn help %s' for usage.\n"
msgstr ""
-"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ–°å¢žè°ƒåº¦) ä¸ŽåŠ å…¥æ–°å¢žè°ƒåº¦çš„ä¸ä¸€è‡´"
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
+"请输入“svn help %sâ€ä»¥å–得用法。\n"
-#: libsvn_wc/entries.c:881
-#, c-format
+#: svn/main.c:1338
+msgid "Log message file is a versioned file; use '--force-log' to override"
+msgstr "æ—¥å¿—ä¿¡æ¯æ¡£æ˜¯ä¸€ä¸ªç‰ˆæœ¬æŽ§åˆ¶ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 以跳过æ¤é™åˆ¶"
+
+#: svn/main.c:1345
+#, fuzzy
+msgid "Lock comment file is a versioned file; use '--force-log' to override"
+msgstr "é”定注释文件是一个版本控制ä¸çš„æ–‡ä»¶ï¼›è¯·ä½¿ç”¨ '--force-log' 强制执行"
+
+#: svn/main.c:1366
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"deletion) is not itself scheduled for deletion"
+"The log message is a pathname (was -F intended?); use '--force-log' to "
+"override"
msgstr ""
-"æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥åˆ é™¤è°ƒåº¦) ä¸ŽåŠ å…¥åˆ é™¤è°ƒåº¦çš„ä¸ä¸€è‡´"
+"æ—¥å¿—ä¿¡æ¯æ˜¯ä¸€ä¸ªè·¯å¾„åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 以跳过æ¤é™åˆ¶"
-#: libsvn_wc/entries.c:889
-#, c-format
+#: svn/main.c:1373
+#, fuzzy
msgid ""
-"Corrupt working copy: '%s' in directory '%s' (which is scheduled for "
-"replacement) has an invalid schedule"
-msgstr "æŸå的工作拷è´ï¼šâ€œ%sâ€äºŽç›®å½•“%sâ€ä¸ (å·²åŠ å…¥æ›¿æ¢è°ƒåº¦) æœ‰æ— æ•ˆçš„è°ƒåº¦"
+"The lock comment is a pathname (was -F intended?); use '--force-log' to "
+"override"
+msgstr ""
+"é”定注释是一个路径åç§° (-F 是故æ„çš„å—?);请使用 '--force-log' 强制执行"
-#: libsvn_wc/entries.c:1204
-#, c-format
-msgid "No default entry in directory '%s'"
-msgstr "在目录“%sâ€ä¸æ²¡æœ‰é»˜è®¤çš„项目"
+#: svn/main.c:1498
+msgid ""
+"svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for "
+"details)\n"
+msgstr ""
+"svn:请执行“svn cleanupâ€ä»¥ç§»åŽ»é”定 (输入“svn help cleanupâ€ä»¥å–得详细说明)\n"
-#: libsvn_wc/entries.c:1259
-#, c-format
-msgid "Error writing to '%s'"
-msgstr "写至“%sâ€æ—¶å‘生错误"
+#: svn/merge-cmd.c:59
+msgid "Second revision required"
+msgstr "需è¦ç¬¬äºŒä¸ªä¿®è®¢ç‰ˆ"
-#: libsvn_wc/entries.c:1525
-#, c-format
-msgid ""
-"Can't add '%s' to deleted directory; try undeleting its parent directory "
-"first"
-msgstr "æ— æ³•æ–°å¢žâ€œ%sâ€è‡³å·²åˆ 除的目录;请先å°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
+#: svn/merge-cmd.c:73 svn/merge-cmd.c:96
+#, fuzzy
+msgid "Too many arguments given"
+msgstr "å¯¼å…¥å‘½ä»¤æœ‰å¤ªå¤šå‚æ•°"
-#: libsvn_wc/entries.c:1531
-#, c-format
-msgid ""
-"Can't replace '%s' in deleted directory; try undeleting its parent directory "
-"first"
-msgstr "æ— æ³•åœ¨å·²åˆ é™¤çš„ç›®å½•ä¸æ›¿æ¢â€œ%sâ€ï¼›è¯·å…ˆå°è¯•æ¢å¤å…¶çˆ¶ç›®å½•"
+#: svn/merge-cmd.c:117
+msgid "A working copy merge source needs an explicit revision"
+msgstr "工作拷è´çš„åˆå¹¶æ¥æºéœ€ç‰¹åˆ«æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: libsvn_wc/entries.c:1540
-#, c-format
-msgid "'%s' is marked as absent, so it cannot be scheduled for addition"
-msgstr "“%sâ€è¢«æ ‡è®°ä¸ºä¸å˜åœ¨ï¼Œæ‰€ä»¥æ— æ³•åŠ å…¥æ–°å¢žè°ƒåº¦"
+#: svn/mkdir-cmd.c:84
+msgid "Try 'svn add' or 'svn add --non-recursive' instead?"
+msgstr "å°è¯•用 “svn addâ€æˆ– “svn add --non-recursiveâ€ä»£æ›¿ï¼Ÿ"
-#: libsvn_wc/entries.c:1569
+#: svn/notify.c:69
#, c-format
-msgid "Entry '%s' is already under version control"
-msgstr "项目“%sâ€å·²çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶"
+msgid "Skipped missing target: '%s'\n"
+msgstr "跳过找ä¸åˆ°çš„ç›®æ ‡ï¼šâ€œ%sâ€\n"
-#: libsvn_wc/entries.c:1661
+#: svn/notify.c:76
#, c-format
-msgid "Entry '%s' has illegal schedule"
-msgstr "项目“%sâ€æœ‰ä¸åˆæ³•的调度"
+msgid "Skipped '%s'\n"
+msgstr "跳过“%sâ€\n"
-#: libsvn_wc/entries.c:1802
+#: svn/notify.c:94
#, c-format
-msgid "No such entry: '%s'"
-msgstr "æ²¡æœ‰è¿™æ ·çš„é¡¹ç›®:“%sâ€"
+msgid "Restored '%s'\n"
+msgstr "已还原“%sâ€\n"
-#: libsvn_wc/entries.c:1913
+#: svn/notify.c:100
#, c-format
-msgid "Directory '%s' has no THIS_DIR entry"
-msgstr "目录“%sâ€æ²¡æœ‰ THIS_DIR 项目"
+msgid "Reverted '%s'\n"
+msgstr "å·²æ¢å¤â€œ%sâ€\n"
-#: libsvn_wc/entries.c:2002
+#: svn/notify.c:106
#, c-format
-msgid "'%s' has an unrecognized node kind"
-msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
+msgid "Failed to revert '%s' -- try updating instead.\n"
+msgstr "æ— æ³•æ¢å¤â€œ%sâ€-- 请改用更新试试。\n"
-#: libsvn_wc/entries.c:2038
+#: svn/notify.c:114
#, c-format
-msgid "Unexpectedly found '%s': path is marked 'missing'"
-msgstr "æ„æƒ³ä¸åˆ°åœ°æ‰¾åˆ°äº†â€œ%sâ€ï¼šè·¯å¾„å·²è¢«æ ‡è®°ä¸º '丢失'"
+msgid "Resolved conflicted state of '%s'\n"
+msgstr "“%sâ€çš„已解决的冲çªçжæ€\n"
-#: libsvn_wc/lock.c:159 libsvn_wc/lock.c:360
+#: svn/notify.c:195
#, c-format
-msgid "Working copy '%s' locked"
-msgstr "工作拷è´â€œ%sâ€è¢«é”定了"
+msgid ""
+"\n"
+"Fetching external item into '%s'\n"
+msgstr ""
+"\n"
+"æ£åœ¨å–得外部项目至“%sâ€\n"
-#: libsvn_wc/lock.c:280
+#: svn/notify.c:210
#, c-format
-msgid "Path '%s' ends in '%s', which is unsupported for this operation"
-msgstr "路径“%sâ€ä»¥â€œ%sâ€ç»“æŸï¼Œæœ¬æ“ä½œä¸æ”¯æŒ"
-
-#: libsvn_wc/lock.c:679
-#, fuzzy, c-format
-msgid "Working copy '%s' is missing or not locked"
-msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
+msgid "Exported external at revision %ld.\n"
+msgstr "导出修订版 %ld 的外部定义。\n"
-#: libsvn_wc/lock.c:1079
+#: svn/notify.c:211
#, c-format
-msgid "Write-lock stolen in '%s'"
-msgstr "“%sâ€ä¸çš„写入é”定被å·èµ°äº†"
+msgid "Exported revision %ld.\n"
+msgstr "导出修订版 %ld。\n"
-#: libsvn_wc/lock.c:1087
+#: svn/notify.c:219
#, c-format
-msgid "No write-lock in '%s'"
-msgstr "“%sâ€ä¸æ²¡æœ‰å†™å…¥é”定"
+msgid "Checked out external at revision %ld.\n"
+msgstr "å–出修订版 %ld 的外部定义。\n"
-#: libsvn_wc/lock.c:1109
+#: svn/notify.c:220
#, c-format
-msgid "Lock file '%s' is not a regular file"
-msgstr "é”定文件“%sâ€ä¸æ˜¯ä¸€èˆ¬çš„æ–‡ä»¶"
+msgid "Checked out revision %ld.\n"
+msgstr "å–出修订版 %ld。\n"
-#: libsvn_wc/log.c:183
-msgid "Can't move source to dest"
-msgstr "æ— æ³•ç§»åŠ¨æ¥æºè‡³ç›®çš„"
+#: svn/notify.c:230
+#, c-format
+msgid "Updated external to revision %ld.\n"
+msgstr "更新外部定义至修订版 %ld。\n"
-#: libsvn_wc/log.c:339
+#: svn/notify.c:231
#, c-format
-msgid "In directory '%s'"
-msgstr "在目录“%sâ€ä¸"
+msgid "Updated to revision %ld.\n"
+msgstr "更新至修订版 %ld。\n"
-#: libsvn_wc/log.c:365
+#: svn/notify.c:239
#, c-format
-msgid "Missing 'left' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'left' 属性"
+msgid "External at revision %ld.\n"
+msgstr "于修订版 %ld 的外部定义。\n"
-#: libsvn_wc/log.c:372
+#: svn/notify.c:240
#, c-format
-msgid "Missing 'right' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'right' 属性"
+msgid "At revision %ld.\n"
+msgstr "于修订版 %ld。\n"
-#: libsvn_wc/log.c:415
+#: svn/notify.c:252
#, c-format
-msgid "Missing 'dest' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'dest' 属性"
+msgid "External export complete.\n"
+msgstr "外部定义导出完æˆã€‚\n"
-#: libsvn_wc/log.c:475
+#: svn/notify.c:253
#, c-format
-msgid "Missing 'timestamp' attribute in '%s'"
-msgstr "“%sâ€ä¸¢å¤± 'timestamp' 属性"
+msgid "Export complete.\n"
+msgstr "导出完æˆã€‚\n"
-#: libsvn_wc/log.c:551 libsvn_wc/log.c:584
+#: svn/notify.c:260
#, c-format
-msgid "Error checking path '%s'"
-msgstr "检查路径“%sâ€æ—¶å‘生错误"
+msgid "External checkout complete.\n"
+msgstr "外部定义å–出完æˆã€‚\n"
-#: libsvn_wc/log.c:558 libsvn_wc/log.c:591
+#: svn/notify.c:261
#, c-format
-msgid "Error getting 'affected time' on '%s'"
-msgstr "å–得“%sâ€çš„“affected timeâ€æ—¶å‘生错误"
+msgid "Checkout complete.\n"
+msgstr "å–出完æˆã€‚\n"
-#: libsvn_wc/log.c:602
+#: svn/notify.c:268
#, c-format
-msgid "Error modifying entry for '%s'"
-msgstr "修改“%sâ€çš„项目时å‘生错误"
+msgid "External update complete.\n"
+msgstr "外部定义更新完æˆã€‚\n"
-#: libsvn_wc/log.c:628
-#, fuzzy, c-format
-msgid "Error removing lock from entry for '%s'"
-msgstr "移除æ¡ç›®â€œ%sâ€çš„锿—¶å‘生错误"
+#: svn/notify.c:269
+#, c-format
+msgid "Update complete.\n"
+msgstr "更新完æˆã€‚\n"
-#: libsvn_wc/log.c:759
+#: svn/notify.c:285
#, c-format
-msgid "Missing 'revision' attribute for '%s'"
-msgstr "“%sâ€ä¸¢å¤±äº† 'revision' 属性"
+msgid ""
+"\n"
+"Performing status on external item at '%s'\n"
+msgstr ""
+"\n"
+"对外部项目“%sâ€è¿›è¡ŒçŠ¶æ€æ£€æŸ¥\n"
-#: libsvn_wc/log.c:773
+#: svn/notify.c:293
#, c-format
-msgid "Log command for directory '%s' is mislocated"
-msgstr "对目录“%sâ€çš„æ—¥å¿—命令被错置"
+msgid "Status against revision: %6ld\n"
+msgstr "状æ€äºŽä¿®è®¢ç‰ˆï¼š%6ld\n"
-#: libsvn_wc/log.c:940 libsvn_wc/log.c:1012
+#: svn/notify.c:301
#, c-format
-msgid "Error checking existence of '%s'"
-msgstr "检查“%sâ€æ˜¯å¦å˜åœ¨æ—¶å‘生错误"
+msgid "Sending %s\n"
+msgstr "æ£åœ¨å‘é€ %s\n"
-#: libsvn_wc/log.c:951 libsvn_wc/log.c:1023
+#: svn/notify.c:310
#, c-format
-msgid "Error comparing '%s' and '%s'"
-msgstr "比较“%sâ€ä¸Žâ€œ%sâ€æ—¶å‘生错误"
+msgid "Adding (bin) %s\n"
+msgstr "新增 (二进制) %s\n"
-#: libsvn_wc/log.c:963
+#: svn/notify.c:317
#, c-format
-msgid "Error getting 'affected time' for '%s'"
-msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
+msgid "Adding %s\n"
+msgstr "新增 %s\n"
-#: libsvn_wc/log.c:1034 libsvn_wc/log.c:1121
+#: svn/notify.c:324
#, c-format
-msgid "Error getting 'affected time' of '%s'"
-msgstr "å–得“%sâ€çš„ 'affected time' æ—¶å‘生错误"
+msgid "Deleting %s\n"
+msgstr "åˆ é™¤ %s\n"
-#: libsvn_wc/log.c:1092
+#: svn/notify.c:331
#, c-format
-msgid "Error replacing text-base of '%s'"
-msgstr "替æ¢â€œ%sâ€çš„æ–‡ä»¶å‚考基础时å‘生错误"
+msgid "Replacing %s\n"
+msgstr "æ›¿æ¢ %s\n"
-#: libsvn_wc/log.c:1161 libsvn_wc/log.c:1210
+#: svn/notify.c:341
#, c-format
-msgid "Error modifying entry of '%s'"
-msgstr "修改“%sâ€çš„项目时å‘生错误"
+msgid "Transmitting file data "
+msgstr "ä¼ è¾“æ–‡ä»¶æ•°æ®"
-#: libsvn_wc/log.c:1269
+#: svn/notify.c:350
#, c-format
-msgid "Log entry missing 'name' attribute (entry '%s' for directory '%s')"
-msgstr "日志文件项目丢失 'name' 属性 (项目“%sâ€å¯¹åº”至目录“%sâ€)"
+msgid "'%s' locked by user '%s'.\n"
+msgstr "“%sâ€è¢«ç”¨æˆ·â€œ%sâ€é”定。\n"
-#: libsvn_wc/log.c:1331
+#: svn/notify.c:356
#, c-format
-msgid "Unrecognized logfile element '%s' in '%s'"
-msgstr "æ— æ³•ç¡®è®¤çš„æ—¥å¿—æ–‡ä»¶å…ƒç´ â€œ%sâ€äºŽâ€œ%sâ€ä¸"
+msgid "'%s' unlocked.\n"
+msgstr "“%sâ€è¢«è§£é™¤é”定。\n"
-#: libsvn_wc/log.c:1342
+#: svn/propdel-cmd.c:77
#, c-format
-msgid "Error processing command '%s' in '%s'"
-msgstr "在“%2$sâ€ä¸å¤„ç†å‘½ä»¤â€œ%1$sâ€æ—¶å‘生错误"
+msgid "property '%s' deleted from repository revision %ld\n"
+msgstr "属性“%sâ€è‡ªæ¡£æ¡ˆåº“修订版 %ld ä¸åˆ 除\n"
-#: libsvn_wc/log.c:1464
-msgid "Couldn't open log"
-msgstr "æ— æ³•æ‰“å¼€æ—¥å¿—æ–‡ä»¶"
+#: svn/propdel-cmd.c:86
+#, c-format
+msgid "Cannot specify revision for deleting versioned property '%s'"
+msgstr "åˆ é™¤çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„å±žæ€§â€œ%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: libsvn_wc/log.c:1475
+#: svn/propdel-cmd.c:116
#, c-format
-msgid "Error reading administrative log file in '%s'"
-msgstr "于“%sâ€ä¸è¯»å–ç®¡ç†æ—¥å¿—文件时å‘生错误"
+msgid "property '%s' deleted (recursively) from '%s'.\n"
+msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除 (递归)。\n"
-#: libsvn_wc/log.c:1569
+#: svn/propdel-cmd.c:117
#, c-format
-msgid "'%s' is not a working copy directory"
-msgstr "“%sâ€å¹¶ä¸æ˜¯å·¥ä½œæ‹·è´ç›®å½•"
+msgid "property '%s' deleted from '%s'.\n"
+msgstr "属性“%sâ€è‡ªâ€œ%sâ€åˆ 除。\n"
+
+#: svn/propedit-cmd.c:101 svn/propedit-cmd.c:225 svn/propset-cmd.c:85
+msgid "Bad encoding option: prop value not stored as UTF8"
+msgstr "有问题的编ç 选项:属性内容未以 UTF8 储å˜"
-#: libsvn_wc/merge.c:306 libsvn_wc/merge.c:308 libsvn_wc/merge.c:310
-#: libsvn_wc/merge.c:312
-msgid "Unable to delete temporary file"
-msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
+#: svn/propedit-cmd.c:110
+#, c-format
+msgid "Set new value for property '%s' on revision %ld\n"
+msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 设为新值\n"
-#: libsvn_wc/props.c:100
+#: svn/propedit-cmd.c:116
#, c-format
-msgid "Property '%s' locally changed to '%s', but update deletes it\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
+msgid "No changes to property '%s' on revision %ld\n"
+msgstr "属性“%sâ€äºŽä¿®è®¢ç‰ˆ %ld 没有改å˜\n"
-#: libsvn_wc/props.c:109
+#: svn/propedit-cmd.c:124
#, c-format
-msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
+msgid "Cannot specify revision for editing versioned property '%s'"
+msgstr "编辑纳入版本控制的属性“%sâ€æ—¶ä¸å¯æŒ‡å®šä¿®è®¢ç‰ˆ"
-#: libsvn_wc/props.c:125
-#, c-format
-msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
-msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
+#: svn/propedit-cmd.c:150 svn/propset-cmd.c:158
+msgid "Explicit target argument required"
+msgstr "必须明确地æä¾›ç›®æ ‡"
-#: libsvn_wc/props.c:172
+#: svn/propedit-cmd.c:173
#, c-format
-msgid "Can't parse '%s'"
-msgstr "æ— æ³•å‰–æžâ€œ%sâ€"
+msgid "Editing property on non-local target '%s' not yet supported"
+msgstr "å°šä¸æ”¯æŒç¼–è¾‘éžæœ¬åœ°ç›®æ ‡â€œ%sâ€çš„属性"
-#: libsvn_wc/props.c:198
+#: svn/propedit-cmd.c:200 svn/switch-cmd.c:140
#, c-format
-msgid "Can't write property hash to '%s'"
-msgstr "æ— æ³•å†™å…¥å±žæ€§é›†åˆ°â€œ%sâ€"
+msgid "'%s' does not appear to be a working copy path"
+msgstr "“%sâ€ä¸åƒæ˜¯å·¥ä½œæ‹·è´è·¯å¾„"
-#: libsvn_wc/props.c:251
+#: svn/propedit-cmd.c:232
#, c-format
-msgid "Can't find entry '%s' in '%s'"
-msgstr "æ— æ³•åœ¨â€œ%2$sâ€ä¸æ‰¾åˆ°é¡¹ç›®â€œ%1$sâ€"
+msgid "Set new value for property '%s' on '%s'\n"
+msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§è¢«è®¾ä¸ºæ–°å€¼\n"
-#: libsvn_wc/props.c:323 libsvn_wc/props.c:1161 libsvn_wc/update_editor.c:2342
+#: svn/propedit-cmd.c:239
#, c-format
-msgid "Error writing log for '%s'"
-msgstr "为“%sâ€å†™å…¥æ—¥å¿—æ—¶å‘生错误"
+msgid "No changes to property '%s' on '%s'\n"
+msgstr "“%2$sâ€çš„“%1$sâ€å±žæ€§æ²¡æœ‰æ”¹å˜\n"
-#: libsvn_wc/props.c:459
+#: svn/proplist-cmd.c:71
#, c-format
-msgid ""
-"Trying to add new property '%s' with value '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"å°è¯•æ·»åŠ æ–°å±žæ€§â€œ%sâ€çš„值为“%sâ€ï¼Œ\n"
-"但是属性已ç»å˜åœ¨ï¼Œå€¼ä¸ºâ€œ%sâ€ã€‚"
+msgid "Unversioned properties on revision %ld:\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
-#: libsvn_wc/props.c:481
-#, c-format
-msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but the property does not exist."
-msgstr ""
-"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
-"但是属性并ä¸å˜åœ¨ã€‚"
+#: svn/proplist-cmd.c:119
+#, fuzzy, c-format
+msgid "Properties on '%s':\n"
+msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
-#: libsvn_wc/props.c:510
-#, c-format
+#: svn/props.c:51
+#, fuzzy
msgid ""
-"Trying to change property '%s' from '%s' to '%s',\n"
-"but property already exists with value '%s'."
-msgstr ""
-"å°è¯•把属性“%sâ€çš„值从“%sâ€æ”¹å˜ä¸ºâ€œ%sâ€ï¼Œ\n"
-"ä½†æ˜¯å±žæ€§çš„å€¼å·²ç»æ˜¯â€œ%sâ€äº†ã€‚"
+"Must specify the revision as a number, a date or 'HEAD' when operating on a "
+"revision property"
+msgstr "æ“作修订版属性时,必须指定修订版为数å—,日期或‘HEAD’。"
-#: libsvn_wc/props.c:1202
-#, c-format
-msgid "Unknown node kind: '%s'"
-msgstr "未知的节点类型:“%sâ€"
+#: svn/props.c:58
+#, fuzzy
+msgid "Wrong number of targets specified"
+msgstr "æŒ‡å®šäº†é”™è¯¯æ•°ç›®çš„ç›®æ ‡"
-#: libsvn_wc/props.c:1238 libsvn_wc/props.c:1260 libsvn_wc/props.c:1344
-#: libsvn_wc/props.c:1582
-msgid "Failed to load properties from disk"
-msgstr "æ— æ³•ä»Žç£ç¢Ÿè£…载属性"
+#: svn/props.c:67
+msgid "Either a URL or versioned item is required"
+msgstr "å¿…é¡»æä¾›åœ°å€(URL)或纳入版本控制的项目"
-#: libsvn_wc/props.c:1276 libsvn_wc/props.c:1612
+#: svn/propset-cmd.c:111
#, c-format
-msgid "Cannot write property hash for '%s'"
-msgstr "æ— æ³•å†™å…¥â€œ%sâ€çš„属性æ‚凑"
+msgid "property '%s' set on repository revision %ld\n"
+msgstr "设定属性“%sâ€äºŽæ¡£æ¡ˆåº“修订版 %ld\n"
-#: libsvn_wc/props.c:1336 libsvn_wc/props.c:1474
+#: svn/propset-cmd.c:119
#, c-format
-msgid "Property '%s' is an entry property"
-msgstr "属性“%sâ€æ˜¯é¡¹ç›®å±žæ€§"
+msgid "Cannot specify revision for setting versioned property '%s'"
+msgstr "æ— æ³•æŒ‡å®šä¿®è®¢ç‰ˆä»¥è®¾å®šç‰ˆæœ¬æŽ§åˆ¶ä¸‹çš„å±žæ€§â€œ%sâ€"
-#: libsvn_wc/props.c:1381
+#: svn/propset-cmd.c:151
#, c-format
-msgid "Cannot set '%s' on a directory ('%s')"
-msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽç›®å½• (“%sâ€)"
+msgid "Explicit target required ('%s' interpreted as prop value)"
+msgstr "必须明确地æä¾›ç›®çš„ (“%sâ€è§£é‡Šä¸ºå±žæ€§å†…容)"
-#: libsvn_wc/props.c:1389
+#: svn/propset-cmd.c:184
#, c-format
-msgid "Cannot set '%s' on a file ('%s')"
-msgstr "æ— æ³•è®¾å®šâ€œ%sâ€äºŽæ–‡ä»¶ (“%sâ€)"
+msgid "property '%s' set (recursively) on '%s'\n"
+msgstr "属性“%sâ€è®¾å®š (递归) 于“%sâ€\n"
-#: libsvn_wc/props.c:1395
+#: svn/propset-cmd.c:185
#, c-format
-msgid "'%s' is not a file or directory"
-msgstr "“%sâ€ä¸æ˜¯æ–‡ä»¶æˆ–目录"
+msgid "property '%s' set on '%s'\n"
+msgstr "属性“%sâ€è®¾å®šäºŽâ€œ%sâ€\n"
-#: libsvn_wc/props.c:1419
-#, c-format
-msgid "File '%s' has binary mime type property"
-msgstr "文件“%sâ€æœ‰äºŒè¿›åˆ¶çš„ mime 型别属性"
+#: svn/revert-cmd.c:61
+#, fuzzy
+msgid "Try 'svn revert --recursive' instead?"
+msgstr "å°è¯•用 “svn revert -recursive†代替?"
-#: libsvn_wc/props.c:2038
+#: svn/status.c:263
#, c-format
-msgid "Error parsing %s property on '%s': '%s'"
-msgstr "å‰–æž %s 属性于“%sâ€å‘生错误:“%sâ€"
+msgid "'%s' has lock token, but no lock owner"
+msgstr "‘%s’é”被盗å–,但没有é”的所有者"
-#: libsvn_wc/props.c:2051
+#: svn/switch-cmd.c:58
#, c-format
-msgid ""
-"Invalid %s property on '%s': target involves '.' or '..' or is an absolute "
-"path"
-msgstr "æ— æ•ˆå±žæ€§ %s 于“%sâ€ï¼šç›®å½•牵涉到 '.' 或 '..' 或是ç»å¯¹è·¯å¾„"
+msgid "'%s' to '%s' is not a valid relocation"
+msgstr "“%sâ€åˆ°â€œ%sâ€ä¸æ˜¯æœ‰æ•ˆçš„é‡å®šä½"
-#: libsvn_wc/questions.c:104
+#: svn/util.c:60
#, c-format
msgid ""
-"Working copy format of '%s' is too old (%d); please check out your working "
-"copy again"
-msgstr "“%sâ€çš„å·¥ä½œæ‹·è´æ ¼å¼å·²è¿‡æ—¶(%d)ï¼›è¯·é‡æ–°å–出您的工作拷è´"
+"\n"
+"Committed revision %ld.\n"
+msgstr ""
+"\n"
+"æäº¤åŽçš„修订版为 %ld。\n"
-#: libsvn_wc/questions.c:112
-#, c-format
+#: svn/util.c:68
+#, fuzzy, c-format
msgid ""
-"This client is too old to work with working copy '%s'; please get a newer "
-"Subversion client"
-msgstr "æœ¬å®¢æˆ·ç«¯å·²è¿‡æ—¶ï¼Œæ— æ³•å˜å–工作拷è´â€œ%sâ€ï¼›è¯·å–得更新版的 Subversion 客户端"
+"\n"
+"Warning: %s\n"
+msgstr "%sè¦å‘Šï¼š%s\n"
-#: libsvn_wc/questions.c:352
-#, c-format
+#: svn/util.c:136
msgid ""
-"Checksum mismatch indicates corrupt text base: '%s'\n"
-" expected: %s\n"
-" actual: %s\n"
+"None of the environment variables SVN_EDITOR, VISUAL or EDITOR is set, and "
+"no 'editor-cmd' run-time configuration option was found"
msgstr ""
-"总和检查值ä¸ä¸€è‡´ï¼Œè¡¨ç¤ºæ–‡ä»¶å‚考基础æŸå:“%sâ€\n"
-" 预期: %s\n"
-" 实际: %s\n"
+"没有一个 SVN_EDITOR,VISUAL 或 EDITOR çŽ¯å¢ƒå˜æ•°è¢«è®¾å®šï¼Œæ‰§è¡Œæ—¶æœŸçš„设定ä¸ä¹Ÿæ²¡æœ‰ "
+"'editor-cmd' 选项"
-#: libsvn_wc/translate.c:124
+#: svn/util.c:162
#, c-format
-msgid "'%s' has unknown value for svn:eol-style property"
-msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
+msgid "Can't get working directory"
+msgstr "æ— æ³•å–得工作目录"
-#: libsvn_wc/update_editor.c:387
+#: svn/util.c:173 svn/util.c:196
#, c-format
-msgid "No '.' entry in: '%s'"
-msgstr "ä¸å˜åœ¨ '.' 项目:“%sâ€"
+msgid "Can't change working directory to '%s'"
+msgstr "æ— æ³•æ›´æ”¹å·¥ä½œæ‹·è´è‡³â€œ%sâ€"
-#: libsvn_wc/update_editor.c:863
+#: svn/util.c:221
#, c-format
-msgid "Won't delete locally modified directory '%s'"
-msgstr "æ— æ³•åˆ é™¤æœ¬åœ°ä¿®æ”¹çš„ç›®å½•â€œ%sâ€"
+msgid "Can't write to '%s'"
+msgstr "æ— æ³•å†™å…¥è‡³â€œ%sâ€"
-#: libsvn_wc/update_editor.c:1049
+#: svn/util.c:251
#, c-format
-msgid "Failed to add directory '%s': object of the same name already exists"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+msgid "system('%s') returned %d"
+msgstr "系统(“%sâ€) 返回 %d"
-#: libsvn_wc/update_editor.c:1057
+#: svn/util.c:318
#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name as the administrative "
-"directory"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šç‰©ä»¶ä¸Žç®¡ç†ç›®å½•åŒå"
+msgid "Can't restore working directory"
+msgstr "æ— æ³•è¿˜åŽŸå·¥ä½œç›®å½•"
-#: libsvn_wc/update_editor.c:1071
-#, c-format
-msgid "Failed to add directory '%s': copyfrom arguments not yet supported"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šcopyfrom 傿•°å°šä¸æ”¯æŒ"
+#: svn/util.c:358
+msgid "Log message contains a zero byte"
+msgstr "日志信æ¯ä¸æœ‰ä¸€ä¸ªé›¶å—节"
-#: libsvn_wc/update_editor.c:1092
-#, c-format
-msgid ""
-"Failed to add directory '%s': object of the same name is already scheduled "
-"for addition"
-msgstr "æ— æ³•æ–°å¢žç›®å½•â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
+#: svn/util.c:418
+msgid "Your commit message was left in a temporary file:"
+msgstr "您的æäº¤ä¿¡æ¯ä¿ç•™åœ¨ä¸´æ—¶æ–‡ä»¶ä¸ï¼š"
-#: libsvn_wc/update_editor.c:1315
-msgid "Couldn't do property merge"
-msgstr "æ— æ³•è¿›è¡Œå±žæ€§åˆå¹¶"
+# as-is
+#: svn/util.c:470
+msgid "--This line, and those below, will be ignored--"
+msgstr "--æ¤è¡ŒåŠä»¥ä¸‹å†…容将会被忽略--"
-#: libsvn_wc/update_editor.c:1409
-#, c-format
+#: svn/util.c:510
+#, fuzzy
msgid ""
-"Failed to mark '%s' absent: item of the same name is already scheduled for "
-"addition"
-msgstr "æ— æ³•å°†â€œ%sâ€æ ‡è®°ä¸ºä¸å˜åœ¨ï¼šåŒåé¡¹ç›®å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
+"Use of an external editor to fetch log message is not supported on OS400; "
+"consider using the --message (-m) or --file (-F) options"
+msgstr ""
+"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
+"message (-m) 或 --file (-F) 选项"
-#: libsvn_wc/update_editor.c:1501
-#, c-format
-msgid "Failed to add file '%s': object of the same name already exists"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒå物件已å˜åœ¨"
+#: svn/util.c:592
+msgid "Cannot invoke editor to get log message when non-interactive"
+msgstr "在éžäº¤äº’å¼çš„æƒ…况下ä¸èƒ½è°ƒç”¨ç¼–è¾‘å™¨èŽ·å–æ—¥å¿—ä¿¡æ¯"
-#: libsvn_wc/update_editor.c:1522
-#, c-format
+#: svn/util.c:605
msgid ""
-"Failed to add file '%s': object of the same name is already scheduled for "
-"addition"
-msgstr "æ— æ³•æ–°å¢žæ–‡ä»¶â€œ%sâ€ï¼šåŒåç‰©ä»¶å·²åŠ å…¥æ–°å¢žè°ƒåº¦"
-
-#: libsvn_wc/update_editor.c:1530
-#, c-format
-msgid "File '%s' in directory '%s' is not a versioned resource"
-msgstr "文件“%sâ€äºŽç›®å½•“%sâ€ä¸çš„并䏿˜¯çº³å…¥ç‰ˆæœ¬æŽ§åˆ¶çš„资æº"
+"Could not use external editor to fetch log message; consider setting the "
+"$SVN_EDITOR environment variable or using the --message (-m) or --file (-F) "
+"options"
+msgstr ""
+"æ— æ³•ä½¿ç”¨å¤–éƒ¨ç¼–è¾‘å™¨å–得日志信æ¯ï¼›è¯·å°è¯•设定 $SVN_EDITOR çŽ¯å¢ƒå˜æ•°ï¼Œæˆ–是使用 --"
+"message (-m) 或 --file (-F) 选项"
-#: libsvn_wc/update_editor.c:1651
-#, c-format
-msgid "Checksum mismatch for '%s'; recorded: '%s', actual: '%s'"
-msgstr "“%sâ€çš„æ€»å’Œæ£€æŸ¥å€¼ä¸ç¬¦åˆï¼›è®°å½•:“%sâ€ï¼Œå®žé™…:“%sâ€"
+#: svn/util.c:641
+msgid ""
+"\n"
+"Log message unchanged or not specified\n"
+"a)bort, c)ontinue, e)dit\n"
+msgstr ""
+"\n"
+"æ—¥å¿—ä¿¡æ¯æœªæ”¹å˜ï¼Œæˆ–是未指定\n"
+"a)䏿–,c)ç»§ç»ï¼Œe)编辑\n"
-#: libsvn_wc/update_editor.c:1957
-msgid "Move failed"
-msgstr "移动失败"
+#: svn/util.c:694
+msgid "Use --force to override this restriction"
+msgstr "请用 --force æ¥æ’¤é”€é™åˆ¶"
-#: libsvn_wc/update_editor.c:2884
+#: svnadmin/main.c:95 svndumpfilter/main.c:62
#, c-format
-msgid "'%s' has no ancestry information"
-msgstr "“%sâ€æ²¡æœ‰æ¼”进历程信æ¯"
-
-#: libsvn_wc/update_editor.c:2972
-#, fuzzy, c-format
-msgid "Copyfrom-url '%s' has different repository root than '%s'"
-msgstr "Copyfrom-url “%sâ€ä¸Žâ€œ%sâ€çš„æ¡£æ¡ˆåº“æ ¹ç›®å½•ä¸ç›¸åŒ"
-
-#: libsvn_wc/util.c:83
-msgid "Unable to make any directories"
-msgstr "æ— æ³•å»ºç«‹ä»»ä½•ç›®å½•"
-
-#: svnadmin/main.c:94 svndumpfilter/main.c:62
msgid "Can't open stdio file"
msgstr "æ— æ³•å¯åŠ¨æ ‡å‡†è¾“å‡ºå…¥æ–‡ä»¶"
-#: svnadmin/main.c:123
+#: svnadmin/main.c:124
msgid "Repository argument required"
msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
-#: svnadmin/main.c:128
+#: svnadmin/main.c:129
#, c-format
msgid "'%s' is an URL when it should be a path"
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径"
-#: svnadmin/main.c:233 svndumpfilter/main.c:762 svnlook/main.c:98
-#: svnserve/main.c:111 svnversion/main.c:182
-msgid "show version information"
-msgstr "显示版本信æ¯"
-
#: svnadmin/main.c:236
msgid "specify revision number ARG (or X:Y range)"
msgstr "æŒ‡å®šä¿®è®¢ç‰ˆç¼–å· ARG (或 X:Y 范围)"
@@ -6808,18 +7310,21 @@
msgstr "关闿—¥å¿—文件自动移除 [Berkeley DB]"
#: svnadmin/main.c:272
-msgid "remove redundant log files from source repository"
+#, fuzzy
+msgid ""
+"remove redundant Berkeley DB log files\n"
+" from source repository [Berkeley DB]"
msgstr "è‡ªæ¥æºæ¡£æ¡ˆåº“移除多余的日志文件"
-#: svnadmin/main.c:275
+#: svnadmin/main.c:276
msgid "call pre-commit hook before committing revisions"
msgstr "æäº¤ä¿®è®¢ç‰ˆç¾è°ƒç”¨ pre-commit 外挂"
-#: svnadmin/main.c:278
+#: svnadmin/main.c:279
msgid "call post-commit hook after committing revisions"
msgstr "æäº¤ä¿®è®¢ç‰ˆåŽè°ƒç”¨ post-commit 外挂"
-#: svnadmin/main.c:281
+#: svnadmin/main.c:282
msgid ""
"wait instead of exit if the repository is in\n"
" use by another process"
@@ -6827,7 +7332,21 @@
"如果档案库被其他进程å 用,ç‰å¾…而ä¸ç›´æŽ¥é€€å‡º\n"
" "
-#: svnadmin/main.c:294
+#: svnadmin/main.c:286
+msgid ""
+"disallow use of SVNDIFF1 in on-disk storage,\n"
+" for backwards compatibility"
+msgstr ""
+
+#: svnadmin/main.c:299
+msgid ""
+"usage: svnadmin crashtest REPOS_PATH\n"
+"\n"
+"Open the repository at REPOS_PATH, then abort, thus simulating\n"
+"a process that crashes while holding an open repository handle.\n"
+msgstr ""
+
+#: svnadmin/main.c:305
msgid ""
"usage: svnadmin create REPOS_PATH\n"
"\n"
@@ -6837,7 +7356,7 @@
"\n"
"于 REPOS_PATH 建立一个新的,空的 Subversion 档案库。\n"
-#: svnadmin/main.c:300
+#: svnadmin/main.c:311
msgid ""
"usage: svnadmin deltify [-r LOWER[:UPPER]] REPOS_PATH\n"
"\n"
@@ -6853,7 +7372,7 @@
"与å‰ä¸€ä¿®è®¢ç‰ˆçš„差异,deltification 本质上å¯åŽ‹ç¼©æ¡£æ¡ˆåº“ã€‚å¦‚æžœæ²¡æœ‰æŒ‡å®š\n"
"修订版的è¯ï¼Œåˆ™ç›´æŽ¥å¯¹ HEAD 修订版进行。\n"
-#: svnadmin/main.c:309
+#: svnadmin/main.c:320
msgid ""
"usage: svnadmin dump REPOS_PATH [-r LOWER[:UPPER]] [--incremental]\n"
"\n"
@@ -6872,7 +7391,7 @@
"ä¸€ä¸ªä¿®è®¢ç‰ˆæ ‘ã€‚å¦‚æžœä½¿ç”¨äº† --incremental 选项,那么第一个转å˜çš„修订版会\n"
"是与å‰ä¸€ä¸ªä¿®è®¢ç‰ˆçš„差异,而éžå¹³å¸¸çš„全文输出。\n"
-#: svnadmin/main.c:320
+#: svnadmin/main.c:330
msgid ""
"usage: svnadmin help [SUBCOMMAND...]\n"
"\n"
@@ -6882,7 +7401,7 @@
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-#: svnadmin/main.c:325
+#: svnadmin/main.c:335
msgid ""
"usage: svnadmin hotcopy REPOS_PATH NEW_REPOS_PATH\n"
"\n"
@@ -6892,7 +7411,7 @@
"\n"
"äº§ç”Ÿæ¡£æ¡ˆåº“çš„å³æ—¶æ‹·è´ã€‚\n"
-#: svnadmin/main.c:330
+#: svnadmin/main.c:340
msgid ""
"usage: svnadmin list-dblogs REPOS_PATH\n"
"\n"
@@ -6907,7 +7426,7 @@
"\n"
"è¦å‘Šï¼šä¿®æ”¹æˆ–åˆ é™¤ä»åœ¨ä½¿ç”¨ä¸çš„记录文件将导致档案库æŸå。\n"
-#: svnadmin/main.c:337
+#: svnadmin/main.c:347
msgid ""
"usage: svnadmin list-unused-dblogs REPOS_PATH\n"
"\n"
@@ -6919,7 +7438,7 @@
"åˆ—å‡ºæ— ç”¨çš„ Berkeley DB 日志文件。\n"
"\n"
-#: svnadmin/main.c:342
+#: svnadmin/main.c:352
msgid ""
"usage: svnadmin load REPOS_PATH\n"
"\n"
@@ -6934,7 +7453,7 @@
"系统ä¸ã€‚如果档案库原先是空的,默认会将其 UUID 以æµä¸çš„æ•°å€¼ä»£ä¹‹ã€‚\n"
"进度报告会é€è‡³æ ‡å‡†è¾“出。\n"
-#: svnadmin/main.c:353
+#: svnadmin/main.c:362
#, fuzzy
msgid ""
"usage: svnadmin lslocks REPOS_PATH\n"
@@ -6945,7 +7464,7 @@
"\n"
"显示所有é”的相信信æ¯ã€‚\n"
-#: svnadmin/main.c:358
+#: svnadmin/main.c:367
msgid ""
"usage: svnadmin lstxns REPOS_PATH\n"
"\n"
@@ -6955,7 +7474,7 @@
"\n"
"显示所有未处ç†äº‹åŠ¡çš„å称。\n"
-#: svnadmin/main.c:363
+#: svnadmin/main.c:372
msgid ""
"usage: svnadmin recover REPOS_PATH\n"
"\n"
@@ -6974,7 +7493,7 @@
"上结æŸã€‚\n"
"\n"
-#: svnadmin/main.c:371
+#: svnadmin/main.c:380
msgid ""
"usage: svnadmin rmlocks REPOS_PATH LOCKED_PATH...\n"
"\n"
@@ -6984,7 +7503,7 @@
"\n"
"æ— æ¡ä»¶åœ°ä»Žæ¯ä¸€ä¸ª LOCKED_PATH åˆ é™¤é”。\n"
-#: svnadmin/main.c:376
+#: svnadmin/main.c:385
msgid ""
"usage: svnadmin rmtxns REPOS_PATH TXN_NAME...\n"
"\n"
@@ -6994,7 +7513,7 @@
"\n"
"ä»Žæ¡£æ¡ˆåº“åˆ é™¤å‘½å事务。\n"
-#: svnadmin/main.c:381
+#: svnadmin/main.c:390
msgid ""
"usage: svnadmin setlog REPOS_PATH -r REVISION FILE\n"
"\n"
@@ -7018,7 +7537,7 @@
"注æ„:修订版属性并未纳入版本控管,所以这个命令会永远盖写掉先å‰çš„\n"
"日志信æ¯ã€‚\n"
-#: svnadmin/main.c:395
+#: svnadmin/main.c:402
msgid ""
"usage: svnadmin verify REPOS_PATH\n"
"\n"
@@ -7028,33 +7547,36 @@
"\n"
"æ ¡éªŒå‚¨å˜äºŽæ¡£æ¡ˆåº“的数æ®ã€‚\n"
-#: svnadmin/main.c:448
+#: svnadmin/main.c:456
#, fuzzy
msgid "Invalid revision specifier"
msgstr "æŒ‡å®šäº†æ— æ•ˆçš„ä¿®è®¢ç‰ˆæœ¬"
-#: svnadmin/main.c:453
+#: svnadmin/main.c:461
#, fuzzy, c-format
msgid "Revisions must not be greater than the youngest revision (%ld)"
msgstr "修订版必须ä¸èƒ½å¤§äºŽæœ€æ–°çš„修订版å·(%ld)"
-#: svnadmin/main.c:521 svnadmin/main.c:603
+#: svnadmin/main.c:534 svnadmin/main.c:629
msgid "First revision cannot be higher than second"
msgstr "第一个修订版ä¸å¯é«˜äºŽç¬¬äºŒä¸ª"
-#: svnadmin/main.c:530
+#: svnadmin/main.c:543
#, c-format
msgid "Deltifying revision %ld..."
msgstr "æ£åœ¨ deltify 修订版 %ld..."
-#: svnadmin/main.c:534
+#: svnadmin/main.c:547
+#, c-format
msgid "done.\n"
msgstr "完æˆã€‚\n"
-#: svnadmin/main.c:634
+#: svnadmin/main.c:654
+#, fuzzy
msgid ""
"general usage: svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Type 'svnadmin help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnadmin --version' to see the program version and FS modules.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7063,7 +7585,7 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svnadmin/main.c:641 svnlook/main.c:1765 svnserve/main.c:158
+#: svnadmin/main.c:661 svnlook/main.c:1663 svnserve/main.c:203
#, fuzzy
msgid ""
"The following repository back-end (FS) modules are available:\n"
@@ -7072,7 +7594,8 @@
"以下的档案库åŽå°(FS) 模å—å¯ç”¨ï¼š\n"
"\n"
-#: svnadmin/main.c:724
+#: svnadmin/main.c:738
+#, c-format
msgid ""
"Repository lock acquired.\n"
"Please wait; recovering the repository may take some time...\n"
@@ -7080,7 +7603,7 @@
"å·²å–得档案库é”定。\n"
"请ç¨å€™ï¼›ä¿®å¤æ¡£æ¡ˆåº“也许得花费一些时间...\n"
-#: svnadmin/main.c:759
+#: svnadmin/main.c:773
msgid ""
"Failed to get exclusive repository access; perhaps another process\n"
"such as httpd, svnserve or svn has it open?"
@@ -7088,11 +7611,13 @@
"æ— æ³•å–得独å å˜å–æƒé™ï¼›å¯èƒ½æ˜¯å…¶ä»–如 httpd,svnserve 或 svn 的进程æ£åœ¨æ‰“开它\n"
"并没有释放æƒé™ï¼Ÿ"
-#: svnadmin/main.c:764
+#: svnadmin/main.c:778
+#, c-format
msgid "Waiting on repository lock; perhaps another process has it open?\n"
msgstr "ç‰å¾…档案库é”定ä¸ï¼›ä¹Ÿè®¸å…¶å®ƒçš„进程把它打开了?\n"
-#: svnadmin/main.c:771
+#: svnadmin/main.c:785
+#, c-format
msgid ""
"\n"
"Recovery completed.\n"
@@ -7100,50 +7625,53 @@
"\n"
"ä¿®å¤å®Œæˆã€‚\n"
-#: svnadmin/main.c:778
+#: svnadmin/main.c:792
#, c-format
msgid "The latest repos revision is %ld.\n"
msgstr "最新的档案库修订版为 %ld。\n"
-#: svnadmin/main.c:888
+#: svnadmin/main.c:902
#, c-format
msgid "Transaction '%s' removed.\n"
msgstr "事务“%sâ€è¢«ç§»é™¤ã€‚\n"
-#: svnadmin/main.c:912
+#: svnadmin/main.c:926
+#, c-format
msgid "Missing revision"
msgstr "丢失修订版"
-#: svnadmin/main.c:915
+#: svnadmin/main.c:929
+#, c-format
msgid "Only one revision allowed"
msgstr "ä»…å…许一个修订版"
-#: svnadmin/main.c:921
+#: svnadmin/main.c:935
+#, c-format
msgid "Exactly one file argument required"
msgstr "å¿…é¡»æä¾›æ°å¥½ä¸€ä¸ªçš„æ–‡ä»¶å‚æ•°"
-#: svnadmin/main.c:1029 svnlook/main.c:1830
+#: svnadmin/main.c:1047 svnlook/main.c:1728
#, c-format
msgid "UUID Token: %s\n"
msgstr "UUID æ ‡è¯†ï¼š%s\n"
# this points to filename according to sunny256
-#: svnadmin/main.c:1030 svnlook/main.c:1831
+#: svnadmin/main.c:1048 svnlook/main.c:1729
#, fuzzy, c-format
msgid "Owner: %s\n"
msgstr "所有者:%s\n"
-#: svnadmin/main.c:1031 svnlook/main.c:1832
+#: svnadmin/main.c:1049 svnlook/main.c:1730
#, fuzzy, c-format
msgid "Created: %s\n"
msgstr "创建于:%s\n"
-#: svnadmin/main.c:1032 svnlook/main.c:1833
+#: svnadmin/main.c:1050 svnlook/main.c:1731
#, c-format
msgid "Expires: %s\n"
msgstr "过期:%s\n"
-#: svnadmin/main.c:1034
+#: svnadmin/main.c:1052
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -7154,7 +7682,7 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1035
+#: svnadmin/main.c:1053
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -7165,21 +7693,28 @@
"%s\n"
"\n"
-#: svnadmin/main.c:1102
+#: svnadmin/main.c:1110
#, fuzzy, c-format
msgid "Path '%s' isn't locked.\n"
msgstr "路径“%sâ€æ²¡æœ‰è¢«é”定。\n"
-#: svnadmin/main.c:1114
+#: svnadmin/main.c:1122
#, fuzzy, c-format
msgid "Removed lock on '%s'.\n"
msgstr "åˆ é™¤â€œ%sâ€ä¸Šçš„é”。\n"
-#: svnadmin/main.c:1324
+#: svnadmin/main.c:1230
+#, fuzzy
+msgid ""
+"Multiple revision arguments encountered; try '-r N:M' instead of '-r N -r M'"
+msgstr "é‡åˆ°äº†å¤šä¸ªä¿®è®¢ç‰ˆå‚数;请å°è¯•å°† '-r M -r N' 改为 '-r M:N'"
+
+#: svnadmin/main.c:1349
+#, c-format
msgid "subcommand argument required\n"
msgstr "å¿…é¡»æä¾›å命令傿•°\n"
-#: svnadmin/main.c:1409
+#: svnadmin/main.c:1434
#, c-format
msgid ""
"subcommand '%s' doesn't accept option '%s'\n"
@@ -7189,50 +7724,51 @@
"请使用“svnadmin help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
# as-is
-#: svndumpfilter/main.c:325
+#: svndumpfilter/main.c:319
msgid "This is an empty revision for padding."
msgstr "This is an empty revision for padding."
-#: svndumpfilter/main.c:378
+#: svndumpfilter/main.c:389
#, c-format
msgid "Revision %ld committed as %ld.\n"
msgstr "修订版 %ld æäº¤ä¸º %ld。\n"
-#: svndumpfilter/main.c:386
+#: svndumpfilter/main.c:412
#, c-format
msgid "Revision %ld skipped.\n"
msgstr "跳过修订版 %ld。\n"
-#: svndumpfilter/main.c:489
+#: svndumpfilter/main.c:514
#, c-format
msgid "Invalid copy source path '%s'"
msgstr "æ— æ•ˆçš„å¤åˆ¶æ¥æºè·¯å¾„“%sâ€"
-#: svndumpfilter/main.c:532
-msgid "Node with dropped parent sneaked in"
-msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
+#: svndumpfilter/main.c:558
+#, c-format
+msgid "No valid copyfrom revision in filtered stream"
+msgstr ""
-#: svndumpfilter/main.c:638
+#: svndumpfilter/main.c:663
msgid "Delta property block detected - not supported by svndumpfilter"
msgstr "Delta 属性å—被检测到 - svndumpfilter 䏿”¯æŒ"
-#: svndumpfilter/main.c:764
+#: svndumpfilter/main.c:788
msgid "Do not display filtering statistics."
msgstr "䏿˜¾ç¤ºè¿‡æ»¤çš„统计数æ®ã€‚"
-#: svndumpfilter/main.c:766
+#: svndumpfilter/main.c:790
msgid "Remove revisions emptied by filtering."
msgstr "ç§»é™¤å› è¿‡æ»¤è€Œäº§ç”Ÿçš„ç©ºä¿®è®¢ç‰ˆã€‚"
-#: svndumpfilter/main.c:768
+#: svndumpfilter/main.c:792
msgid "Renumber revisions left after filtering."
msgstr "过滤åŽé‡ç¼–余下的修订版。"
-#: svndumpfilter/main.c:770
+#: svndumpfilter/main.c:794
msgid "Don't filter revision properties."
msgstr "ä¸è¿‡æ»¤ä¿®è®¢ç‰ˆå±žæ€§ã€‚"
-#: svndumpfilter/main.c:781
+#: svndumpfilter/main.c:805
msgid ""
"Filter out nodes with given prefixes from dumpstream.\n"
"usage: svndumpfilter exclude PATH_PREFIX...\n"
@@ -7240,7 +7776,7 @@
"è‡ªè½¬å˜æµç§»é™¤ç¬¦åˆæŒ‡å®šå—首的节点。\n"
"用法:svndumpfilter exclude PATH_PREFIX...\n"
-#: svndumpfilter/main.c:787
+#: svndumpfilter/main.c:811
msgid ""
"Filter out nodes without given prefixes from dumpstream.\n"
"usage: svndumpfilter include PATH_PREFIX...\n"
@@ -7248,7 +7784,7 @@
"自转å˜ä¸²æµç§»é™¤æœªåŒ…嫿Œ‡å®šå—首的节点。\n"
"用法:svndumpfilter include PATH_PREFIX...\n"
-#: svndumpfilter/main.c:793
+#: svndumpfilter/main.c:817
msgid ""
"Describe the usage of this program or its subcommands.\n"
"usage: svndumpfilter help [SUBCOMMAND...]\n"
@@ -7256,10 +7792,12 @@
"æè¿°æœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
"用法:svndumpfilter help [SUBCOMMAND...]\n"
-#: svndumpfilter/main.c:863
+#: svndumpfilter/main.c:888
+#, fuzzy
msgid ""
"general usage: svndumpfilter SUBCOMMAND [ARGS & OPTIONS ...]\n"
"Type 'svndumpfilter help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svndumpfilter --version' to see the program version number.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7268,23 +7806,27 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svndumpfilter/main.c:917
+#: svndumpfilter/main.c:943
+#, c-format
msgid "Excluding (and dropping empty revisions for) prefixes:\n"
msgstr "排除 (以åŠä¸¢å¼ƒç©ºä¿®è®¢ç‰ˆ) çš„å—首:\n"
-#: svndumpfilter/main.c:919
+#: svndumpfilter/main.c:945
+#, c-format
msgid "Excluding prefixes:\n"
msgstr "排除å—首:\n"
-#: svndumpfilter/main.c:921
+#: svndumpfilter/main.c:947
+#, c-format
msgid "Including (and dropping empty revisions for) prefixes:\n"
msgstr "涵盖 (以åŠä¸¢å¼ƒç©ºä¿®è®¢ç‰ˆ) çš„å—首:\n"
-#: svndumpfilter/main.c:923
+#: svndumpfilter/main.c:949
+#, c-format
msgid "Including prefixes:\n"
msgstr "包å«çš„å—首:\n"
-#: svndumpfilter/main.c:950
+#: svndumpfilter/main.c:976
#, c-format
msgid ""
"Dropped %d revision(s).\n"
@@ -7293,21 +7835,22 @@
"丢弃 %d 修订版。\n"
"\n"
-#: svndumpfilter/main.c:956
+#: svndumpfilter/main.c:982
msgid "Revisions renumbered as follows:\n"
msgstr "ä¿®è®¢ç‰ˆè¢«é‡æ–°ç¼–å·ï¼Œå¦‚下:\n"
-#: svndumpfilter/main.c:984
+#: svndumpfilter/main.c:1009
#, c-format
msgid " %ld => (dropped)\n"
msgstr " %ld => (丢弃)\n"
-#: svndumpfilter/main.c:999
+#: svndumpfilter/main.c:1024
#, c-format
msgid "Dropped %d node(s):\n"
msgstr "丢弃 %d 节点:\n"
-#: svndumpfilter/main.c:1204
+#: svndumpfilter/main.c:1245
+#, c-format
msgid ""
"\n"
"Error: no prefixes supplied.\n"
@@ -7315,7 +7858,7 @@
"\n"
"错误:没有æä¾›å‰ç½®å—首,\n"
-#: svndumpfilter/main.c:1247
+#: svndumpfilter/main.c:1289
#, fuzzy, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7324,40 +7867,44 @@
"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svndumpfilter help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
-#: svnlook/main.c:101
+#: svnlook/main.c:99
msgid "specify revision number ARG"
msgstr "æŒ‡å®šä¿®è®¢ç‰ˆç¼–å· ARG"
-#: svnlook/main.c:104
+#: svnlook/main.c:102
msgid "specify transaction name ARG"
msgstr "指定事务åç§° ARG"
-#: svnlook/main.c:107
+#: svnlook/main.c:105
msgid "be verbose"
msgstr "详细"
-#: svnlook/main.c:110
+#: svnlook/main.c:108
msgid "show node revision ids for each path"
msgstr "为æ¯ä¸ªè·¯å¾„显示节点修订版编å·"
-#: svnlook/main.c:116
+#: svnlook/main.c:114
#, fuzzy
msgid "do not print differences for added files"
msgstr "ä¸è¦æ‰“å°å·²æ–°åŠ æ–‡ä»¶çš„ä¸åŒå¤„"
-#: svnlook/main.c:119
+#: svnlook/main.c:117
msgid "print differences against the copy source"
msgstr "显示差异并对照原始内容"
-#: svnlook/main.c:122
+#: svnlook/main.c:120
#, fuzzy
msgid "operate on a revision property (use with -r or -t)"
msgstr "在修订版属性上作æ“作(使用-r傿•°)"
-#: svnlook/main.c:125
+#: svnlook/main.c:123
msgid "show full paths instead of indenting them"
msgstr "显示完整路径代替缩略形å¼"
+#: svnlook/main.c:126
+msgid "show details for copies"
+msgstr ""
+
#: svnlook/main.c:138
msgid ""
"usage: svnlook author REPOS_PATH\n"
@@ -7378,7 +7925,7 @@
"\n"
"显示文件的内容。FILE_PATH å‰çš„ '/' å¯çœç•¥ã€‚\n"
-#: svnlook/main.c:149
+#: svnlook/main.c:148
msgid ""
"usage: svnlook changed REPOS_PATH\n"
"\n"
@@ -7388,7 +7935,7 @@
"\n"
"显示已改å˜çš„路径。\n"
-#: svnlook/main.c:154
+#: svnlook/main.c:153
msgid ""
"usage: svnlook date REPOS_PATH\n"
"\n"
@@ -7398,7 +7945,7 @@
"\n"
"显示日期。\n"
-#: svnlook/main.c:159
+#: svnlook/main.c:158
msgid ""
"usage: svnlook diff REPOS_PATH\n"
"\n"
@@ -7408,7 +7955,7 @@
"\n"
"以 GNU æ ·å¼ï¼Œæ˜¾ç¤ºæ¡£æ¡ˆåº“䏿”¹å˜çš„æ–‡ä»¶ä¸Žå±žæ€§å·®å¼‚。\n"
-#: svnlook/main.c:165
+#: svnlook/main.c:164
msgid ""
"usage: svnlook dirs-changed REPOS_PATH\n"
"\n"
@@ -7419,7 +7966,7 @@
"\n"
"æ˜¾ç¤ºæœ¬èº«æ›¾æ”¹å˜ (或属性编辑) 过的目录,或是其下的文件更曾动过目录。\n"
-#: svnlook/main.c:171
+#: svnlook/main.c:170
msgid ""
"usage: svnlook help [SUBCOMMAND...]\n"
"\n"
@@ -7429,7 +7976,7 @@
"\n"
"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
-#: svnlook/main.c:176
+#: svnlook/main.c:175
msgid ""
"usage: svnlook history REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -7440,7 +7987,7 @@
"\n"
"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的历å²è®°å½•ä¿¡æ¯ (å¦‚æžœæ²¡æœ‰æŒ‡å®šè·¯å¾„ï¼Œåˆ™ä¸ºæ ¹ç›®å½•)。\n"
-#: svnlook/main.c:182
+#: svnlook/main.c:181
msgid ""
"usage: svnlook info REPOS_PATH\n"
"\n"
@@ -7450,7 +7997,7 @@
"\n"
"显示作者,日期戳,日志信æ¯å¤§å°ï¼Œä»¥åŠæ—¥å¿—ä¿¡æ¯ã€‚\n"
-#: svnlook/main.c:187
+#: svnlook/main.c:186
#, fuzzy
msgid ""
"usage: svnlook lock REPOS_PATH PATH_IN_REPOS\n"
@@ -7461,7 +8008,7 @@
"\n"
"如果档案库路径已ç»å˜åœ¨é”,æè¿°å®ƒã€‚\n"
-#: svnlook/main.c:192
+#: svnlook/main.c:191
msgid ""
"usage: svnlook log REPOS_PATH\n"
"\n"
@@ -7471,7 +8018,7 @@
"\n"
"显示日志信æ¯ã€‚\n"
-#: svnlook/main.c:197
+#: svnlook/main.c:196
#, fuzzy
msgid ""
"usage: svnlook propget REPOS_PATH PROPNAME [PATH_IN_REPOS]\n"
@@ -7484,7 +8031,7 @@
"显示档案库ä¸ï¼ŒæŸä¸ªè·¯å¾„的属性的原始内容。\n"
"åŠ ä¸Š --revprop, 显示修订版属性的原始值。\n"
-#: svnlook/main.c:203
+#: svnlook/main.c:202
#, fuzzy
msgid ""
"usage: svnlook proplist REPOS_PATH [PATH_IN_REPOS]\n"
@@ -7499,7 +8046,7 @@
"åŠ ä¸Š --revprop 选项, 修订版属性。\n"
"åŠ ä¸Š -v çš„è¯ï¼Œä¸€å¹¶æ˜¾ç¤ºå±žæ€§å†…容。\n"
-#: svnlook/main.c:210
+#: svnlook/main.c:209
msgid ""
"usage: svnlook tree REPOS_PATH [PATH_IN_REPOS]\n"
"\n"
@@ -7511,7 +8058,7 @@
"æ˜¾ç¤ºç›®å½•æ ‘ï¼Œè‡ª PATH_IN_REPOS 开始 (如果有æä¾›çš„è¯ï¼Œä¸ç„¶å°±ä»Žç›®å½•æ ‘çš„\n"
"æ ¹ç›®å½•å¼€å§‹),å¯é€‰æ‹©æ€§åœ°æ˜¾ç¤ºèŠ‚ç‚¹ä¿®è®¢ç‰ˆ id。\n"
-#: svnlook/main.c:216
+#: svnlook/main.c:215
msgid ""
"usage: svnlook uuid REPOS_PATH\n"
"\n"
@@ -7521,7 +8068,7 @@
"\n"
"显示档案库的 UUID。\n"
-#: svnlook/main.c:221
+#: svnlook/main.c:220
msgid ""
"usage: svnlook youngest REPOS_PATH\n"
"\n"
@@ -7531,60 +8078,53 @@
"\n"
"显示最新的修订版å·ã€‚\n"
-#: svnlook/main.c:589
-#, fuzzy, c-format
-msgid "Error creating dir '%s' (path exists)"
-msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
-
-#: svnlook/main.c:863
+#: svnlook/main.c:815
#, c-format
msgid "Copied: %s (from rev %ld, %s)\n"
msgstr "å·²å¤åˆ¶ï¼š%s (æ¥è‡ªä¿®è®¢ç‰ˆ %ld,%s)\n"
-#: svnlook/main.c:941
+#: svnlook/main.c:884
msgid "Added"
msgstr "å·²åŠ å…¥"
-#: svnlook/main.c:942
+#: svnlook/main.c:885
msgid "Deleted"
msgstr "å·²åˆ é™¤"
-#: svnlook/main.c:943
+#: svnlook/main.c:886
msgid "Modified"
msgstr "已修改"
-#: svnlook/main.c:944
+#: svnlook/main.c:887
msgid "Index"
msgstr "索引"
-#: svnlook/main.c:956
+#: svnlook/main.c:899
+#, c-format
msgid "(Binary files differ)\n"
msgstr "(二进制文件差异)\n"
-#: svnlook/main.c:1085
+#: svnlook/main.c:1028
msgid "unknown"
msgstr "未知"
-#: svnlook/main.c:1230 svnlook/main.c:1323 svnlook/main.c:1393
+#: svnlook/main.c:1173 svnlook/main.c:1266 svnlook/main.c:1295
#, c-format
msgid "Transaction '%s' is not based on a revision; how odd"
msgstr "事务“%sâ€å¹¶éžæ ¹åŸºäºŽæŸä¸ªä¿®è®¢ç‰ˆï¼›å¤šç¥žç§˜å•Š"
-#: svnlook/main.c:1260
+#: svnlook/main.c:1203
#, c-format
msgid "'%s' is a URL, probably should be a path"
msgstr "“%sâ€æ˜¯åœ°å€(URL),也许该是路径。"
-#: svnlook/main.c:1287
+#: svnlook/main.c:1230
#, c-format
msgid "Path '%s' is not a file"
msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
-#: svnlook/main.c:1373
-msgid "Can't create temporary directory"
-msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
-
-#: svnlook/main.c:1473
+#: svnlook/main.c:1369
+#, c-format
msgid ""
"REVISION PATH <ID>\n"
"-------- ---------\n"
@@ -7592,7 +8132,8 @@
"修 订 版 路径 <ID>\n"
"-------- ---------\n"
-#: svnlook/main.c:1478
+#: svnlook/main.c:1374
+#, c-format
msgid ""
"REVISION PATH\n"
"-------- ----\n"
@@ -7600,27 +8141,30 @@
"修 订 版 路径\n"
"-------- ----\n"
-#: svnlook/main.c:1523
+#: svnlook/main.c:1419
#, fuzzy, c-format
msgid "Property '%s' not found on revision %ld"
msgstr "属性“%sâ€åœ¨ä¿®è®¢ç‰ˆ %ld 䏿‰¾ä¸åˆ°"
-#: svnlook/main.c:1527
+#: svnlook/main.c:1423
#, fuzzy, c-format
msgid "Property '%s' not found on path '%s' in revision %ld"
msgstr "属性“%1$sâ€åœ¨ä¿®è®¢ç‰ˆ %3$ld ä¸çš„路径“%2$sâ€ä¸æ‰¾ä¸åˆ°"
-#: svnlook/main.c:1695 svnlook/main.c:1909
+#: svnlook/main.c:1592 svnlook/main.c:1807
+#, c-format
msgid "Missing repository path argument"
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1756
+#: svnlook/main.c:1653
+#, fuzzy
msgid ""
"general usage: svnlook SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
"Note: any subcommand which takes the '--revision' and '--transaction'\n"
" options will, if invoked without one of those options, act on\n"
" the repository's youngest revision.\n"
"Type 'svnlook help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnlook --version' to see the program version and FS modules.\n"
"\n"
"Available subcommands:\n"
msgstr ""
@@ -7631,12 +8175,12 @@
"\n"
"å¯ç”¨çš„å命令:\n"
-#: svnlook/main.c:1811
+#: svnlook/main.c:1709
#, fuzzy
msgid "Missing path argument"
msgstr "未æä¾›æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1836
+#: svnlook/main.c:1734
#, c-format
msgid ""
"Comment (%i lines):\n"
@@ -7645,7 +8189,7 @@
"注释 (%i 行):\n"
"%s\n"
-#: svnlook/main.c:1837
+#: svnlook/main.c:1735
#, c-format
msgid ""
"Comment (%i line):\n"
@@ -7654,39 +8198,40 @@
"注释 (%i 行):\n"
"%s\n"
-#: svnlook/main.c:1883
-#, fuzzy
+#: svnlook/main.c:1781
+#, fuzzy, c-format
msgid "Missing propname argument"
msgstr "未æä¾›å±žæ€§åç§°å‚æ•°"
-#: svnlook/main.c:1884
+#: svnlook/main.c:1782
+#, c-format
msgid "Missing propname and repository path arguments"
msgstr "未æä¾›å±žæ€§åç§°ä¸Žæ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:1890
+#: svnlook/main.c:1788
msgid "Missing propname or repository path argument"
msgstr "未æä¾›å±žæ€§åç§°æˆ–æ¡£æ¡ˆåº“è·¯å¾„å‚æ•°"
-#: svnlook/main.c:2045
+#: svnlook/main.c:1946
msgid "Invalid revision number supplied"
msgstr "æä¾›äº†æ— 效的版本å·ç "
-#: svnlook/main.c:2103
+#: svnlook/main.c:2007
msgid ""
"The '--transaction' (-t) and '--revision' (-r) arguments can not co-exist"
msgstr "'--transaction' (-t) 与 '--revision' (-r) 傿•°ä¸èƒ½åŒæ—¶å˜åœ¨"
-#: svnlook/main.c:2172
-#, fuzzy
+#: svnlook/main.c:2089
+#, fuzzy, c-format
msgid "Repository argument required\n"
msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°"
-#: svnlook/main.c:2181
+#: svnlook/main.c:2098
#, c-format
msgid "'%s' is a URL when it should be a path\n"
msgstr "“%sâ€æ˜¯åœ°å€(URL),但是应该是路径\n"
-#: svnlook/main.c:2229
+#: svnlook/main.c:2149
#, fuzzy, c-format
msgid ""
"Subcommand '%s' doesn't accept option '%s'\n"
@@ -7695,62 +8240,72 @@
"å命令“%sâ€å¹¶ä¸æŽ¥å—选项“%sâ€\n"
"请使用“svnlook help %sâ€ä»¥äº†è§£ç”¨æ³•。\n"
-#: svnserve/main.c:102
+#: svnserve/main.c:140
msgid "daemon mode"
msgstr "åŽå°æ¨¡å¼"
-#: svnserve/main.c:104
+#: svnserve/main.c:142
msgid "listen port (for daemon mode)"
msgstr "监å¬ç«¯å£ï¼ˆåŽå°æ¨¡å¼ï¼‰"
-#: svnserve/main.c:106
+#: svnserve/main.c:144
msgid "listen hostname or IP address (for daemon mode)"
msgstr "监å¬ä¸»æœºå或IP地å€ï¼ˆåŽå°æ¨¡å¼ï¼‰"
-#: svnserve/main.c:108
+#: svnserve/main.c:146
msgid "run in foreground (useful for debugging)"
msgstr "在å‰å°è¿è¡Œï¼ˆè°ƒè¯•时有用)"
-#: svnserve/main.c:109 svnversion/main.c:181
+#: svnserve/main.c:147 svnversion/main.c:123
msgid "display this help"
msgstr "显示这个帮助"
-#: svnserve/main.c:112
+#: svnserve/main.c:150
msgid "inetd mode"
msgstr "inetd 模å¼"
-#: svnserve/main.c:113
+#: svnserve/main.c:151
msgid "root of directory to serve"
msgstr "æœåŠ¡æ ¹ç›®å½•"
-#: svnserve/main.c:114
-msgid "deprecated; use repository config file"
+#: svnserve/main.c:153
+#, fuzzy
+msgid "force read only, overriding repository config file"
msgstr "ä¸èµžæˆï¼›ä½¿ç”¨æ¡£æ¡ˆåº“é…置文件"
-#: svnserve/main.c:115
+#: svnserve/main.c:154
msgid "tunnel mode"
msgstr "éš§é“æ¨¡å¼"
-#: svnserve/main.c:117
+#: svnserve/main.c:156
msgid "tunnel username (default is current uid's name)"
msgstr "éš§é“用户åï¼ˆæ¨¡å¼æ˜¯å½“å‰ç”¨æˆ·UIDçš„åå—)"
-#: svnserve/main.c:119
+#: svnserve/main.c:158
msgid "use threads instead of fork"
msgstr "使用线程代替进程"
-#: svnserve/main.c:121
+#: svnserve/main.c:160
msgid "listen once (useful for debugging)"
msgstr "监å¬ä¸€æ¬¡ï¼ˆè°ƒè¯•时有用)"
-#: svnserve/main.c:132
+#: svnserve/main.c:162
+msgid "write server process ID to file arg"
+msgstr ""
+
+#: svnserve/main.c:165
+msgid "run as a windows service (SCM only)"
+msgstr ""
+
+#: svnserve/main.c:177
#, c-format
msgid "Type '%s --help' for usage.\n"
msgstr "请使用“%s helpâ€ä»¥å¾—到用法和帮助。\n"
-#: svnserve/main.c:141
+#: svnserve/main.c:186
+#, fuzzy
msgid ""
-"Usage: svnserve [options]\n"
+"usage: svnserve [options]\n"
"\n"
"Valid options:\n"
msgstr ""
@@ -7758,76 +8313,243 @@
"\n"
"有效选项:\n"
-#: svnserve/main.c:359
-msgid ""
-"Warning: -R is deprecated.\n"
-"Anonymous access is now read-only by default.\n"
-"To change, use conf/svnserve.conf in repos:\n"
-" [general]\n"
-" anon-access = read|write|none (default read)\n"
-" auth-access = read|write|none (default write)\n"
-"Forcing all access to read-only for now\n"
-msgstr ""
-"è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
-"匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
-"修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
-" [general]\n"
-" anon-access = read|write|none (默认 read)\n"
-" auth-access = read|write|none (默认 write)\n"
-"强制所有访问为åªè¯»\n"
-
-#: svnserve/main.c:381
-msgid "Option --tunnel-user is only valid in tunnel mode.\n"
-msgstr "选项 --tunnel-user åªæœ‰éš§é“æ¨¡å¼æ—¶æœ‰æ•ˆã€‚\n"
-
-#: svnserve/main.c:388
+#: svnserve/main.c:453
#, fuzzy
msgid "You must specify exactly one of -d, -i, -t or -X.\n"
msgstr "您必须指定 -d, -i, -t 或 -X ä¸çš„一个。\n"
-#: svnserve/main.c:429
+#: svnserve/main.c:463
#, c-format
-msgid "Can't get address info: %s\n"
-msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+msgid "Option --tunnel-user is only valid in tunnel mode.\n"
+msgstr "选项 --tunnel-user åªæœ‰éš§é“æ¨¡å¼æ—¶æœ‰æ•ˆã€‚\n"
-#: svnserve/main.c:446
+#: svnserve/main.c:532
#, c-format
-msgid "Can't create server socket: %s\n"
+msgid ""
+"svnserve: The --service flag is only valid if the process is started by the "
+"Service Control Manager.\n"
+msgstr ""
+
+#: svnserve/main.c:568
+#, fuzzy, c-format
+msgid "Can't get address info"
+msgstr "ä¸èƒ½èŽ·å–地å€ä¿¡æ¯ï¼šâ€œ%sâ€\n"
+
+#: svnserve/main.c:584
+#, fuzzy, c-format
+msgid "Can't create server socket"
msgstr "æ— æ³•åˆ›å»ºæœåŠ¡å™¨å¥—æŽ¥å—:%s\n"
-#: svnserve/main.c:460
-#, c-format
-msgid "Can't bind server socket: %s\n"
+#: svnserve/main.c:597
+#, fuzzy, c-format
+msgid "Can't bind server socket"
msgstr "ä¸èƒ½ç»‘定æœåŠ¡å™¨å¥—æŽ¥å—:“%sâ€\n"
-#: svnserve/main.c:503
+#: svnserve/main.c:665
#, fuzzy, c-format
-msgid "Can't accept client connection: %s\n"
+msgid "Can't accept client connection"
msgstr "æ— æ³•æŽ¥å—客户连接:%s\n"
-#: svnserve/main.c:558
+#: svnserve/main.c:719
#, fuzzy, c-format
-msgid "Can't create threadattr: %s\n"
+msgid "Can't create threadattr"
msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹å±žæ€§ï¼šâ€œ%sâ€\n"
# as-is
-#: svnserve/main.c:567
+#: svnserve/main.c:727
#, fuzzy, c-format
-msgid "Can't set detached state: %s\n"
+msgid "Can't set detached state"
msgstr "ä¸èƒ½è®¾ç½®åˆ†ç¦»çš„状æ€ï¼šâ€œ%sâ€\n"
-#: svnserve/main.c:581
+#: svnserve/main.c:740
#, fuzzy, c-format
-msgid "Can't create thread: %s\n"
+msgid "Can't create thread"
msgstr "æ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s\n"
-#: svnversion/main.c:90
+#: svnserve/winservice.c:341
+#, c-format
+msgid "Failed to create winservice_start_event"
+msgstr ""
+
+#: svnserve/winservice.c:352
+#, c-format
+msgid "The service failed to start"
+msgstr ""
+
+#: svnserve/winservice.c:400
+#, c-format
+msgid "Failed to connect to Service Control Manager"
+msgstr ""
+
+#: svnserve/winservice.c:411
+#, c-format
+msgid ""
+"The service failed to start; an internal error occurred while starting the "
+"service"
+msgstr ""
+
+#: svnsync/main.c:56
+msgid ""
+"usage: svnsync initialize DEST_URL SOURCE_URL\n"
+"\n"
+"Initialize a destination repository for synchronization from\n"
+"another repository.\n"
+"\n"
+"The destination URL must point to the root of a repository with\n"
+"no committed revisions. The destination repository must allow\n"
+"revision property changes.\n"
+"\n"
+"You should not commit to, or make revision property changes in,\n"
+"the destination repository by any method other than 'svnsync'.\n"
+"In other words, the destination repository should be a read-only\n"
+"mirror of the source repository.\n"
+msgstr ""
+
+#: svnsync/main.c:71
+msgid ""
+"usage: svnsync synchronize DEST_URL\n"
+"\n"
+"Transfer all pending revisions from source to destination.\n"
+msgstr ""
+
+#: svnsync/main.c:76
+msgid ""
+"usage: svnsync copy-revprops DEST_URL REV\n"
+"\n"
+"Copy all revision properties for revision REV from source to\n"
+"destination.\n"
+msgstr ""
+
+#: svnsync/main.c:82
+#, fuzzy
+msgid ""
+"usage: svnsync help [SUBCOMMAND...]\n"
+"\n"
+"Describe the usage of this program or its subcommands.\n"
+msgstr ""
+"用法:svnadmin help [SUBCOMMAND...]\n"
+"\n"
+"æ˜¾ç¤ºæœ¬ç¨‹åºæˆ–å…¶å命令的用法。\n"
+
+#: svnsync/main.c:184
+#, fuzzy, c-format
+msgid "Can't get local hostname"
+msgstr "æ— æ³•èŽ·å–æ–‡ä»¶å"
+
+#: svnsync/main.c:206
+#, c-format
+msgid "Failed to get lock on destination repos, currently held by '%s'\n"
+msgstr ""
+
+#: svnsync/main.c:301
+#, c-format
+msgid "Session is rooted at '%s' but the repos root is '%s'"
+msgstr ""
+
+#: svnsync/main.c:341
+#, c-format
+msgid "Copied properties for revision %ld (%s* properties skipped).\n"
+msgstr ""
+
+#: svnsync/main.c:346
+#, fuzzy, c-format
+msgid "Copied properties for revision %ld.\n"
+msgstr "修订版 %ld 上的未纳入版本控制的属性:\n"
+
+#: svnsync/main.c:387
+msgid "Cannot initialize a repository with content in it"
+msgstr ""
+
+#: svnsync/main.c:398
+#, c-format
+msgid "Destination repository is already synchronizing from '%s'"
+msgstr ""
+
+#: svnsync/main.c:455 svnsync/main.c:458 svnsync/main.c:1116
+#: svnsync/main.c:1200
+#, fuzzy, c-format
+msgid "Path '%s' is not a URL"
+msgstr "路径“%sâ€ä¸æ˜¯æ–‡ä»¶"
+
+#: svnsync/main.c:838
+#, fuzzy, c-format
+msgid "Committed revision %ld.\n"
+msgstr ""
+"\n"
+"æäº¤åŽçš„修订版为 %ld。\n"
+
+#: svnsync/main.c:877
+msgid "Destination repository has not been initialized"
+msgstr ""
+
+#: svnsync/main.c:892
+#, c-format
+msgid "UUID of source repository (%s) does not match expected UUID (%s)"
+msgstr ""
+
+#: svnsync/main.c:954
+#, c-format
+msgid ""
+"Revision being currently copied (%ld), last merged revision (%ld), and "
+"destination HEAD (%ld) are inconsistent; have you committed to the "
+"destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:992
+#, c-format
+msgid ""
+"Destination HEAD (%ld) is not the last merged revision (%ld); have you "
+"committed to the destination without using svnsync?"
+msgstr ""
+
+#: svnsync/main.c:1069
+#, c-format
+msgid "Commit created rev %ld but should have created %ld"
+msgstr ""
+
+#: svnsync/main.c:1171
+msgid "Cannot copy revprops for a revision that has not been synchronized yet"
+msgstr ""
+
+#: svnsync/main.c:1203
+#, fuzzy
+msgid "Invalid revision number"
+msgstr "æä¾›äº†æ— 效的版本å·ç "
+
+#: svnsync/main.c:1239
#, fuzzy
+msgid ""
+"general usage: svnsync SUBCOMMAND DEST_URL [ARGS & OPTIONS ...]\n"
+"Type 'svnsync help <subcommand>' for help on a specific subcommand.\n"
+"Type 'svnsync --version' to see the program version and RA modules.\n"
+"\n"
+"Available subcommands:\n"
+msgstr ""
+"一般用法:svnadmin SUBCOMMAND REPOS_PATH [ARGS & OPTIONS ...]\n"
+"请使用 “svnadmin help <subcommand>†以å–得特定å命令的帮助信æ¯ã€‚\n"
+"\n"
+"å¯ç”¨çš„å命令:\n"
+
+#: svnsync/main.c:1429
+#, fuzzy, c-format
+msgid ""
+"subcommand '%s' doesn't accept option '%s'\n"
+"Type 'svnsync help %s' for usage.\n"
+msgstr ""
+"å命令“%sâ€ä¸æŽ¥å—选项“%sâ€\n"
+"请输入“svn help %sâ€ä»¥å–得用法。\n"
+
+#: svnsync/main.c:1490
+msgid "Not enough arguments provided; try 'svnsync help' for more info"
+msgstr ""
+
+#: svnversion/main.c:39
+#, fuzzy, c-format
msgid "Type 'svnversion --help' for usage.\n"
msgstr "请使用“svnversion --helpâ€ä»¥å¾—到用法和帮助。\n"
-#: svnversion/main.c:101
-#, fuzzy
+#: svnversion/main.c:50
+#, fuzzy, c-format
msgid ""
"usage: svnversion [OPTIONS] [WC_PATH [TRAIL_URL]]\n"
"\n"
@@ -7880,81 +8602,237 @@
" å¦‚æžœè°ƒç”¨æ—¶æ²¡æœ‰å‚æ•° WC_PATH 会使用当å‰ç›®å½•。\n"
"有效选项:\n"
-#: svnversion/main.c:179
+#: svnversion/main.c:121
msgid "do not output the trailing newline"
msgstr "ä¸è¾“出其åŽçš„æ¢è¡Œç¬¦"
-#: svnversion/main.c:180
+#: svnversion/main.c:122
msgid "last changed rather than current revisions"
msgstr "最近一次改å˜çš„ï¼Œè€Œä¸æ˜¯ç›®å‰çš„修订版"
-#: svnversion/main.c:272
+#: svnversion/main.c:229
#, c-format
msgid "exported%s"
msgstr "已导出%s"
-#: svnversion/main.c:281
+#: svnversion/main.c:238
#, c-format
msgid "'%s' not versioned, and not exported\n"
msgstr "“%sâ€æœªçº³å…¥ç‰ˆæœ¬æŽ§åˆ¶ï¼Œå¹¶æœªå¯¼å‡º\n"
-#~ msgid " %ld => %ld\n"
-#~ msgstr " %ld => %ld\n"
+#~ msgid "Finished"
+#~ msgstr "完æˆ"
-#~ msgid "Cannot cleanup '%s': not a directory"
-#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
+#~ msgid "Can't get default file perms for file at '%s' (file close error)"
+#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
-#~ msgid "'svn info' only works on working copy paths, not URLs"
-#~ msgstr "“svn infoâ€åªå·¥ä½œäºŽå·¥ä½œç›®å½•,ä¸èƒ½æ˜¯åœ°å€(URL)"
+#, fuzzy
+#~ msgid ""
+#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
+#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
-#~ msgid "No commit for revision 0.\n"
-#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
+#~ msgid "'%s' is already a file/something else"
+#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
-#~ msgid "Print client version info\n"
-#~ msgstr "输出客户端版本信æ¯\n"
+#~ msgid "No URL target available"
+#~ msgstr "没有æä¾› URL ç›®æ ‡"
-#~ msgid "Working copy not locked"
-#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
+#~ msgid "repository argument required\n"
+#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
-#~ msgid "No get_dir() available for URL schema"
-#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
+#~ msgid "unknown command: '%s'\n"
+#~ msgstr "未知的命令:“%sâ€\n"
+
+#~ msgid "Can't recode string"
+#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
+
+#~ msgid "native"
+#~ msgstr "本地"
+
+# as-is
+#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
+#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
# as-is
#~ msgid "Unsupported RA plugin ABI version (%d) for ra_dav"
#~ msgstr "䏿”¯æŒra_davçš„ RA æ’ä»¶ ABI 版本 (%d)"
+#~ msgid "No get_dir() available for URL schema"
+#~ msgstr "该地å€(URL)规则ä¸å¹¶ä¸æ”¯æŒ get_dir()"
+
+#~ msgid "Working copy not locked"
+#~ msgstr "å·¥ä½œæ‹·è´æœªé”定"
+
+#~ msgid "Print client version info\n"
+#~ msgstr "输出客户端版本信æ¯\n"
+
+#~ msgid "No commit for revision 0.\n"
+#~ msgstr "没有修订版0çš„æäº¤ã€‚\n"
+
+#~ msgid "Cannot cleanup '%s': not a directory"
+#~ msgstr "æ— æ³•æ¸…é™¤â€œ%sâ€ï¼šä¸æ˜¯ä¸€ä¸ªç›®å½•"
+
+#~ msgid " %ld => %ld\n"
+#~ msgstr " %ld => %ld\n"
+
+#~ msgid "print client version info"
+#~ msgstr "打å°å®¢æˆ·ç«¯ç‰ˆæœ¬ä¿¡æ¯"
+
+#~ msgid "pass ARG to --diff-cmd as options (default: '-u')"
+#~ msgstr "ä¼ é€’ ARG 到 --diff-cmd 作为选项(é»˜è®¤ä½¿ç”¨å‚æ•° '-u')"
+
+#~ msgid "Wrong number of paths given"
+#~ msgstr "指定了错误数目的路径"
+
+#~ msgid "Not enough args provided"
+#~ msgstr "未æä¾›è¶³å¤Ÿçš„傿•°"
+
# as-is
-#~ msgid "Unsupported RA plugin ABI version (%d) for ra_svn."
-#~ msgstr "未支æŒra_svnçš„ RA æ’ä»¶ ABI 版本 (%d)。"
+#~ msgid "Can't seek in '%s'"
+#~ msgstr "ä¸èƒ½åœ¨â€œ%sâ€å®šä½"
-#~ msgid "native"
-#~ msgstr "本地"
+#~ msgid "Commit item '%s' has copy flag but no copyfrom URL\n"
+#~ msgstr "æäº¤é¡¹ç›®â€œ%sâ€æœ‰å¤åˆ¶æ ‡å¿—,但是没有å¤åˆ¶çš„地å€(copyfrom URL)\n"
-#~ msgid "Can't recode string"
-#~ msgstr "æ— æ³•é‡æ–°ç¼–ç å—符串"
+#~ msgid "Unrecognized node kind of '%s'"
+#~ msgstr "“%sâ€çš„节点ç§ç±»æ— 法辨识"
-#~ msgid "unknown command: '%s'\n"
-#~ msgstr "未知的命令:“%sâ€\n"
+#~ msgid "'%s' is in the way"
+#~ msgstr "“%sâ€æŒ¡åœ¨ä¸é—´"
-#~ msgid "repository argument required\n"
-#~ msgstr "éœ€æœ‰æ¡£æ¡ˆåº“å‚æ•°\n"
+#~ msgid "'%s' is not supported"
+#~ msgstr "“%sâ€ä¸æ”¯æŒ"
-#~ msgid "No URL target available"
-#~ msgstr "没有æä¾› URL ç›®æ ‡"
+#~ msgid "Corrupt clone record for '%s' in transaction '%s' in filesystem '%s'"
+#~ msgstr "文件系统“%3$sâ€ä¸åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸æœ‰æŸåçš„å¤åˆ¶è®°å½•“%1$sâ€"
-#~ msgid "'%s' is already a file/something else"
-#~ msgstr "“%sâ€å·²æ˜¯æ–‡ä»¶/其它的东西"
+#~ msgid "Malformed ID as key in 'nodes' table of filesystem '%s'"
+#~ msgstr "文件系统“%sâ€çš„“nodesâ€è¡¨æ ¼ä¸ï¼Œä»¥ç•¸å½¢çš„ ID 作为æœå¯»å…³é”®å—"
+
+#~ msgid "Corrupt value for 'next-id' key in '%s' table of filesystem '%s'"
+#~ msgstr "文件系统“%2$sâ€ä¸â€œ%1$sâ€çš„ 'next-id' è¡¨æ ¼æœ‰æ— æ•ˆçš„é¡¹ç›®"
+
+#~ msgid "Search for malformed path '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$sâ€ä¸æœå¯»ç•¸å½¢çš„路径“%1$sâ€"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for reading"
+#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œè¯»å–"
+
+# as-is
+#, fuzzy
+#~ msgid "Can't open file '%s' for writing"
+#~ msgstr "ä¸èƒ½æ‰“开文件“%sâ€è¿›è¡Œå†™å…¥"
+
+#, fuzzy
+#~ msgid "Error reading file '%s'"
+#~ msgstr "è¯»å–æ–‡ä»¶â€œ%sâ€æ—¶å‘生错误"
+
+#, fuzzy
+#~ msgid "Error writing file '%s'"
+#~ msgstr "写入文件“%sâ€æ—¶å‘生错误"
+
+#~ msgid "Corrupt node revision for node '%s' in filesystem '%s'"
+#~ msgstr "在文件系统“%2$sâ€ä¸èŠ‚ç‚¹â€œ%1$sâ€æœ‰æŸå的节点修订版"
+
+#~ msgid "Corrupt node revision id '%s' appears in filesystem '%s'"
+#~ msgstr "æŸå的节点修订版编å·â€œ%sâ€å‡ºçŽ°äºŽæ–‡ä»¶ç³»ç»Ÿâ€œ%sâ€ä¸"
+
+#~ msgid "Found malformed header block in dumpfile stream"
+#~ msgstr "在导出文件æµä¸æ‰¾åˆ°æœ‰ç•¸å½¢çš„æ–‡ä»¶å¤´"
+
+# as-is
+#~ msgid "Creating readme file"
+#~ msgstr "æ£åœ¨åˆ›å»º readme 文件"
#, fuzzy
+#~ msgid "Expected format '%d' of repository; found format '%d'"
+#~ msgstr "é¢„æœŸæ¡£æ¡ˆåº“æ ¼å¼â€œ%dâ€ï¼›æ‰¾åˆ°æ ¼å¼â€œ%dâ€"
+
+# as-is
+#~ msgid "Can't open config file '%s'"
+#~ msgstr "ä¸èƒ½æ‰“å¼€é…置文件“%sâ€"
+
+# as-is
+#~ msgid "Can't find config file '%s'"
+#~ msgstr "找ä¸åˆ°é…置文件“%sâ€"
+
+#~ msgid "Can't change executability of file '%s'"
+#~ msgstr "ä¸èƒ½æ”¹å˜æ–‡ä»¶â€œ%sâ€ä¸ºå¯æ‰§è¡Œ"
+
+#~ msgid "Can't stat new directory '%s'"
+#~ msgstr "æ— æ³•èŽ·å–æ–°ç›®å½•“%sâ€çš„状æ€"
+
+#~ msgid "Too few arguments"
+#~ msgstr "傿•°å¤ªå°‘"
+
#~ msgid ""
-#~ "No deletion changes for path '%s' in transaction '%s' of filesystem '%s'"
-#~ msgstr "文件系统“%3$sâ€åœ¨äº‹åŠ¡â€œ%2$sâ€ä¸è·¯å¾„“%1$sâ€æ²¡æœ‰è¢«åˆ 除部分的更改"
+#~ "The entry '%s' is no longer a directory; remove the entry before updating"
+#~ msgstr "项目“%sâ€å·²ä¸å†æ˜¯ç›®å½•了;更新å‰è¯·ç§»é™¤æœ¬é¡¹ç›®"
-#~ msgid "Error writing to stream: unexpected EOF"
-#~ msgstr "å†™å…¥æµæ—¶å‘ç”Ÿé”™è¯¯ï¼šæ„æƒ³ä¸åˆ°çš„ EOF"
+#~ msgid "Error restoring props for '%s'"
+#~ msgstr "还原“%sâ€çš„属性时å‘生错误"
-#~ msgid "Can't get default file perms for file at '%s' (file close error)"
-#~ msgstr "ä¸èƒ½èŽ·å–â€%s“文件的默认文件æƒé™(关闿–‡ä»¶é”™è¯¯)"
+#~ msgid "Error removing props for '%s'"
+#~ msgstr "移除“%sâ€çš„属性时å‘生错误"
-#~ msgid "Finished"
-#~ msgstr "完æˆ"
+#~ msgid ""
+#~ "'%s' is scheduled for deletion; it must be committed before being "
+#~ "overwritten"
+#~ msgstr "“%sâ€å·²åŠ å…¥åˆ é™¤è°ƒåº¦ï¼›åœ¨è¦†ç›–ä¹‹å‰ï¼Œå¿…须先被æäº¤"
+
+#, fuzzy
+#~ msgid "Working copy '%s' is missing or not locked"
+#~ msgstr "工作拷è´â€œ%sâ€ä¸¢å¤±æˆ–并未é”定"
+
+#~ msgid "Error checking path '%s'"
+#~ msgstr "检查路径“%sâ€æ—¶å‘生错误"
+
+#~ msgid "Unable to delete temporary file"
+#~ msgstr "æ— æ³•åˆ é™¤æš‚å˜æ–‡ä»¶"
+
+#~ msgid "Property '%s' locally changed to '%s', but update deletes it\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶åˆ 除\n"
+
+#~ msgid "Property '%s' locally deleted, but update sets it to '%s'\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«åˆ 除,但是更新将其设定为“%sâ€\n"
+
+#~ msgid "Property '%s' locally changed to '%s', but update sets it to '%s'\n"
+#~ msgstr "属性“%sâ€äºŽæœ¬åœ°è¢«ä¿®æ”¹æˆâ€œ%sâ€ï¼Œä½†æ˜¯æ›´æ–°å°†å…¶è®¾å®šä¸ºâ€œ%sâ€\n"
+
+#~ msgid "Unknown node kind: '%s'"
+#~ msgstr "未知的节点类型:“%sâ€"
+
+#~ msgid "'%s' has unknown value for svn:eol-style property"
+#~ msgstr "“%sâ€çš„ svn:eol-style å±žæ€§æœ‰ä¸æ˜Žçš„æ•°å€¼"
+
+#~ msgid "Move failed"
+#~ msgstr "移动失败"
+
+#~ msgid "Node with dropped parent sneaked in"
+#~ msgstr "其父节点已èˆå¼ƒçš„节点å·è·‘è¿›æ¥"
+
+#, fuzzy
+#~ msgid "Error creating dir '%s' (path exists)"
+#~ msgstr "创建目录“%sâ€æ—¶å‘生错误(路径已ç»å˜åœ¨)"
+
+#~ msgid "Can't create temporary directory"
+#~ msgstr "æ— æ³•å»ºç«‹ä¸´æ—¶ç›®å½•"
+
+#~ msgid ""
+#~ "Warning: -R is deprecated.\n"
+#~ "Anonymous access is now read-only by default.\n"
+#~ "To change, use conf/svnserve.conf in repos:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (default read)\n"
+#~ " auth-access = read|write|none (default write)\n"
+#~ "Forcing all access to read-only for now\n"
+#~ msgstr ""
+#~ "è¦å‘Šï¼š-R ä¸èµžæˆä½¿ç”¨ã€‚\n"
+#~ "匿å访问默认åªè¯»ã€‚Anonymous access is now read-only by default.\n"
+#~ "修改å¯é€šè¿‡ç¼–辑档案库目录 conf/svnserve.conf ä¸çš„:\n"
+#~ " [general]\n"
+#~ " anon-access = read|write|none (默认 read)\n"
+#~ " auth-access = read|write|none (默认 write)\n"
+#~ "强制所有访问为åªè¯»\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 23 05:34:28 2006