[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] Updated subversion/po/zh_CN.po for trunk and branches/1.4.x (was: [l10n] Translation status for branches/1.4.x r21204)

From: Liu Yubao <yubao.liu_at_gmail.com>
Date: 2006-08-23 05:27:40 CEST

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

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.