[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 "‘–ƒȃ